From b25dcec5a5ef63939587476ddac05eb95905dce4 Mon Sep 17 00:00:00 2001 From: Antoine BERNIER Date: Thu, 14 Nov 2024 15:35:47 +0100 Subject: [PATCH] fix: Revert "chore: rollup 4 upgrade (#2175)" (#2200) This reverts commit 63c331fbac83bcf363986faec7a3abd2b1c44ecb. --- package.json | 20 +- rollup.config.mjs => rollup.config.js | 41 +-- yarn.lock | 499 +++++++++++--------------- 3 files changed, 233 insertions(+), 327 deletions(-) rename rollup.config.mjs => rollup.config.js (62%) diff --git a/package.json b/package.json index 332d57dd4..572302f68 100644 --- a/package.json +++ b/package.json @@ -71,12 +71,9 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-class-properties": "^7.25.9", - "@babel/plugin-transform-logical-assignment-operators": "^7.25.9", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", "@babel/plugin-transform-modules-commonjs": "^7.25.9", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9", - "@babel/plugin-transform-numeric-separator": "^7.25.9", - "@babel/plugin-transform-optional-chaining": "^7.25.9", "@babel/plugin-transform-runtime": "^7.25.9", "@babel/preset-env": "^7.26.0", "@babel/preset-react": "^7.25.9", @@ -87,10 +84,10 @@ "@eslint/js": "^9.14.0", "@playwright/test": "^1.45.2", "@react-three/fiber": "^8.0.8", - "@rollup/plugin-babel": "^6.0.4", - "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.3.0", - "@rollup/plugin-terser": "^0.4.4", + "@rollup/plugin-babel": "^5.3.0", + "@rollup/plugin-commonjs": "^19.0.0", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^13.0.0", "@storybook/addon-actions": "^8.4.2", "@storybook/addon-controls": "^8.4.2", "@storybook/addon-essentials": "^8.4.2", @@ -120,9 +117,10 @@ "react": "^18.0.0", "react-dom": "^18.0.0", "rimraf": "^6.0.1", - "rollup": "^4.25.0", - "rollup-plugin-glslify": "^1.3.1", + "rollup": "^2.79.2", + "rollup-plugin-glslify": "^1.3.0", "rollup-plugin-multi-input": "^1.5.0", + "rollup-plugin-terser": "^7.0.2", "semantic-release": "^24.2.0", "serve": "^14.2.4", "storybook": "^8.4.2", diff --git a/rollup.config.mjs b/rollup.config.js similarity index 62% rename from rollup.config.mjs rename to rollup.config.js index 97bc34e61..96639522e 100644 --- a/rollup.config.mjs +++ b/rollup.config.js @@ -1,16 +1,16 @@ import path from 'path' -import { babel } from '@rollup/plugin-babel' -import { nodeResolve } from '@rollup/plugin-node-resolve' +import babel from '@rollup/plugin-babel' +import resolve from '@rollup/plugin-node-resolve' import json from '@rollup/plugin-json' import glslify from 'rollup-plugin-glslify' import multiInput from 'rollup-plugin-multi-input' -import terser from '@rollup/plugin-terser' +import { terser } from 'rollup-plugin-terser' const root = process.platform === 'win32' ? path.resolve('/') : '/' const external = (id) => !id.startsWith('.') && !id.startsWith(root) const extensions = ['.js', '.jsx', '.ts', '.tsx', '.json'] -const getBabelOptions = ({ useESModules }, targets = '> 1%, not dead, not ie 11, not op_mini all') => ({ +const getBabelOptions = ({ useESModules }) => ({ babelrc: false, extensions, exclude: '**/node_modules/**', @@ -20,24 +20,24 @@ const getBabelOptions = ({ useESModules }, targets = '> 1%, not dead, not ie 11, '@babel/preset-env', { include: [ - '@babel/plugin-transform-class-properties', - '@babel/plugin-transform-optional-chaining', - '@babel/plugin-transform-nullish-coalescing-operator', - '@babel/plugin-transform-numeric-separator', - '@babel/plugin-transform-logical-assignment-operators', + '@babel/plugin-proposal-class-properties', + '@babel/plugin-proposal-optional-chaining', + '@babel/plugin-proposal-nullish-coalescing-operator', + '@babel/plugin-proposal-numeric-separator', + '@babel/plugin-proposal-logical-assignment-operators', ], bugfixes: true, loose: true, modules: false, - targets, + targets: '> 1%, not dead, not ie 11, not op_mini all', }, ], '@babel/preset-react', '@babel/preset-typescript', ], plugins: [ - '@babel/plugin-transform-nullish-coalescing-operator', - ['@babel/plugin-transform-runtime', { regenerator: false, useESModules }], + '@babel/plugin-proposal-nullish-coalescing-operator', + ['@babel/transform-runtime', { regenerator: false, useESModules }], ], }) @@ -51,19 +51,20 @@ export default [ json(), glslify(), babel(getBabelOptions({ useESModules: true }, '>1%, not dead, not ie 11, not op_mini all')), - nodeResolve({ extensions }), + resolve({ extensions }), ], }, { input: `./src/index.ts`, - output: { dir: `dist`, format: 'esm', preserveModules: true }, + output: { dir: `dist`, format: 'esm' }, external, plugins: [ json(), glslify(), babel(getBabelOptions({ useESModules: true }, '>1%, not dead, not ie 11, not op_mini all')), - nodeResolve({ extensions }), + resolve({ extensions }), ], + preserveModules: true, }, { input: ['src/**/*.ts', 'src/**/*.tsx', '!src/index.ts'], @@ -76,7 +77,7 @@ export default [ json(), glslify(), babel(getBabelOptions({ useESModules: false })), - nodeResolve({ extensions }), + resolve({ extensions }), terser(), ], }, @@ -84,12 +85,6 @@ export default [ input: `./src/index.ts`, output: { file: `dist/index.cjs.js`, format: 'cjs' }, external, - plugins: [ - json(), - glslify(), - babel(getBabelOptions({ useESModules: false })), - nodeResolve({ extensions }), - terser(), - ], + plugins: [json(), glslify(), babel(getBabelOptions({ useESModules: false })), resolve({ extensions }), terser()], }, ] diff --git a/yarn.lock b/yarn.lock index 348d625ac..030018e9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,6 +25,17 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.10.4": + version: 7.26.2 + resolution: "@babel/code-frame@npm:7.26.2" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.25.9" + js-tokens: "npm:^4.0.0" + picocolors: "npm:^1.0.0" + checksum: 10c0/7d79621a6849183c415486af99b1a20b84737e8c11cd55b6544f688c51ce1fd710e6d869c3dd21232023da272a79b91efb3e83b5bc2dc65c1187c5fcd1b72ea8 + languageName: node + linkType: hard + "@babel/code-frame@npm:^7.24.6": version: 7.24.6 resolution: "@babel/code-frame@npm:7.24.6" @@ -205,7 +216,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.25.9": +"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.25.9": version: 7.25.9 resolution: "@babel/helper-create-class-features-plugin@npm:7.25.9" dependencies: @@ -280,7 +291,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-imports@npm:^7.18.6, @babel/helper-module-imports@npm:^7.25.9": +"@babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.25.9": version: 7.25.9 resolution: "@babel/helper-module-imports@npm:7.25.9" dependencies: @@ -343,7 +354,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.25.9": +"@babel/helper-plugin-utils@npm:^7.25.9, @babel/helper-plugin-utils@npm:^7.8.0": version: 7.25.9 resolution: "@babel/helper-plugin-utils@npm:7.25.9" checksum: 10c0/483066a1ba36ff16c0116cd24f93de05de746a603a777cd695ac7a1b034928a65a4ecb35f255761ca56626435d7abdb73219eba196f9aa83b6c3c3169325599d @@ -633,6 +644,30 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-proposal-class-properties@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6" + dependencies: + "@babel/helper-create-class-features-plugin": "npm:^7.18.6" + "@babel/helper-plugin-utils": "npm:^7.18.6" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/d5172ac6c9948cdfc387e94f3493ad86cb04035cf7433f86b5d358270b1b9752dc25e176db0c5d65892a246aca7bdb4636672e15626d7a7de4bc0bd0040168d9 + languageName: node + linkType: hard + +"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.18.6" + "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/f6629158196ee9f16295d16db75825092ef543f8b98f4dfdd516e642a0430c7b1d69319ee676d35485d9b86a53ade6de0b883490d44de6d4336d38cdeccbe0bf + languageName: node + linkType: hard + "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2": version: 7.21.0-placeholder-for-preset-env.2 resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2" @@ -675,6 +710,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.8.0" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce + languageName: node + linkType: hard + "@babel/plugin-syntax-typescript@npm:^7.25.9": version: 7.25.9 resolution: "@babel/plugin-syntax-typescript@npm:7.25.9" @@ -2779,12 +2825,9 @@ __metadata: resolution: "@react-three/drei@workspace:." dependencies: "@babel/core": "npm:^7.26.0" - "@babel/plugin-transform-class-properties": "npm:^7.25.9" - "@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.9" + "@babel/plugin-proposal-class-properties": "npm:^7.18.6" + "@babel/plugin-proposal-nullish-coalescing-operator": "npm:^7.18.6" "@babel/plugin-transform-modules-commonjs": "npm:^7.25.9" - "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.25.9" - "@babel/plugin-transform-numeric-separator": "npm:^7.25.9" - "@babel/plugin-transform-optional-chaining": "npm:^7.25.9" "@babel/plugin-transform-runtime": "npm:^7.25.9" "@babel/preset-env": "npm:^7.26.0" "@babel/preset-react": "npm:^7.25.9" @@ -2799,10 +2842,10 @@ __metadata: "@playwright/test": "npm:^1.45.2" "@react-spring/three": "npm:~9.7.5" "@react-three/fiber": "npm:^8.0.8" - "@rollup/plugin-babel": "npm:^6.0.4" - "@rollup/plugin-json": "npm:^6.1.0" - "@rollup/plugin-node-resolve": "npm:^15.3.0" - "@rollup/plugin-terser": "npm:^0.4.4" + "@rollup/plugin-babel": "npm:^5.3.0" + "@rollup/plugin-commonjs": "npm:^19.0.0" + "@rollup/plugin-json": "npm:^4.1.0" + "@rollup/plugin-node-resolve": "npm:^13.0.0" "@storybook/addon-actions": "npm:^8.4.2" "@storybook/addon-controls": "npm:^8.4.2" "@storybook/addon-essentials": "npm:^8.4.2" @@ -2841,9 +2884,10 @@ __metadata: react-composer: "npm:^5.0.3" react-dom: "npm:^18.0.0" rimraf: "npm:^6.0.1" - rollup: "npm:^4.25.0" - rollup-plugin-glslify: "npm:^1.3.1" + rollup: "npm:^2.79.2" + rollup-plugin-glslify: "npm:^1.3.0" rollup-plugin-multi-input: "npm:^1.5.0" + rollup-plugin-terser: "npm:^7.0.2" semantic-release: "npm:^24.2.0" serve: "npm:^14.2.4" stats-gl: "npm:^2.2.8" @@ -2912,70 +2956,77 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-babel@npm:^6.0.4": - version: 6.0.4 - resolution: "@rollup/plugin-babel@npm:6.0.4" +"@rollup/plugin-babel@npm:^5.3.0": + version: 5.3.1 + resolution: "@rollup/plugin-babel@npm:5.3.1" dependencies: - "@babel/helper-module-imports": "npm:^7.18.6" - "@rollup/pluginutils": "npm:^5.0.1" + "@babel/helper-module-imports": "npm:^7.10.4" + "@rollup/pluginutils": "npm:^3.1.0" peerDependencies: "@babel/core": ^7.0.0 "@types/babel__core": ^7.1.9 - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + rollup: ^1.20.0||^2.0.0 peerDependenciesMeta: "@types/babel__core": optional: true - rollup: - optional: true - checksum: 10c0/5a7c04fa6d608512b597835e749aef33e129ee9ed6cc9e33489b7d43937358fc8aba48b00819604d0bc9b7c20790a6c035e4136e8d9f70cf0d0f056ba547e700 + checksum: 10c0/2766134dd5567c0d4fd6909d1f511ce9bf3bd9d727e1bc5ffdd6097a3606faca324107ae8e0961839ee4dbb45e5e579ae601efe472fc0a271259aea79920cafa languageName: node linkType: hard -"@rollup/plugin-json@npm:^6.1.0": - version: 6.1.0 - resolution: "@rollup/plugin-json@npm:6.1.0" +"@rollup/plugin-commonjs@npm:^19.0.0": + version: 19.0.2 + resolution: "@rollup/plugin-commonjs@npm:19.0.2" dependencies: - "@rollup/pluginutils": "npm:^5.1.0" + "@rollup/pluginutils": "npm:^3.1.0" + commondir: "npm:^1.0.1" + estree-walker: "npm:^2.0.1" + glob: "npm:^7.1.6" + is-reference: "npm:^1.2.1" + magic-string: "npm:^0.25.7" + resolve: "npm:^1.17.0" peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: 10c0/9400c431b5e0cf3088ba2eb2d038809a2b0fb2a84ed004997da85582f48cd64958ed3168893c4f2c8109e38652400ed68282d0c92bf8ec07a3b2ef2e1ceab0b7 + rollup: ^2.38.3 + checksum: 10c0/9adccf77ad835cbe565da4385212f1e54c3e0dca2be174b5c2cfe89cfaeb240f42c7673e97e49b21b7c66ed901cc1c711552b6727f60b43a953ce996eb2868a7 languageName: node linkType: hard -"@rollup/plugin-node-resolve@npm:^15.3.0": - version: 15.3.0 - resolution: "@rollup/plugin-node-resolve@npm:15.3.0" +"@rollup/plugin-json@npm:^4.1.0": + version: 4.1.0 + resolution: "@rollup/plugin-json@npm:4.1.0" dependencies: - "@rollup/pluginutils": "npm:^5.0.1" - "@types/resolve": "npm:1.20.2" + "@rollup/pluginutils": "npm:^3.0.8" + peerDependencies: + rollup: ^1.20.0 || ^2.0.0 + checksum: 10c0/9fc4a3ee60929afcb5269ebda602914d1cf5dc020808f85be90c0a5a2ba9ca26136b0284a1935984861f0549a1e1db30fc372906c14425f5da4909f0fd21e5ea + languageName: node + linkType: hard + +"@rollup/plugin-node-resolve@npm:^13.0.0": + version: 13.3.0 + resolution: "@rollup/plugin-node-resolve@npm:13.3.0" + dependencies: + "@rollup/pluginutils": "npm:^3.1.0" + "@types/resolve": "npm:1.17.1" deepmerge: "npm:^4.2.2" + is-builtin-module: "npm:^3.1.0" is-module: "npm:^1.0.0" - resolve: "npm:^1.22.1" + resolve: "npm:^1.19.0" peerDependencies: - rollup: ^2.78.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: 10c0/5f3b11f9f6d00fe9fd3fe1977cc71f6a99c2b13d0ee82ad6822c4c4ecfc98854791c5a505798762f7e2332d9d67568a561e89aa8268ed3b1668563be1845109e + rollup: ^2.42.0 + checksum: 10c0/6caa32a8304a20f1c9953111b25e9543f4de7d254958d81ce0158ad909e4493946bc2060c4ace23d9748b560ebc84c920ee7bc1b7d50dbf8ba852ef13c91af58 languageName: node linkType: hard -"@rollup/plugin-terser@npm:^0.4.4": - version: 0.4.4 - resolution: "@rollup/plugin-terser@npm:0.4.4" +"@rollup/pluginutils@npm:^3.0.8, @rollup/pluginutils@npm:^3.1.0": + version: 3.1.0 + resolution: "@rollup/pluginutils@npm:3.1.0" dependencies: - serialize-javascript: "npm:^6.0.1" - smob: "npm:^1.0.0" - terser: "npm:^5.17.4" + "@types/estree": "npm:0.0.39" + estree-walker: "npm:^1.0.1" + picomatch: "npm:^2.2.2" peerDependencies: - rollup: ^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: 10c0/b9cb6c8f02ac1c1344019e9fb854321b74f880efebc41b6bdd84f18331fce0f4a2aadcdb481042245cd3f409b429ac363af71f9efec4a2024731d67d32af36ee + rollup: ^1.20.0||^2.0.0 + checksum: 10c0/7151753160d15ba2b259461a6c25b3932150994ea52dba8fd3144f634c7647c2e56733d986e2c15de67c4d96a9ee7d6278efa6d2e626a7169898fd64adc0f90c languageName: node linkType: hard @@ -2989,22 +3040,6 @@ __metadata: languageName: node linkType: hard -"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.1.0": - version: 5.1.3 - resolution: "@rollup/pluginutils@npm:5.1.3" - dependencies: - "@types/estree": "npm:^1.0.0" - estree-walker: "npm:^2.0.2" - picomatch: "npm:^4.0.2" - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: 10c0/ba46ad588733fb01d184ee3bc7a127d626158bc840b5874a94c129ff62689d12f16f537530709c54da6f3b71f67d705c4e09235b1dc9542e9d47ee8f2d0b8b9e - languageName: node - linkType: hard - "@rollup/pluginutils@npm:^5.0.2": version: 5.0.4 resolution: "@rollup/pluginutils@npm:5.0.4" @@ -3028,13 +3063,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.25.0" - conditions: os=android & cpu=arm - languageName: node - linkType: hard - "@rollup/rollup-android-arm64@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-android-arm64@npm:4.24.3" @@ -3042,13 +3070,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm64@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-android-arm64@npm:4.25.0" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - "@rollup/rollup-darwin-arm64@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-darwin-arm64@npm:4.24.3" @@ -3056,13 +3077,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-darwin-arm64@npm:4.25.0" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@rollup/rollup-darwin-x64@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-darwin-x64@npm:4.24.3" @@ -3070,13 +3084,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-darwin-x64@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-darwin-x64@npm:4.25.0" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "@rollup/rollup-freebsd-arm64@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-freebsd-arm64@npm:4.24.3" @@ -3084,13 +3091,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-freebsd-arm64@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-freebsd-arm64@npm:4.25.0" - conditions: os=freebsd & cpu=arm64 - languageName: node - linkType: hard - "@rollup/rollup-freebsd-x64@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-freebsd-x64@npm:4.24.3" @@ -3098,13 +3098,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-freebsd-x64@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-freebsd-x64@npm:4.25.0" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - "@rollup/rollup-linux-arm-gnueabihf@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.24.3" @@ -3112,13 +3105,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-arm-gnueabihf@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.25.0" - conditions: os=linux & cpu=arm & libc=glibc - languageName: node - linkType: hard - "@rollup/rollup-linux-arm-musleabihf@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.24.3" @@ -3126,13 +3112,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-arm-musleabihf@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.25.0" - conditions: os=linux & cpu=arm & libc=musl - languageName: node - linkType: hard - "@rollup/rollup-linux-arm64-gnu@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.24.3" @@ -3140,13 +3119,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.25.0" - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - "@rollup/rollup-linux-arm64-musl@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-arm64-musl@npm:4.24.3" @@ -3154,13 +3126,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-arm64-musl@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.25.0" - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.24.3" @@ -3168,13 +3133,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-powerpc64le-gnu@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.25.0" - conditions: os=linux & cpu=ppc64 & libc=glibc - languageName: node - linkType: hard - "@rollup/rollup-linux-riscv64-gnu@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.24.3" @@ -3182,13 +3140,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-riscv64-gnu@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.25.0" - conditions: os=linux & cpu=riscv64 & libc=glibc - languageName: node - linkType: hard - "@rollup/rollup-linux-s390x-gnu@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.24.3" @@ -3196,13 +3147,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-s390x-gnu@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.25.0" - conditions: os=linux & cpu=s390x & libc=glibc - languageName: node - linkType: hard - "@rollup/rollup-linux-x64-gnu@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-x64-gnu@npm:4.24.3" @@ -3210,13 +3154,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-x64-gnu@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.25.0" - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - "@rollup/rollup-linux-x64-musl@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-linux-x64-musl@npm:4.24.3" @@ -3224,13 +3161,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.25.0" - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - "@rollup/rollup-win32-arm64-msvc@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.24.3" @@ -3238,13 +3168,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-win32-arm64-msvc@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.25.0" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - "@rollup/rollup-win32-ia32-msvc@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.24.3" @@ -3252,13 +3175,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.25.0" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "@rollup/rollup-win32-x64-msvc@npm:4.24.3": version: 4.24.3 resolution: "@rollup/rollup-win32-x64-msvc@npm:4.24.3" @@ -3266,13 +3182,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-win32-x64-msvc@npm:4.25.0": - version: 4.25.0 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.25.0" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@sec-ant/readable-stream@npm:^0.4.1": version: 0.4.1 resolution: "@sec-ant/readable-stream@npm:0.4.1" @@ -3891,13 +3800,20 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:1.0.6, @types/estree@npm:^1.0.6": +"@types/estree@npm:*, @types/estree@npm:1.0.6, @types/estree@npm:^1.0.6": version: 1.0.6 resolution: "@types/estree@npm:1.0.6" checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a languageName: node linkType: hard +"@types/estree@npm:0.0.39": + version: 0.0.39 + resolution: "@types/estree@npm:0.0.39" + checksum: 10c0/f0af6c95ac1988c4827964bd9d3b51d24da442e2188943f6dfcb1e1559103d5d024d564b2e9d3f84c53714a02a0a7435c7441138eb63d9af5de4dfc66cdc0d92 + languageName: node + linkType: hard + "@types/estree@npm:^1.0.0": version: 1.0.1 resolution: "@types/estree@npm:1.0.1" @@ -4013,10 +3929,12 @@ __metadata: languageName: node linkType: hard -"@types/resolve@npm:1.20.2": - version: 1.20.2 - resolution: "@types/resolve@npm:1.20.2" - checksum: 10c0/c5b7e1770feb5ccfb6802f6ad82a7b0d50874c99331e0c9b259e415e55a38d7a86ad0901c57665d93f75938be2a6a0bc9aa06c9749192cadb2e4512800bbc6e6 +"@types/resolve@npm:1.17.1": + version: 1.17.1 + resolution: "@types/resolve@npm:1.17.1" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/6eeb9c27d99bf4b393bf168d43208f63e78cefca5644662a0bdb2bdbf8352386f4f3aca66add138fc41bce5f66fd48a0de430a1473f11b612fbed0375ae78031 languageName: node linkType: hard @@ -5010,6 +4928,13 @@ __metadata: languageName: node linkType: hard +"builtin-modules@npm:^3.3.0": + version: 3.3.0 + resolution: "builtin-modules@npm:3.3.0" + checksum: 10c0/2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a + languageName: node + linkType: hard + "bytes@npm:3.0.0": version: 3.0.0 resolution: "bytes@npm:3.0.0" @@ -5398,6 +5323,13 @@ __metadata: languageName: node linkType: hard +"commondir@npm:^1.0.1": + version: 1.0.1 + resolution: "commondir@npm:1.0.1" + checksum: 10c0/33a124960e471c25ee19280c9ce31ccc19574b566dc514fe4f4ca4c34fa8b0b57cf437671f5de380e11353ea9426213fca17687dd2ef03134fea2dbc53809fd6 + languageName: node + linkType: hard + "compare-func@npm:^2.0.0": version: 2.0.0 resolution: "compare-func@npm:2.0.0" @@ -6601,6 +6533,13 @@ __metadata: languageName: node linkType: hard +"estree-walker@npm:^1.0.1": + version: 1.0.1 + resolution: "estree-walker@npm:1.0.1" + checksum: 10c0/fa9e5f8c1bbe8d01e314c0f03067b64a4f22d4c58410fc5237060d0c15b81e58c23921c41acc60abbdab490f1fdfcbd6408ede2d03ca704454272e0244d61a55 + languageName: node + linkType: hard + "estree-walker@npm:^2.0.1, estree-walker@npm:^2.0.2": version: 2.0.2 resolution: "estree-walker@npm:2.0.2" @@ -7204,7 +7143,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.5, glob@npm:^7.2.0": +"glob@npm:^7.0.5, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -7942,6 +7881,15 @@ __metadata: languageName: node linkType: hard +"is-builtin-module@npm:^3.1.0": + version: 3.2.1 + resolution: "is-builtin-module@npm:3.2.1" + dependencies: + builtin-modules: "npm:^3.3.0" + checksum: 10c0/5a66937a03f3b18803381518f0ef679752ac18cdb7dd53b5e23ee8df8d440558737bd8dcc04d2aae555909d2ecb4a81b5c0d334d119402584b61e6a003e31af1 + languageName: node + linkType: hard + "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": version: 1.2.7 resolution: "is-callable@npm:1.2.7" @@ -8114,6 +8062,15 @@ __metadata: languageName: node linkType: hard +"is-reference@npm:^1.2.1": + version: 1.2.1 + resolution: "is-reference@npm:1.2.1" + dependencies: + "@types/estree": "npm:*" + checksum: 10c0/7dc819fc8de7790264a0a5d531164f9f5b9ef5aa1cd05f35322d14db39c8a2ec78fd5d4bf57f9789f3ddd2b3abeea7728432b759636157a42db12a9e8c3b549b + languageName: node + linkType: hard + "is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" @@ -8362,6 +8319,17 @@ __metadata: languageName: node linkType: hard +"jest-worker@npm:^26.2.1": + version: 26.6.2 + resolution: "jest-worker@npm:26.6.2" + dependencies: + "@types/node": "npm:*" + merge-stream: "npm:^2.0.0" + supports-color: "npm:^7.0.0" + checksum: 10c0/07e4dba650381604cda253ab6d5837fe0279c8d68c25884995b45bfe149a7a1e1b5a97f304b4518f257dac2a9ddc1808d57d650649c3ab855e9e60cf824d2970 + languageName: node + linkType: hard + "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0": version: 4.0.0 resolution: "js-tokens@npm:4.0.0" @@ -10281,13 +10249,6 @@ __metadata: languageName: node linkType: hard -"picomatch@npm:^4.0.2": - version: 4.0.2 - resolution: "picomatch@npm:4.0.2" - checksum: 10c0/7c51f3ad2bb42c776f49ebf964c644958158be30d0a510efd5a395e8d49cb5acfed5b82c0c5b365523ce18e6ab85013c9ebe574f60305892ec3fa8eee8304ccc - languageName: node - linkType: hard - "pify@npm:^3.0.0": version: 3.0.0 resolution: "pify@npm:3.0.0" @@ -11028,7 +10989,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.22.1, resolve@npm:^1.22.8": +"resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.22.1, resolve@npm:^1.22.8": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -11074,7 +11035,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin": +"resolve@patch:resolve@npm%3A^1.17.0#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -11137,7 +11098,7 @@ __metadata: languageName: node linkType: hard -"rollup-plugin-glslify@npm:^1.3.1": +"rollup-plugin-glslify@npm:^1.3.0": version: 1.3.1 resolution: "rollup-plugin-glslify@npm:1.3.1" dependencies: @@ -11156,6 +11117,20 @@ __metadata: languageName: node linkType: hard +"rollup-plugin-terser@npm:^7.0.2": + version: 7.0.2 + resolution: "rollup-plugin-terser@npm:7.0.2" + dependencies: + "@babel/code-frame": "npm:^7.10.4" + jest-worker: "npm:^26.2.1" + serialize-javascript: "npm:^4.0.0" + terser: "npm:^5.0.0" + peerDependencies: + rollup: ^2.0.0 + checksum: 10c0/f79b851c6f7b06555d3a8ce7a4e32abd2b7cb8318e89fb8db73e662fa6e3af1a59920e881d111efc65a7437fd9582b61b1f4859b6fd839ba948616829d92432d + languageName: node + linkType: hard + "rollup-pluginutils@npm:^2.8.2": version: 2.8.2 resolution: "rollup-pluginutils@npm:2.8.2" @@ -11165,6 +11140,20 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^2.79.2": + version: 2.79.2 + resolution: "rollup@npm:2.79.2" + dependencies: + fsevents: "npm:~2.3.2" + dependenciesMeta: + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: 10c0/bc3746c988d903c2211266ddc539379d53d92689b9cc5c2b4e3ae161689de9af491957a567c629b6cc81f48d0928a7591fc4c383fba68a48d2966c9fb8a2bce9 + languageName: node + linkType: hard + "rollup@npm:^4.20.0": version: 4.24.3 resolution: "rollup@npm:4.24.3" @@ -11234,75 +11223,6 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^4.25.0": - version: 4.25.0 - resolution: "rollup@npm:4.25.0" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.25.0" - "@rollup/rollup-android-arm64": "npm:4.25.0" - "@rollup/rollup-darwin-arm64": "npm:4.25.0" - "@rollup/rollup-darwin-x64": "npm:4.25.0" - "@rollup/rollup-freebsd-arm64": "npm:4.25.0" - "@rollup/rollup-freebsd-x64": "npm:4.25.0" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.25.0" - "@rollup/rollup-linux-arm-musleabihf": "npm:4.25.0" - "@rollup/rollup-linux-arm64-gnu": "npm:4.25.0" - "@rollup/rollup-linux-arm64-musl": "npm:4.25.0" - "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.25.0" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.25.0" - "@rollup/rollup-linux-s390x-gnu": "npm:4.25.0" - "@rollup/rollup-linux-x64-gnu": "npm:4.25.0" - "@rollup/rollup-linux-x64-musl": "npm:4.25.0" - "@rollup/rollup-win32-arm64-msvc": "npm:4.25.0" - "@rollup/rollup-win32-ia32-msvc": "npm:4.25.0" - "@rollup/rollup-win32-x64-msvc": "npm:4.25.0" - "@types/estree": "npm:1.0.6" - fsevents: "npm:~2.3.2" - dependenciesMeta: - "@rollup/rollup-android-arm-eabi": - optional: true - "@rollup/rollup-android-arm64": - optional: true - "@rollup/rollup-darwin-arm64": - optional: true - "@rollup/rollup-darwin-x64": - optional: true - "@rollup/rollup-freebsd-arm64": - optional: true - "@rollup/rollup-freebsd-x64": - optional: true - "@rollup/rollup-linux-arm-gnueabihf": - optional: true - "@rollup/rollup-linux-arm-musleabihf": - optional: true - "@rollup/rollup-linux-arm64-gnu": - optional: true - "@rollup/rollup-linux-arm64-musl": - optional: true - "@rollup/rollup-linux-powerpc64le-gnu": - optional: true - "@rollup/rollup-linux-riscv64-gnu": - optional: true - "@rollup/rollup-linux-s390x-gnu": - optional: true - "@rollup/rollup-linux-x64-gnu": - optional: true - "@rollup/rollup-linux-x64-musl": - optional: true - "@rollup/rollup-win32-arm64-msvc": - optional: true - "@rollup/rollup-win32-ia32-msvc": - optional: true - "@rollup/rollup-win32-x64-msvc": - optional: true - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 10c0/fdb4d530bc942024f6e9ee3b5051fd2a8ef545a3869a689f6d1fea0f391e0b257835b639c01dc3024dbafe3790c8210aea547bcddbdb38c002087e5bf4630ad8 - languageName: node - linkType: hard - "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -11502,12 +11422,12 @@ __metadata: languageName: node linkType: hard -"serialize-javascript@npm:^6.0.1": - version: 6.0.2 - resolution: "serialize-javascript@npm:6.0.2" +"serialize-javascript@npm:^4.0.0": + version: 4.0.0 + resolution: "serialize-javascript@npm:4.0.0" dependencies: randombytes: "npm:^2.1.0" - checksum: 10c0/2dd09ef4b65a1289ba24a788b1423a035581bef60817bea1f01eda8e3bda623f86357665fe7ac1b50f6d4f583f97db9615b3f07b2a2e8cbcb75033965f771dd2 + checksum: 10c0/510dfe7f0311c0b2f7ab06311afa1668ba2969ab2f1faaac0a4924ede76b7f22ba85cfdeaa0052ec5a047bca42c8cd8ac8df8f0efe52f9bd290b3a39ae69fe9d languageName: node linkType: hard @@ -11692,13 +11612,6 @@ __metadata: languageName: node linkType: hard -"smob@npm:^1.0.0": - version: 1.5.0 - resolution: "smob@npm:1.5.0" - checksum: 10c0/a1067f23265812de8357ed27312101af49b89129eb973e3f26ab5856ea774f88cace13342e66e32470f933ccfa916e0e9d0f7ca8bbd4f92dfab2af45c15956c2 - languageName: node - linkType: hard - "socks-proxy-agent@npm:^8.0.1": version: 8.0.2 resolution: "socks-proxy-agent@npm:8.0.2" @@ -12236,7 +12149,7 @@ __metadata: languageName: node linkType: hard -"terser@npm:^5.17.4": +"terser@npm:^5.0.0": version: 5.36.0 resolution: "terser@npm:5.36.0" dependencies: