diff --git a/.changeset/green-ligers-fold.md b/.changeset/green-ligers-fold.md new file mode 100644 index 000000000..1af0bfd5c --- /dev/null +++ b/.changeset/green-ligers-fold.md @@ -0,0 +1,7 @@ +--- +'@web/dev-server': minor +'@web/dev-server-storybook': minor +'@web/test-runner': minor +--- + +update to node-resolve v11 diff --git a/.changeset/polite-planes-wash.md b/.changeset/polite-planes-wash.md new file mode 100644 index 000000000..ec308a246 --- /dev/null +++ b/.changeset/polite-planes-wash.md @@ -0,0 +1,5 @@ +--- +'rollup-plugin-workbox': minor +--- + +update to node-resolve v11 diff --git a/package.json b/package.json index e5ba692a7..cf9a1164e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@changesets/cli": "^2.12.0", - "@rollup/plugin-node-resolve": "^10.0.0", + "@rollup/plugin-node-resolve": "^11.0.0", "@rollup/plugin-typescript": "^6.1.0", "@types/chai": "^4.2.14", "@types/mocha": "^8.0.01", diff --git a/packages/dev-server-rollup/package.json b/packages/dev-server-rollup/package.json index 9e93444c0..f1879edd8 100644 --- a/packages/dev-server-rollup/package.json +++ b/packages/dev-server-rollup/package.json @@ -61,7 +61,7 @@ "@rollup/plugin-image": "^2.0.5", "@rollup/plugin-inject": "^4.0.2", "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^10.0.0", + "@rollup/plugin-node-resolve": "^11.0.0", "@rollup/plugin-replace": "^2.3.4", "@rollup/plugin-url": "^5.0.1", "@types/parse5": "^5.0.3", diff --git a/packages/dev-server-storybook/package.json b/packages/dev-server-storybook/package.json index ad52eeb76..ef430b30d 100644 --- a/packages/dev-server-storybook/package.json +++ b/packages/dev-server-storybook/package.json @@ -59,7 +59,7 @@ "@babel/preset-env": "^7.12.7", "@mdx-js/mdx": "^1.6.22", "@rollup/plugin-babel": "^5.2.2", - "@rollup/plugin-node-resolve": "^10.0.0", + "@rollup/plugin-node-resolve": "^11.0.0", "@web/dev-server-core": "^0.2.19", "@web/rollup-plugin-html": "^1.2.0", "@web/rollup-plugin-polyfills-loader": "^1.0.3", diff --git a/packages/dev-server-storybook/src/build/rollup/createRollupConfig.ts b/packages/dev-server-storybook/src/build/rollup/createRollupConfig.ts index 4854b7e67..e6071126e 100644 --- a/packages/dev-server-storybook/src/build/rollup/createRollupConfig.ts +++ b/packages/dev-server-storybook/src/build/rollup/createRollupConfig.ts @@ -46,9 +46,7 @@ export function createRollupConfig(params: CreateRollupConfigParams): RollupOpti }, plugins: [ resolve({ - customResolveOptions: { - moduleDirectory: ['node_modules', 'web_modules'], - }, + moduleDirectories: ['node_modules', 'web_modules'], }), babel({ babelHelpers: 'bundled', diff --git a/packages/dev-server/package.json b/packages/dev-server/package.json index 9e49475c5..d36ca7031 100644 --- a/packages/dev-server/package.json +++ b/packages/dev-server/package.json @@ -56,7 +56,7 @@ ], "dependencies": { "@babel/code-frame": "^7.10.4", - "@rollup/plugin-node-resolve": "^10.0.0", + "@rollup/plugin-node-resolve": "^11.0.0", "@types/command-line-args": "^5.0.0", "@web/config-loader": "^0.1.1", "@web/dev-server-core": "^0.2.19", diff --git a/packages/dev-server/src/plugins/nodeResolvePlugin.ts b/packages/dev-server/src/plugins/nodeResolvePlugin.ts index a87986bfc..2d926a244 100644 --- a/packages/dev-server/src/plugins/nodeResolvePlugin.ts +++ b/packages/dev-server/src/plugins/nodeResolvePlugin.ts @@ -13,9 +13,7 @@ export function nodeResolvePlugin( { rootDir, extensions: ['.mjs', '.js', '.cjs', '.jsx', '.json', '.ts', '.tsx'], - customResolveOptions: { - moduleDirectory: ['node_modules', 'web_modules'], - }, + moduleDirectories: ['node_modules', 'web_modules'], // allow resolving polyfills for nodejs libs preferBuiltins: false, }, diff --git a/packages/rollup-plugin-workbox/package.json b/packages/rollup-plugin-workbox/package.json index 039066049..22b727bb4 100644 --- a/packages/rollup-plugin-workbox/package.json +++ b/packages/rollup-plugin-workbox/package.json @@ -31,7 +31,7 @@ "workbox" ], "dependencies": { - "@rollup/plugin-node-resolve": "^10.0.0", + "@rollup/plugin-node-resolve": "^11.0.0", "@rollup/plugin-replace": "^2.3.4", "pretty-bytes": "^5.4.1", "rollup-plugin-terser": "^7.0.2", diff --git a/packages/test-runner/package.json b/packages/test-runner/package.json index 4f4934eac..d89e97bd2 100644 --- a/packages/test-runner/package.json +++ b/packages/test-runner/package.json @@ -70,7 +70,7 @@ "cli" ], "dependencies": { - "@rollup/plugin-node-resolve": "^10.0.0", + "@rollup/plugin-node-resolve": "^11.0.0", "@web/config-loader": "^0.1.2", "@web/dev-server-rollup": "^0.2.9", "@web/test-runner-chrome": "^0.7.3", diff --git a/packages/test-runner/src/nodeResolvePlugin.ts b/packages/test-runner/src/nodeResolvePlugin.ts index c0b9774a0..5b54fdc48 100644 --- a/packages/test-runner/src/nodeResolvePlugin.ts +++ b/packages/test-runner/src/nodeResolvePlugin.ts @@ -13,9 +13,7 @@ export function nodeResolvePlugin( { rootDir, extensions: ['.mjs', '.js', '.cjs', '.jsx', '.json', '.ts', '.tsx'], - customResolveOptions: { - moduleDirectory: ['node_modules', 'web_modules'], - }, + moduleDirectories: ['node_modules', 'web_modules'], // allow resolving polyfills for nodejs libs preferBuiltins: false, }, diff --git a/yarn.lock b/yarn.lock index 56bf70f3c..e4ea18e3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1517,17 +1517,17 @@ dependencies: "@rollup/pluginutils" "^3.0.8" -"@rollup/plugin-node-resolve@^10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-10.0.0.tgz#44064a2b98df7530e66acf8941ff262fc9b4ead8" - integrity sha512-sNijGta8fqzwA1VwUEtTvWCx2E7qC70NMsDh4ZG13byAXYigBNZMxALhKUSycBks5gupJdq0lFrKumFrRZ8H3A== +"@rollup/plugin-node-resolve@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.0.tgz#770458fb26691a686c5f29f37dded94832ffce59" + integrity sha512-8Hrmwjn1pLYjUxcv7U7IPP0qfnzEJWHyHE6CaZ8jbLM+8axaarJRB1jB6JgKTDp5gNga+TpsgX6F8iuvgOerKQ== dependencies: "@rollup/pluginutils" "^3.1.0" "@types/resolve" "1.17.1" builtin-modules "^3.1.0" deepmerge "^4.2.2" is-module "^1.0.0" - resolve "^1.17.0" + resolve "^1.19.0" "@rollup/plugin-node-resolve@^7.1.1": version "7.1.3" @@ -10242,7 +10242,7 @@ resolve-path@^1.4.0: http-errors "~1.6.2" path-is-absolute "1.0.1" -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.16.1, resolve@^1.17.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.16.1, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.3.2: version "1.19.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==