Skip to content

Commit

Permalink
upgrade to webpack 5.47.0 and webpack-sources 3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sokra committed Jul 27, 2021
1 parent 26105e2 commit d8773e1
Show file tree
Hide file tree
Showing 8 changed files with 486 additions and 252 deletions.
4 changes: 2 additions & 2 deletions packages/next/bundles/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"dependencies": {
"schema-utils3": "npm:[email protected]",
"webpack-sources2": "npm:webpack-sources@2.3.0",
"webpack5": "npm:webpack@5.44.0"
"webpack-sources3": "npm:[email protected].1",
"webpack5": "npm:webpack@5.47.0"
},
"resolutions": {
"browserslist": "4.16.6",
Expand Down
60 changes: 26 additions & 34 deletions packages/next/bundles/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"@types/estree" "*"

"@types/eslint@*":
version "7.2.14"
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.14.tgz#088661518db0c3c23089ab45900b99dd9214b92a"
integrity sha512-pESyhSbUOskqrGcaN+bCXIQDyT5zTaRWfj5ZjjSlMatgGjIn3QQPfocAu4WSabUR7CGyLZ2CQaZyISOEX7/saw==
version "7.28.0"
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
dependencies:
"@types/estree" "*"
"@types/json-schema" "*"
Expand All @@ -23,15 +23,15 @@
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==

"@types/json-schema@*", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7":
"@types/json-schema@*", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.8":
version "7.0.8"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==

"@types/node@*":
version "16.0.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.0.tgz#067a6c49dc7a5c2412a505628e26902ae967bf6f"
integrity sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg==
version "16.4.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.3.tgz#c01c1a215721f6dec71b47d88b4687463601ba48"
integrity sha512-GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg==

"@webassemblyjs/[email protected]":
version "1.11.1"
Expand Down Expand Up @@ -221,9 +221,9 @@ commander@^2.20.0:
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==

electron-to-chromium@^1.3.723:
version "1.3.769"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.769.tgz#73ad7e3f2d435810b6f8b29617ec344c782fcbed"
integrity sha512-B+3hW8D76/uoTPSobWI3D/CFn2S4jPn88dVJ+BkD88Lz6LijQpL+hfdzIFJGTQK4KdE0XwmNbjUQFH1OQVwKdQ==
version "1.3.788"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.788.tgz#7a304c8ebb11d30916a1a1c1b4a9bad3983ef232"
integrity sha512-dbMIpX4E4/Gk4gzOh1GYS7ls1vGsByWKpIqLviJi1mSmSt5BvrWLLtSqpFE5BaC7Ef4NnI0GMaiddNX2Brw6zA==

enhanced-resolve@^5.8.0:
version "5.8.2"
Expand Down Expand Up @@ -382,12 +382,12 @@ safe-buffer@^5.1.0:
ajv "^6.12.5"
ajv-keywords "^3.5.2"

schema-utils@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.0.tgz#95986eb604f66daadeed56e379bfe7a7f963cdb9"
integrity sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==
schema-utils@^3.0.0, schema-utils@^3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
dependencies:
"@types/json-schema" "^7.0.7"
"@types/json-schema" "^7.0.8"
ajv "^6.12.5"
ajv-keywords "^3.5.2"

Expand All @@ -398,11 +398,6 @@ serialize-javascript@^6.0.0:
dependencies:
randombytes "^2.1.0"

source-list-map@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==

source-map-support@~0.5.19:
version "0.5.19"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
Expand Down Expand Up @@ -469,19 +464,16 @@ watchpack@^2.2.0:
glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2"

"webpack-sources2@npm:[email protected]", webpack-sources@^2.3.0:
name webpack-sources2
version "2.3.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa"
integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
dependencies:
source-list-map "^2.0.1"
source-map "^0.6.1"
"webpack-sources3@npm:[email protected]", webpack-sources@^3.0.1:
name webpack-sources3
version "3.0.1"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.0.1.tgz#518cfabdbde3962f75bbecbacd11d88ab3205252"
integrity sha512-LkBxiXJ3tTuhLaS5gz6D6l77Et8mPWlghAe7bbnmi2PyN1CtkiL/YitR+I0pn9PtBC88Irqgg6F9dBJh8+sJRQ==

"webpack5@npm:webpack@5.44.0":
version "5.44.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.44.0.tgz#97b13a02bd79fb71ac6301ce697920660fa214a1"
integrity sha512-I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ==
"webpack5@npm:webpack@5.47.0":
version "5.47.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.47.0.tgz#3c13862b5d7b428792bfe76c5f67a0f43ba685f8"
integrity sha512-soKLGwcUM1R3YEbJhJNiZzy7T43TnI7ENda/ywfDp9G1mDlDTpO+qfc8I5b0AzMr9xM3jyvQ0n7ctJyiXuXW6Q==
dependencies:
"@types/eslint-scope" "^3.7.0"
"@types/estree" "^0.0.50"
Expand All @@ -501,11 +493,11 @@ watchpack@^2.2.0:
loader-runner "^4.2.0"
mime-types "^2.1.27"
neo-async "^2.6.2"
schema-utils "^3.0.0"
schema-utils "^3.1.0"
tapable "^2.1.1"
terser-webpack-plugin "^5.1.3"
watchpack "^2.2.0"
webpack-sources "^2.3.0"
webpack-sources "^3.0.1"

yocto-queue@^0.1.0:
version "0.1.0"
Expand Down
1 change: 0 additions & 1 deletion packages/next/compiled/webpack-sources2/index.js

This file was deleted.

1 change: 1 addition & 0 deletions packages/next/compiled/webpack-sources3/index.js

Large diffs are not rendered by default.

660 changes: 451 additions & 209 deletions packages/next/compiled/webpack/bundle5.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/next/taskfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -614,14 +614,14 @@ export async function ncc_webpack_sources(task, opts) {
.target('compiled/webpack-sources')
}
// eslint-disable-next-line camelcase
externals['webpack-sources2'] = 'next/dist/compiled/webpack-sources2'
export async function ncc_webpack_sources2(task, opts) {
externals['webpack-sources3'] = 'next/dist/compiled/webpack-sources3'
export async function ncc_webpack_sources3(task, opts) {
await task
.source(
opts.src || relative(__dirname, bundleRequire.resolve('webpack-sources2'))
opts.src || relative(__dirname, bundleRequire.resolve('webpack-sources3'))
)
.ncc({ packageName: 'webpack-sources2', externals, target: 'es5' })
.target('compiled/webpack-sources2')
.ncc({ packageName: 'webpack-sources3', externals, target: 'es5' })
.target('compiled/webpack-sources3')
}
// eslint-disable-next-line camelcase
externals['mini-css-extract-plugin'] =
Expand Down Expand Up @@ -685,7 +685,7 @@ export async function ncc_webpack_bundle5(task, opts) {
externals: {
...externals,
'schema-utils': 'next/dist/compiled/schema-utils3',
'webpack-sources': 'next/dist/compiled/webpack-sources2',
'webpack-sources': 'next/dist/compiled/webpack-sources3',
},
minify: false,
target: 'es5',
Expand Down

0 comments on commit d8773e1

Please sign in to comment.