diff --git a/apis/snapshooter/rollup.config.js b/apis/snapshooter/rollup.config.js index 8a865659d..e9cc19c21 100644 --- a/apis/snapshooter/rollup.config.js +++ b/apis/snapshooter/rollup.config.js @@ -1,6 +1,6 @@ const path = require('path'); -const babel = require('rollup-plugin-babel'); // eslint-disable-line -const { terser } = require('rollup-plugin-terser'); // eslint-disable-line +const babel = require('@rollup/plugin-babel'); // eslint-disable-line +const terser = require('@rollup/plugin-terser'); // eslint-disable-line const cwd = process.cwd(); const pkg = require(path.join(cwd, 'package.json')); // eslint-disable-line diff --git a/commands/build/lib/build.js b/commands/build/lib/build.js index 72cb93629..bcfb9f79b 100644 --- a/commands/build/lib/build.js +++ b/commands/build/lib/build.js @@ -6,7 +6,7 @@ const fs = require('fs'); const extend = require('extend'); const yargs = require('yargs'); const rollup = require('rollup'); -const babel = require('rollup-plugin-babel'); +const babel = require('@rollup/plugin-babel'); const postcss = require('rollup-plugin-postcss'); const replace = require('@rollup/plugin-replace'); const sourcemaps = require('rollup-plugin-sourcemaps'); @@ -17,7 +17,7 @@ const commonjs = require('@rollup/plugin-commonjs'); const babelPreset = require('@babel/preset-env'); -const { terser } = require('rollup-plugin-terser'); +const terser = require('@rollup/plugin-terser'); const resolveNative = require('./resolveNative'); const initConfig = require('./init-config'); diff --git a/commands/build/package.json b/commands/build/package.json index 6621b71e3..78dd91dcd 100644 --- a/commands/build/package.json +++ b/commands/build/package.json @@ -25,6 +25,7 @@ "@babel/core": "7.20.12", "@babel/plugin-transform-react-jsx": "7.20.7", "@babel/preset-env": "7.20.2", + "@rollup/plugin-babel": "6.0.3", "@rollup/plugin-commonjs": "23.0.7", "@rollup/plugin-json": "6.0.0", "@rollup/plugin-node-resolve": "15.0.1", @@ -33,10 +34,9 @@ "extend": "3.0.2", "postcss": "^8.4.21", "rollup": "3.10.0", - "rollup-plugin-babel": "4.4.0", "rollup-plugin-postcss": "4.0.2", "rollup-plugin-sourcemaps": "0.6.3", - "rollup-plugin-terser": "7.0.2", + "@rollup/plugin-terser": "0.3.0", "yargs": "17.6.2" }, "devDependencies": { diff --git a/commands/sense/lib/build-legacy.js b/commands/sense/lib/build-legacy.js index 1ae14f285..f88d382f2 100644 --- a/commands/sense/lib/build-legacy.js +++ b/commands/sense/lib/build-legacy.js @@ -5,8 +5,8 @@ const rollup = require('rollup'); const { nodeResolve } = require('@rollup/plugin-node-resolve'); const common = require('@rollup/plugin-commonjs'); const replace = require('@rollup/plugin-replace'); -const babel = require('rollup-plugin-babel'); -const { terser } = require('rollup-plugin-terser'); +const babel = require('@rollup/plugin-babel'); +const terser = require('@rollup/plugin-terser'); async function build(argv) { const cwd = process.cwd(); diff --git a/commands/sense/lib/build.js b/commands/sense/lib/build.js index 48951c578..849f0b15c 100644 --- a/commands/sense/lib/build.js +++ b/commands/sense/lib/build.js @@ -4,8 +4,8 @@ const fs = require('fs-extra'); const rollup = require('rollup'); const { nodeResolve } = require('@rollup/plugin-node-resolve'); const common = require('@rollup/plugin-commonjs'); -const babel = require('rollup-plugin-babel'); -const { terser } = require('rollup-plugin-terser'); +const babel = require('@rollup/plugin-babel'); +const terser = require('@rollup/plugin-terser'); async function build(argv) { const cwd = process.cwd(); diff --git a/commands/sense/package.json b/commands/sense/package.json index f544931ec..19be54a92 100644 --- a/commands/sense/package.json +++ b/commands/sense/package.json @@ -31,6 +31,7 @@ "@babel/core": "7.20.12", "@babel/preset-env": "7.20.2", "@nebula.js/stardust": "^3.1.0-alpha.3", + "@rollup/plugin-babel": "6.0.3", "@rollup/plugin-commonjs": "23.0.7", "@rollup/plugin-node-resolve": "15.0.1", "@rollup/plugin-replace": "5.0.2", @@ -38,8 +39,7 @@ "fs-extra": "11.1.0", "node-event-emitter": "0.0.1", "rollup": "3.10.0", - "rollup-plugin-babel": "4.4.0", - "rollup-plugin-terser": "7.0.2", + "@rollup/plugin-terser": "0.3.0", "yargs": "17.6.2" } } diff --git a/package.json b/package.json index 6345be32f..4cfadb59b 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "@babel/preset-react": "7.18.6", "@commitlint/cli": "17.4.1", "@commitlint/config-conventional": "17.4.0", + "@rollup/plugin-babel": "6.0.3", "@rollup/plugin-commonjs": "23.0.7", "@rollup/plugin-json": "6.0.0", "@rollup/plugin-node-resolve": "15.0.1", @@ -96,10 +97,9 @@ "puppeteer": "19.5.2", "qix-faker": "0.3.0", "rollup": "3.10.0", - "rollup-plugin-babel": "4.4.0", "rollup-plugin-dependency-flow": "0.3.0", "rollup-plugin-sass": "1.12.17", - "rollup-plugin-terser": "7.0.2", + "@rollup/plugin-terser": "0.3.0", "whatwg-fetch": "^3.6.2", "yargs": "17.6.2" }, diff --git a/rollup.config.js b/rollup.config.js index 7f2716352..5376194c7 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,10 +1,10 @@ const path = require('path'); -const babel = require('rollup-plugin-babel'); +const babel = require('@rollup/plugin-babel'); const commonjs = require('@rollup/plugin-commonjs'); const json = require('@rollup/plugin-json'); const { nodeResolve } = require('@rollup/plugin-node-resolve'); const replace = require('@rollup/plugin-replace'); -const { terser } = require('rollup-plugin-terser'); +const terser = require('@rollup/plugin-terser'); const crypto = require('crypto'); const localeStringValidator = require('./tools/locale-string-validator'); diff --git a/yarn.lock b/yarn.lock index 82bded13f..c2c550118 100644 --- a/yarn.lock +++ b/yarn.lock @@ -672,7 +672,7 @@ dependencies: "@babel/types" "^7.18.9" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== @@ -5163,6 +5163,14 @@ resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.2.1.tgz#812edd4104a15a493dda1ccac0b352270d7a188c" integrity sha512-XiY0IsyHR+DXYS5vBxpoBe/8veTeoRpMHP+vDosLZxL5bnpetzI0igkxkLZS235ldLzyfkxF+2divEwWHP3vMQ== +"@rollup/plugin-babel@6.0.3": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-6.0.3.tgz#07ccde15de278c581673034ad6accdb4a153dfeb" + integrity sha512-fKImZKppa1A/gX73eg4JGo+8kQr/q1HBQaCGKECZ0v4YBBv3lFqi14+7xyApECzvkLTHCifx+7ntcrvtBIRcpg== + dependencies: + "@babel/helper-module-imports" "^7.18.6" + "@rollup/pluginutils" "^5.0.1" + "@rollup/plugin-commonjs@23.0.7": version "23.0.7" resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-23.0.7.tgz#7d26d879caa54283086de1974b66f512ef60abdc" @@ -5202,6 +5210,15 @@ "@rollup/pluginutils" "^5.0.1" magic-string "^0.27.0" +"@rollup/plugin-terser@0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-terser/-/plugin-terser-0.3.0.tgz#43ee908fed27ed2bc876496fb9aab8033a0566ac" + integrity sha512-mYTkNW9KjOscS/3QWU5LfOKsR3/fAAVDaqcAe2TZ7ng6pN46f+C7FOZbITuIW/neA+PhcjoKl7yMyB3XcmA4gw== + dependencies: + serialize-javascript "^6.0.0" + smob "^0.0.6" + terser "^5.15.1" + "@rollup/plugin-typescript@10.0.1": version "10.0.1" resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-10.0.1.tgz#270b515b116ea28320e6bb62451c4767d49072d6" @@ -14729,7 +14746,7 @@ jest-watcher@^29.3.1: jest-util "^29.3.1" string-length "^4.0.1" -jest-worker@^26.2.1, jest-worker@^26.5.0, jest-worker@^26.6.2: +jest-worker@^26.5.0, jest-worker@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -19270,14 +19287,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-babel@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz#d15bd259466a9d1accbdb2fe2fff17c52d030acb" - integrity sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - rollup-pluginutils "^2.8.1" - rollup-plugin-dependency-flow@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/rollup-plugin-dependency-flow/-/rollup-plugin-dependency-flow-0.3.0.tgz#9208799190eb29ecb09482289011d2b9ecb714e7" @@ -19321,17 +19330,7 @@ rollup-plugin-sourcemaps@0.6.3: "@rollup/pluginutils" "^3.0.9" source-map-resolve "^0.6.0" -rollup-plugin-terser@7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" - integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== - dependencies: - "@babel/code-frame" "^7.10.4" - jest-worker "^26.2.1" - serialize-javascript "^4.0.0" - terser "^5.0.0" - -rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2: +rollup-pluginutils@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== @@ -19866,6 +19865,11 @@ smart-buffer@^4.2.0: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== +smob@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/smob/-/smob-0.0.6.tgz#09b268fea916158a2781c152044c6155adbb8aa1" + integrity sha512-V21+XeNni+tTyiST1MHsa84AQhT1aFZipzPpOFAVB8DkHzwJyjjAmt9bgwnuZiZWnIbMo2duE29wybxv/7HWUw== + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -20705,7 +20709,7 @@ terser@^4.1.2, terser@^4.6.3: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.0.0, terser@^5.10.0, terser@^5.3.4, terser@^5.7.2: +terser@^5.10.0, terser@^5.3.4, terser@^5.7.2: version "5.14.1" resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca" integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ== @@ -20715,6 +20719,16 @@ terser@^5.0.0, terser@^5.10.0, terser@^5.3.4, terser@^5.7.2: commander "^2.20.0" source-map-support "~0.5.20" +terser@^5.15.1: + version "5.16.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880" + integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw== + dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" + commander "^2.20.0" + source-map-support "~0.5.20" + test-exclude@5.2.3, test-exclude@^5.2.3: version "5.2.3" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"