Merge branch 'main' into dependabot/github_actions/actions/add-to-pro…

…ject-0.6.1
carbon-design-system · Mar 20, 2024 · 57740cd · 57740cd
2 parents b649201 + 5da8493
commit 57740cd
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 26 deletions.
diff --git a/.yarn/cache/@rollup-plugin-terser-npm-0.1.0-e208d1c0c5-e8abed2bc9.zip b/.yarn/cache/@rollup-plugin-terser-npm-0.1.0-e208d1c0c5-e8abed2bc9.zip
diff --git a/.yarn/cache/rollup-plugin-terser-npm-7.0.2-3f55469f5a-af84bb7a7a.zip b/.yarn/cache/rollup-plugin-terser-npm-7.0.2-3f55469f5a-af84bb7a7a.zip
diff --git a/.yarn/cache/terser-npm-5.29.2-03dea5684a-062df6a8f9.zip b/.yarn/cache/terser-npm-5.29.2-03dea5684a-062df6a8f9.zip
diff --git a/packages/carbon-web-components/tools/get-rollup-config.js b/packages/carbon-web-components/tools/get-rollup-config.js
@@ -18,7 +18,7 @@ const postcss = require('postcss');
 const replace = require('@rollup/plugin-replace');
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
 const { promisify } = require('util');
-const { terser } = require('rollup-plugin-terser');
+const terser = require('@rollup/plugin-terser');
 
 const carbonIcons = require('./rollup-plugin-icons');
 const fixHostPseudo = require('./postcss-fix-host-pseudo');

diff --git a/packages/services/package.json b/packages/services/package.json
@@ -66,6 +66,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^8.4.0",
     "@rollup/plugin-replace": "^4.0.0",
+    "@rollup/plugin-terser": "^0.1.0",
     "all-contributors-cli": "^6.0.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.0.0",
@@ -85,7 +86,6 @@
     "rollup": "^2.55.1",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-sizes": "^1.0.4",
-    "rollup-plugin-terser": "^7.0.2",
     "whatwg-fetch": "^2.0.3"
   }
 }
diff --git a/packages/services/scripts/rollup.config.js b/packages/services/scripts/rollup.config.js
@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -17,7 +17,7 @@ const builtins = require('rollup-plugin-node-builtins');
 const babel = require('@rollup/plugin-babel');
 const json = require('@rollup/plugin-json');
 const replace = require('@rollup/plugin-replace');
-const { terser } = require('rollup-plugin-terser');
+const terser = require('@rollup/plugin-terser');
 const sizes = require('rollup-plugin-sizes');
 
 const packageJson = require('../package.json');

diff --git a/packages/utilities/package.json b/packages/utilities/package.json
@@ -66,6 +66,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^8.4.0",
     "@rollup/plugin-replace": "^4.0.0",
+    "@rollup/plugin-terser": "^0.1.0",
     "all-contributors-cli": "^6.0.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.0.0",
@@ -84,7 +85,6 @@
     "rollup": "^2.55.1",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-sizes": "^1.0.4",
-    "rollup-plugin-terser": "^7.0.2",
     "whatwg-fetch": "^2.0.3"
   }
 }
diff --git a/packages/utilities/scripts/rollup.config.js b/packages/utilities/scripts/rollup.config.js
@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -17,7 +17,7 @@ const builtins = require('rollup-plugin-node-builtins');
 const babel = require('@rollup/plugin-babel');
 const json = require('@rollup/plugin-json');
 const replace = require('@rollup/plugin-replace');
-const { terser } = require('rollup-plugin-terser');
+const terser = require('@rollup/plugin-terser');
 const sizes = require('rollup-plugin-sizes');
 
 const packageJson = require('../package.json');

diff --git a/packages/web-components/tools/get-rollup-config.js b/packages/web-components/tools/get-rollup-config.js
@@ -20,7 +20,7 @@ const babel = require('@rollup/plugin-babel');
 const commonjs = require('@rollup/plugin-commonjs');
 const json = require('@rollup/plugin-json');
 const replace = require('@rollup/plugin-replace');
-const { terser } = require('rollup-plugin-terser');
+const terser = require('@rollup/plugin-terser');
 const multiInput = require('rollup-plugin-multi-input').default;
 const injectProcessEnv = require('rollup-plugin-inject-process-env');
 

diff --git a/yarn.lock b/yarn.lock
@@ -3297,6 +3297,7 @@ __metadata:
     "@rollup/plugin-json": "npm:^4.1.0"
     "@rollup/plugin-node-resolve": "npm:^8.4.0"
     "@rollup/plugin-replace": "npm:^4.0.0"
