Skip to content

Commit

Permalink
Merge branch 'main' of github.com:carbon-design-system/carbon-for-ibm…
Browse files Browse the repository at this point in the history
…-dotcom into renovate/lock-file-maintenance
  • Loading branch information
kennylam committed Oct 30, 2023
2 parents 1964d90 + dce03d7 commit 4584e54
Show file tree
Hide file tree
Showing 46 changed files with 955 additions and 395 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.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
"@actions/tool-cache": "^1.5.0",
"@babel/core": "~7.12.0",
"@babel/helper-annotate-as-pure": "^7.9.0",
"@babel/plugin-proposal-class-properties": "~7.12.0",
"@babel/plugin-proposal-export-default-from": "~7.12.0",
"@babel/plugin-proposal-export-namespace-from": "~7.12.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "~7.12.0",
"@babel/plugin-proposal-optional-chaining": "~7.12.0",
"@babel/plugin-transform-class-properties": "~7.22.5",
"@babel/plugin-transform-export-namespace-from": "~7.22.11",
"@babel/plugin-transform-nullish-coalescing-operator": "~7.22.11",
"@babel/plugin-transform-optional-chaining": "~7.23.0",
"@babel/plugin-transform-runtime": "7.18.5",
"@babel/preset-env": "~7.12.0",
"@babel/preset-env": "~7.23.2",
"@babel/preset-react": "~7.12.1",
"@commitlint/cli": "^16.0.0",
"@commitlint/config-conventional": "^16.0.0",
Expand Down
13 changes: 8 additions & 5 deletions packages/carbon-web-components/.babelrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"plugins": [
"@babel/plugin-transform-typescript",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-class-properties",
["@babel/plugin-proposal-decorators", { "decoratorsBeforeExport": true }],
"@babel/plugin-proposal-nullish-coalescing-operator",
["@babel/plugin-proposal-object-rest-spread", { "useBuiltIns": true }],
"@babel/plugin-proposal-optional-chaining",
["@babel/plugin-transform-runtime", { "useESModules": true, "version": "7.8.0" }]
"@babel/plugin-transform-nullish-coalescing-operator",
["@babel/plugin-transform-object-rest-spread", { "useBuiltIns": true }],
"@babel/plugin-transform-optional-chaining",
[
"@babel/plugin-transform-runtime",
{ "useESModules": true, "version": "7.8.0" }
]
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2020, 2022
* Copyright IBM Corp. 2020, 2023
*
* 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 @@ -39,8 +39,8 @@ async function reactTypes() {
plugins: [
['@babel/plugin-syntax-decorators', { decoratorsBeforeExport: true }],
'@babel/plugin-syntax-typescript',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-optional-chaining',
babelPluginCreateReactCustomElementTypeDef,
],
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2020, 2022
* Copyright IBM Corp. 2020, 2023
*
* 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 @@ -45,8 +45,8 @@ const buildModulesReact = ({ banner, targetEnv = 'browser' }) => {
plugins: [
['@babel/plugin-syntax-decorators', { decoratorsBeforeExport: true }],
'@babel/plugin-syntax-typescript',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-optional-chaining',
[babelPluginCreateReactCustomElementType, { nonUpgradable: targetEnv === 'node' }],
],
})
Expand Down
10 changes: 5 additions & 5 deletions packages/carbon-web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,16 @@
},
"devDependencies": {
"@babel/core": "~7.12.0",
"@babel/plugin-proposal-class-properties": "~7.12.0",
"@babel/plugin-proposal-decorators": "~7.12.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "~7.12.0",
"@babel/plugin-proposal-object-rest-spread": "~7.12.0",
"@babel/plugin-proposal-optional-chaining": "~7.12.0",
"@babel/plugin-transform-class-properties": "~7.22.5",
"@babel/plugin-transform-modules-commonjs": "~7.12.0",
"@babel/plugin-transform-nullish-coalescing-operator": "~7.22.11",
"@babel/plugin-transform-object-rest-spread": "~7.22.15",
"@babel/plugin-transform-optional-chaining": "~7.23.0",
"@babel/plugin-transform-runtime": "7.18.5",
"@babel/plugin-transform-template-literals": "~7.12.0",
"@babel/plugin-transform-typescript": "~7.12.0",
"@babel/preset-env": "~7.12.0",
"@babel/preset-env": "~7.23.2",
"@babel/preset-modules": "^0.1.5",
"@babel/template": "~7.12.0",
"@babel/traverse": "~7.23.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/carbon-web-components/tools/get-rollup-config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2020, 2022
* Copyright IBM Corp. 2020, 2023
*
* 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 @@ -137,14 +137,14 @@ function getRollupConfig({
presets: ['@babel/preset-modules'],
plugins: [
'@babel/plugin-transform-typescript',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-class-properties',
[
'@babel/plugin-proposal-decorators',
{ decoratorsBeforeExport: true },
],
'@babel/plugin-proposal-nullish-coalescing-operator',
['@babel/plugin-proposal-object-rest-spread', { useBuiltIns: true }],
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
['@babel/plugin-transform-object-rest-spread', { useBuiltIns: true }],
'@babel/plugin-transform-optional-chaining',
...(mode === 'development'
? []
: [
Expand Down
14 changes: 7 additions & 7 deletions packages/react/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2020, 2022
* Copyright IBM Corp. 2020, 2023
*
* 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 All @@ -9,13 +9,13 @@ module.exports = {
presets: ['./scripts/env', '@babel/preset-react'],
plugins: [
'macros',
['@babel/plugin-proposal-class-properties', { loose: true }],
['@babel/plugin-proposal-private-methods', { loose: true }],
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
'@babel/plugin-proposal-export-namespace-from',
['@babel/plugin-transform-class-properties', { loose: true }],
['@babel/plugin-transform-private-methods', { loose: true }],
['@babel/plugin-transform-private-property-in-object', { loose: true }],
'@babel/plugin-transform-export-namespace-from',
'@babel/plugin-proposal-export-default-from',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-optional-chaining',
'inline-react-svg',
[
'@babel/plugin-transform-runtime',
Expand Down
9 changes: 5 additions & 4 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,13 @@
"devDependencies": {
"@babel/cli": "~7.12.0",
"@babel/core": "~7.12.0",
"@babel/plugin-proposal-class-properties": "~7.12.0",
"@babel/plugin-proposal-export-default-from": "~7.12.0",
"@babel/plugin-proposal-export-namespace-from": "~7.12.0",
"@babel/plugin-proposal-private-property-in-object": "~7.21.0",
"@babel/plugin-transform-class-properties": "~7.22.5",
"@babel/plugin-transform-export-namespace-from": "~7.22.11",
"@babel/plugin-transform-private-methods": "~7.22.5",
"@babel/plugin-transform-private-property-in-object": "~7.22.11",
"@babel/plugin-transform-runtime": "7.18.5",
"@babel/preset-env": "~7.12.0",
"@babel/preset-env": "~7.23.2",
"@babel/preset-react": "~7.12.1",
"@carbon/icons-react": "10.49.2",
"@carbon/pictograms-react": "11.50.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/react/tests/karma-accessibility-checker.conf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2020, 2022
* Copyright IBM Corp. 2020, 2023
*
* 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 @@ -87,10 +87,10 @@ module.exports = function setupKarmaIBMa(config) {
],
],
plugins: [
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-class-properties',
'@babel/plugin-proposal-export-default-from',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-optional-chaining',
[
'babel-plugin-transform-define',
{
Expand Down
4 changes: 2 additions & 2 deletions packages/services-store/.babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"plugins": [
"@babel/plugin-transform-typescript",
["@babel/plugin-proposal-decorators", { "decoratorsBeforeExport": true }],
"@babel/plugin-proposal-nullish-coalescing-operator",
"@babel/plugin-proposal-optional-chaining"
"@babel/plugin-transform-nullish-coalescing-operator",
"@babel/plugin-transform-optional-chaining"
]
}
6 changes: 3 additions & 3 deletions packages/services-store/config/jest/jsTransform.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2023
*
* 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 All @@ -14,8 +14,8 @@ module.exports = createTransformer({
plugins: [
'@babel/plugin-transform-typescript',
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
],
});
4 changes: 2 additions & 2 deletions packages/services-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"devDependencies": {
"@babel/core": "~7.12.0",
"@babel/plugin-proposal-decorators": "~7.12.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "~7.12.0",
"@babel/plugin-proposal-optional-chaining": "~7.12.0",
"@babel/plugin-transform-modules-commonjs": "~7.12.0",
"@babel/plugin-transform-nullish-coalescing-operator": "~7.22.11",
"@babel/plugin-transform-optional-chaining": "~7.23.0",
"@babel/plugin-transform-typescript": "~7.12.0",
"@babel/preset-modules": "^0.1.5",
"async-done": "^1.3.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/services/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2023
*
* 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 All @@ -12,11 +12,11 @@ module.exports = {
'macros',
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-export-namespace-from',
'@babel/plugin-transform-class-properties',
'@babel/plugin-transform-export-namespace-from',
'@babel/plugin-proposal-export-default-from',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-optional-chaining',
[
'@babel/plugin-transform-runtime',
{
Expand Down
6 changes: 3 additions & 3 deletions packages/services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@
"devDependencies": {
"@babel/cli": "~7.12.0",
"@babel/core": "~7.12.0",
"@babel/plugin-proposal-class-properties": "~7.12.0",
"@babel/plugin-proposal-export-default-from": "~7.12.0",
"@babel/plugin-proposal-export-namespace-from": "~7.12.0",
"@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/plugin-transform-class-properties": "~7.22.5",
"@babel/plugin-transform-export-namespace-from": "~7.22.11",
"@babel/plugin-transform-runtime": "7.18.5",
"@babel/preset-env": "~7.12.0",
"@babel/preset-env": "~7.23.2",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^21.0.3",
"@rollup/plugin-json": "^4.1.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/utilities/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2020
* Copyright IBM Corp. 2020, 2023
*
* 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 All @@ -12,10 +12,10 @@ module.exports = {
'macros',
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-export-namespace-from',
'@babel/plugin-transform-class-properties',
'@babel/plugin-transform-export-namespace-from',
'@babel/plugin-proposal-export-default-from',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-optional-chaining',
],
};
6 changes: 3 additions & 3 deletions packages/utilities/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
"devDependencies": {
"@babel/cli": "~7.12.0",
"@babel/core": "~7.12.0",
"@babel/plugin-proposal-class-properties": "~7.12.0",
"@babel/plugin-proposal-export-default-from": "~7.12.0",
"@babel/plugin-proposal-export-namespace-from": "~7.12.0",
"@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/preset-env": "~7.12.0",
"@babel/plugin-transform-class-properties": "~7.22.5",
"@babel/plugin-transform-export-namespace-from": "~7.22.11",
"@babel/preset-env": "~7.23.2",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^21.0.3",
"@rollup/plugin-json": "^4.1.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/web-components/.babelrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"plugins": [
"@babel/plugin-transform-typescript",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-class-properties",
["@babel/plugin-proposal-decorators", { "decoratorsBeforeExport": true }],
"@babel/plugin-proposal-nullish-coalescing-operator",
["@babel/plugin-proposal-object-rest-spread", { "useBuiltIns": true }],
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-transform-nullish-coalescing-operator",
["@babel/plugin-transform-object-rest-spread", { "useBuiltIns": true }],
"@babel/plugin-transform-optional-chaining",
"@babel/plugin-syntax-dynamic-import"
]
}
12 changes: 6 additions & 6 deletions packages/web-components/.storybook/react/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ const buildCreateReactCustomElementTypeBabelOpts = {
plugins: [
['@babel/plugin-syntax-decorators', { decoratorsBeforeExport: true }],
'@babel/plugin-syntax-typescript',
'@babel/plugin-proposal-nullish-coalescing-operator',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-nullish-coalescing-operator',
'@babel/plugin-transform-optional-chaining',
babelPluginCreateReactCustomElementType,
],
};
Expand Down Expand Up @@ -157,8 +157,8 @@ module.exports = {
options: {
presets: ['@babel/preset-modules', '@babel/preset-react'],
plugins: [
'@babel/plugin-proposal-object-rest-spread',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-object-rest-spread',
'@babel/plugin-transform-class-properties',
[
'babel-plugin-react-docgen',
{
Expand All @@ -179,8 +179,8 @@ module.exports = {
options: {
presets: ['@babel/preset-modules', '@babel/preset-react'],
plugins: [
'@babel/plugin-proposal-object-rest-spread',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-object-rest-spread',
'@babel/plugin-transform-class-properties',
[
'babel-plugin-react-docgen',
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@babel/core": "^7.0.0-0",
"@babel/plugin-transform-runtime": "^7.16.7",
"@babel/preset-env": "^7.16.7",
"@babel/preset-env": "~7.23.2",
"parcel-bundler": "1.12.3",
"rimraf": "^3.0.2"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@babel/core": "^7.0.0-0",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.6",
"@babel/preset-env": "~7.23.2",
"carbon-components": "^10.36.0",
"parcel-bundler": "1.12.3",
"rimraf": "^3.0.2",
Expand Down
Loading

0 comments on commit 4584e54

Please sign in to comment.