Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgrade deps fix pnpm lock fix resolution clean
- Loading branch information
Showing
18 changed files
with
389 additions
and
229 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 46 additions & 36 deletions
82
packages/next/src/bundles/webpack/packages/lazy-compilation-node.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,50 @@ | ||
| /* global __resourceQuery */ | ||
|
|
||
| "use strict"; | ||
| 'use strict' | ||
|
|
||
| var urlBase = decodeURIComponent(__resourceQuery.slice(1)); | ||
| var urlBase = decodeURIComponent(__resourceQuery.slice(1)) | ||
|
|
||
| /** | ||
| * @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options | ||
| * @returns {() => void} function to destroy response | ||
| */ | ||
| exports.keepAlive = function (options) { | ||
| var data = options.data; | ||
| var onError = options.onError; | ||
| var active = options.active; | ||
| var module = options.module; | ||
| 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..." | ||
| ); | ||
| } | ||
| } | ||
| ); | ||
| function errorHandler(err) { | ||
| err.message = | ||
| "Problem communicating active modules to the server: " + err.message; | ||
| onError(err); | ||
| } | ||
| request.on("error", errorHandler); | ||
| request.end(); | ||
| return function () { | ||
| response.destroy(); | ||
| }; | ||
| }; | ||
| 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 | ||
| */ | ||
| function errorHandler(err) { | ||
| err.message = | ||
| 'Problem communicating active modules to the server: ' + err.message | ||
| onError(err) | ||
| } | ||
| request.on('error', errorHandler) | ||
| request.end() | ||
| return function () { | ||
| response.destroy() | ||
| } | ||
| } |
137 changes: 73 additions & 64 deletions
137
packages/next/src/bundles/webpack/packages/lazy-compilation-web.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,83 @@ | ||
| /* global __resourceQuery */ | ||
|
|
||
| "use strict"; | ||
| 'use strict' | ||
|
|
||
| if (typeof EventSource !== "function") { | ||
| throw new Error( | ||
| "Environment doesn't support lazy compilation (requires EventSource)" | ||
| ); | ||
| if (typeof EventSource !== 'function') { | ||
| throw new Error( | ||
| "Environment doesn't support lazy compilation (requires EventSource)" | ||
| ) | ||
| } | ||
|
|
||
| var urlBase = decodeURIComponent(__resourceQuery.slice(1)); | ||
| var activeEventSource; | ||
| var activeKeys = new Map(); | ||
| var errorHandlers = new Set(); | ||
| var urlBase = decodeURIComponent(__resourceQuery.slice(1)) | ||
| /** @type {EventSource | undefined} */ | ||
| var activeEventSource | ||
| var activeKeys = new Map() | ||
| var errorHandlers = new Set() | ||
|
|
||
| var updateEventSource = function updateEventSource() { | ||
| if (activeEventSource) activeEventSource.close(); | ||
| if (activeKeys.size) { | ||
| activeEventSource = new EventSource( | ||
| urlBase + Array.from(activeKeys.keys()).join("@") | ||
| ); | ||
| activeEventSource.onerror = function (event) { | ||
| errorHandlers.forEach(function (onError) { | ||
| onError( | ||
| new Error( | ||
| "Problem communicating active modules to the server: " + | ||
| event.message + | ||
| " " + | ||
| event.filename + | ||
| ":" + | ||
| event.lineno + | ||
| ":" + | ||
| event.colno + | ||
| " " + | ||
| event.error | ||
| ) | ||
| ); | ||
| }); | ||
| }; | ||
| } else { | ||
| activeEventSource = undefined; | ||
| } | ||
| }; | ||
| if (activeEventSource) activeEventSource.close() | ||
| if (activeKeys.size) { | ||
| activeEventSource = new EventSource( | ||
| urlBase + Array.from(activeKeys.keys()).join('@') | ||
| ) | ||
| /** | ||
| * @this {EventSource} | ||
| * @param {Event & { message?: string, filename?: string, lineno?: number, colno?: number, error?: Error }} event event | ||
| */ | ||
| activeEventSource.onerror = function (event) { | ||
| errorHandlers.forEach(function (onError) { | ||
| onError( | ||
| new Error( | ||
| 'Problem communicating active modules to the server: ' + | ||
| event.message + | ||
| ' ' + | ||
| event.filename + | ||
| ':' + | ||
| event.lineno + | ||
| ':' + | ||
| event.colno + | ||
| ' ' + | ||
| event.error | ||
| ) | ||
| ) | ||
| }) | ||
| } | ||
| } else { | ||
| activeEventSource = undefined | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options | ||
| * @returns {() => void} function to destroy response | ||
| */ | ||
| exports.keepAlive = function (options) { | ||
| var data = options.data; | ||
| var onError = options.onError; | ||
| var active = options.active; | ||
| var module = options.module; | ||
| errorHandlers.add(onError); | ||
| var value = activeKeys.get(data) || 0; | ||
| activeKeys.set(data, value + 1); | ||
| if (value === 0) { | ||
| updateEventSource(); | ||
| } | ||
| if (!active && !module.hot) { | ||
| console.log( | ||
| "Hot Module Replacement is not enabled. Waiting for process restart..." | ||
| ); | ||
| } | ||
| var data = options.data | ||
| var onError = options.onError | ||
| var active = options.active | ||
| var module = options.module | ||
| errorHandlers.add(onError) | ||
| var value = activeKeys.get(data) || 0 | ||
| activeKeys.set(data, value + 1) | ||
| if (value === 0) { | ||
| updateEventSource() | ||
| } | ||
| if (!active && !module.hot) { | ||
| console.log( | ||
| 'Hot Module Replacement is not enabled. Waiting for process restart...' | ||
| ) | ||
| } | ||
|
|
||
| return function () { | ||
| errorHandlers.delete(onError); | ||
| setTimeout(function () { | ||
| var value = activeKeys.get(data); | ||
| if (value === 1) { | ||
| activeKeys.delete(data); | ||
| updateEventSource(); | ||
| } else { | ||
| activeKeys.set(data, value - 1); | ||
| } | ||
| }, 1000); | ||
| }; | ||
| }; | ||
| return function () { | ||
| errorHandlers.delete(onError) | ||
| setTimeout(function () { | ||
| var value = activeKeys.get(data) | ||
| if (value === 1) { | ||
| activeKeys.delete(data) | ||
| updateEventSource() | ||
| } else { | ||
| activeKeys.set(data, value - 1) | ||
| } | ||
| }, 1000) | ||
| } | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
packages/next/src/compiled/mini-css-extract-plugin/hmr/hotModuleReplacement.js
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.