+    "@rollup/plugin-terser": "npm:^0.1.0"
     all-contributors-cli: "npm:^6.0.0"
     axios: "npm:^1.6.0"
     babel-core: "npm:^7.0.0-bridge.0"
@@ -3318,7 +3319,6 @@ __metadata:
     rollup: "npm:^2.55.1"
     rollup-plugin-node-builtins: "npm:^2.1.2"
     rollup-plugin-sizes: "npm:^1.0.4"
-    rollup-plugin-terser: "npm:^7.0.2"
     whatwg-fetch: "npm:^2.0.3"
     window-or-global: "npm:^1.0.1"
   languageName: unknown
@@ -3379,6 +3379,7 @@ __metadata:
     "@rollup/plugin-json": "npm:^4.1.0"
     "@rollup/plugin-node-resolve": "npm:^8.4.0"
     "@rollup/plugin-replace": "npm:^4.0.0"
+    "@rollup/plugin-terser": "npm:^0.1.0"
     all-contributors-cli: "npm:^6.0.0"
     axios: "npm:^1.6.0"
     babel-core: "npm:^7.0.0-bridge.0"
@@ -3401,7 +3402,6 @@ __metadata:
     rollup: "npm:^2.55.1"
     rollup-plugin-node-builtins: "npm:^2.1.2"
     rollup-plugin-sizes: "npm:^1.0.4"
-    rollup-plugin-terser: "npm:^7.0.2"
     striptags: "npm:^3.2.0"
     whatwg-fetch: "npm:^2.0.3"
     window-or-global: "npm:^1.0.1"
@@ -6347,6 +6347,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/plugin-terser@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@rollup/plugin-terser@npm:0.1.0"
+  dependencies:
+    terser: "npm:^5.15.1"
+  peerDependencies:
+    rollup: ^2.x || ^3.x
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10/e8abed2bc9f91d2aa54819fd26e98333596b97153bb1d636fe2396db258ea580cc6c88f9e28ea2f69a20fa4e7dca33d0a9f235cd21986f4b633484757b0f31d2
+  languageName: node
+  linkType: hard
+
 "@rollup/plugin-terser@npm:^0.4.3":
   version: 0.4.4
   resolution: "@rollup/plugin-terser@npm:0.4.4"
@@ -22757,7 +22771,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^26.2.1, jest-worker@npm:^26.5.0, jest-worker@npm:^26.6.2":
+"jest-worker@npm:^26.5.0, jest-worker@npm:^26.6.2":
   version: 26.6.2
   resolution: "jest-worker@npm:26.6.2"
   dependencies:
@@ -31017,20 +31031,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup-plugin-terser@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "rollup-plugin-terser@npm:7.0.2"
-  dependencies:
-    "@babel/code-frame": "npm:^7.10.4"
-    jest-worker: "npm:^26.2.1"
-    serialize-javascript: "npm:^4.0.0"
-    terser: "npm:^5.0.0"
-  peerDependencies:
-    rollup: ^2.0.0
-  checksum: 10/af84bb7a7a894cd00852b6486528dfb8653cf94df4c126f95f389a346f401d054b08c46bee519a2ab6a22b33804d1d6ac6d8c90b1b2bf8fffb097eed73fc3c72
-  languageName: node
-  linkType: hard
-
 "rollup@npm:^2.55.1":
   version: 2.79.1
   resolution: "rollup@npm:2.79.1"
@@ -33659,7 +33659,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser@npm:^5.0.0, terser@npm:^5.17.4, terser@npm:^5.26.0, terser@npm:^5.3.4":
+"terser@npm:^5.15.1":
+  version: 5.29.2
+  resolution: "terser@npm:5.29.2"
+  dependencies:
+    "@jridgewell/source-map": "npm:^0.3.3"
+    acorn: "npm:^8.8.2"
+    commander: "npm:^2.20.0"
+    source-map-support: "npm:~0.5.20"
+  bin:
+    terser: bin/terser
+  checksum: 10/062df6a8f99ea2635d1b3ce41cfd4180dea6e1c83db9b2cf4b525170b2446d10e069d2877d8dcb59fbf6045870efa17b56462b67045ef2d2b420870f9d144690
+  languageName: node
+  linkType: hard
+
+"terser@npm:^5.17.4, terser@npm:^5.26.0, terser@npm:^5.3.4":
   version: 5.27.1
   resolution: "terser@npm:5.27.1"
   dependencies: