Skip to content

Commit

Permalink
Merge branch 'main' into feat/v2-shadow-parts
Browse files Browse the repository at this point in the history
  • Loading branch information
andy-blum committed Aug 2, 2024
2 parents b03cec1 + 3143781 commit 22ec854
Show file tree
Hide file tree
Showing 37 changed files with 178 additions and 171 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions packages/carbon-web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"dependencies": {
"@babel/runtime": "^7.16.3",
"@carbon/ibm-products-styles": "^2.30.1",
"@carbon/styles": "1.61.0",
"@carbon/styles": "1.62.0",
"@floating-ui/dom": "^1.6.3",
"@ibm/telemetry-js": "^1.5.0",
"flatpickr": "4.6.13",
Expand All @@ -93,7 +93,7 @@
"@babel/preset-modules": "^0.1.5",
"@babel/template": "~7.12.0",
"@babel/traverse": "~7.23.7",
"@carbon/icon-helpers": "10.49.0",
"@carbon/icon-helpers": "10.50.0",
"@carbon/icons": "10.48.5",
"@open-wc/semantic-dom-diff": "~0.18.0",
"@percy-io/in-percy": "^0.1.11",
Expand Down Expand Up @@ -196,7 +196,7 @@
"rollup-plugin-multi-input": "^1.3.1",
"sass": "~1.77.0",
"sass-loader": "^10.0.0",
"strip-comments": "^1.0.0",
"strip-comments": "^2.0.1",
"style-loader": "^2.0.0",
"temp": "^0.9.0",
"terser-webpack-plugin": "^4.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/services-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"jest-circus": "25.5.4",
"jest-fetch-mock": "^3.0.0",
"redux-mock-store": "^1.5.0",
"strip-comments": "^1.0.0",
"strip-comments": "^2.0.1",
"through2": "^3.0.0",
"typescript": "^5.2.2"
}
Expand Down
10 changes: 5 additions & 5 deletions packages/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"upgrade-carbon": "yarn upgrade-interactive @carbon/layout @carbon/styles @carbon/themes @carbon/icons-react --latest --exact"
},
"dependencies": {
"@carbon/icons-react": "11.45.0",
"@carbon/layout": "11.23.1",
"@carbon/styles": "1.61.0",
"@carbon/type": "11.28.1",
"@carbon/icons-react": "11.46.0",
"@carbon/layout": "11.24.0",
"@carbon/styles": "1.62.0",
"@carbon/type": "11.29.0",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
"@carbon/themes": "11.37.1",
"@carbon/themes": "11.38.0",
"del": "^6.0.0",
"gulp": "^4.0.2",
"gulp-autoprefixer": "^6.1.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/web-components/gulp-tasks/build/modules/scripts.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2020, 2023
* Copyright IBM Corp. 2020, 2024
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand Down Expand Up @@ -36,7 +36,7 @@ function scripts() {
.pipe(sourcemaps.init())
.pipe(
babel({
presets: ['@babel/preset-modules', '@babel/preset-env'],
presets: ['@babel/preset-modules'],
// `version: '7.3.0'` ensures `@babel/plugin-transform-runtime` is applied to decorator helper
plugins: [
[
Expand All @@ -50,7 +50,7 @@ function scripts() {
)
// Avoids generating `.js` from interface-only `.ts` files
.pipe(
filter(file =>
filter((file) =>
stripComments(file.contents.toString(), {
sourceType: 'module',
}).replace(/\s/g, '')
Expand Down
16 changes: 8 additions & 8 deletions packages/web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@
"@carbon/ibmdotcom-services": "2.11.1",
"@carbon/ibmdotcom-styles": "2.11.1",
"@carbon/ibmdotcom-utilities": "2.11.1",
"@carbon/layout": "11.23.1",
"@carbon/motion": "11.19.1",
"@carbon/styles": "1.61.0",
"@carbon/layout": "11.24.0",
"@carbon/motion": "11.20.0",
"@carbon/styles": "1.62.0",
"@carbon/web-components": "2.11.1",
"@ibm/telemetry-js": "^1.5.0",
"lit": "^2.7.6",
Expand Down Expand Up @@ -131,12 +131,12 @@
"@babel/template": "~7.12.0",
"@babel/traverse": "~7.23.7",
"@carbon/ibmdotcom-services-store": "1.53.1",
"@carbon/icon-helpers": "10.49.0",
"@carbon/icon-helpers": "10.50.0",
"@carbon/icons": "10.48.5",
"@carbon/icons-react": "^11.33.0",
"@carbon/pictograms-react": "11.63.0",
"@carbon/react": "1.61.0",
"@carbon/type": "11.28.1",
"@carbon/pictograms-react": "11.64.0",
"@carbon/react": "1.63.0",
"@carbon/type": "11.29.0",
"@open-wc/semantic-dom-diff": "~0.18.0",
"@percy-io/in-percy": "^0.1.11",
"@percy/cli": "^1.28.5",
Expand Down Expand Up @@ -230,7 +230,7 @@
"rollup-plugin-sizes": "^1.0.4",
"sass-loader": "^10.0.0",
"storybook-addon-rtl": "^0.5.0",
"strip-comments": "^1.0.0",
"strip-comments": "^2.0.1",
"style-loader": "^2.0.0",
"svgo": "^1.3.0",
"temp": "^0.9.0",
Expand Down
Loading

0 comments on commit 22ec854

Please sign in to comment.