Unverified Commit e019ef6a authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

update webpack, fix runtime location, fix undeclared variable, omit env vars…

update webpack, fix runtime location, fix undeclared variable, omit env vars from cache version (#23113)

* this will fix problems with serverless target which doesn't use a runtime chunk
* It also omit env vars from contributing to cache version as webpack will handle that now
* It moves the webpack-runtime chunk from ./chunks back to ./
parent a9da48d3
...@@ -788,7 +788,7 @@ export default async function getBaseWebpackConfig( ...@@ -788,7 +788,7 @@ export default async function getBaseWebpackConfig(
splitChunks: isServer ? false : splitChunksConfig, splitChunks: isServer ? false : splitChunksConfig,
runtimeChunk: isServer runtimeChunk: isServer
? isWebpack5 && !isLikeServerless ? isWebpack5 && !isLikeServerless
? { name: `${dev ? '' : 'chunks/'}webpack-runtime` } ? { name: 'webpack-runtime' }
: undefined : undefined
: { name: CLIENT_STATIC_FILES_RUNTIME_WEBPACK }, : { name: CLIENT_STATIC_FILES_RUNTIME_WEBPACK },
minimize: !(dev || isServer), minimize: !(dev || isServer),
...@@ -1217,22 +1217,6 @@ export default async function getBaseWebpackConfig( ...@@ -1217,22 +1217,6 @@ export default async function getBaseWebpackConfig(
webpackConfig.optimization.usedExports = false webpackConfig.optimization.usedExports = false
} }
const nextPublicVariables = Object.keys(process.env)
.reduce((acc: string[], key: string) => {
if (key.startsWith('NEXT_PUBLIC_')) {
return [...acc, `${key}=${process.env[key]}`]
}
return acc
}, [])
.join('|')
const nextEnvVariables = Object.keys(config.env).reduce(
(prev: string, key: string) => {
return `${prev}|${key}=${config.env[key]}`
},
''
)
const configVars = JSON.stringify({ const configVars = JSON.stringify({
crossOrigin: config.crossOrigin, crossOrigin: config.crossOrigin,
pageExtensions: config.pageExtensions, pageExtensions: config.pageExtensions,
...@@ -1257,10 +1241,8 @@ export default async function getBaseWebpackConfig( ...@@ -1257,10 +1241,8 @@ export default async function getBaseWebpackConfig(
type: 'filesystem', type: 'filesystem',
// Includes: // Includes:
// - Next.js version // - Next.js version
// - NEXT_PUBLIC_ variable values (they affect caching) TODO: make this module usage only
// - next.config.js `env` key
// - next.config.js keys that affect compilation // - next.config.js keys that affect compilation
version: `${process.env.__NEXT_VERSION}|${nextPublicVariables}|${nextEnvVariables}|${configVars}`, version: `${process.env.__NEXT_VERSION}|${configVars}`,
cacheDirectory: path.join(dir, '.next', 'cache', 'webpack'), cacheDirectory: path.join(dir, '.next', 'cache', 'webpack'),
} }
......
...@@ -104,6 +104,7 @@ module.exports = function () { ...@@ -104,6 +104,7 @@ module.exports = function () {
var hot = { var hot = {
// private stuff // private stuff
_acceptedDependencies: {}, _acceptedDependencies: {},
_acceptedErrorHandlers: {},
_declinedDependencies: {}, _declinedDependencies: {},
_selfAccepted: false, _selfAccepted: false,
_selfDeclined: false, _selfDeclined: false,
...@@ -118,13 +119,18 @@ module.exports = function () { ...@@ -118,13 +119,18 @@ module.exports = function () {
// Module API // Module API
active: true, active: true,
accept: function (dep, callback) { accept: function (dep, callback, errorHandler) {
if (dep === undefined) hot._selfAccepted = true; if (dep === undefined) hot._selfAccepted = true;
else if (typeof dep === "function") hot._selfAccepted = dep; else if (typeof dep === "function") hot._selfAccepted = dep;
else if (typeof dep === "object" && dep !== null) else if (typeof dep === "object" && dep !== null) {
for (var i = 0; i < dep.length; i++) for (var i = 0; i < dep.length; i++) {
hot._acceptedDependencies[dep[i]] = callback || function () {}; hot._acceptedDependencies[dep[i]] = callback || function () {};
else hot._acceptedDependencies[dep] = callback || function () {}; hot._acceptedErrorHandlers[dep[i]] = errorHandler;
}
} else {
hot._acceptedDependencies[dep] = callback || function () {};
hot._acceptedErrorHandlers[dep] = errorHandler;
}
}, },
decline: function (dep) { decline: function (dep) {
if (dep === undefined) hot._selfDeclined = true; if (dep === undefined) hot._selfDeclined = true;
......
...@@ -204,18 +204,19 @@ module.exports = function () { ...@@ -204,18 +204,19 @@ module.exports = function () {
var outdatedSelfAcceptedModules = []; var outdatedSelfAcceptedModules = [];
for (var j = 0; j < outdatedModules.length; j++) { for (var j = 0; j < outdatedModules.length; j++) {
var outdatedModuleId = outdatedModules[j]; var outdatedModuleId = outdatedModules[j];
var module = $moduleCache$[outdatedModuleId];
if ( if (
$moduleCache$[outdatedModuleId] && module &&
$moduleCache$[outdatedModuleId].hot._selfAccepted && module.hot._selfAccepted &&
// removed self-accepted modules should not be required // removed self-accepted modules should not be required
appliedUpdate[outdatedModuleId] !== warnUnexpectedRequire && appliedUpdate[outdatedModuleId] !== warnUnexpectedRequire &&
// when called invalidate self-accepting is not possible // when called invalidate self-accepting is not possible
!$moduleCache$[outdatedModuleId].hot._selfInvalidated !module.hot._selfInvalidated
) { ) {
outdatedSelfAcceptedModules.push({ outdatedSelfAcceptedModules.push({
module: outdatedModuleId, module: outdatedModuleId,
require: $moduleCache$[outdatedModuleId].hot._requireSelf, require: module.hot._requireSelf,
errorHandler: $moduleCache$[outdatedModuleId].hot._selfAccepted errorHandler: module.hot._selfAccepted
}); });
} }
} }
...@@ -303,14 +304,18 @@ module.exports = function () { ...@@ -303,14 +304,18 @@ module.exports = function () {
moduleOutdatedDependencies = moduleOutdatedDependencies =
outdatedDependencies[outdatedModuleId]; outdatedDependencies[outdatedModuleId];
var callbacks = []; var callbacks = [];
var errorHandlers = [];
var dependenciesForCallbacks = []; var dependenciesForCallbacks = [];
for (var j = 0; j < moduleOutdatedDependencies.length; j++) { for (var j = 0; j < moduleOutdatedDependencies.length; j++) {
var dependency = moduleOutdatedDependencies[j]; var dependency = moduleOutdatedDependencies[j];
var acceptCallback = var acceptCallback =
module.hot._acceptedDependencies[dependency]; module.hot._acceptedDependencies[dependency];
var errorHandler =
module.hot._acceptedErrorHandlers[dependency];
if (acceptCallback) { if (acceptCallback) {
if (callbacks.indexOf(acceptCallback) !== -1) continue; if (callbacks.indexOf(acceptCallback) !== -1) continue;
callbacks.push(acceptCallback); callbacks.push(acceptCallback);
errorHandlers.push(errorHandler);
dependenciesForCallbacks.push(dependency); dependenciesForCallbacks.push(dependency);
} }
} }
...@@ -318,16 +323,39 @@ module.exports = function () { ...@@ -318,16 +323,39 @@ module.exports = function () {
try { try {
callbacks[k].call(null, moduleOutdatedDependencies); callbacks[k].call(null, moduleOutdatedDependencies);
} catch (err) { } catch (err) {
if (options.onErrored) { if (typeof errorHandlers[k] === "function") {
options.onErrored({ try {
type: "accept-errored", errorHandlers[k](err, {
moduleId: outdatedModuleId, moduleId: outdatedModuleId,
dependencyId: dependenciesForCallbacks[k], dependencyId: dependenciesForCallbacks[k]
error: err });
}); } catch (err2) {
} if (options.onErrored) {
if (!options.ignoreErrored) { options.onErrored({
reportError(err); type: "accept-error-handler-errored",
moduleId: outdatedModuleId,
dependencyId: dependenciesForCallbacks[k],
error: err2,
originalError: err
});
}
if (!options.ignoreErrored) {
reportError(err2);
reportError(err);
}
}
} else {
if (options.onErrored) {
options.onErrored({
type: "accept-errored",
moduleId: outdatedModuleId,
dependencyId: dependenciesForCallbacks[k],
error: err
});
}
if (!options.ignoreErrored) {
reportError(err);
}
} }
} }
} }
...@@ -344,7 +372,10 @@ module.exports = function () { ...@@ -344,7 +372,10 @@ module.exports = function () {
} catch (err) { } catch (err) {
if (typeof item.errorHandler === "function") { if (typeof item.errorHandler === "function") {
try { try {
item.errorHandler(err); item.errorHandler(err, {
moduleId: moduleId,
module: $moduleCache$[moduleId]
});
} catch (err2) { } catch (err2) {
if (options.onErrored) { if (options.onErrored) {
options.onErrored({ options.onErrored({
...@@ -356,8 +387,8 @@ module.exports = function () { ...@@ -356,8 +387,8 @@ module.exports = function () {
} }
if (!options.ignoreErrored) { if (!options.ignoreErrored) {
reportError(err2); reportError(err2);
reportError(err);
} }
reportError(err);
} }
} else { } else {
if (options.onErrored) { if (options.onErrored) {
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
"@types/node@*": "@types/node@*":
version "14.14.32" version "14.14.35"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.32.tgz#90c5c4a8d72bbbfe53033f122341343249183448" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz#42c953a4e2b18ab931f72477e7012172f4ffa313"
integrity sha512-/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg== integrity sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==
"@webassemblyjs/ast@1.11.0": "@webassemblyjs/ast@1.11.0":
version "1.11.0" version "1.11.0"
...@@ -165,9 +165,9 @@ ...@@ -165,9 +165,9 @@
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
acorn@^8.0.4: acorn@^8.0.4:
version "8.0.5" version "8.1.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg== integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
ajv-keywords@^3.5.2: ajv-keywords@^3.5.2:
version "3.5.2" version "3.5.2"
...@@ -223,9 +223,9 @@ commander@^2.20.0: ...@@ -223,9 +223,9 @@ commander@^2.20.0:
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
electron-to-chromium@^1.3.634: electron-to-chromium@^1.3.634:
version "1.3.682" version "1.3.690"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.682.tgz#f4b5c8d4479df96b61e508a721d6c32c1262ef23" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.690.tgz#54df63ec42fba6b8e9e05fe4be52caeeedb6e634"
integrity sha512-zok2y37qR00U14uM6qBz/3iIjWHom2eRfC2S1StA0RslP7x34jX+j4mxv80t8OEOHLJPVG54ZPeaFxEI7gPrwg== integrity sha512-zPbaSv1c8LUKqQ+scNxJKv01RYFkVVF1xli+b+3Ty8ONujHjAMg+t/COmdZqrtnS1gT+g4hbSodHillymt1Lww==
enhanced-resolve@^5.7.0: enhanced-resolve@^5.7.0:
version "5.7.0" version "5.7.0"
...@@ -476,9 +476,9 @@ watchpack@^2.0.0: ...@@ -476,9 +476,9 @@ watchpack@^2.0.0:
source-map "^0.6.1" source-map "^0.6.1"
"webpack5@npm:webpack@5": "webpack5@npm:webpack@5":
version "5.24.4" version "5.26.2"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.24.4.tgz#37d8cf95841dd23c809ea02931294b3455d74a59" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.26.2.tgz#b61c018c9abdb7c67b08e2783ba46fe8723f59e8"
integrity sha512-RXOdxF9hFFFhg47BryCgyFrEyyu7Y/75/uiI2DoUiTMqysK+WczVSTppvkR47oZcmI/DPaXCiCiaXBP8QjkNpA== integrity sha512-h07tAPeQceEO3Idrevqv4ECcpMH8Zp0aUUJ+IytujWTVf6TF5PI3rKVw0Z+7rNjU4qJuEx18BykFxgRvR9VgEQ==
dependencies: dependencies:
"@types/eslint-scope" "^3.7.0" "@types/eslint-scope" "^3.7.0"
"@types/estree" "^0.0.46" "@types/estree" "^0.0.46"
......
...@@ -104,6 +104,7 @@ module.exports = function () { ...@@ -104,6 +104,7 @@ module.exports = function () {
var hot = { var hot = {
// private stuff // private stuff
_acceptedDependencies: {}, _acceptedDependencies: {},
_acceptedErrorHandlers: {},
_declinedDependencies: {}, _declinedDependencies: {},
_selfAccepted: false, _selfAccepted: false,
_selfDeclined: false, _selfDeclined: false,
...@@ -118,13 +119,18 @@ module.exports = function () { ...@@ -118,13 +119,18 @@ module.exports = function () {
// Module API // Module API
active: true, active: true,
accept: function (dep, callback) { accept: function (dep, callback, errorHandler) {
if (dep === undefined) hot._selfAccepted = true; if (dep === undefined) hot._selfAccepted = true;
else if (typeof dep === "function") hot._selfAccepted = dep; else if (typeof dep === "function") hot._selfAccepted = dep;
else if (typeof dep === "object" && dep !== null) else if (typeof dep === "object" && dep !== null) {
for (var i = 0; i < dep.length; i++) for (var i = 0; i < dep.length; i++) {
hot._acceptedDependencies[dep[i]] = callback || function () {}; hot._acceptedDependencies[dep[i]] = callback || function () {};
else hot._acceptedDependencies[dep] = callback || function () {}; hot._acceptedErrorHandlers[dep[i]] = errorHandler;
}
} else {
hot._acceptedDependencies[dep] = callback || function () {};
hot._acceptedErrorHandlers[dep] = errorHandler;
}
}, },
decline: function (dep) { decline: function (dep) {
if (dep === undefined) hot._selfDeclined = true; if (dep === undefined) hot._selfDeclined = true;
......
...@@ -204,18 +204,19 @@ module.exports = function () { ...@@ -204,18 +204,19 @@ module.exports = function () {
var outdatedSelfAcceptedModules = []; var outdatedSelfAcceptedModules = [];
for (var j = 0; j < outdatedModules.length; j++) { for (var j = 0; j < outdatedModules.length; j++) {
var outdatedModuleId = outdatedModules[j]; var outdatedModuleId = outdatedModules[j];
var module = $moduleCache$[outdatedModuleId];
if ( if (
$moduleCache$[outdatedModuleId] && module &&
$moduleCache$[outdatedModuleId].hot._selfAccepted && module.hot._selfAccepted &&
// removed self-accepted modules should not be required // removed self-accepted modules should not be required
appliedUpdate[outdatedModuleId] !== warnUnexpectedRequire && appliedUpdate[outdatedModuleId] !== warnUnexpectedRequire &&
// when called invalidate self-accepting is not possible // when called invalidate self-accepting is not possible
!$moduleCache$[outdatedModuleId].hot._selfInvalidated !module.hot._selfInvalidated
) { ) {
outdatedSelfAcceptedModules.push({ outdatedSelfAcceptedModules.push({
module: outdatedModuleId, module: outdatedModuleId,
require: $moduleCache$[outdatedModuleId].hot._requireSelf, require: module.hot._requireSelf,
errorHandler: $moduleCache$[outdatedModuleId].hot._selfAccepted errorHandler: module.hot._selfAccepted
}); });
} }
} }
...@@ -303,14 +304,18 @@ module.exports = function () { ...@@ -303,14 +304,18 @@ module.exports = function () {
moduleOutdatedDependencies = moduleOutdatedDependencies =
outdatedDependencies[outdatedModuleId]; outdatedDependencies[outdatedModuleId];
var callbacks = []; var callbacks = [];
var errorHandlers = [];
var dependenciesForCallbacks = []; var dependenciesForCallbacks = [];
for (var j = 0; j < moduleOutdatedDependencies.length; j++) { for (var j = 0; j < moduleOutdatedDependencies.length; j++) {
var dependency = moduleOutdatedDependencies[j]; var dependency = moduleOutdatedDependencies[j];
var acceptCallback = var acceptCallback =
module.hot._acceptedDependencies[dependency]; module.hot._acceptedDependencies[dependency];
var errorHandler =
module.hot._acceptedErrorHandlers[dependency];
if (acceptCallback) { if (acceptCallback) {
if (callbacks.indexOf(acceptCallback) !== -1) continue; if (callbacks.indexOf(acceptCallback) !== -1) continue;
callbacks.push(acceptCallback); callbacks.push(acceptCallback);
errorHandlers.push(errorHandler);
dependenciesForCallbacks.push(dependency); dependenciesForCallbacks.push(dependency);
} }
} }
...@@ -318,16 +323,39 @@ module.exports = function () { ...@@ -318,16 +323,39 @@ module.exports = function () {
try { try {
callbacks[k].call(null, moduleOutdatedDependencies); callbacks[k].call(null, moduleOutdatedDependencies);
} catch (err) { } catch (err) {
if (options.onErrored) { if (typeof errorHandlers[k] === "function") {
options.onErrored({ try {
type: "accept-errored", errorHandlers[k](err, {
moduleId: outdatedModuleId, moduleId: outdatedModuleId,
dependencyId: dependenciesForCallbacks[k], dependencyId: dependenciesForCallbacks[k]
error: err });
}); } catch (err2) {
} if (options.onErrored) {
if (!options.ignoreErrored) { options.onErrored({
reportError(err); type: "accept-error-handler-errored",
moduleId: outdatedModuleId,
dependencyId: dependenciesForCallbacks[k],
error: err2,
originalError: err
});
}
if (!options.ignoreErrored) {
reportError(err2);
reportError(err);
}
}
} else {
if (options.onErrored) {
options.onErrored({
type: "accept-errored",
moduleId: outdatedModuleId,
dependencyId: dependenciesForCallbacks[k],
error: err
});
}
if (!options.ignoreErrored) {
reportError(err);
}
} }
} }
} }
...@@ -344,7 +372,10 @@ module.exports = function () { ...@@ -344,7 +372,10 @@ module.exports = function () {
} catch (err) { } catch (err) {
if (typeof item.errorHandler === "function") { if (typeof item.errorHandler === "function") {
try { try {
item.errorHandler(err); item.errorHandler(err, {
moduleId: moduleId,
module: $moduleCache$[moduleId]
});
} catch (err2) { } catch (err2) {
if (options.onErrored) { if (options.onErrored) {
options.onErrored({ options.onErrored({
...@@ -356,8 +387,8 @@ module.exports = function () { ...@@ -356,8 +387,8 @@ module.exports = function () {
} }
if (!options.ignoreErrored) { if (!options.ignoreErrored) {
reportError(err2); reportError(err2);
reportError(err);
} }
reportError(err);
} }
} else { } else {
if (options.onErrored) { if (options.onErrored) {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -44,7 +44,7 @@ describe('Build Output', () => { ...@@ -44,7 +44,7 @@ describe('Build Output', () => {
expect(parseFloat(indexSize)).toBeGreaterThanOrEqual(2) expect(parseFloat(indexSize)).toBeGreaterThanOrEqual(2)
expect(indexSize.endsWith('kB')).toBe(true) expect(indexSize.endsWith('kB')).toBe(true)
expect(parseFloat(indexFirstLoad)).toBeLessThanOrEqual(67.8) expect(parseFloat(indexFirstLoad)).toBeLessThanOrEqual(67.9)
expect(parseFloat(indexFirstLoad)).toBeGreaterThanOrEqual(60) expect(parseFloat(indexFirstLoad)).toBeGreaterThanOrEqual(60)
expect(indexFirstLoad.endsWith('kB')).toBe(true) expect(indexFirstLoad.endsWith('kB')).toBe(true)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment