Skip to content

Commit

Permalink
fix: bump @rollup/plugin-commonjs to v19, fix vitejs#3312 (vitejs#3353)
Browse files Browse the repository at this point in the history
- v18 added the `ignoreDynamicRequires` option as a breaking change. The earlier behaviour matched `true`, so I set it as the default (ref: rollup/plugins#819)
- v19 is a breaking change since it now requires Rollup 2.38.0, but we’re already on 2.38.5. (ref: rollup/plugins#658)
  • Loading branch information
nihalgonsalves authored and fi3ework committed May 22, 2021
1 parent 9a4e603 commit fd213ed
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 17 deletions.
9 changes: 8 additions & 1 deletion packages/vite/LICENSE.md
Expand Up @@ -25,7 +25,7 @@ SOFTWARE.

# Licenses of bundled dependencies
The published Vite artifact additionally contains code with the following licenses:
Apache-2.0, MIT, ISC, BSD-2-Clause, (BSD-3-Clause OR GPL-2.0), BSD-3-Clause, CC0-1.0
Apache-2.0, MIT, ISC, BSD-2-Clause, (MIT), (BSD-3-Clause OR GPL-2.0), BSD-3-Clause, CC0-1.0

# Bundled dependencies:
## @ampproject/remapping
Expand Down Expand Up @@ -1565,6 +1565,13 @@ By: motdotla
---------------------------------------

## duplexer
License: (MIT)
By: Raynos, Jake Verbaten
Repository: git://github.com/Raynos/duplexer.git

---------------------------------------

## ee-first
License: MIT
By: Jonathan Ong, Douglas Christopher Wilson
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/package.json
Expand Up @@ -57,7 +57,7 @@
"devDependencies": {
"@ampproject/remapping": "^1.0.1",
"@rollup/plugin-alias": "^3.1.1",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-commonjs": "^19.0.0",
"@rollup/plugin-dynamic-import-vars": "^1.1.1",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^11.0.1",
Expand Down
5 changes: 4 additions & 1 deletion packages/vite/src/node/build.ts
Expand Up @@ -258,7 +258,10 @@ export function resolveBuildPlugins(
return {
pre: [
buildHtmlPlugin(config),
commonjsPlugin(options.commonjsOptions),
commonjsPlugin({
ignoreDynamicRequires: true,
...options.commonjsOptions
}),
dataURIPlugin(),
dynamicImportVars({
warnOnError: true,
Expand Down
36 changes: 22 additions & 14 deletions yarn.lock
Expand Up @@ -789,10 +789,10 @@
dependencies:
slash "^3.0.0"

"@rollup/plugin-commonjs@^17.0.0":
version "17.1.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz#757ec88737dffa8aa913eb392fade2e45aef2a2d"
integrity sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==
"@rollup/plugin-commonjs@^19.0.0":
version "19.0.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-19.0.0.tgz#8c3e71f9a66908e60d70cc1be205834ef3e45f71"
integrity sha512-adTpD6ATGbehdaQoZQ6ipDFhdjqsTgpOAhFiPwl+dzre4pPshsecptDPyEFb61JMJ1+mGljktaC4jI8ARMSNyw==
dependencies:
"@rollup/pluginutils" "^3.1.0"
commondir "^1.0.1"
Expand Down Expand Up @@ -2511,7 +2511,8 @@ css-color-names@^1.0.1:
integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==

"css-dep@link:./packages/playground/css/css-dep":
version "1.0.0"
version "0.0.0"
uid ""

css-parse@~2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -2704,22 +2705,23 @@ delegate@^3.1.2:

"dep-cjs-named-only@link:./packages/playground/optimize-deps/dep-cjs-named-only":
version "0.0.0"
uid ""

"dep-esbuild-plugin-transform@link:./packages/playground/optimize-deps/dep-esbuild-plugin-transform":
version "0.0.0"
uid ""

"dep-import-type@link:./packages/playground/ssr-vue/dep-import-type":
version "0.0.0"
uid ""

"dep-linked-include@link:./packages/playground/optimize-deps/dep-linked-include":
version "0.0.0"
dependencies:
react "17.0.0"
uid ""

"dep-linked@link:./packages/playground/optimize-deps/dep-linked":
version "0.0.0"
dependencies:
lodash-es "^4.17.20"
uid ""

depd@~1.1.2:
version "1.1.2"
Expand Down Expand Up @@ -6765,13 +6767,16 @@ requires-port@^1.0.0:
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=

"resolve-browser-field@link:./packages/playground/resolve/browser-field":
version "1.0.0"
version "0.0.0"
uid ""

"resolve-custom-condition@link:./packages/playground/resolve/custom-condition":
version "1.0.0"
version "0.0.0"
uid ""

"resolve-custom-main-field@link:./packages/playground/resolve/custom-main-field":
version "1.0.0"
version "0.0.0"
uid ""

resolve-cwd@^3.0.0:
version "3.0.0"
Expand All @@ -6781,10 +6786,12 @@ resolve-cwd@^3.0.0:
resolve-from "^5.0.0"

"resolve-exports-env@link:./packages/playground/resolve/exports-env":
version "1.0.0"
version "0.0.0"
uid ""

"resolve-exports-path@link:./packages/playground/resolve/exports-path":
version "1.0.0"
version "0.0.0"
uid ""

resolve-from@^4.0.0:
version "4.0.0"
Expand Down Expand Up @@ -7859,6 +7866,7 @@ typedarray-to-buffer@^3.1.5:

"types@link:./packages/vite/types":
version "0.0.0"
uid ""

typescript@^4.1.2:
version "4.2.3"
Expand Down

0 comments on commit fd213ed

Please sign in to comment.