Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace rollup-plugin-node-polyfills to analogs #18975

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/lib/builder-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
"esbuild-plugin-alias": "^0.2.1",
"express": "^4.17.1",
"fs-extra": "^9.0.1",
"rollup-plugin-node-polyfills": "^0.2.1"
"process": "^0.11.10",
"util": "^0.12.4"
},
"devDependencies": {
"typescript": "~4.6.3"
Expand Down
4 changes: 2 additions & 2 deletions code/lib/builder-manager/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ export const getConfig: ManagerBuilder['getConfig'] = async (options) => {
legalComments: 'external',
plugins: [
aliasPlugin({
process: require.resolve('rollup-plugin-node-polyfills/polyfills/process-es6.js'),
util: require.resolve('rollup-plugin-node-polyfills/polyfills/util.js'),
process: require.resolve('process/browser.js'),
util: require.resolve('util/util.js'),
assert: require.resolve('browser-assert'),
}),
globalExternals(definitions),
Expand Down
3 changes: 2 additions & 1 deletion code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@
"playwright": "^1.24.2",
"postcss-loader": "^6.2.1",
"prettier": ">=2.2.1 <=2.3.0",
"process": "^0.11.10",
"prompts": "^2.4.0",
"raf": "^3.4.1",
"read-pkg-up": "^7.0.1",
Expand All @@ -331,7 +332,6 @@
"rollup": "^2.60.2",
"rollup-plugin-extensions": "^0.1.0",
"rollup-plugin-jsx": "^1.0.3",
"rollup-plugin-node-polyfills": "^0.2.1",
"rollup-plugin-terser": "^7.0.2",
"serve-static": "^1.14.1",
"shelljs": "^0.8.5",
Expand All @@ -344,6 +344,7 @@
"ts-node": "^10.4.0",
"tsup": "^6.1.2",
"typescript": "~4.6.3",
"util": "^0.12.4",
"wait-on": "^5.2.1",
"web-component-analyzer": "^1.1.6",
"webpack": "5",
Expand Down
44 changes: 5 additions & 39 deletions code/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7572,8 +7572,9 @@ __metadata:
esbuild-plugin-alias: ^0.2.1
express: ^4.17.1
fs-extra: ^9.0.1
rollup-plugin-node-polyfills: ^0.2.1
process: ^0.11.10
typescript: ~4.6.3
util: ^0.12.4
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -9059,6 +9060,7 @@ __metadata:
playwright: ^1.24.2
postcss-loader: ^6.2.1
prettier: ">=2.2.1 <=2.3.0"
process: ^0.11.10
prompts: ^2.4.0
puppeteer: ^2.1.1
raf: ^3.4.1
Expand All @@ -9071,7 +9073,6 @@ __metadata:
rollup: ^2.60.2
rollup-plugin-extensions: ^0.1.0
rollup-plugin-jsx: ^1.0.3
rollup-plugin-node-polyfills: ^0.2.1
rollup-plugin-terser: ^7.0.2
serve-static: ^1.14.1
shelljs: ^0.8.5
Expand All @@ -9085,6 +9086,7 @@ __metadata:
ts-node: ^10.4.0
tsup: ^6.1.2
typescript: ~4.6.3
util: ^0.12.4
verdaccio: ^4.10.0
verdaccio-auth-memory: ^9.7.2
wait-on: ^5.2.1
Expand Down Expand Up @@ -21367,13 +21369,6 @@ __metadata:
languageName: node
linkType: hard

"estree-walker@npm:^0.6.1":
version: 0.6.1
resolution: "estree-walker@npm:0.6.1"
checksum: 6dabc855faa04a1ffb17b6a9121b6008ba75ab5a163ad9dc3d7fca05cfda374c5f5e91418d783496620ca75e99a73c40874d8b75f23b4117508cc8bde78e7b41
languageName: node
linkType: hard

"estree-walker@npm:^1.0.1":
version: 1.0.1
resolution: "estree-walker@npm:1.0.1"
Expand Down Expand Up @@ -30095,7 +30090,7 @@ __metadata:
languageName: node
linkType: hard

"magic-string@npm:^0.25.0, magic-string@npm:^0.25.3, magic-string@npm:^0.25.7":
"magic-string@npm:^0.25.0, magic-string@npm:^0.25.7":
version: 0.25.9
resolution: "magic-string@npm:0.25.9"
dependencies:
Expand Down Expand Up @@ -38866,17 +38861,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-plugin-inject@npm:^3.0.0":
version: 3.0.2
resolution: "rollup-plugin-inject@npm:3.0.2"
dependencies:
estree-walker: ^0.6.1
magic-string: ^0.25.3
rollup-pluginutils: ^2.8.1
checksum: 35b9d955039b56b43750a9e458bb51b7956b048b6d3ca57b1f03462aa5a0cb176d1b677d95e909b64eee4e9adf73c02f569ad8c0ab5aafdec818ff51700c114c
languageName: node
linkType: hard

"rollup-plugin-jsx@npm:^1.0.3":
version: 1.0.3
resolution: "rollup-plugin-jsx@npm:1.0.3"
Expand All @@ -38888,15 +38872,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-plugin-node-polyfills@npm:^0.2.1":
version: 0.2.1
resolution: "rollup-plugin-node-polyfills@npm:0.2.1"
dependencies:
rollup-plugin-inject: ^3.0.0
checksum: 30f9e09cbbf979b1212e0c455d74c3a061994fc19ddf160da4634b11377222cea5903a5ba05db66be849f550cde9ffc80ecbfcfb48544045d08bfc408501417d
languageName: node
linkType: hard

"rollup-plugin-terser@npm:^7.0.0, rollup-plugin-terser@npm:^7.0.2":
version: 7.0.2
resolution: "rollup-plugin-terser@npm:7.0.2"
Expand All @@ -38921,15 +38896,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-pluginutils@npm:^2.8.1":
version: 2.8.2
resolution: "rollup-pluginutils@npm:2.8.2"
dependencies:
estree-walker: ^0.6.1
checksum: 20947bec5a5dd68b5c5c8423911e6e7c0ad834c451f1a929b1f4e2bc08836ad3f1a722ef2bfcbeca921870a0a283f13f064a317dc7a6768496e98c9a641ba290
languageName: node
linkType: hard

"rollup@npm:^2.43.1, rollup@npm:^2.60.2, rollup@npm:^2.74.1":
version: 2.77.0
resolution: "rollup@npm:2.77.0"
Expand Down
3 changes: 2 additions & 1 deletion scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
"p-limit": "^3.1.0",
"prettier": ">=2.2.1 <=2.3.0",
"pretty-hrtime": "^1.0.0",
"process": "^0.11.10",
"prompts": "^2.4.0",
"react": "16.14.0",
"react-dom": "16.14.0",
Expand All @@ -167,7 +168,6 @@
"rollup": "^2.60.2",
"rollup-plugin-extensions": "^0.1.0",
"rollup-plugin-jsx": "^1.0.3",
"rollup-plugin-node-polyfills": "^0.2.1",
"rollup-plugin-terser": "^7.0.2",
"serve-static": "^1.14.1",
"shelljs": "^0.8.5",
Expand All @@ -181,6 +181,7 @@
"ts-node": "^10.4.0",
"tsup": "^6.1.2",
"typescript": "~4.6.3",
"util": "^0.12.4",
"wait-on": "^5.2.1",
"window-size": "^1.1.1",
"zx": "^7.0.3"
Expand Down
6 changes: 2 additions & 4 deletions scripts/prepare/bundle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,8 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
platform: platform || 'browser',
esbuildPlugins: [
aliasPlugin({
process: path.resolve(
'../node_modules/rollup-plugin-node-polyfills/polyfills/process-es6.js'
),
util: path.resolve('../node_modules/rollup-plugin-node-polyfills/polyfills/util.js'),
process: path.resolve('../node_modules/process/browser.js'),
util: path.resolve('../node_modules/util/util.js'),
}),
],
external: [name, ...Object.keys(dependencies || {}), ...Object.keys(peerDependencies || {})],
Expand Down
100 changes: 61 additions & 39 deletions scripts/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3342,6 +3342,7 @@ __metadata:
p-limit: ^3.1.0
prettier: ">=2.2.1 <=2.3.0"
pretty-hrtime: ^1.0.0
process: ^0.11.10
prompts: ^2.4.0
puppeteer: ^2.1.1
react: 16.14.0
Expand All @@ -3355,7 +3356,6 @@ __metadata:
rollup: ^2.60.2
rollup-plugin-extensions: ^0.1.0
rollup-plugin-jsx: ^1.0.3
rollup-plugin-node-polyfills: ^0.2.1
rollup-plugin-terser: ^7.0.2
serve-static: ^1.14.1
shelljs: ^0.8.5
Expand All @@ -3370,6 +3370,7 @@ __metadata:
ts-node: ^10.4.0
tsup: ^6.1.2
typescript: ~4.6.3
util: ^0.12.4
verdaccio: ^4.10.0
verdaccio-auth-memory: ^9.7.2
wait-on: ^5.2.1
Expand Down Expand Up @@ -5198,6 +5199,13 @@ __metadata:
languageName: node
linkType: hard

"available-typed-arrays@npm:^1.0.5":
version: 1.0.5
resolution: "available-typed-arrays@npm:1.0.5"
checksum: c4df567ca72d2754a6cbad20088f5f98b1065b3360178169fa9b44ea101af62c0f423fc3854fa820fd6895b6b9171b8386e71558203103ff8fc2ad503fdcc660
languageName: node
linkType: hard

"aws-sign2@npm:~0.7.0":
version: 0.7.0
resolution: "aws-sign2@npm:0.7.0"
Expand Down Expand Up @@ -8006,7 +8014,7 @@ __metadata:
languageName: node
linkType: hard

"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.4, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.1":
"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.4, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.0, es-abstract@npm:^1.20.1":
version: 1.20.1
resolution: "es-abstract@npm:1.20.1"
dependencies:
Expand Down Expand Up @@ -8889,13 +8897,6 @@ __metadata:
languageName: node
linkType: hard

"estree-walker@npm:^0.6.1":
version: 0.6.1
resolution: "estree-walker@npm:0.6.1"
checksum: 6dabc855faa04a1ffb17b6a9121b6008ba75ab5a163ad9dc3d7fca05cfda374c5f5e91418d783496620ca75e99a73c40874d8b75f23b4117508cc8bde78e7b41
languageName: node
linkType: hard

"estree-walker@npm:^1.0.1":
version: 1.0.1
resolution: "estree-walker@npm:1.0.1"
Expand Down Expand Up @@ -11321,6 +11322,15 @@ __metadata:
languageName: node
linkType: hard

"is-generator-function@npm:^1.0.7":
version: 1.0.10
resolution: "is-generator-function@npm:1.0.10"
dependencies:
has-tostringtag: ^1.0.0
checksum: df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b
languageName: node
linkType: hard

"is-glob@npm:^3.1.0":
version: 3.1.0
resolution: "is-glob@npm:3.1.0"
Expand Down Expand Up @@ -11534,6 +11544,19 @@ __metadata:
languageName: node
linkType: hard

"is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
version: 1.1.9
resolution: "is-typed-array@npm:1.1.9"
dependencies:
available-typed-arrays: ^1.0.5
call-bind: ^1.0.2
es-abstract: ^1.20.0
for-each: ^0.3.3
has-tostringtag: ^1.0.0
checksum: 613b7dd6d121c331bb7456f6b678ebd74aee9d77f61c3df09da2cd7841c060d4f8cff14ae8ab54977180d5da2f2da300394810bc92a05a985b3438f55cf629b2
languageName: node
linkType: hard

"is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0":
version: 1.0.0
resolution: "is-typedarray@npm:1.0.0"
Expand Down Expand Up @@ -13698,7 +13721,7 @@ __metadata:
languageName: node
linkType: hard

"magic-string@npm:^0.25.3, magic-string@npm:^0.25.7":
"magic-string@npm:^0.25.7":
version: 0.25.9
resolution: "magic-string@npm:0.25.9"
dependencies:
Expand Down Expand Up @@ -17140,17 +17163,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-plugin-inject@npm:^3.0.0":
version: 3.0.2
resolution: "rollup-plugin-inject@npm:3.0.2"
dependencies:
estree-walker: ^0.6.1
magic-string: ^0.25.3
rollup-pluginutils: ^2.8.1
checksum: 35b9d955039b56b43750a9e458bb51b7956b048b6d3ca57b1f03462aa5a0cb176d1b677d95e909b64eee4e9adf73c02f569ad8c0ab5aafdec818ff51700c114c
languageName: node
linkType: hard

"rollup-plugin-jsx@npm:^1.0.3":
version: 1.0.3
resolution: "rollup-plugin-jsx@npm:1.0.3"
Expand All @@ -17162,15 +17174,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-plugin-node-polyfills@npm:^0.2.1":
version: 0.2.1
resolution: "rollup-plugin-node-polyfills@npm:0.2.1"
dependencies:
rollup-plugin-inject: ^3.0.0
checksum: 30f9e09cbbf979b1212e0c455d74c3a061994fc19ddf160da4634b11377222cea5903a5ba05db66be849f550cde9ffc80ecbfcfb48544045d08bfc408501417d
languageName: node
linkType: hard

"rollup-plugin-terser@npm:^7.0.2":
version: 7.0.2
resolution: "rollup-plugin-terser@npm:7.0.2"
Expand All @@ -17195,15 +17198,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-pluginutils@npm:^2.8.1":
version: 2.8.2
resolution: "rollup-pluginutils@npm:2.8.2"
dependencies:
estree-walker: ^0.6.1
checksum: 20947bec5a5dd68b5c5c8423911e6e7c0ad834c451f1a929b1f4e2bc08836ad3f1a722ef2bfcbeca921870a0a283f13f064a317dc7a6768496e98c9a641ba290
languageName: node
linkType: hard

"rollup@npm:^2.60.2, rollup@npm:^2.74.1":
version: 2.77.0
resolution: "rollup@npm:2.77.0"
Expand Down Expand Up @@ -19715,6 +19709,20 @@ __metadata:
languageName: node
linkType: hard

"util@npm:^0.12.4":
version: 0.12.4
resolution: "util@npm:0.12.4"
dependencies:
inherits: ^2.0.3
is-arguments: ^1.0.4
is-generator-function: ^1.0.7
is-typed-array: ^1.1.3
safe-buffer: ^5.1.2
which-typed-array: ^1.1.2
checksum: 3e04e6feb68bccdc9fdfa013050719b3b41ce698ff5e244ee683d675b7fb9b91c8a1594b164696ee2201cca9579c286b968d0aabd9c9069ae1667413940a4e49
languageName: node
linkType: hard

"utils-merge@npm:1.0.1":
version: 1.0.1
resolution: "utils-merge@npm:1.0.1"
Expand Down Expand Up @@ -20174,6 +20182,20 @@ __metadata:
languageName: node
linkType: hard

"which-typed-array@npm:^1.1.2":
version: 1.1.8
resolution: "which-typed-array@npm:1.1.8"
dependencies:
available-typed-arrays: ^1.0.5
call-bind: ^1.0.2
es-abstract: ^1.20.0
for-each: ^0.3.3
has-tostringtag: ^1.0.0
is-typed-array: ^1.1.9
checksum: bdab0d7d077015a8e9710d93951614f2a7962ed62f5240d2852c61eb578a888c4a9da5ef93ba9d0191812e05db1817168e1ab746036d39e863d555f9b68008f1
languageName: node
linkType: hard

"which@npm:^1.2.9":
version: 1.3.1
resolution: "which@npm:1.3.1"
Expand Down