From c7594c9f0c762c9f97d6a5878fb7335d2ef309e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?= Date: Sat, 29 Apr 2023 23:26:08 +0800 Subject: [PATCH] chore: remove deprecated package see https://github.com/remorses/esbuild-plugins/pull/29#issuecomment-1497077035 --- package.json | 2 +- pnpm-lock.yaml | 68 +++++++++++++++----------------------------------- scripts/dev.js | 4 +-- 3 files changed, 23 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index da0090026a0..c3f07b0beda 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "devDependencies": { "@babel/parser": "^7.21.3", "@babel/types": "^7.21.3", - "@esbuild-plugins/node-modules-polyfill": "^0.2.2", "@rollup/plugin-alias": "^4.0.3", "@rollup/plugin-commonjs": "^24.0.1", "@rollup/plugin-json": "^6.0.0", @@ -73,6 +72,7 @@ "conventional-changelog-cli": "^2.0.31", "enquirer": "^2.3.2", "esbuild": "^0.17.4", + "esbuild-plugin-polyfill-node": "^0.2.0", "eslint": "^8.33.0", "eslint-plugin-jest": "^27.2.1", "estree-walker": "^2.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 517eceae939..9c8ef1f4b49 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,6 @@ importers: specifiers: '@babel/parser': ^7.21.3 '@babel/types': ^7.21.3 - '@esbuild-plugins/node-modules-polyfill': ^0.2.2 '@rollup/plugin-alias': ^4.0.3 '@rollup/plugin-commonjs': ^24.0.1 '@rollup/plugin-json': ^6.0.0 @@ -22,6 +21,7 @@ importers: conventional-changelog-cli: ^2.0.31 enquirer: ^2.3.2 esbuild: ^0.17.4 + esbuild-plugin-polyfill-node: ^0.2.0 eslint: ^8.33.0 eslint-plugin-jest: ^27.2.1 estree-walker: ^2.0.2 @@ -52,7 +52,6 @@ importers: devDependencies: '@babel/parser': 7.21.3 '@babel/types': 7.21.3 - '@esbuild-plugins/node-modules-polyfill': 0.2.2_esbuild@0.17.5 '@rollup/plugin-alias': 4.0.3_rollup@3.20.2 '@rollup/plugin-commonjs': 24.0.1_rollup@3.20.2 '@rollup/plugin-json': 6.0.0_rollup@3.20.2 @@ -68,6 +67,7 @@ importers: conventional-changelog-cli: 2.2.2 enquirer: 2.3.6 esbuild: 0.17.5 + esbuild-plugin-polyfill-node: 0.2.0_esbuild@0.17.5 eslint: 8.33.0 eslint-plugin-jest: 27.2.1_qesohl5arz7pvqyycxtsqomlr4 estree-walker: 2.0.2 @@ -500,16 +500,6 @@ packages: '@babel/helper-validator-identifier': 7.19.1 to-fast-properties: 2.0.0 - /@esbuild-plugins/node-modules-polyfill/0.2.2_esbuild@0.17.5: - resolution: {integrity: sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==} - peerDependencies: - esbuild: '*' - dependencies: - esbuild: 0.17.5 - escape-string-regexp: 4.0.0 - rollup-plugin-node-polyfills: 0.2.1 - dev: true - /@esbuild/android-arm/0.17.5: resolution: {integrity: sha512-crmPUzgCmF+qZXfl1YkiFoUta2XAfixR1tEnr/gXIixE+WL8Z0BGqfydP5oox0EUOgQMMRgtATtakyAcClQVqQ==} engines: {node: '>=12'} @@ -799,6 +789,10 @@ packages: '@jridgewell/sourcemap-codec': 1.4.14 dev: true + /@jspm/core/2.0.1: + resolution: {integrity: sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==} + dev: true + /@nodelib/fs.scandir/2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -2238,6 +2232,16 @@ packages: is-symbol: 1.0.4 dev: true + /esbuild-plugin-polyfill-node/0.2.0_esbuild@0.17.5: + resolution: {integrity: sha512-rpCoK4mag0nehBtFlFMLSuL9bNBLEh8h3wZ/FsrJEDompA/AwOqInx6Xow01+CXAcvZYhkoJ0SIZiS37qkecDA==} + peerDependencies: + esbuild: '*' + dependencies: + '@jspm/core': 2.0.1 + esbuild: 0.17.5 + import-meta-resolve: 2.2.2 + dev: true + /esbuild/0.17.5: resolution: {integrity: sha512-Bu6WLCc9NMsNoMJUjGl3yBzTjVLXdysMltxQWiLAypP+/vQrf+3L1Xe8fCXzxaECus2cEJ9M7pk4yKatEwQMqQ==} engines: {node: '>=12'} @@ -2439,10 +2443,6 @@ packages: engines: {node: '>=4.0'} dev: true - /estree-walker/0.6.1: - resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==} - dev: true - /estree-walker/2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} @@ -2998,6 +2998,10 @@ packages: resolve-from: 4.0.0 dev: true + /import-meta-resolve/2.2.2: + resolution: {integrity: sha512-f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA==} + dev: true + /imurmurhash/0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -3614,12 +3618,6 @@ packages: yallist: 4.0.0 dev: true - /magic-string/0.25.9: - resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} - dependencies: - sourcemap-codec: 1.4.8 - dev: true - /magic-string/0.27.0: resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} engines: {node: '>=12'} @@ -4672,21 +4670,6 @@ packages: - supports-color dev: true - /rollup-plugin-inject/3.0.2: - resolution: {integrity: sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==} - deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject. - dependencies: - estree-walker: 0.6.1 - magic-string: 0.25.9 - rollup-pluginutils: 2.8.2 - dev: true - - /rollup-plugin-node-polyfills/0.2.1: - resolution: {integrity: sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==} - dependencies: - rollup-plugin-inject: 3.0.2 - dev: true - /rollup-plugin-polyfill-node/0.12.0_rollup@3.20.2: resolution: {integrity: sha512-PWEVfDxLEKt8JX1nZ0NkUAgXpkZMTb85rO/Ru9AQ69wYW8VUCfDgP4CGRXXWYni5wDF0vIeR1UoF3Jmw/Lt3Ug==} peerDependencies: @@ -4696,12 +4679,6 @@ packages: rollup: 3.20.2 dev: true - /rollup-pluginutils/2.8.2: - resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==} - dependencies: - estree-walker: 0.6.1 - dev: true - /rollup/3.20.2: resolution: {integrity: sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -4918,11 +4895,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /sourcemap-codec/1.4.8: - resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} - deprecated: Please use @jridgewell/sourcemap-codec instead - dev: true - /spdx-correct/3.1.1: resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==} dependencies: diff --git a/scripts/dev.js b/scripts/dev.js index d3dc9311717..8342f5237b7 100644 --- a/scripts/dev.js +++ b/scripts/dev.js @@ -9,7 +9,7 @@ import { resolve, relative, dirname } from 'node:path' import { fileURLToPath } from 'node:url' import { createRequire } from 'node:module' import minimist from 'minimist' -import { NodeModulesPolyfillPlugin as nodePolyfills } from '@esbuild-plugins/node-modules-polyfill' +import { polyfillNode } from 'esbuild-plugin-polyfill-node' const require = createRequire(import.meta.url) const __dirname = dirname(fileURLToPath(import.meta.url)) @@ -92,7 +92,7 @@ const plugins = [ ] if (format === 'cjs' || pkg.buildOptions?.enableNonBrowserBranches) { - plugins.push(nodePolyfills()) + plugins.push(polyfillNode()) } esbuild