Commit fc03aef7 authored by Luke Sandberg's avatar Luke Sandberg

bump the webpack version bundled in next

parent 18b18e22
...@@ -32,6 +32,21 @@ URL Imports can be used everywhere normal package imports can be used. ...@@ -32,6 +32,21 @@ URL Imports can be used everywhere normal package imports can be used.
This feature is being designed with **security as the top priority**. To start, we added an experimental flag forcing you to explicitly allow the domains you accept URL imports from. We're working to take this further by limiting URL imports to execute in the browser sandbox using the [Edge Runtime](/docs/app/api-reference/edge). This feature is being designed with **security as the top priority**. To start, we added an experimental flag forcing you to explicitly allow the domains you accept URL imports from. We're working to take this further by limiting URL imports to execute in the browser sandbox using the [Edge Runtime](/docs/app/api-reference/edge).
## Redirect Validation
If a URL import redirects to a different domain (for example, `https://github.com/org/repo/raw/main/file.png` redirecting to `https://raw.githubusercontent.com/...`), the redirect target domain must also be listed in the `urlImports` array:
```js filename="next.config.js"
module.exports = {
experimental: {
urlImports: [
'https://github.com/org/repo/raw/main/',
'https://raw.githubusercontent.com/org/repo/main/',
],
},
}
```
## Lockfile ## Lockfile
When using URL imports, Next.js will create a `next.lock` directory containing a lockfile and fetched assets. When using URL imports, Next.js will create a `next.lock` directory containing a lockfile and fetched assets.
......
...@@ -297,9 +297,9 @@ ...@@ -297,9 +297,9 @@
"typescript-eslint": "8.46.0", "typescript-eslint": "8.46.0",
"unfetch": "4.2.0", "unfetch": "4.2.0",
"wait-port": "0.2.2", "wait-port": "0.2.2",
"webpack": "5.98.0", "webpack": "5.105.0",
"webpack-bundle-analyzer": "4.7.0", "webpack-bundle-analyzer": "4.7.0",
"webpack-dev-server": "5.2.0", "webpack-dev-server": "5.2.3",
"whatwg-fetch": "3.0.0", "whatwg-fetch": "3.0.0",
"ws": "8.2.3", "ws": "8.2.3",
"yargs": "16.2.0" "yargs": "16.2.0"
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
"packageManager": "pnpm@9.6.0", "packageManager": "pnpm@9.6.0",
"pnpm": { "pnpm": {
"overrides": { "overrides": {
"webpack": "5.98.0", "webpack": "5.105.0",
"browserslist": "4.28.1", "browserslist": "4.28.1",
"caniuse-lite": "1.0.30001746", "caniuse-lite": "1.0.30001746",
"@types/node": "20.17.6", "@types/node": "20.17.6",
...@@ -322,6 +322,7 @@ ...@@ -322,6 +322,7 @@
"@types/react": "19.2.10", "@types/react": "19.2.10",
"@types/react-dom": "19.2.3", "@types/react-dom": "19.2.3",
"@types/retry": "0.12.0", "@types/retry": "0.12.0",
"@types/estree": "1.0.8",
"jest-snapshot": "30.0.0-alpha.6", "jest-snapshot": "30.0.0-alpha.6",
"react": "19.3.0-canary-6066c782-20260212", "react": "19.3.0-canary-6066c782-20260212",
"react-dom": "19.3.0-canary-6066c782-20260212", "react-dom": "19.3.0-canary-6066c782-20260212",
......
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
"vm-browserify": "1.1.2", "vm-browserify": "1.1.2",
"watchpack": "2.4.0", "watchpack": "2.4.0",
"web-vitals": "4.2.1", "web-vitals": "4.2.1",
"webpack": "5.98.0", "webpack": "5.105.0",
"webpack-sources1": "npm:webpack-sources@1.4.3", "webpack-sources1": "npm:webpack-sources@1.4.3",
"webpack-sources3": "npm:webpack-sources@3.2.3", "webpack-sources3": "npm:webpack-sources@3.2.3",
"ws": "8.2.3", "ws": "8.2.3",
......
...@@ -1617,7 +1617,7 @@ export function isWebpackClientOnlyLayer( ...@@ -1617,7 +1617,7 @@ export function isWebpackClientOnlyLayer(
} }
export function isWebpackDefaultLayer( export function isWebpackDefaultLayer(
layer: WebpackLayerName | null | undefined layer: WebpackLayerName | string | null | undefined
): boolean { ): boolean {
return ( return (
layer === null || layer === null ||
......
...@@ -1151,11 +1151,11 @@ export default async function getBaseWebpackConfig( ...@@ -1151,11 +1151,11 @@ export default async function getBaseWebpackConfig(
layer: string | null | undefined layer: string | null | undefined
type: string type: string
libIdent?: Function libIdent?: Function
updateHash: (hash: crypto.Hash) => void updateHash: (hash: crypto.Hash, context?: any) => void
}): string { }): string {
const hash = crypto.createHash('sha1') const hash = crypto.createHash('sha1')
if (isModuleCSS(module)) { if (isModuleCSS(module)) {
module.updateHash(hash) module.updateHash(hash, {} as any)
} else { } else {
if (!module.libIdent) { if (!module.libIdent) {
throw new Error( throw new Error(
......
...@@ -166,7 +166,9 @@ ${JSON.stringify(ref)}, ...@@ -166,7 +166,9 @@ ${JSON.stringify(ref)},
return this.callback(null, esmSource, { return this.callback(null, esmSource, {
version: 3, version: 3,
file: originalSourceURL,
sources: [originalSourceURL], sources: [originalSourceURL],
names: [],
// minimal, parseable mappings // minimal, parseable mappings
mappings: 'AAAA', mappings: 'AAAA',
sourcesContent: [esmSource], sourcesContent: [esmSource],
...@@ -199,7 +201,9 @@ module.exports = createProxy(${stringifiedResourceKey}) ...@@ -199,7 +201,9 @@ module.exports = createProxy(${stringifiedResourceKey})
return this.callback(null, cjsSource, { return this.callback(null, cjsSource, {
version: 3, version: 3,
file: originalSourceURL,
sources: [originalSourceURL], sources: [originalSourceURL],
names: [],
// minimal, parseable mappings // minimal, parseable mappings
mappings: 'AAAA', mappings: 'AAAA',
sourcesContent: [cjsSource], sourcesContent: [cjsSource],
......
...@@ -48,7 +48,12 @@ export class CssMinimizerPlugin { ...@@ -48,7 +48,12 @@ export class CssMinimizerPlugin {
.process(input, postcssOptions) .process(input, postcssOptions)
.then((res) => { .then((res) => {
if (res.map) { if (res.map) {
return new sources.SourceMapSource(res.css, file, res.map.toJSON()) const sourceMap = res.map.toJSON()
return new sources.SourceMapSource(res.css, file, {
...sourceMap,
version: Number(sourceMap.version),
file: sourceMap.file || file,
})
} else { } else {
return new sources.RawSource(res.css) return new sources.RawSource(res.css)
} }
......
...@@ -44,10 +44,8 @@ export interface EvalSourceMapDevToolPluginOptions ...@@ -44,10 +44,8 @@ export interface EvalSourceMapDevToolPluginOptions
// https://github.com/webpack/webpack/blob/e237b580e2bda705c5ab39973f786f7c5a7026bc/lib/EvalSourceMapDevToolPlugin.js#L37 // https://github.com/webpack/webpack/blob/e237b580e2bda705c5ab39973f786f7c5a7026bc/lib/EvalSourceMapDevToolPlugin.js#L37
export default class EvalSourceMapDevToolPlugin { export default class EvalSourceMapDevToolPlugin {
sourceMapComment: string sourceMapComment: string
moduleFilenameTemplate: NonNullable< moduleFilenameTemplate: string
EvalSourceMapDevToolPluginOptions['moduleFilenameTemplate'] namespace: string
>
namespace: NonNullable<EvalSourceMapDevToolPluginOptions['namespace']>
options: EvalSourceMapDevToolPluginOptions options: EvalSourceMapDevToolPluginOptions
shouldIgnorePath: (modulePath: string) => boolean shouldIgnorePath: (modulePath: string) => boolean
...@@ -68,8 +66,9 @@ export default class EvalSourceMapDevToolPlugin { ...@@ -68,8 +66,9 @@ export default class EvalSourceMapDevToolPlugin {
? options.append ? options.append
: '//# sourceURL=[module]\n//# sourceMappingURL=[url]' : '//# sourceURL=[module]\n//# sourceMappingURL=[url]'
this.moduleFilenameTemplate = this.moduleFilenameTemplate =
options.moduleFilenameTemplate || (typeof options.moduleFilenameTemplate === 'string'
'webpack://[namespace]/[resource-path]?[hash]' ? options.moduleFilenameTemplate
: null) || 'webpack://[namespace]/[resource-path]?[hash]'
this.namespace = options.namespace || '' this.namespace = options.namespace || ''
this.options = options this.options = options
......
...@@ -125,7 +125,7 @@ export class MinifyPlugin { ...@@ -125,7 +125,7 @@ export class MinifyPlugin {
return { return {
minify: async (options: { minify: async (options: {
input: string input: string
inputSourceMap: Object inputSourceMap: object | null
}) => { }) => {
const result = await ( const result = await (
require('../../../../swc') as typeof import('../../../../swc') require('../../../../swc') as typeof import('../../../../swc')
...@@ -196,16 +196,17 @@ export class MinifyPlugin { ...@@ -196,16 +196,17 @@ export class MinifyPlugin {
return return
} }
const source = minifiedOutput.map const source =
? new SourceMapSource( minifiedOutput.map && inputSourceMap
minifiedOutput.code, ? new SourceMapSource(
name, minifiedOutput.code,
minifiedOutput.map, name,
input, minifiedOutput.map,
inputSourceMap, input,
true inputSourceMap,
) true
: new RawSource(minifiedOutput.code) )
: new RawSource(minifiedOutput.code)
await cache.storePromise(name, eTag, { source }) await cache.storePromise(name, eTag, { source })
......
import type { webpack } from 'next/dist/compiled/webpack/webpack' import type { webpack } from 'next/dist/compiled/webpack/webpack'
import type { WebpackError } from 'webpack'
import { getModuleBuildError } from './webpackModuleError' import { getModuleBuildError } from './webpackModuleError'
...@@ -10,9 +11,10 @@ export class WellKnownErrorsPlugin { ...@@ -10,9 +11,10 @@ export class WellKnownErrorsPlugin {
if (compilation.warnings?.length) { if (compilation.warnings?.length) {
await Promise.all( await Promise.all(
compilation.warnings.map(async (warn, i) => { compilation.warnings.map(async (warn, i) => {
const webpackWarn = warn as WebpackError
if ( if (
warn.name === 'ModuleDependencyWarning' && webpackWarn.name === 'ModuleDependencyWarning' &&
warn.module?.context?.includes('node_modules') webpackWarn.module?.context?.includes('node_modules')
) { ) {
compilation.warnings.splice(i, 1) compilation.warnings.splice(i, 1)
} }
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
var $interceptModuleExecution$ = undefined; var $interceptModuleExecution$ = undefined;
var $moduleCache$ = undefined; var $moduleCache$ = undefined;
// eslint-disable-next-line no-unused-vars
var $hmrModuleData$ = undefined; var $hmrModuleData$ = undefined;
/** @type {() => Promise} */ /** @type {() => Promise} */
var $hmrDownloadManifest$ = undefined; var $hmrDownloadManifest$ = undefined;
...@@ -286,7 +285,8 @@ module.exports = function () { ...@@ -286,7 +285,8 @@ module.exports = function () {
update.m, update.m,
promises, promises,
currentUpdateApplyHandlers, currentUpdateApplyHandlers,
updatedModules updatedModules,
update.css
); );
return promises; return promises;
}, []) }, [])
...@@ -355,38 +355,50 @@ module.exports = function () { ...@@ -355,38 +355,50 @@ module.exports = function () {
}; };
var outdatedModules = []; var outdatedModules = [];
results.forEach(function (result) {
if (result.apply) {
var modules = result.apply(reportError);
if (modules) {
for (var i = 0; i < modules.length; i++) {
outdatedModules.push(modules[i]);
}
}
}
});
return Promise.all([disposePromise, applyPromise]).then(function () { var onAccepted = function () {
// handle errors in accept handlers and self accepted module load return Promise.all([disposePromise, applyPromise]).then(function () {
if (error) { // handle errors in accept handlers and self accepted module load
return setStatus("fail").then(function () { if (error) {
throw error; return setStatus("fail").then(function () {
}); throw error;
} });
}
if (queuedInvalidatedModules) { if (queuedInvalidatedModules) {
return internalApply(options).then(function (list) { return internalApply(options).then(function (list) {
outdatedModules.forEach(function (moduleId) { outdatedModules.forEach(function (moduleId) {
if (list.indexOf(moduleId) < 0) list.push(moduleId); if (list.indexOf(moduleId) < 0) list.push(moduleId);
});
return list;
}); });
return list; }
});
}
return setStatus("idle").then(function () { return setStatus("idle").then(function () {
return outdatedModules; return outdatedModules;
});
}); });
}); };
return Promise.all(
results
.filter(function (result) {
return result.apply;
})
.map(function (result) {
return result.apply(reportError);
})
)
.then(function (applyResults) {
applyResults.forEach(function (modules) {
if (modules) {
for (var i = 0; i < modules.length; i++) {
outdatedModules.push(modules[i]);
}
}
});
})
.then(onAccepted);
} }
function applyInvalidatedModules() { function applyInvalidatedModules() {
......
...@@ -117,7 +117,6 @@ module.exports = function () { ...@@ -117,7 +117,6 @@ module.exports = function () {
for (var moduleId in currentUpdate) { for (var moduleId in currentUpdate) {
if ($hasOwnProperty$(currentUpdate, moduleId)) { if ($hasOwnProperty$(currentUpdate, moduleId)) {
var newModuleFactory = currentUpdate[moduleId]; var newModuleFactory = currentUpdate[moduleId];
/** @type {TODO} */
var result = newModuleFactory var result = newModuleFactory
? getAffectedModuleEffects(moduleId) ? getAffectedModuleEffects(moduleId)
: { : {
...@@ -282,6 +281,7 @@ module.exports = function () { ...@@ -282,6 +281,7 @@ module.exports = function () {
} }
}, },
apply: function (reportError) { apply: function (reportError) {
var acceptPromises = [];
// insert new code // insert new code
for (var updateModuleId in appliedUpdate) { for (var updateModuleId in appliedUpdate) {
if ($hasOwnProperty$(appliedUpdate, updateModuleId)) { if ($hasOwnProperty$(appliedUpdate, updateModuleId)) {
...@@ -318,8 +318,9 @@ module.exports = function () { ...@@ -318,8 +318,9 @@ module.exports = function () {
} }
} }
for (var k = 0; k < callbacks.length; k++) { for (var k = 0; k < callbacks.length; k++) {
var result;
try { try {
callbacks[k].call(null, moduleOutdatedDependencies); result = callbacks[k].call(null, moduleOutdatedDependencies);
} catch (err) { } catch (err) {
if (typeof errorHandlers[k] === "function") { if (typeof errorHandlers[k] === "function") {
try { try {
...@@ -356,54 +357,63 @@ module.exports = function () { ...@@ -356,54 +357,63 @@ module.exports = function () {
} }
} }
} }
if (result && typeof result.then === "function") {
acceptPromises.push(result);
}
} }
} }
} }
} }
// Load self accepted modules var onAccepted = function () {
for (var o = 0; o < outdatedSelfAcceptedModules.length; o++) { // Load self accepted modules
var item = outdatedSelfAcceptedModules[o]; for (var o = 0; o < outdatedSelfAcceptedModules.length; o++) {
var moduleId = item.module; var item = outdatedSelfAcceptedModules[o];
try { var moduleId = item.module;
item.require(moduleId); try {
} catch (err) { item.require(moduleId);
if (typeof item.errorHandler === "function") { } catch (err) {
try { if (typeof item.errorHandler === "function") {
item.errorHandler(err, { try {
moduleId: moduleId, item.errorHandler(err, {
module: $moduleCache$[moduleId] moduleId: moduleId,
}); module: $moduleCache$[moduleId]
} catch (err1) { });
} catch (err1) {
if (options.onErrored) {
options.onErrored({
type: "self-accept-error-handler-errored",
moduleId: moduleId,
error: err1,
originalError: err
});
}
if (!options.ignoreErrored) {
reportError(err1);
reportError(err);
}
}
} else {
if (options.onErrored) { if (options.onErrored) {
options.onErrored({ options.onErrored({
type: "self-accept-error-handler-errored", type: "self-accept-errored",
moduleId: moduleId, moduleId: moduleId,
error: err1, error: err
originalError: err
}); });
} }
if (!options.ignoreErrored) { if (!options.ignoreErrored) {
reportError(err1);
reportError(err); reportError(err);
} }
} }
} else {
if (options.onErrored) {
options.onErrored({
type: "self-accept-errored",
moduleId: moduleId,
error: err
});
}
if (!options.ignoreErrored) {
reportError(err);
}
} }
} }
} };
return outdatedModules; return Promise.all(acceptPromises)
.then(onAccepted)
.then(function () {
return outdatedModules;
});
} }
}; };
} }
......
/* global __resourceQuery */
"use strict"; "use strict";
/* global __resourceQuery */
var urlBase = decodeURIComponent(__resourceQuery.slice(1)); var urlBase = decodeURIComponent(__resourceQuery.slice(1));
/** /**
...@@ -10,29 +10,6 @@ var urlBase = decodeURIComponent(__resourceQuery.slice(1)); ...@@ -10,29 +10,6 @@ var urlBase = decodeURIComponent(__resourceQuery.slice(1));
*/ */
exports.keepAlive = function (options) { exports.keepAlive = function (options) {
var data = options.data; var data = options.data;
var onError = options.onError;
var active = options.active;
var module = options.module;
/** @type {import("http").IncomingMessage} */
var response;
var request = (
urlBase.startsWith("https") ? require("https") : require("http")
).request(
urlBase + data,
{
agent: false,
headers: { accept: "text/event-stream" }
},
function (res) {
response = res;
response.on("error", errorHandler);
if (!active && !module.hot) {
console.log(
"Hot Module Replacement is not enabled. Waiting for process restart..."
);
}
}
);
/** /**
* @param {Error} err error * @param {Error} err error
...@@ -40,11 +17,50 @@ exports.keepAlive = function (options) { ...@@ -40,11 +17,50 @@ exports.keepAlive = function (options) {
function errorHandler(err) { function errorHandler(err) {
err.message = err.message =
"Problem communicating active modules to the server: " + err.message; "Problem communicating active modules to the server: " + err.message;
onError(err); options.onError(err);
} }
request.on("error", errorHandler);
request.end(); /** @type {Promise<import("http") | import("https")>} */
var mod = require("./load-http")(urlBase.startsWith("https"));
/** @type {import("http").ClientRequest} */
var request;
/** @type {import("http").IncomingMessage} */
var response;
mod.then(function (client) {
request = client.request(
urlBase + data,
{
agent: false,
headers: { accept: "text/event-stream" }
},
function (res) {
response = res;
response.on("error", errorHandler);
if (!options.active && !options.module.hot) {
console.log(
"Hot Module Replacement is not enabled. Waiting for process restart..."
);
}
}
);
request.on("error", errorHandler);
request.end();
});
return function () { return function () {
response.destroy(); if (response) {
response.destroy();
}
}; };
}; };
/**
* @param {string} value new url value
*/
exports.setUrl = function (value) {
urlBase = value;
};
"use strict";
/* global __resourceQuery */
var isNodeLikeEnv =
typeof global !== "undefined" && typeof global.process !== "undefined";
var handler = isNodeLikeEnv
? require("./lazy-compilation-node")
: require("./lazy-compilation-web");
handler.setUrl(decodeURIComponent(__resourceQuery.slice(1)));
/**
* @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options
* @returns {() => void} function to destroy response
*/
module.exports = handler;
/* global __resourceQuery */
"use strict"; "use strict";
/* global __resourceQuery */
if (typeof EventSource !== "function") { if (typeof EventSource !== "function") {
throw new Error( throw new Error(
"Environment doesn't support lazy compilation (requires EventSource)" "Environment doesn't support lazy compilation (requires EventSource)"
...@@ -54,15 +54,18 @@ var updateEventSource = function updateEventSource() { ...@@ -54,15 +54,18 @@ var updateEventSource = function updateEventSource() {
exports.keepAlive = function (options) { exports.keepAlive = function (options) {
var data = options.data; var data = options.data;
var onError = options.onError; var onError = options.onError;
var active = options.active;
var module = options.module;
errorHandlers.add(onError); errorHandlers.add(onError);
var value = activeKeys.get(data) || 0; var value = activeKeys.get(data) || 0;
activeKeys.set(data, value + 1); activeKeys.set(data, value + 1);
if (value === 0) { if (value === 0) {
updateEventSource(); updateEventSource();
} }
if (!active && !module.hot) {
if (!options.active && !options.module.hot) {
console.log( console.log(
"Hot Module Replacement is not enabled. Waiting for process restart..." "Hot Module Replacement is not enabled. Waiting for process restart..."
); );
...@@ -81,3 +84,10 @@ exports.keepAlive = function (options) { ...@@ -81,3 +84,10 @@ exports.keepAlive = function (options) {
}, 1000); }, 1000);
}; };
}; };
/**
* @param {string} value new url value
*/
exports.setUrl = function (value) {
urlBase = value;
};
/**
* @param {boolean} isHTTPS true when need https module, otherwise false
* @returns {Promise<import("http") | import("https")>}
*/
module.exports = function (isHTTPS) {
return isHTTPS ? import('https') : import('http')
}
(()=>{"use strict";var e={977:(e,r,_)=>{e.exports=_(717)["default"]},717:e=>{e.exports=require("./index.js")}};var r={};function __nccwpck_require__(_){var t=r[_];if(t!==undefined){return t.exports}var a=r[_]={exports:{}};var i=true;try{e[_](a,a.exports,__nccwpck_require__);i=false}finally{if(i)delete r[_]}return a.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var _=__nccwpck_require__(977);module.exports=_})(); (()=>{"use strict";var e={681:(e,r,_)=>{e.exports=_(717)["default"]},717:e=>{e.exports=require("./index.js")}};var r={};function __nccwpck_require__(_){var t=r[_];if(t!==undefined){return t.exports}var a=r[_]={exports:{}};var i=true;try{e[_](a,a.exports,__nccwpck_require__);i=false}finally{if(i)delete r[_]}return a.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var _=__nccwpck_require__(681);module.exports=_})();
\ No newline at end of file \ No newline at end of file
(()=>{"use strict";var e={902:(e,r,t)=>{var n=t(784);var i=Object.create(null);var a=typeof document==="undefined";var o=Array.prototype.forEach;function debounce(e,r){var t=0;return function(){var n=this;var i=arguments;var a=function functionCall(){return e.apply(n,i)};clearTimeout(t);t=setTimeout(a,r)}}function noop(){}function getCurrentScriptUrl(e){var r=i[e];if(!r){if(document.currentScript){r=document.currentScript.src}else{var t=document.getElementsByTagName("script");var a=t[t.length-1];if(a){r=a.src}}i[e]=r}return function(e){if(!r){return null}var t=r.split(/([^\\/]+)\.js$/);var i=t&&t[1];if(!i){return[r.replace(".js",".css")]}if(!e){return[r.replace(".js",".css")]}return e.split(",").map((function(e){var t=new RegExp("".concat(i,"\\.js$"),"g");return n(r.replace(t,"".concat(e.replace(/{fileName}/g,i),".css")))}))}}function updateCss(e,r){if(!r){if(!e.href){return}r=e.href.split("?")[0]}if(!isUrlRequest(r)){return}if(e.isLoaded===false){return}if(!r||!(r.indexOf(".css")>-1)){return}e.visited=true;var t=e.cloneNode();t.isLoaded=false;t.addEventListener("load",(function(){if(t.isLoaded){return}t.isLoaded=true;e.parentNode.removeChild(e)}));t.addEventListener("error",(function(){if(t.isLoaded){return}t.isLoaded=true;e.parentNode.removeChild(e)}));t.href="".concat(r,"?").concat(Date.now());if(e.nextSibling){e.parentNode.insertBefore(t,e.nextSibling)}else{e.parentNode.appendChild(t)}}function getReloadUrl(e,r){var t;e=n(e,{stripWWW:false});r.some((function(n){if(e.indexOf(r)>-1){t=n}}));return t}function reloadStyle(e){if(!e){return false}var r=document.querySelectorAll("link");var t=false;o.call(r,(function(r){if(!r.href){return}var n=getReloadUrl(r.href,e);if(!isUrlRequest(n)){return}if(r.visited===true){return}if(n){updateCss(r,n);t=true}}));return t}function reloadAll(){var e=document.querySelectorAll("link");o.call(e,(function(e){if(e.visited===true){return}updateCss(e)}))}function isUrlRequest(e){if(!/^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(e)){return false}return true}e.exports=function(e,r){if(a){console.log("no window.document found, will not HMR CSS");return noop}var t=getCurrentScriptUrl(e);function update(){var e=t(r.filename);var n=reloadStyle(e);if(r.locals){console.log("[HMR] Detected local css modules. Reload all css");reloadAll();return}if(n){console.log("[HMR] css reload %s",e.join(" "))}else{console.log("[HMR] Reload all css");reloadAll()}}return debounce(update,50)}},784:e=>{function normalizeUrl(e){return e.reduce((function(e,r){switch(r){case"..":e.pop();break;case".":break;default:e.push(r)}return e}),[]).join("/")}e.exports=function(e){e=e.trim();if(/^data:/i.test(e)){return e}var r=e.indexOf("//")!==-1?e.split("//")[0]+"//":"";var t=e.replace(new RegExp(r,"i"),"").split("/");var n=t[0].toLowerCase().replace(/\.$/,"");t[0]="";var i=normalizeUrl(t);return r+n+i}}};var r={};function __nccwpck_require__(t){var n=r[t];if(n!==undefined){return n.exports}var i=r[t]={exports:{}};var a=true;try{e[t](i,i.exports,__nccwpck_require__);a=false}finally{if(a)delete r[t]}return i.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(902);module.exports=t})(); (()=>{"use strict";var e={700:(e,r,t)=>{var n=t(493);var i=Object.create(null);var a=typeof document==="undefined";var o=Array.prototype.forEach;function debounce(e,r){var t=0;return function(){var n=this;var i=arguments;var a=function functionCall(){return e.apply(n,i)};clearTimeout(t);t=setTimeout(a,r)}}function noop(){}function getCurrentScriptUrl(e){var r=i[e];if(!r){if(document.currentScript){r=document.currentScript.src}else{var t=document.getElementsByTagName("script");var a=t[t.length-1];if(a){r=a.src}}i[e]=r}return function(e){if(!r){return null}var t=r.split(/([^\\/]+)\.js$/);var i=t&&t[1];if(!i){return[r.replace(".js",".css")]}if(!e){return[r.replace(".js",".css")]}return e.split(",").map((function(e){var t=new RegExp("".concat(i,"\\.js$"),"g");return n(r.replace(t,"".concat(e.replace(/{fileName}/g,i),".css")))}))}}function updateCss(e,r){if(!r){if(!e.href){return}r=e.href.split("?")[0]}if(!isUrlRequest(r)){return}if(e.isLoaded===false){return}if(!r||!(r.indexOf(".css")>-1)){return}e.visited=true;var t=e.cloneNode();t.isLoaded=false;t.addEventListener("load",(function(){if(t.isLoaded){return}t.isLoaded=true;e.parentNode.removeChild(e)}));t.addEventListener("error",(function(){if(t.isLoaded){return}t.isLoaded=true;e.parentNode.removeChild(e)}));t.href="".concat(r,"?").concat(Date.now());if(e.nextSibling){e.parentNode.insertBefore(t,e.nextSibling)}else{e.parentNode.appendChild(t)}}function getReloadUrl(e,r){var t;e=n(e,{stripWWW:false});r.some((function(n){if(e.indexOf(r)>-1){t=n}}));return t}function reloadStyle(e){if(!e){return false}var r=document.querySelectorAll("link");var t=false;o.call(r,(function(r){if(!r.href){return}var n=getReloadUrl(r.href,e);if(!isUrlRequest(n)){return}if(r.visited===true){return}if(n){updateCss(r,n);t=true}}));return t}function reloadAll(){var e=document.querySelectorAll("link");o.call(e,(function(e){if(e.visited===true){return}updateCss(e)}))}function isUrlRequest(e){if(!/^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(e)){return false}return true}e.exports=function(e,r){if(a){console.log("no window.document found, will not HMR CSS");return noop}var t=getCurrentScriptUrl(e);function update(){var e=t(r.filename);var n=reloadStyle(e);if(r.locals){console.log("[HMR] Detected local css modules. Reload all css");reloadAll();return}if(n){console.log("[HMR] css reload %s",e.join(" "))}else{console.log("[HMR] Reload all css");reloadAll()}}return debounce(update,50)}},493:e=>{function normalizeUrl(e){return e.reduce((function(e,r){switch(r){case"..":e.pop();break;case".":break;default:e.push(r)}return e}),[]).join("/")}e.exports=function(e){e=e.trim();if(/^data:/i.test(e)){return e}var r=e.indexOf("//")!==-1?e.split("//")[0]+"//":"";var t=e.replace(new RegExp(r,"i"),"").split("/");var n=t[0].toLowerCase().replace(/\.$/,"");t[0]="";var i=normalizeUrl(t);return r+n+i}}};var r={};function __nccwpck_require__(t){var n=r[t];if(n!==undefined){return n.exports}var i=r[t]={exports:{}};var a=true;try{e[t](i,i.exports,__nccwpck_require__);a=false}finally{if(a)delete r[t]}return i.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(700);module.exports=t})();
\ No newline at end of file \ No newline at end of file
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
var $interceptModuleExecution$ = undefined; var $interceptModuleExecution$ = undefined;
var $moduleCache$ = undefined; var $moduleCache$ = undefined;
// eslint-disable-next-line no-unused-vars
var $hmrModuleData$ = undefined; var $hmrModuleData$ = undefined;
/** @type {() => Promise} */ /** @type {() => Promise} */
var $hmrDownloadManifest$ = undefined; var $hmrDownloadManifest$ = undefined;
...@@ -286,7 +285,8 @@ module.exports = function () { ...@@ -286,7 +285,8 @@ module.exports = function () {
update.m, update.m,
promises, promises,
currentUpdateApplyHandlers, currentUpdateApplyHandlers,
updatedModules updatedModules,
update.css
); );
return promises; return promises;
}, []) }, [])
...@@ -355,38 +355,50 @@ module.exports = function () { ...@@ -355,38 +355,50 @@ module.exports = function () {
}; };
var outdatedModules = []; var outdatedModules = [];
results.forEach(function (result) {
if (result.apply) {
var modules = result.apply(reportError);
if (modules) {
for (var i = 0; i < modules.length; i++) {
outdatedModules.push(modules[i]);
}
}
}
});
return Promise.all([disposePromise, applyPromise]).then(function () { var onAccepted = function () {
// handle errors in accept handlers and self accepted module load return Promise.all([disposePromise, applyPromise]).then(function () {
if (error) { // handle errors in accept handlers and self accepted module load
return setStatus("fail").then(function () { if (error) {
throw error; return setStatus("fail").then(function () {
}); throw error;
} });
}
if (queuedInvalidatedModules) { if (queuedInvalidatedModules) {
return internalApply(options).then(function (list) { return internalApply(options).then(function (list) {
outdatedModules.forEach(function (moduleId) { outdatedModules.forEach(function (moduleId) {
if (list.indexOf(moduleId) < 0) list.push(moduleId); if (list.indexOf(moduleId) < 0) list.push(moduleId);
});
return list;
}); });
return list; }
});
}
return setStatus("idle").then(function () { return setStatus("idle").then(function () {
return outdatedModules; return outdatedModules;
});
}); });
}); };
return Promise.all(
results
.filter(function (result) {
return result.apply;
})
.map(function (result) {
return result.apply(reportError);
})
)
.then(function (applyResults) {
applyResults.forEach(function (modules) {
if (modules) {
for (var i = 0; i < modules.length; i++) {
outdatedModules.push(modules[i]);
}
}
});
})
.then(onAccepted);
} }
function applyInvalidatedModules() { function applyInvalidatedModules() {
......
...@@ -117,7 +117,6 @@ module.exports = function () { ...@@ -117,7 +117,6 @@ module.exports = function () {
for (var moduleId in currentUpdate) { for (var moduleId in currentUpdate) {
if ($hasOwnProperty$(currentUpdate, moduleId)) { if ($hasOwnProperty$(currentUpdate, moduleId)) {
var newModuleFactory = currentUpdate[moduleId]; var newModuleFactory = currentUpdate[moduleId];
/** @type {TODO} */
var result = newModuleFactory var result = newModuleFactory
? getAffectedModuleEffects(moduleId) ? getAffectedModuleEffects(moduleId)
: { : {
...@@ -282,6 +281,7 @@ module.exports = function () { ...@@ -282,6 +281,7 @@ module.exports = function () {
} }
}, },
apply: function (reportError) { apply: function (reportError) {
var acceptPromises = [];
// insert new code // insert new code
for (var updateModuleId in appliedUpdate) { for (var updateModuleId in appliedUpdate) {
if ($hasOwnProperty$(appliedUpdate, updateModuleId)) { if ($hasOwnProperty$(appliedUpdate, updateModuleId)) {
...@@ -318,8 +318,9 @@ module.exports = function () { ...@@ -318,8 +318,9 @@ module.exports = function () {
} }
} }
for (var k = 0; k < callbacks.length; k++) { for (var k = 0; k < callbacks.length; k++) {
var result;
try { try {
callbacks[k].call(null, moduleOutdatedDependencies); result = callbacks[k].call(null, moduleOutdatedDependencies);
} catch (err) { } catch (err) {
if (typeof errorHandlers[k] === "function") { if (typeof errorHandlers[k] === "function") {
try { try {
...@@ -356,54 +357,63 @@ module.exports = function () { ...@@ -356,54 +357,63 @@ module.exports = function () {
} }
} }
} }
if (result && typeof result.then === "function") {
acceptPromises.push(result);
}
} }
} }
} }
} }
// Load self accepted modules var onAccepted = function () {
for (var o = 0; o < outdatedSelfAcceptedModules.length; o++) { // Load self accepted modules
var item = outdatedSelfAcceptedModules[o]; for (var o = 0; o < outdatedSelfAcceptedModules.length; o++) {
var moduleId = item.module; var item = outdatedSelfAcceptedModules[o];
try { var moduleId = item.module;
item.require(moduleId); try {
} catch (err) { item.require(moduleId);
if (typeof item.errorHandler === "function") { } catch (err) {
try { if (typeof item.errorHandler === "function") {
item.errorHandler(err, { try {
moduleId: moduleId, item.errorHandler(err, {
module: $moduleCache$[moduleId] moduleId: moduleId,
}); module: $moduleCache$[moduleId]
} catch (err1) { });
} catch (err1) {
if (options.onErrored) {
options.onErrored({
type: "self-accept-error-handler-errored",
moduleId: moduleId,
error: err1,
originalError: err
});
}
if (!options.ignoreErrored) {
reportError(err1);
reportError(err);
}
}
} else {
if (options.onErrored) { if (options.onErrored) {
options.onErrored({ options.onErrored({
type: "self-accept-error-handler-errored", type: "self-accept-errored",
moduleId: moduleId, moduleId: moduleId,
error: err1, error: err
originalError: err
}); });
} }
if (!options.ignoreErrored) { if (!options.ignoreErrored) {
reportError(err1);
reportError(err); reportError(err);
} }
} }
} else {
if (options.onErrored) {
options.onErrored({
type: "self-accept-errored",
moduleId: moduleId,
error: err
});
}
if (!options.ignoreErrored) {
reportError(err);
}
} }
} }
} };
return outdatedModules; return Promise.all(acceptPromises)
.then(onAccepted)
.then(function () {
return outdatedModules;
});
} }
}; };
} }
......
(function(){var e={813:function(e){if(typeof EventTarget!=="function"){throw new Error("Environment doesn't support lazy compilation (requires EventTarget)")}e.exports=new EventTarget}};var r={};function __nccwpck_require__(t){var _=r[t];if(_!==undefined){return _.exports}var n=r[t]={exports:{}};var i=true;try{e[t](n,n.exports,__nccwpck_require__);i=false}finally{if(i)delete r[t]}return n.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(813);module.exports=t})();
\ No newline at end of file
/* global __resourceQuery */
"use strict"; "use strict";
/* global __resourceQuery */
var urlBase = decodeURIComponent(__resourceQuery.slice(1)); var urlBase = decodeURIComponent(__resourceQuery.slice(1));
/** /**
...@@ -10,29 +10,6 @@ var urlBase = decodeURIComponent(__resourceQuery.slice(1)); ...@@ -10,29 +10,6 @@ var urlBase = decodeURIComponent(__resourceQuery.slice(1));
*/ */
exports.keepAlive = function (options) { exports.keepAlive = function (options) {
var data = options.data; var data = options.data;
var onError = options.onError;
var active = options.active;
var module = options.module;
/** @type {import("http").IncomingMessage} */
var response;
var request = (
urlBase.startsWith("https") ? require("https") : require("http")
).request(
urlBase + data,
{
agent: false,
headers: { accept: "text/event-stream" }
},
function (res) {
response = res;
response.on("error", errorHandler);
if (!active && !module.hot) {
console.log(
"Hot Module Replacement is not enabled. Waiting for process restart..."
);
}
}
);
/** /**
* @param {Error} err error * @param {Error} err error
...@@ -40,11 +17,50 @@ exports.keepAlive = function (options) { ...@@ -40,11 +17,50 @@ exports.keepAlive = function (options) {
function errorHandler(err) { function errorHandler(err) {
err.message = err.message =
"Problem communicating active modules to the server: " + err.message; "Problem communicating active modules to the server: " + err.message;
onError(err); options.onError(err);
} }
request.on("error", errorHandler);
request.end(); /** @type {Promise<import("http") | import("https")>} */
var mod = require("./load-http")(urlBase.startsWith("https"));
/** @type {import("http").ClientRequest} */
var request;
/** @type {import("http").IncomingMessage} */
var response;
mod.then(function (client) {
request = client.request(
urlBase + data,
{
agent: false,
headers: { accept: "text/event-stream" }
},
function (res) {
response = res;
response.on("error", errorHandler);
if (!options.active && !options.module.hot) {
console.log(
"Hot Module Replacement is not enabled. Waiting for process restart..."
);
}
}
);
request.on("error", errorHandler);
request.end();
});
return function () { return function () {
response.destroy(); if (response) {
response.destroy();
}
}; };
}; };
/**
* @param {string} value new url value
*/
exports.setUrl = function (value) {
urlBase = value;
};
"use strict";
/* global __resourceQuery */
var isNodeLikeEnv =
typeof global !== "undefined" && typeof global.process !== "undefined";
var handler = isNodeLikeEnv
? require("./lazy-compilation-node")
: require("./lazy-compilation-web");
handler.setUrl(decodeURIComponent(__resourceQuery.slice(1)));
/**
* @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options
* @returns {() => void} function to destroy response
*/
module.exports = handler;
/* global __resourceQuery */
"use strict"; "use strict";
/* global __resourceQuery */
if (typeof EventSource !== "function") { if (typeof EventSource !== "function") {
throw new Error( throw new Error(
"Environment doesn't support lazy compilation (requires EventSource)" "Environment doesn't support lazy compilation (requires EventSource)"
...@@ -54,15 +54,18 @@ var updateEventSource = function updateEventSource() { ...@@ -54,15 +54,18 @@ var updateEventSource = function updateEventSource() {
exports.keepAlive = function (options) { exports.keepAlive = function (options) {
var data = options.data; var data = options.data;
var onError = options.onError; var onError = options.onError;
var active = options.active;
var module = options.module;
errorHandlers.add(onError); errorHandlers.add(onError);
var value = activeKeys.get(data) || 0; var value = activeKeys.get(data) || 0;
activeKeys.set(data, value + 1); activeKeys.set(data, value + 1);
if (value === 0) { if (value === 0) {
updateEventSource(); updateEventSource();
} }
if (!active && !module.hot) {
if (!options.active && !options.module.hot) {
console.log( console.log(
"Hot Module Replacement is not enabled. Waiting for process restart..." "Hot Module Replacement is not enabled. Waiting for process restart..."
); );
...@@ -81,3 +84,10 @@ exports.keepAlive = function (options) { ...@@ -81,3 +84,10 @@ exports.keepAlive = function (options) {
}, 1000); }, 1000);
}; };
}; };
/**
* @param {string} value new url value
*/
exports.setUrl = function (value) {
urlBase = value;
};
/**
* @param {boolean} isHTTPS true when need https module, otherwise false
* @returns {Promise<import("http") | import("https")>}
*/
module.exports = function (isHTTPS) {
return isHTTPS ? import('https') : import('http')
}
...@@ -196,11 +196,12 @@ function findEntryModule( ...@@ -196,11 +196,12 @@ function findEntryModule(
function erroredPages(compilation: webpack.Compilation) { function erroredPages(compilation: webpack.Compilation) {
const failedPages: { [page: string]: WebpackError[] } = {} const failedPages: { [page: string]: WebpackError[] } = {}
for (const error of compilation.errors) { for (const error of compilation.errors) {
if (!error.module) { const webpackError = error as WebpackError
if (!webpackError.module) {
continue continue
} }
const entryModule = findEntryModule(error.module, compilation) const entryModule = findEntryModule(webpackError.module, compilation)
const { name } = entryModule const { name } = entryModule
if (!name) { if (!name) {
continue continue
...@@ -217,7 +218,7 @@ function erroredPages(compilation: webpack.Compilation) { ...@@ -217,7 +218,7 @@ function erroredPages(compilation: webpack.Compilation) {
failedPages[enhancedName] = [] failedPages[enhancedName] = []
} }
failedPages[enhancedName].push(error) failedPages[enhancedName].push(webpackError)
} }
return failedPages return failedPages
......
...@@ -2090,12 +2090,41 @@ export async function ncc_webpack_bundle5(task, opts) { ...@@ -2090,12 +2090,41 @@ export async function ncc_webpack_bundle5(task, opts) {
packageName: 'webpack', packageName: 'webpack',
bundleName: 'webpack', bundleName: 'webpack',
customEmit(path) { customEmit(path) {
if (path.endsWith('.runtime.js')) return `'./${basename(path)}'` if (path.endsWith('.runtime')) return `'./${basename(path)}.js'`
}, },
externals: bundleExternals, externals: bundleExternals,
target: 'es5', target: 'es5',
}) })
.target('src/compiled/webpack') .target('src/compiled/webpack')
// Webpack 5.105+ uses a dynamic require.resolve() with a ternary + template
// literal for lazy-compilation client paths. ncc can't statically analyze this
// pattern, so it's left as-is in the bundled output. Post-process the bundle to
// replace it with ncc's __dirname-based path format (.ab + "filename").
const bundlePath = join(__dirname, 'src/compiled/webpack/bundle5.js')
let bundleContent = await fs.readFile(bundlePath, 'utf8')
// Detect the ncc __dirname variable from the nearby emitter-event-target.js
// reference (which ncc correctly transforms via the same mechanism).
const abVarMatch = bundleContent.match(
/(\w+)\.ab\+"emitter-event-target\.js"/
)
if (!abVarMatch) {
throw new Error('Could not detect ncc __dirname variable in webpack bundle')
}
const abVar = abVarMatch[1] + '.ab'
const beforeReplace = bundleContent
bundleContent = bundleContent.replace(
/require\.resolve\((\w+)\?"\.\.\/hot\/lazy-compilation-universal\.js":`\.\.\/hot\/lazy-compilation-\$\{(\w+)\.externalsPresets\.node\?"node":"web"\}\.js`\)/,
(_, universalVar, optsVar) =>
`(${universalVar}?${abVar}+"lazy-compilation-universal.js":${optsVar}.externalsPresets.node?${abVar}+"lazy-compilation-node.js":${abVar}+"lazy-compilation-web.js")`
)
if (bundleContent === beforeReplace) {
throw new Error(
'Failed to patch lazy-compilation paths in webpack bundle. ' +
'The require.resolve pattern for lazy-compilation may have changed in the webpack source.'
)
}
await fs.writeFile(bundlePath, bundleContent)
} }
const webpackBundlePackages = { const webpackBundlePackages = {
......
This diff is collapsed.
...@@ -317,7 +317,7 @@ describe('middleware - development errors', () => { ...@@ -317,7 +317,7 @@ describe('middleware - development errors', () => {
'\n at <unknown> (middleware.js:3)' + '\n at <unknown> (middleware.js:3)' +
// TODO: Should be ignore-listed // TODO: Should be ignore-listed
'\n at eval (middleware.js:3:13)' + '\n at eval (middleware.js:3:13)' +
`\n at (middleware)/./middleware.js (${getDistDir()}/server/middleware.js:18:1)` + `\n at (middleware)/./middleware.js (${getDistDir()}/server/middleware.js:40:1)` +
'\n at __webpack_require__ ' '\n at __webpack_require__ '
) )
}) })
......
...@@ -3,6 +3,7 @@ module.exports = { ...@@ -3,6 +3,7 @@ module.exports = {
urlImports: [ urlImports: [
'http://localhost:12345/', 'http://localhost:12345/',
'https://github.com/vercel/next.js/raw/canary/', 'https://github.com/vercel/next.js/raw/canary/',
'https://raw.githubusercontent.com/vercel/next.js/canary/',
], ],
}, },
} }
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