From 90ad1bf8f63eb725c6f06cf03795aabf2599db43 Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Sat, 13 Aug 2022 13:24:12 +0200 Subject: [PATCH 01/15] Replace webpack with rollup for packages/algorithm/tests --- packages/algorithm/package.json | 9 ++--- packages/algorithm/tests/rollup.config.js | 10 +++++ packages/algorithm/tests/webpack.config.js | 10 ----- yarn.lock | 46 +++++++++++++++++++++- 4 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 packages/algorithm/tests/rollup.config.js delete mode 100644 packages/algorithm/tests/webpack.config.js diff --git a/packages/algorithm/package.json b/packages/algorithm/package.json index 834e2ab25..ba290989c 100644 --- a/packages/algorithm/package.json +++ b/packages/algorithm/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib && rimraf tests/tsconfig.tsbuildinfo", "docs": "typedoc --options ../../typedoc.js src", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", @@ -41,6 +41,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/mocha": "^2.2.39", "chai": "^4.3.4", @@ -59,9 +60,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/algorithm/tests/rollup.config.js b/packages/algorithm/tests/rollup.config.js new file mode 100644 index 000000000..7e197e3ba --- /dev/null +++ b/packages/algorithm/tests/rollup.config.js @@ -0,0 +1,10 @@ +import nodeResolve from '@rollup/plugin-node-resolve'; +import commonjs from '@rollup/plugin-commonjs'; + +export default { + input: './lib/index.spec.js', + output: { + file: './lib/bundle.test.js' + }, + plugins: [commonjs(), nodeResolve()] +}; diff --git a/packages/algorithm/tests/webpack.config.js b/packages/algorithm/tests/webpack.config.js deleted file mode 100644 index 98249849e..000000000 --- a/packages/algorithm/tests/webpack.config.js +++ /dev/null @@ -1,10 +0,0 @@ -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/yarn.lock b/yarn.lock index bbf0f1907..f521ba8e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1154,6 +1154,19 @@ node-addon-api "^3.2.1" node-gyp-build "^4.3.0" +"@rollup/plugin-commonjs@^22.0.2": + version "22.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz#ee8ca8415cda30d383b4096aad5222435b4b69b6" + integrity sha512-//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg== + dependencies: + "@rollup/pluginutils" "^3.1.0" + commondir "^1.0.1" + estree-walker "^2.0.1" + glob "^7.1.6" + is-reference "^1.2.1" + magic-string "^0.25.7" + resolve "^1.17.0" + "@rollup/plugin-node-resolve@^13.3.0": version "13.3.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c" @@ -2456,6 +2469,11 @@ common-ancestor-path@^1.0.1: resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7" integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w== +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== + compare-func@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" @@ -3508,6 +3526,11 @@ estree-walker@^1.0.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== +estree-walker@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -4129,7 +4152,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7: +glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -4736,6 +4759,13 @@ is-promise@^2.1.0, is-promise@^2.2.2: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== +is-reference@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" + integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ== + dependencies: + "@types/estree" "*" + is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" @@ -5453,6 +5483,13 @@ lunr-mutable-indexes@2.3.2: resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1" integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow== +magic-string@^0.25.7: + version "0.25.9" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" + integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== + dependencies: + sourcemap-codec "^1.4.8" + make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" @@ -7284,7 +7321,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.9.0: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.9.0: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -7751,6 +7788,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +sourcemap-codec@^1.4.8: + version "1.4.8" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== + spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" From eda369208d44a895d3131d178abdfe5491373986 Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Sat, 13 Aug 2022 15:41:44 +0200 Subject: [PATCH 02/15] Use Rollup with example-accordionpanel --- examples/example-accordionpanel/package.json | 13 +-- .../example-accordionpanel/rollup.config.js | 12 ++ .../example-accordionpanel/style/index.css | 4 +- examples/example-accordionpanel/tsconfig.json | 2 +- .../example-accordionpanel/webpack.config.js | 19 ---- packages/default-theme/style/index.css | 4 +- yarn.lock | 103 ++++++++++++++++-- 7 files changed, 118 insertions(+), 39 deletions(-) create mode 100644 examples/example-accordionpanel/rollup.config.js delete mode 100644 examples/example-accordionpanel/webpack.config.js diff --git a/examples/example-accordionpanel/package.json b/examples/example-accordionpanel/package.json index 33b459e50..de3d86891 100644 --- a/examples/example-accordionpanel/package.json +++ b/examples/example-accordionpanel/package.json @@ -3,7 +3,7 @@ "version": "0.8.2", "private": true, "scripts": { - "build": "tsc && webpack", + "build": "tsc && rollup -c", "clean": "rimraf build" }, "dependencies": { @@ -12,13 +12,10 @@ "@lumino/widgets": "^1.33.0" }, "devDependencies": { - "css-loader": "^3.4.0", - "file-loader": "^5.0.2", + "@rollup/plugin-node-resolve": "^13.3.0", "rimraf": "^3.0.2", - "source-map-loader": "0.2.4", - "style-loader": "^1.0.2", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "rollup": "^2.77.3", + "rollup-plugin-styles": "^4.0.0", + "typescript": "~4.7.3" } } diff --git a/examples/example-accordionpanel/rollup.config.js b/examples/example-accordionpanel/rollup.config.js new file mode 100644 index 000000000..213df3ee7 --- /dev/null +++ b/examples/example-accordionpanel/rollup.config.js @@ -0,0 +1,12 @@ +import nodeResolve from '@rollup/plugin-node-resolve'; +import styles from 'rollup-plugin-styles'; + +export default { + input: './build/index.js', + output: { + file: './build/bundle.example.js', + format: 'iife', + sourcemap: true + }, + plugins: [styles(), nodeResolve()] +}; diff --git a/examples/example-accordionpanel/style/index.css b/examples/example-accordionpanel/style/index.css index 702470ec6..9bcc1babc 100644 --- a/examples/example-accordionpanel/style/index.css +++ b/examples/example-accordionpanel/style/index.css @@ -1,8 +1,8 @@ -/* +/* Copyright (c) Jupyter Development Team. Distributed under the terms of the Modified BSD License. */ -@import '~@lumino/default-theme/style/index.css'; +@import '@lumino/default-theme/style/index.css'; @import './content.css'; body { diff --git a/examples/example-accordionpanel/tsconfig.json b/examples/example-accordionpanel/tsconfig.json index 99ff76667..dcae33784 100644 --- a/examples/example-accordionpanel/tsconfig.json +++ b/examples/example-accordionpanel/tsconfig.json @@ -6,7 +6,7 @@ "noUnusedLocals": true, "strictNullChecks": true, "sourceMap": true, - "module": "commonjs", + "module": "ES6", "moduleResolution": "node", "target": "ES6", "outDir": "./build", diff --git a/examples/example-accordionpanel/webpack.config.js b/examples/example-accordionpanel/webpack.config.js deleted file mode 100644 index b3ec26ca6..000000000 --- a/examples/example-accordionpanel/webpack.config.js +++ /dev/null @@ -1,19 +0,0 @@ -var path = require('path'); - -module.exports = { - entry: './build/index.js', - mode: 'development', - devtool: 'source-map', - output: { - path: __dirname + '/build/', - filename: 'bundle.example.js', - publicPath: './build/' - }, - module: { - rules: [ - { test: /\.js$/, use: ['source-map-loader'], enforce: 'pre' }, - { test: /\.css$/, use: ['style-loader', 'css-loader'] }, - { test: /\.png$/, use: 'file-loader' } - ] - } -}; diff --git a/packages/default-theme/style/index.css b/packages/default-theme/style/index.css index 905926511..0e547cc4e 100644 --- a/packages/default-theme/style/index.css +++ b/packages/default-theme/style/index.css @@ -5,8 +5,8 @@ | | The full license is in the file LICENSE, distributed with this software. |----------------------------------------------------------------------------*/ -@import '~@lumino/dragdrop/style/index.css'; -@import '~@lumino/widgets/style/index.css'; +@import '@lumino/dragdrop/style/index.css'; +@import '@lumino/widgets/style/index.css'; @import './accordionpanel.css'; @import './commandpalette.css'; @import './datagrid.css'; diff --git a/yarn.lock b/yarn.lock index f521ba8e6..a4dc370a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1188,6 +1188,14 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^4.1.2": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" + integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + "@rushstack/node-core-library@3.50.1": version "3.50.1" resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.50.1.tgz#d4aa4602460f29bbf0662052969b65129384da23" @@ -1273,6 +1281,13 @@ resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== +"@types/cssnano@^5.0.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@types/cssnano/-/cssnano-5.1.0.tgz#a83529c148dccc984bccbe33563941f0fa6bd1e9" + integrity sha512-ikR+18UpFGgvaWSur4og6SJYF/6QEYHXvrIt36dp81p1MG3cAPTYDMBJGeyWa3LCnqEbgNMHKRb+FP0NrXtoWQ== + dependencies: + cssnano "*" + "@types/eslint-scope@^3.7.3": version "3.7.4" resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" @@ -2702,7 +2717,7 @@ cors@2.8.5, cors@~2.8.5: object-assign "^4" vary "^1" -cosmiconfig@^7.0.0: +cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== @@ -2820,6 +2835,15 @@ cssnano-utils@^3.1.0: resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== +cssnano@*, cssnano@^5.0.15: + version "5.1.13" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.13.tgz#83d0926e72955332dc4802a7070296e6258efc0a" + integrity sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ== + dependencies: + cssnano-preset-default "^5.2.12" + lilconfig "^2.0.3" + yaml "^1.10.2" + cssnano@^5.0.1: version "5.1.12" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.12.tgz#bcd0b64d6be8692de79332c501daa7ece969816c" @@ -3772,6 +3796,11 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +filter-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" + integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ== + finalhandler@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -3894,7 +3923,7 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^10.1.0: +fs-extra@^10.0.0, fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== @@ -4479,7 +4508,7 @@ icss-utils@^4.0.0, icss-utils@^4.1.1: dependencies: postcss "^7.0.14" -icss-utils@^5.0.0: +icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== @@ -5616,7 +5645,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: +mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@^2.1.34, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -6887,6 +6916,15 @@ postcss@^8.4.14: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.5: + version "8.4.16" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" + integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -7075,6 +7113,16 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== +query-string@^7.1.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1" + integrity sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w== + dependencies: + decode-uri-component "^0.2.0" + filter-obj "^1.1.0" + split-on-first "^1.0.0" + strict-uri-encode "^2.0.0" + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -7321,7 +7369,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.9.0: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.9.0: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -7423,6 +7471,30 @@ rollup-plugin-sourcemaps@^0.6.3: "@rollup/pluginutils" "^3.0.9" source-map-resolve "^0.6.0" +rollup-plugin-styles@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-styles/-/rollup-plugin-styles-4.0.0.tgz#472f104d33edda27fb089b63a315e31531611826" + integrity sha512-A2K2sao84OsTmDxXG83JTCdXWrmgvQkkI38XDat46rdtpGMRm9tSYqeCdlwwGDJF4kKIafhV1mUidqu8MxUGig== + dependencies: + "@rollup/pluginutils" "^4.1.2" + "@types/cssnano" "^5.0.0" + cosmiconfig "^7.0.1" + cssnano "^5.0.15" + fs-extra "^10.0.0" + icss-utils "^5.1.0" + mime-types "^2.1.34" + p-queue "^6.6.2" + postcss "^8.4.5" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.0" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.2.0" + query-string "^7.1.0" + resolve "^1.21.0" + source-map-js "^1.0.1" + tslib "^2.3.1" + rollup-pluginutils@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" @@ -7437,6 +7509,13 @@ rollup@^2.77.2: optionalDependencies: fsevents "~2.3.2" +rollup@^2.77.3: + version "2.77.3" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12" + integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g== + optionalDependencies: + fsevents "~2.3.2" + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -7754,7 +7833,7 @@ sort-package-json@~1.44.0: is-plain-obj "2.1.0" sort-object-keys "^1.1.3" -source-map-js@^1.0.2: +source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -7819,6 +7898,11 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== +split-on-first@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" + integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== + split2@^3.0.0: version "3.2.2" resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" @@ -7891,6 +7975,11 @@ streamroller@^3.1.2: debug "^4.3.4" fs-extra "^8.1.0" +strict-uri-encode@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" + integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ== + string-argv@0.3.1, string-argv@~0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" @@ -8235,7 +8324,7 @@ tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0: +tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== From 7bc7876a8d4ef4d21a7df291ea898cacbaf250e3 Mon Sep 17 00:00:00 2001 From: gabalafou Date: Tue, 16 Aug 2022 04:18:11 -0500 Subject: [PATCH 03/15] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Frédéric Collonval --- packages/algorithm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/algorithm/package.json b/packages/algorithm/package.json index ba290989c..ca21d15d2 100644 --- a/packages/algorithm/package.json +++ b/packages/algorithm/package.json @@ -28,7 +28,7 @@ "build:src": "tsc --build", "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/lib && rimraf tests/tsconfig.tsbuildinfo", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "docs": "typedoc --options ../../typedoc.js src", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", From add2f4711f7697fa7d3b80d734c09bd7c573990e Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Fri, 19 Aug 2022 15:42:58 +0200 Subject: [PATCH 04/15] Consolidate rollup configs --- .../example-accordionpanel/rollup.config.js | 13 +----- packages/algorithm/rollup.config.js | 40 ++----------------- packages/algorithm/tests/rollup.config.js | 11 +---- rollup.examples.config.js | 16 ++++++++ rollup.src.config.js | 38 ++++++++++++++++++ rollup.tests.config.js | 10 +++++ 6 files changed, 69 insertions(+), 59 deletions(-) create mode 100644 rollup.examples.config.js create mode 100644 rollup.src.config.js create mode 100644 rollup.tests.config.js diff --git a/examples/example-accordionpanel/rollup.config.js b/examples/example-accordionpanel/rollup.config.js index 213df3ee7..ac8a2a06a 100644 --- a/examples/example-accordionpanel/rollup.config.js +++ b/examples/example-accordionpanel/rollup.config.js @@ -1,12 +1 @@ -import nodeResolve from '@rollup/plugin-node-resolve'; -import styles from 'rollup-plugin-styles'; - -export default { - input: './build/index.js', - output: { - file: './build/bundle.example.js', - format: 'iife', - sourcemap: true - }, - plugins: [styles(), nodeResolve()] -}; +export { default } from '../../rollup.examples.config'; diff --git a/packages/algorithm/rollup.config.js b/packages/algorithm/rollup.config.js index 574c06122..6d0a5e1fb 100644 --- a/packages/algorithm/rollup.config.js +++ b/packages/algorithm/rollup.config.js @@ -1,40 +1,6 @@ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig(pkg); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/algorithm/tests/rollup.config.js b/packages/algorithm/tests/rollup.config.js index 7e197e3ba..0627b2fa4 100644 --- a/packages/algorithm/tests/rollup.config.js +++ b/packages/algorithm/tests/rollup.config.js @@ -1,10 +1 @@ -import nodeResolve from '@rollup/plugin-node-resolve'; -import commonjs from '@rollup/plugin-commonjs'; - -export default { - input: './lib/index.spec.js', - output: { - file: './lib/bundle.test.js' - }, - plugins: [commonjs(), nodeResolve()] -}; +export { default } from '../../../rollup.tests.config'; diff --git a/rollup.examples.config.js b/rollup.examples.config.js new file mode 100644 index 000000000..27294ad88 --- /dev/null +++ b/rollup.examples.config.js @@ -0,0 +1,16 @@ +import nodeResolve from '@rollup/plugin-node-resolve'; +import styles from 'rollup-plugin-styles'; + +const globals = id => + id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; + +export default { + input: './build/index.js', + output: { + file: './build/bundle.example.js', + format: 'iife', + globals, + sourcemap: true + }, + plugins: [styles(), nodeResolve()] +}; diff --git a/rollup.src.config.js b/rollup.src.config.js new file mode 100644 index 000000000..f7eb8315e --- /dev/null +++ b/rollup.src.config.js @@ -0,0 +1,38 @@ +import nodeResolve from '@rollup/plugin-node-resolve'; +import sourcemaps from 'rollup-plugin-sourcemaps'; +import postcss from 'rollup-plugin-postcss'; + +const globals = id => + id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; + +export function createRollupConfig(pkg) { + return { + input: 'lib/index', + external: id => pkg.dependencies && !!pkg.dependencies[id], + output: [ + { + file: pkg.main, + globals, + format: 'umd', + sourcemap: true, + name: pkg.name + }, + { + file: pkg.module + '.js', + format: 'es', + sourcemap: true, + name: pkg.name + } + ], + plugins: [ + nodeResolve({ + preferBuiltins: true + }), + sourcemaps(), + postcss({ + extensions: ['.css'], + minimize: true + }) + ] + }; +} diff --git a/rollup.tests.config.js b/rollup.tests.config.js new file mode 100644 index 000000000..7e197e3ba --- /dev/null +++ b/rollup.tests.config.js @@ -0,0 +1,10 @@ +import nodeResolve from '@rollup/plugin-node-resolve'; +import commonjs from '@rollup/plugin-commonjs'; + +export default { + input: './lib/index.spec.js', + output: { + file: './lib/bundle.test.js' + }, + plugins: [commonjs(), nodeResolve()] +}; From 88520a2c3db44ae7cada33a06595dea44ab47c71 Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Fri, 2 Sep 2022 15:31:06 +0200 Subject: [PATCH 05/15] finish adding rollup to examples --- .../example-accordionpanel/rollup.config.js | 9 +++++- examples/example-datagrid/package.json | 12 ++++---- examples/example-datagrid/rollup.config.js | 8 +++++ examples/example-datagrid/style/index.css | 2 +- examples/example-datagrid/tsconfig.json | 3 +- examples/example-datagrid/webpack.config.js | 22 -------------- examples/example-dockpanel/package.json | 13 ++++----- examples/example-dockpanel/rollup.config.js | 8 +++++ examples/example-dockpanel/style/index.css | 2 +- examples/example-dockpanel/tsconfig.json | 2 +- examples/example-dockpanel/webpack.config.js | 24 --------------- rollup.examples.config.js | 4 ++- yarn.lock | 29 ++----------------- 13 files changed, 45 insertions(+), 93 deletions(-) create mode 100644 examples/example-datagrid/rollup.config.js delete mode 100644 examples/example-datagrid/webpack.config.js create mode 100644 examples/example-dockpanel/rollup.config.js delete mode 100644 examples/example-dockpanel/webpack.config.js diff --git a/examples/example-accordionpanel/rollup.config.js b/examples/example-accordionpanel/rollup.config.js index ac8a2a06a..11c401c1f 100644 --- a/examples/example-accordionpanel/rollup.config.js +++ b/examples/example-accordionpanel/rollup.config.js @@ -1 +1,8 @@ -export { default } from '../../rollup.examples.config'; +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../rollup.examples.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/examples/example-datagrid/package.json b/examples/example-datagrid/package.json index c13329235..9a4586ee8 100644 --- a/examples/example-datagrid/package.json +++ b/examples/example-datagrid/package.json @@ -3,7 +3,7 @@ "version": "0.33.0-alpha.3", "private": true, "scripts": { - "build": "tsc && webpack", + "build": "tsc && rollup -c", "clean": "rimraf build" }, "dependencies": { @@ -13,12 +13,10 @@ "@lumino/widgets": "^2.0.0-alpha.3" }, "devDependencies": { - "css-loader": "^3.4.0", - "file-loader": "^5.0.2", + "@rollup/plugin-node-resolve": "^13.3.0", "rimraf": "^3.0.2", - "style-loader": "^1.0.2", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "rollup": "^2.77.3", + "rollup-plugin-styles": "^4.0.0", + "typescript": "~4.7.3" } } diff --git a/examples/example-datagrid/rollup.config.js b/examples/example-datagrid/rollup.config.js new file mode 100644 index 000000000..11c401c1f --- /dev/null +++ b/examples/example-datagrid/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../rollup.examples.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/examples/example-datagrid/style/index.css b/examples/example-datagrid/style/index.css index b70e00b30..f61532f72 100644 --- a/examples/example-datagrid/style/index.css +++ b/examples/example-datagrid/style/index.css @@ -10,7 +10,7 @@ | | The full license is in the file LICENSE, distributed with this software. |----------------------------------------------------------------------------*/ -@import '~@lumino/default-theme/style/index.css'; +@import '@lumino/default-theme/style/index.css'; body { display: flex; diff --git a/examples/example-datagrid/tsconfig.json b/examples/example-datagrid/tsconfig.json index 056b91c55..dcae33784 100644 --- a/examples/example-datagrid/tsconfig.json +++ b/examples/example-datagrid/tsconfig.json @@ -5,7 +5,8 @@ "noEmitOnError": true, "noUnusedLocals": true, "strictNullChecks": true, - "module": "commonjs", + "sourceMap": true, + "module": "ES6", "moduleResolution": "node", "target": "ES6", "outDir": "./build", diff --git a/examples/example-datagrid/webpack.config.js b/examples/example-datagrid/webpack.config.js deleted file mode 100644 index b2b24453e..000000000 --- a/examples/example-datagrid/webpack.config.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './build/index.js', - mode: 'development', - output: { - path: __dirname + '/build/', - filename: 'bundle.example.js', - publicPath: './build/' - }, - module: { - rules: [ - { test: /\.css$/, use: ['style-loader', 'css-loader'] }, - { test: /\.png$/, use: 'file-loader' } - ] - } -}; diff --git a/examples/example-dockpanel/package.json b/examples/example-dockpanel/package.json index cbf464074..7ef2eccc0 100644 --- a/examples/example-dockpanel/package.json +++ b/examples/example-dockpanel/package.json @@ -3,7 +3,7 @@ "version": "0.22.0-alpha.3", "private": true, "scripts": { - "build": "tsc && webpack", + "build": "tsc && rollup -c", "clean": "rimraf build" }, "dependencies": { @@ -14,13 +14,10 @@ "@lumino/widgets": "^2.0.0-alpha.3" }, "devDependencies": { - "css-loader": "^3.4.0", - "file-loader": "^5.0.2", + "@rollup/plugin-node-resolve": "^13.3.0", "rimraf": "^3.0.2", - "source-map-loader": "0.2.4", - "style-loader": "^1.0.2", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "rollup": "^2.77.3", + "rollup-plugin-styles": "^4.0.0", + "typescript": "~4.7.3" } } diff --git a/examples/example-dockpanel/rollup.config.js b/examples/example-dockpanel/rollup.config.js new file mode 100644 index 000000000..11c401c1f --- /dev/null +++ b/examples/example-dockpanel/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../rollup.examples.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/examples/example-dockpanel/style/index.css b/examples/example-dockpanel/style/index.css index 3cf47dece..d138d95bf 100644 --- a/examples/example-dockpanel/style/index.css +++ b/examples/example-dockpanel/style/index.css @@ -10,7 +10,7 @@ | | The full license is in the file LICENSE, distributed with this software. |----------------------------------------------------------------------------*/ -@import '~@lumino/default-theme/style/index.css'; +@import '@lumino/default-theme/style/index.css'; @import './content.css'; body { diff --git a/examples/example-dockpanel/tsconfig.json b/examples/example-dockpanel/tsconfig.json index 812ad282c..1ab9dd31f 100644 --- a/examples/example-dockpanel/tsconfig.json +++ b/examples/example-dockpanel/tsconfig.json @@ -6,7 +6,7 @@ "noUnusedLocals": true, "strictNullChecks": true, "sourceMap": true, - "module": "commonjs", + "module": "ES6", "moduleResolution": "node", "target": "ES6", "outDir": "./build", diff --git a/examples/example-dockpanel/webpack.config.js b/examples/example-dockpanel/webpack.config.js deleted file mode 100644 index 00de80e78..000000000 --- a/examples/example-dockpanel/webpack.config.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './build/index.js', - mode: 'development', - devtool: 'source-map', - output: { - path: __dirname + '/build/', - filename: 'bundle.example.js', - publicPath: './build/' - }, - module: { - rules: [ - { test: /\.js$/, use: ['source-map-loader'], enforce: 'pre' }, - { test: /\.css$/, use: ['style-loader', 'css-loader'] }, - { test: /\.png$/, use: 'file-loader' } - ] - } -}; diff --git a/rollup.examples.config.js b/rollup.examples.config.js index 78be55f2c..04936ca77 100644 --- a/rollup.examples.config.js +++ b/rollup.examples.config.js @@ -1,6 +1,8 @@ import nodeResolve from '@rollup/plugin-node-resolve'; import styles from 'rollup-plugin-styles'; -import { globals } from './rollup.src.config'; + +export const globals = id => + id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; export function createRollupConfig(options) { return { diff --git a/yarn.lock b/yarn.lock index a66de23b2..d812e0c65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1934,13 +1934,6 @@ async@3.2.4: resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== -async@^2.5.0: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -3786,14 +3779,6 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -file-loader@^5.0.2: - version "5.1.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.1.0.tgz#cb56c070efc0e40666424309bd0d9e45ac6f2bb8" - integrity sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg== - dependencies: - loader-utils "^1.4.0" - schema-utils "^2.5.0" - fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -5290,7 +5275,7 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== -loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: +loader-utils@^1.2.3: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== @@ -5412,7 +5397,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -lodash@4, lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.6.1, lodash@^4.7.0, lodash@~4.17.15: +lodash@4, lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.6.1, lodash@^4.7.0, lodash@~4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -7574,7 +7559,7 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -schema-utils@^2.5.0, schema-utils@^2.7.0: +schema-utils@^2.7.0: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -7843,14 +7828,6 @@ source-map-js@^1.0.1, source-map-js@^1.0.2: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-loader@0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271" - integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ== - dependencies: - async "^2.5.0" - loader-utils "^1.1.0" - source-map-resolve@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" From 78cc28538430175637526123a3db99402cd1441f Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Sun, 4 Sep 2022 10:22:46 +0200 Subject: [PATCH 06/15] update createRollupConfig() call --- packages/algorithm/rollup.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/algorithm/rollup.config.js b/packages/algorithm/rollup.config.js index 756299550..4a75f8983 100644 --- a/packages/algorithm/rollup.config.js +++ b/packages/algorithm/rollup.config.js @@ -6,6 +6,6 @@ import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); -const config = createRollupConfig(pkg); +const config = createRollupConfig({ pkg }); export default config; From d0ba4754ef5e7714923a75d15cc717686d380503 Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Sun, 4 Sep 2022 13:00:12 +0200 Subject: [PATCH 07/15] call createRollupConfig() from algorithm/test/rollup.config.js --- packages/algorithm/tests/rollup.config.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/algorithm/tests/rollup.config.js b/packages/algorithm/tests/rollup.config.js index 0627b2fa4..d1edf5205 100644 --- a/packages/algorithm/tests/rollup.config.js +++ b/packages/algorithm/tests/rollup.config.js @@ -1 +1,8 @@ -export { default } from '../../../rollup.tests.config'; +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; From 4c7d2e2576b94cac4a4ae25ee2b79e565a847d5f Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Sun, 4 Sep 2022 13:00:37 +0200 Subject: [PATCH 08/15] rollup packages/application --- packages/application/package.json | 9 ++--- packages/application/rollup.config.js | 40 ++------------------ packages/application/tests/rollup.config.js | 8 ++++ packages/application/tests/webpack.config.js | 15 -------- 4 files changed, 15 insertions(+), 57 deletions(-) create mode 100644 packages/application/tests/rollup.config.js delete mode 100644 packages/application/tests/webpack.config.js diff --git a/packages/application/package.json b/packages/application/package.json index 3943094d8..a9a93a568 100644 --- a/packages/application/package.json +++ b/packages/application/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -49,6 +49,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -68,9 +69,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/application/rollup.config.js b/packages/application/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/application/rollup.config.js +++ b/packages/application/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/application/tests/rollup.config.js b/packages/application/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/application/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/application/tests/webpack.config.js b/packages/application/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/application/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; From 1ff2bfbd3a3cecb50723def07e1f091d41895a00 Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Sun, 4 Sep 2022 13:02:59 +0200 Subject: [PATCH 09/15] remove webpack config file from algorithm/tests --- packages/algorithm/tests/webpack.config.js | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 packages/algorithm/tests/webpack.config.js diff --git a/packages/algorithm/tests/webpack.config.js b/packages/algorithm/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/algorithm/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; From 01406c3b4d21db3a9b4de477ab2b5b77831795b9 Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Sun, 4 Sep 2022 16:38:56 +0200 Subject: [PATCH 10/15] remove webpack from remaining packages --- packages/collections/package.json | 9 ++--- packages/collections/rollup.config.js | 40 ++------------------ packages/collections/tests/rollup.config.js | 8 ++++ packages/collections/tests/webpack.config.js | 15 -------- packages/commands/package.json | 9 ++--- packages/commands/rollup.config.js | 40 ++------------------ packages/commands/tests/rollup.config.js | 8 ++++ packages/commands/tests/webpack.config.js | 15 -------- packages/coreutils/package.json | 9 ++--- packages/coreutils/tests/rollup.config.js | 8 ++++ packages/coreutils/tests/webpack.config.js | 15 -------- packages/datagrid/package.json | 1 + packages/datagrid/rollup.config.js | 40 ++------------------ packages/disposable/package.json | 9 ++--- packages/disposable/rollup.config.js | 40 ++------------------ packages/disposable/tests/rollup.config.js | 8 ++++ packages/disposable/tests/webpack.config.js | 15 -------- packages/domutils/package.json | 9 ++--- packages/domutils/rollup.config.js | 40 ++------------------ packages/domutils/tests/rollup.config.js | 8 ++++ packages/domutils/tests/webpack.config.js | 15 -------- packages/dragdrop/package.json | 12 +++--- packages/dragdrop/rollup.config.js | 40 ++------------------ packages/dragdrop/tests/rollup.config.js | 11 ++++++ packages/dragdrop/tests/webpack.config.js | 23 ----------- packages/keyboard/package.json | 9 ++--- packages/keyboard/rollup.config.js | 40 ++------------------ packages/keyboard/tests/rollup.config.js | 8 ++++ packages/keyboard/tests/webpack.config.js | 15 -------- packages/messaging/package.json | 9 ++--- packages/messaging/rollup.config.js | 40 ++------------------ packages/messaging/tests/rollup.config.js | 8 ++++ packages/messaging/tests/webpack.config.js | 15 -------- packages/polling/package.json | 9 ++--- packages/polling/rollup.config.js | 40 ++------------------ packages/polling/tests/rollup.config.js | 8 ++++ packages/polling/tests/webpack.config.js | 15 -------- packages/properties/package.json | 9 ++--- packages/properties/rollup.config.js | 40 ++------------------ packages/properties/tests/rollup.config.js | 8 ++++ packages/properties/tests/webpack.config.js | 15 -------- packages/signaling/package.json | 9 ++--- packages/signaling/rollup.config.js | 40 ++------------------ packages/signaling/tests/rollup.config.js | 8 ++++ packages/signaling/tests/webpack.config.js | 15 -------- packages/virtualdom/package.json | 9 ++--- packages/virtualdom/rollup.config.js | 40 ++------------------ packages/virtualdom/tests/rollup.config.js | 8 ++++ packages/virtualdom/tests/webpack.config.js | 15 -------- packages/widgets/package.json | 9 ++--- packages/widgets/rollup.config.js | 40 ++------------------ packages/widgets/tests/rollup.config.js | 11 ++++++ packages/widgets/tests/webpack.config.js | 23 ----------- 53 files changed, 204 insertions(+), 758 deletions(-) create mode 100644 packages/collections/tests/rollup.config.js delete mode 100644 packages/collections/tests/webpack.config.js create mode 100644 packages/commands/tests/rollup.config.js delete mode 100644 packages/commands/tests/webpack.config.js create mode 100644 packages/coreutils/tests/rollup.config.js delete mode 100644 packages/coreutils/tests/webpack.config.js create mode 100644 packages/disposable/tests/rollup.config.js delete mode 100644 packages/disposable/tests/webpack.config.js create mode 100644 packages/domutils/tests/rollup.config.js delete mode 100644 packages/domutils/tests/webpack.config.js create mode 100644 packages/dragdrop/tests/rollup.config.js delete mode 100644 packages/dragdrop/tests/webpack.config.js create mode 100644 packages/keyboard/tests/rollup.config.js delete mode 100644 packages/keyboard/tests/webpack.config.js create mode 100644 packages/messaging/tests/rollup.config.js delete mode 100644 packages/messaging/tests/webpack.config.js create mode 100644 packages/polling/tests/rollup.config.js delete mode 100644 packages/polling/tests/webpack.config.js create mode 100644 packages/properties/tests/rollup.config.js delete mode 100644 packages/properties/tests/webpack.config.js create mode 100644 packages/signaling/tests/rollup.config.js delete mode 100644 packages/signaling/tests/webpack.config.js create mode 100644 packages/virtualdom/tests/rollup.config.js delete mode 100644 packages/virtualdom/tests/webpack.config.js create mode 100644 packages/widgets/tests/rollup.config.js delete mode 100644 packages/widgets/tests/webpack.config.js diff --git a/packages/collections/package.json b/packages/collections/package.json index d1d7b633f..6ac945d49 100644 --- a/packages/collections/package.json +++ b/packages/collections/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -47,6 +47,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -66,9 +67,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/collections/rollup.config.js b/packages/collections/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/collections/rollup.config.js +++ b/packages/collections/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/collections/tests/rollup.config.js b/packages/collections/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/collections/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/collections/tests/webpack.config.js b/packages/collections/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/collections/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/commands/package.json b/packages/commands/package.json index b31760135..c6c3c4714 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "npm run test:nobrowser -- --browsers=Chrome", @@ -60,6 +60,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -79,9 +80,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/commands/rollup.config.js b/packages/commands/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/commands/rollup.config.js +++ b/packages/commands/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/commands/tests/rollup.config.js b/packages/commands/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/commands/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/commands/tests/webpack.config.js b/packages/commands/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/commands/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/coreutils/package.json b/packages/coreutils/package.json index 81ba117f8..ef7d4c097 100644 --- a/packages/coreutils/package.json +++ b/packages/coreutils/package.json @@ -28,9 +28,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -46,6 +46,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -65,9 +66,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/coreutils/tests/rollup.config.js b/packages/coreutils/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/coreutils/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/coreutils/tests/webpack.config.js b/packages/coreutils/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/coreutils/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/datagrid/package.json b/packages/datagrid/package.json index 64445a032..b8de784b2 100644 --- a/packages/datagrid/package.json +++ b/packages/datagrid/package.json @@ -46,6 +46,7 @@ "@lumino/widgets": "^2.0.0-alpha.3" }, "devDependencies": { + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "postcss": "^8.4.14", "rimraf": "^3.0.2", diff --git a/packages/datagrid/rollup.config.js b/packages/datagrid/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/datagrid/rollup.config.js +++ b/packages/datagrid/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/disposable/package.json b/packages/disposable/package.json index 40977ed9e..e5f392cc8 100644 --- a/packages/disposable/package.json +++ b/packages/disposable/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -47,6 +47,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -66,9 +67,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/disposable/rollup.config.js b/packages/disposable/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/disposable/rollup.config.js +++ b/packages/disposable/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/disposable/tests/rollup.config.js b/packages/disposable/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/disposable/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/disposable/tests/webpack.config.js b/packages/disposable/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/disposable/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/domutils/package.json b/packages/domutils/package.json index 851b96b92..40ad46b54 100644 --- a/packages/domutils/package.json +++ b/packages/domutils/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -44,6 +44,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -63,9 +64,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/domutils/rollup.config.js b/packages/domutils/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/domutils/rollup.config.js +++ b/packages/domutils/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/domutils/tests/rollup.config.js b/packages/domutils/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/domutils/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/domutils/tests/webpack.config.js b/packages/domutils/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/domutils/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/dragdrop/package.json b/packages/dragdrop/package.json index 30fad9968..9f5910299 100644 --- a/packages/dragdrop/package.json +++ b/packages/dragdrop/package.json @@ -29,9 +29,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -47,10 +47,12 @@ }, "dependencies": { "@lumino/coreutils": "^2.0.0-alpha.3", - "@lumino/disposable": "^2.0.0-alpha.3" + "@lumino/disposable": "^2.0.0-alpha.3", + "rollup-plugin-styles": "^4.0.0" }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -73,9 +75,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/dragdrop/rollup.config.js b/packages/dragdrop/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/dragdrop/rollup.config.js +++ b/packages/dragdrop/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/dragdrop/tests/rollup.config.js b/packages/dragdrop/tests/rollup.config.js new file mode 100644 index 000000000..5789bd12d --- /dev/null +++ b/packages/dragdrop/tests/rollup.config.js @@ -0,0 +1,11 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ +import styles from 'rollup-plugin-styles'; +import { createRollupConfig } from '../../../rollup.tests.config'; + +const rollupConfig = createRollupConfig(); +rollupConfig.plugins.unshift(styles()); + +export default rollupConfig; diff --git a/packages/dragdrop/tests/webpack.config.js b/packages/dragdrop/tests/webpack.config.js deleted file mode 100644 index 5ee5de397..000000000 --- a/packages/dragdrop/tests/webpack.config.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - }, - module: { - rules: [ - { - test: /\.css$/, - use: ['style-loader', 'css-loader'] - } - ] - } -}; diff --git a/packages/keyboard/package.json b/packages/keyboard/package.json index b283e475d..b07edff42 100644 --- a/packages/keyboard/package.json +++ b/packages/keyboard/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -44,6 +44,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -63,9 +64,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/keyboard/rollup.config.js b/packages/keyboard/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/keyboard/rollup.config.js +++ b/packages/keyboard/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/keyboard/tests/rollup.config.js b/packages/keyboard/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/keyboard/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/keyboard/tests/webpack.config.js b/packages/keyboard/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/keyboard/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/messaging/package.json b/packages/messaging/package.json index a72382639..fc3341c7b 100644 --- a/packages/messaging/package.json +++ b/packages/messaging/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -48,6 +48,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -68,9 +69,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/messaging/rollup.config.js b/packages/messaging/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/messaging/rollup.config.js +++ b/packages/messaging/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/messaging/tests/rollup.config.js b/packages/messaging/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/messaging/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/messaging/tests/webpack.config.js b/packages/messaging/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/messaging/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/polling/package.json b/packages/polling/package.json index 8124096a3..d6cf1a30d 100644 --- a/packages/polling/package.json +++ b/packages/polling/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -49,6 +49,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -68,9 +69,7 @@ "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", "tslib": "^2.4.0", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/polling/rollup.config.js b/packages/polling/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/polling/rollup.config.js +++ b/packages/polling/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/polling/tests/rollup.config.js b/packages/polling/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/polling/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/polling/tests/webpack.config.js b/packages/polling/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/polling/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/properties/package.json b/packages/properties/package.json index 3c4542dcb..8ba8cc9d4 100644 --- a/packages/properties/package.json +++ b/packages/properties/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -44,6 +44,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -63,9 +64,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/properties/rollup.config.js b/packages/properties/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/properties/rollup.config.js +++ b/packages/properties/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/properties/tests/rollup.config.js b/packages/properties/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/properties/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/properties/tests/webpack.config.js b/packages/properties/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/properties/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/signaling/package.json b/packages/signaling/package.json index 2d995682b..7a56b2eb5 100644 --- a/packages/signaling/package.json +++ b/packages/signaling/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "cd tests && karma start --browsers=Chrome", @@ -47,6 +47,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -67,9 +68,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/signaling/rollup.config.js b/packages/signaling/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/signaling/rollup.config.js +++ b/packages/signaling/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/signaling/tests/rollup.config.js b/packages/signaling/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/signaling/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/signaling/tests/webpack.config.js b/packages/signaling/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/signaling/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/virtualdom/package.json b/packages/virtualdom/package.json index b1482fc96..5dc1c14a2 100644 --- a/packages/virtualdom/package.json +++ b/packages/virtualdom/package.json @@ -26,9 +26,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "npm run test:nobrowser -- --browsers=Chrome", @@ -54,6 +54,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -73,9 +74,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/virtualdom/rollup.config.js b/packages/virtualdom/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/virtualdom/rollup.config.js +++ b/packages/virtualdom/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/virtualdom/tests/rollup.config.js b/packages/virtualdom/tests/rollup.config.js new file mode 100644 index 000000000..d1edf5205 --- /dev/null +++ b/packages/virtualdom/tests/rollup.config.js @@ -0,0 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + +import { createRollupConfig } from '../../../rollup.tests.config'; +const rollupConfig = createRollupConfig(); +export default rollupConfig; diff --git a/packages/virtualdom/tests/webpack.config.js b/packages/virtualdom/tests/webpack.config.js deleted file mode 100644 index c832e6dfe..000000000 --- a/packages/virtualdom/tests/webpack.config.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - } -}; diff --git a/packages/widgets/package.json b/packages/widgets/package.json index 99edce93d..3c6f848c0 100644 --- a/packages/widgets/package.json +++ b/packages/widgets/package.json @@ -29,9 +29,9 @@ "api": "api-extractor run --local --verbose", "build": "npm run build:src && rollup -c", "build:src": "tsc --build", - "build:test": "tsc --build tests && cd tests && webpack", + "build:test": "npm run clean:test && tsc --build tests && cd tests && rollup -c", "clean": "rimraf ./lib && rimraf *.tsbuildinfo && rimraf ./types && rimraf ./dist", - "clean:test": "rimraf tests/build", + "clean:test": "rimraf tests/lib tests/tsconfig.tsbuildinfo", "minimize": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js", "test": "npm run test:firefox-headless", "test:chrome": "npm run test:nobrowser -- --browsers=Chrome", @@ -67,6 +67,7 @@ }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@types/chai": "^3.4.35", "@types/mocha": "^2.2.39", @@ -89,9 +90,7 @@ "terser": "^5.7.1", "tslib": "^2.4.0", "typedoc": "~0.23.9", - "typescript": "~4.7.3", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "typescript": "~4.7.3" }, "publishConfig": { "access": "public" diff --git a/packages/widgets/rollup.config.js b/packages/widgets/rollup.config.js index 4b9cdd5cc..4a75f8983 100644 --- a/packages/widgets/rollup.config.js +++ b/packages/widgets/rollup.config.js @@ -3,43 +3,9 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); +const config = createRollupConfig({ pkg }); -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - -export default [ - { - input: 'lib/index', - external: id => pkg.dependencies && !!pkg.dependencies[id], - output: [ - { - file: pkg.main, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins: [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) - ] - } -]; +export default config; diff --git a/packages/widgets/tests/rollup.config.js b/packages/widgets/tests/rollup.config.js new file mode 100644 index 000000000..5789bd12d --- /dev/null +++ b/packages/widgets/tests/rollup.config.js @@ -0,0 +1,11 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ +import styles from 'rollup-plugin-styles'; +import { createRollupConfig } from '../../../rollup.tests.config'; + +const rollupConfig = createRollupConfig(); +rollupConfig.plugins.unshift(styles()); + +export default rollupConfig; diff --git a/packages/widgets/tests/webpack.config.js b/packages/widgets/tests/webpack.config.js deleted file mode 100644 index 5ee5de397..000000000 --- a/packages/widgets/tests/webpack.config.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) Jupyter Development Team. - * Distributed under the terms of the Modified BSD License. - */ - -var path = require('path'); - -module.exports = { - entry: './lib/index.spec.js', - mode: 'development', - output: { - filename: './lib/bundle.test.js', - path: path.resolve(__dirname) - }, - module: { - rules: [ - { - test: /\.css$/, - use: ['style-loader', 'css-loader'] - } - ] - } -}; From 54cf1b6de292687680405a4a67dd9d25ddfd1377 Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Mon, 5 Sep 2022 14:31:07 -0500 Subject: [PATCH 11/15] update Yarn lock file --- yarn.lock | 369 +++--------------------------------------------------- 1 file changed, 16 insertions(+), 353 deletions(-) diff --git a/yarn.lock b/yarn.lock index d812e0c65..2a600dfd7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,11 +28,6 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@discoveryjs/json-ext@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" - integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== - "@eslint/eslintrc@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" @@ -114,7 +109,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9": +"@jridgewell/trace-mapping@^0.3.9": version "0.3.14" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== @@ -1293,22 +1288,6 @@ dependencies: cssnano "*" -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.4.5" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.5.tgz#acdfb7dd36b91cc5d812d7c093811a8f3d9b31e4" - integrity sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - "@types/estree@*": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" @@ -1319,11 +1298,6 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== -"@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - "@types/glob@^7.1.1": version "7.2.0" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" @@ -1332,7 +1306,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.9": version "7.0.11" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== @@ -1527,154 +1501,6 @@ resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-6.0.0-6-next.25.tgz#cbdd27c2455882b8e5e7a66596938887476bb2bd" integrity sha512-zN+72MBsRLzpAzH7NWLQlWEM3k+L+k2Mt08foySELQtN+a2UFHlqkJWDnX7mQNcOiml8eV+ukPUt7wQNn+ziXw== -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" - integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== - -"@webpack-cli/info@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" - integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== - dependencies: - envinfo "^7.7.3" - -"@webpack-cli/serve@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" - integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - "@yarnpkg/lockfile@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" @@ -1714,11 +1540,6 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== - acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -1734,7 +1555,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: +acorn@^8.2.4, acorn@^8.5.0, acorn@^8.8.0: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== @@ -1778,7 +1599,7 @@ ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6: +ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@~6.12.6: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -2082,7 +1903,7 @@ browser-stdout@1.3.1: resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.20.3: +browserslist@^4.0.0, browserslist@^4.16.6, browserslist@^4.20.3: version "4.21.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== @@ -2309,11 +2130,6 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -2432,7 +2248,7 @@ colord@^2.9.1: resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== -colorette@^2.0.14, colorette@^2.0.16: +colorette@^2.0.16: version "2.0.19" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== @@ -2467,7 +2283,7 @@ commander@^6.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -commander@^7.0.0, commander@^7.2.0: +commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -3282,14 +3098,6 @@ engine.io@~6.2.0: engine.io-parser "~5.0.3" ws "~8.2.3" -enhanced-resolve@^5.10.0: - version "5.10.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" - integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - enquirer@^2.3.6, enquirer@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -3312,7 +3120,7 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== -envinfo@7.8.1, envinfo@^7.7.3, envinfo@^7.7.4: +envinfo@7.8.1, envinfo@^7.7.4: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== @@ -3329,11 +3137,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: version "0.10.62" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5" @@ -3422,7 +3225,7 @@ eslint-plugin-prettier@^4.2.0: dependencies: prettier-linter-helpers "^1.0.0" -eslint-scope@5.1.1, eslint-scope@^5.1.1: +eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -3576,11 +3379,6 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.4: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - execa@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" @@ -3746,11 +3544,6 @@ fast-safe-stringify@2.1.1, fast-safe-stringify@^2.0.8: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== -fastest-levenshtein@^1.0.12: - version "1.0.16" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" - integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== - fastq@^1.6.0: version "1.13.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" @@ -4131,11 +3924,6 @@ glob-parent@^6.0.1: dependencies: is-glob "^4.0.3" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - glob@7.1.4: version "7.1.4" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" @@ -4256,7 +4044,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -4646,11 +4434,6 @@ interpret@^1.0.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== - ip@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" @@ -4851,15 +4634,6 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== -jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - jju@~1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" @@ -5270,11 +5044,6 @@ load-json-file@^6.2.0: strip-bom "^4.0.0" type-fest "^0.6.0" -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - loader-utils@^1.2.3: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" @@ -5635,7 +5404,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@^2.1.34, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: +mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.34, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -5904,7 +5673,7 @@ negotiator@0.6.3, negotiator@^0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -neo-async@^2.6.0, neo-async@^2.6.2: +neo-async@^2.6.0: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== @@ -7272,13 +7041,6 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -7359,7 +7121,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.9.0: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -7568,15 +7330,6 @@ schema-utils@^2.7.0: ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -7630,7 +7383,7 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" -serialize-javascript@6.0.0, serialize-javascript@^6.0.0: +serialize-javascript@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== @@ -8080,7 +7833,7 @@ stylehacks@^5.1.0: browserslist "^4.16.6" postcss-selector-parser "^6.0.4" -supports-color@8.1.1, supports-color@^8.0.0: +supports-color@8.1.1: version "8.1.1" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== @@ -8124,11 +7877,6 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - tar-stream@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" @@ -8157,18 +7905,7 @@ temp-dir@^1.0.0: resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" integrity sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ== -terser-webpack-plugin@^5.1.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90" - integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.7" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.7.2" - -terser@^5.7.1, terser@^5.7.2: +terser@^5.7.1: version "5.14.2" resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== @@ -8689,14 +8426,6 @@ walk-up-path@^1.0.0: resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg== -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - wcwidth@^1.0.0, wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" @@ -8719,67 +8448,6 @@ webidl-conversions@^6.1.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== -webpack-cli@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" - integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.2.0" - "@webpack-cli/info" "^1.5.0" - "@webpack-cli/serve" "^1.7.0" - colorette "^2.0.14" - commander "^7.0.0" - cross-spawn "^7.0.3" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" - webpack-merge "^5.7.3" - -webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== - -webpack@^5.74.0: - version "5.74.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980" - integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" @@ -8835,11 +8503,6 @@ wide-align@^1.1.5: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" From ec5bd682782f800a623016ffe239abfdb0d9e69e Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Mon, 5 Sep 2022 14:59:32 -0500 Subject: [PATCH 12/15] use base config in coreutils --- packages/coreutils/rollup.config.js | 73 ++++++----------------------- 1 file changed, 14 insertions(+), 59 deletions(-) diff --git a/packages/coreutils/rollup.config.js b/packages/coreutils/rollup.config.js index 210b3a05e..caa749721 100644 --- a/packages/coreutils/rollup.config.js +++ b/packages/coreutils/rollup.config.js @@ -3,69 +3,24 @@ * Distributed under the terms of the Modified BSD License. */ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sourcemaps from 'rollup-plugin-sourcemaps'; -import postcss from 'rollup-plugin-postcss'; +import { createRollupConfig } from '../../rollup.src.config'; const pkg = require('./package.json'); - -const globals = id => - id.indexOf('@lumino/') === 0 ? id.replace('@lumino/', 'lumino_') : id; - const external = id => (pkg.dependencies && !!pkg.dependencies[id]) || (pkg.peerDependencies && !!pkg.peerDependencies[id]); -const plugins = [ - nodeResolve({ - preferBuiltins: true - }), - sourcemaps(), - postcss({ - extensions: ['.css'], - minimize: true - }) -]; +const browserConfig = { ...createRollupConfig({ pkg }), external }; +browserConfig.output[0].file = pkg.browser; + +const nodeConfig = { ...createRollupConfig({ pkg }), external }; +nodeConfig.input = 'lib/index.node'; +nodeConfig.output[0].file = pkg.main; +nodeConfig.output[0].format = 'cjs'; +nodeConfig.output[1].file = pkg['module-node'] + '.js'; +nodeConfig.output[1].globals = nodeConfig.output[0].globals; +delete nodeConfig.output[1].name; + +const config = [browserConfig, nodeConfig]; -export default [ - { - input: 'lib/index', - external, - output: [ - { - file: pkg.browser, - globals, - format: 'umd', - sourcemap: true, - name: pkg.name - }, - { - file: pkg.module + '.js', - format: 'es', - sourcemap: true, - name: pkg.name - } - ], - plugins - }, - { - input: 'lib/index.node', - external, - output: [ - { - file: pkg.main, - format: 'cjs', - sourcemap: true, - globals: globals, - name: pkg.name - }, - { - file: pkg['module-node'] + '.js', - format: 'es', - sourcemap: true, - globals: globals - } - ], - plugins - } -]; +export default config; From 6768ad1a6e1332f9cf539d47eeb3ce39a453cca6 Mon Sep 17 00:00:00 2001 From: Gabriel Fouasnon Date: Mon, 5 Sep 2022 16:03:53 -0500 Subject: [PATCH 13/15] fix dependencies in drapdrop and widgets --- packages/dragdrop/package.json | 4 ++-- packages/widgets/package.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/dragdrop/package.json b/packages/dragdrop/package.json index 9f5910299..9b0318f80 100644 --- a/packages/dragdrop/package.json +++ b/packages/dragdrop/package.json @@ -47,8 +47,7 @@ }, "dependencies": { "@lumino/coreutils": "^2.0.0-alpha.3", - "@lumino/disposable": "^2.0.0-alpha.3", - "rollup-plugin-styles": "^4.0.0" + "@lumino/disposable": "^2.0.0-alpha.3" }, "devDependencies": { "@microsoft/api-extractor": "^7.6.0", @@ -71,6 +70,7 @@ "rollup": "^2.77.2", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", + "rollup-plugin-styles": "^4.0.0", "style-loader": "^1.0.2", "terser": "^5.7.1", "tslib": "^2.4.0", diff --git a/packages/widgets/package.json b/packages/widgets/package.json index 3c6f848c0..9ffa82ba9 100644 --- a/packages/widgets/package.json +++ b/packages/widgets/package.json @@ -86,6 +86,7 @@ "rollup": "^2.77.2", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", + "rollup-plugin-styles": "^4.0.0", "style-loader": "^1.0.2", "terser": "^5.7.1", "tslib": "^2.4.0", From 80abac9bb02dc8729c64bc6835b5bd9a2984517e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Thu, 8 Sep 2022 09:46:52 +0200 Subject: [PATCH 14/15] Upgrade rollup --- packages/algorithm/package.json | 2 +- packages/application/package.json | 2 +- packages/collections/package.json | 2 +- packages/commands/package.json | 2 +- packages/coreutils/package.json | 2 +- packages/datagrid/package.json | 2 +- packages/disposable/package.json | 2 +- packages/domutils/package.json | 2 +- packages/dragdrop/package.json | 2 +- packages/keyboard/package.json | 2 +- packages/messaging/package.json | 2 +- packages/polling/package.json | 2 +- packages/properties/package.json | 2 +- packages/signaling/package.json | 2 +- packages/virtualdom/package.json | 2 +- packages/widgets/package.json | 2 +- yarn.lock | 13 +++---------- 17 files changed, 19 insertions(+), 26 deletions(-) diff --git a/packages/algorithm/package.json b/packages/algorithm/package.json index 7b45314f5..033c22c9f 100644 --- a/packages/algorithm/package.json +++ b/packages/algorithm/package.json @@ -57,7 +57,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/application/package.json b/packages/application/package.json index a9a93a568..9676d2acb 100644 --- a/packages/application/package.json +++ b/packages/application/package.json @@ -63,7 +63,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/collections/package.json b/packages/collections/package.json index 6ac945d49..2fe33b33f 100644 --- a/packages/collections/package.json +++ b/packages/collections/package.json @@ -61,7 +61,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/commands/package.json b/packages/commands/package.json index c6c3c4714..6ea5a1a20 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -74,7 +74,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/coreutils/package.json b/packages/coreutils/package.json index ef7d4c097..4f1b30c83 100644 --- a/packages/coreutils/package.json +++ b/packages/coreutils/package.json @@ -60,7 +60,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/datagrid/package.json b/packages/datagrid/package.json index b8de784b2..dc78c8ef9 100644 --- a/packages/datagrid/package.json +++ b/packages/datagrid/package.json @@ -50,7 +50,7 @@ "@rollup/plugin-node-resolve": "^13.3.0", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/disposable/package.json b/packages/disposable/package.json index e5f392cc8..ec99b85e9 100644 --- a/packages/disposable/package.json +++ b/packages/disposable/package.json @@ -61,7 +61,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/domutils/package.json b/packages/domutils/package.json index 40ad46b54..7fbe70467 100644 --- a/packages/domutils/package.json +++ b/packages/domutils/package.json @@ -58,7 +58,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/dragdrop/package.json b/packages/dragdrop/package.json index 9b0318f80..1e152adac 100644 --- a/packages/dragdrop/package.json +++ b/packages/dragdrop/package.json @@ -67,7 +67,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-styles": "^4.0.0", diff --git a/packages/keyboard/package.json b/packages/keyboard/package.json index b07edff42..7b36da860 100644 --- a/packages/keyboard/package.json +++ b/packages/keyboard/package.json @@ -58,7 +58,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/messaging/package.json b/packages/messaging/package.json index fc3341c7b..2b76f734b 100644 --- a/packages/messaging/package.json +++ b/packages/messaging/package.json @@ -63,7 +63,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/polling/package.json b/packages/polling/package.json index d6cf1a30d..1daa04abb 100644 --- a/packages/polling/package.json +++ b/packages/polling/package.json @@ -64,7 +64,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/properties/package.json b/packages/properties/package.json index 8ba8cc9d4..2d757e32e 100644 --- a/packages/properties/package.json +++ b/packages/properties/package.json @@ -58,7 +58,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/signaling/package.json b/packages/signaling/package.json index 7a56b2eb5..4ad6d6734 100644 --- a/packages/signaling/package.json +++ b/packages/signaling/package.json @@ -62,7 +62,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/virtualdom/package.json b/packages/virtualdom/package.json index 5dc1c14a2..4f9ae38dc 100644 --- a/packages/virtualdom/package.json +++ b/packages/virtualdom/package.json @@ -68,7 +68,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "terser": "^5.7.1", diff --git a/packages/widgets/package.json b/packages/widgets/package.json index 9ffa82ba9..876e8fd55 100644 --- a/packages/widgets/package.json +++ b/packages/widgets/package.json @@ -83,7 +83,7 @@ "mocha": "^9.0.3", "postcss": "^8.4.14", "rimraf": "^3.0.2", - "rollup": "^2.77.2", + "rollup": "^2.77.3", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-styles": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 2a600dfd7..186d9f174 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7254,17 +7254,10 @@ rollup-pluginutils@^2.8.2: dependencies: estree-walker "^0.6.1" -rollup@^2.77.2: - version "2.77.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.2.tgz#6b6075c55f9cc2040a5912e6e062151e42e2c4e3" - integrity sha512-m/4YzYgLcpMQbxX3NmAqDvwLATZzxt8bIegO78FZLl+lAgKJBd1DRAOeEiZcKOIOPjxE6ewHWHNgGEalFXuz1g== - optionalDependencies: - fsevents "~2.3.2" - rollup@^2.77.3: - version "2.77.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12" - integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g== + version "2.79.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.0.tgz#9177992c9f09eb58c5e56cbfa641607a12b57ce2" + integrity sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA== optionalDependencies: fsevents "~2.3.2" From 6d9cdd1a15e1e91158ee175a80c4195ff949f231 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 8 Sep 2022 07:48:22 +0000 Subject: [PATCH 15/15] Automatic application of license header --- rollup.examples.config.js | 5 +++++ rollup.src.config.js | 5 +++++ rollup.tests.config.js | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/rollup.examples.config.js b/rollup.examples.config.js index 04936ca77..389e944c2 100644 --- a/rollup.examples.config.js +++ b/rollup.examples.config.js @@ -1,3 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + import nodeResolve from '@rollup/plugin-node-resolve'; import styles from 'rollup-plugin-styles'; diff --git a/rollup.src.config.js b/rollup.src.config.js index 5fad2a250..8254c660e 100644 --- a/rollup.src.config.js +++ b/rollup.src.config.js @@ -1,3 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + import nodeResolve from '@rollup/plugin-node-resolve'; import sourcemaps from 'rollup-plugin-sourcemaps'; import postcss from 'rollup-plugin-postcss'; diff --git a/rollup.tests.config.js b/rollup.tests.config.js index c30775cae..ba2dbf8b1 100644 --- a/rollup.tests.config.js +++ b/rollup.tests.config.js @@ -1,3 +1,8 @@ +/* + * Copyright (c) Jupyter Development Team. + * Distributed under the terms of the Modified BSD License. + */ + import nodeResolve from '@rollup/plugin-node-resolve'; import commonjs from '@rollup/plugin-commonjs';