diff --git a/commands/build/lib/build.js b/commands/build/lib/build.js index 4bca85be8..779e38096 100644 --- a/commands/build/lib/build.js +++ b/commands/build/lib/build.js @@ -5,9 +5,9 @@ const yargs = require('yargs'); const rollup = require('rollup'); const babel = require('rollup-plugin-babel'); const postcss = require('rollup-plugin-postcss'); -const replace = require('rollup-plugin-replace'); -const nodeResolve = require('rollup-plugin-node-resolve'); -const commonjs = require('rollup-plugin-commonjs'); +const replace = require('@rollup/plugin-replace'); +const nodeResolve = require('@rollup/plugin-node-resolve'); +const commonjs = require('@rollup/plugin-commonjs'); const babelPreset = require('@babel/preset-env'); diff --git a/commands/build/package.json b/commands/build/package.json index 502a5d033..213a27c63 100644 --- a/commands/build/package.json +++ b/commands/build/package.json @@ -24,14 +24,14 @@ "@babel/cli": "7.7.7", "@babel/core": "7.7.7", "@babel/preset-env": "7.7.7", + "@rollup/plugin-commonjs": "11.0.1", + "@rollup/plugin-node-resolve": "7.0.0", + "@rollup/plugin-replace": "2.3.0", "chalk": "3.0.0", "extend": "3.0.2", "rollup": "1.28.0", "rollup-plugin-babel": "4.3.3", - "rollup-plugin-commonjs": "10.1.0", - "rollup-plugin-node-resolve": "5.2.0", "rollup-plugin-postcss": "2.0.3", - "rollup-plugin-replace": "2.2.0", "rollup-plugin-terser": "5.1.3", "yargs": "15.1.0" } diff --git a/commands/sense/lib/build.js b/commands/sense/lib/build.js index fa98a9a8b..24141f1bc 100644 --- a/commands/sense/lib/build.js +++ b/commands/sense/lib/build.js @@ -2,8 +2,8 @@ const path = require('path'); const fs = require('fs'); const rollup = require('rollup'); -const nodeResolve = require('rollup-plugin-node-resolve'); -const common = require('rollup-plugin-commonjs'); +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'); diff --git a/commands/sense/package.json b/commands/sense/package.json index c66295890..78b85dcf5 100644 --- a/commands/sense/package.json +++ b/commands/sense/package.json @@ -32,12 +32,12 @@ "@babel/preset-env": "7.7.7", "@nebula.js/supernova": "0.1.0-alpha.25", "@nebula.js/theme": "0.1.0-alpha.25", + "@rollup/plugin-commonjs": "11.0.1", + "@rollup/plugin-node-resolve": "7.0.0", "chalk": "3.0.0", "node-event-emitter": "0.0.1", "rollup": "1.28.0", "rollup-plugin-babel": "4.3.3", - "rollup-plugin-commonjs": "10.1.0", - "rollup-plugin-node-resolve": "5.2.0", "rollup-plugin-terser": "5.1.3", "yargs": "15.1.0" } diff --git a/package.json b/package.json index 7485ac044..cac2c133f 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,10 @@ "@babel/preset-react": "7.7.4", "@commitlint/cli": "8.3.4", "@commitlint/config-conventional": "8.3.4", + "@rollup/plugin-commonjs": "11.0.1", + "@rollup/plugin-json": "4.0.1", + "@rollup/plugin-node-resolve": "7.0.0", + "@rollup/plugin-replace": "2.3.0", "@storybook/addon-docs": "5.2.8", "@storybook/addon-knobs": "5.2.8", "@storybook/react": "5.2.8", @@ -69,11 +73,7 @@ "qix-faker": "0.3.0", "rollup": "1.28.0", "rollup-plugin-babel": "4.3.3", - "rollup-plugin-commonjs": "10.1.0", "rollup-plugin-dependency-flow": "0.3.0", - "rollup-plugin-json": "4.0.0", - "rollup-plugin-node-resolve": "5.2.0", - "rollup-plugin-replace": "2.2.0", "rollup-plugin-sass": "1.2.2", "rollup-plugin-terser": "5.1.3", "scriptappy-from-jsdoc": "0.7.0", diff --git a/rollup.config.js b/rollup.config.js index dec1d06dd..718c3b966 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,9 +1,9 @@ const path = require('path'); -const nodeResolve = require('rollup-plugin-node-resolve'); -const commonjs = require('rollup-plugin-commonjs'); const babel = require('rollup-plugin-babel'); -const replace = require('rollup-plugin-replace'); -const json = require('rollup-plugin-json'); +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 localeStringValidator = require('./tools/locale-string-validator'); diff --git a/yarn.lock b/yarn.lock index d1b89ccd1..16498bc37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4114,6 +4114,50 @@ react-lifecycles-compat "^3.0.4" warning "^3.0.0" +"@rollup/plugin-commonjs@11.0.1": + version "11.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.1.tgz#6056a6757286901cc6c1599123e6680a78cad6c2" + integrity sha512-SaVUoaLDg3KnIXC5IBNIspr1APTYDzk05VaYcI6qz+0XX3ZlSCwAkfAhNSOxfd5GAdcm/63Noi4TowOY9MpcDg== + dependencies: + "@rollup/pluginutils" "^3.0.0" + estree-walker "^0.6.1" + is-reference "^1.1.2" + magic-string "^0.25.2" + resolve "^1.11.0" + +"@rollup/plugin-json@4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.0.1.tgz#223898c6c37993886da06989b0e93ceef52aa3ce" + integrity sha512-soxllkhOGgchswBAAaTe7X9G80U2tjjHvXv0sBrriLJcC/89PkP59iTrKPOfbz3SjX088mKDmMhAscuyLz8ZSg== + dependencies: + rollup-pluginutils "^2.5.0" + +"@rollup/plugin-node-resolve@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.0.0.tgz#cce3826df801538b001972fbf9b6b1c22b69fdf8" + integrity sha512-+vOx2+WMBMFotYKM3yYeDGZxIvcQ7yO4g+SuKDFsjKaq8Lw3EPgfB6qNlp8Z/3ceDCEhHvC9/b+PgBGwDQGbzQ== + dependencies: + "@rollup/pluginutils" "^3.0.0" + "@types/resolve" "0.0.8" + builtin-modules "^3.1.0" + is-module "^1.0.0" + resolve "^1.11.1" + +"@rollup/plugin-replace@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.0.tgz#86d88746383e40dd81cffb5216449cc51a734eb9" + integrity sha512-rzWAMqXAHC1w3eKpK6LxRqiF4f3qVFaa1sGii6Bp3rluKcwHNOpPt+hWRCmAH6SDEPtbPiLFf0pfNQyHs6Btlg== + dependencies: + magic-string "^0.25.2" + rollup-pluginutils "^2.6.0" + +"@rollup/pluginutils@^3.0.0": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.3.tgz#70666fb7d44e178c25b0d45790191d85889445d2" + integrity sha512-lxys3KlfYU8LOGu7+UL2upa3kM9q8ISo4EK+vSqqJCLk6N74HsUZbUFiElolh4BUsv0jeMGtYDzpNrtrShE6Gg== + dependencies: + estree-walker "^0.6.1" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -15026,17 +15070,6 @@ rollup-plugin-babel@4.3.3: "@babel/helper-module-imports" "^7.0.0" rollup-pluginutils "^2.8.1" -rollup-plugin-commonjs@10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb" - integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q== - dependencies: - estree-walker "^0.6.1" - is-reference "^1.1.2" - magic-string "^0.25.2" - resolve "^1.11.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" @@ -15044,24 +15077,6 @@ rollup-plugin-dependency-flow@0.3.0: dependencies: dependency-flow "^0.3.0" -rollup-plugin-json@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e" - integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow== - dependencies: - rollup-pluginutils "^2.5.0" - -rollup-plugin-node-resolve@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523" - integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw== - dependencies: - "@types/resolve" "0.0.8" - builtin-modules "^3.1.0" - is-module "^1.0.0" - resolve "^1.11.1" - rollup-pluginutils "^2.8.1" - rollup-plugin-postcss@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-2.0.3.tgz#1fd5b7e1fc7545cb0084d9c99d11b259e41a05e6" @@ -15082,14 +15097,6 @@ rollup-plugin-postcss@2.0.3: rollup-pluginutils "^2.0.1" style-inject "^0.3.0" -rollup-plugin-replace@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz#f41ae5372e11e7a217cde349c8b5d5fd115e70e3" - integrity sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA== - dependencies: - magic-string "^0.25.2" - rollup-pluginutils "^2.6.0" - rollup-plugin-sass@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/rollup-plugin-sass/-/rollup-plugin-sass-1.2.2.tgz#f03cd2b1bee497dc2cc845fae2c5749611fc008f"