next 13.4.13-canary.9 → 13.4.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/next +2 -2
- package/dist/bin/next.map +1 -1
- package/dist/build/analysis/get-page-static-info.js +17 -4
- package/dist/build/analysis/get-page-static-info.js.map +1 -1
- package/dist/build/index.js +8 -3
- package/dist/build/index.js.map +1 -1
- package/dist/build/swc/index.d.ts +5 -1
- package/dist/build/swc/index.js +6 -4
- package/dist/build/swc/index.js.map +1 -1
- package/dist/build/swc/options.js +6 -3
- package/dist/build/swc/options.js.map +1 -1
- package/dist/build/webpack/loaders/next-route-loader/templates/app-page.d.ts +1 -2
- package/dist/build/webpack/loaders/next-route-loader/templates/app-page.js +42 -2
- package/dist/build/webpack/loaders/next-route-loader/templates/app-page.js.map +1 -1
- package/dist/build/webpack/loaders/next-route-loader/templates/app-route.d.ts +1 -2
- package/dist/build/webpack/loaders/next-route-loader/templates/app-route.js +3 -2
- package/dist/build/webpack/loaders/next-route-loader/templates/app-route.js.map +1 -1
- package/dist/build/webpack/loaders/next-route-loader/templates/pages-api.d.ts +1 -2
- package/dist/build/webpack/loaders/next-route-loader/templates/pages-api.js +4 -2
- package/dist/build/webpack/loaders/next-route-loader/templates/pages-api.js.map +1 -1
- package/dist/build/webpack/loaders/next-route-loader/templates/pages.d.ts +1 -2
- package/dist/build/webpack/loaders/next-route-loader/templates/pages.js +4 -2
- package/dist/build/webpack/loaders/next-route-loader/templates/pages.js.map +1 -1
- package/dist/build/webpack/plugins/middleware-plugin.js +3 -0
- package/dist/build/webpack/plugins/middleware-plugin.js.map +1 -1
- package/dist/build/webpack-config.js +12 -2
- package/dist/build/webpack-config.js.map +1 -1
- package/dist/cli/next-build.js +1 -1
- package/dist/cli/next-build.js.map +1 -1
- package/dist/cli/next-info.d.ts +5 -0
- package/dist/cli/next-info.js +392 -20
- package/dist/cli/next-info.js.map +1 -1
- package/dist/client/app-bootstrap.js +1 -1
- package/dist/client/components/app-router.js +6 -3
- package/dist/client/components/app-router.js.map +1 -1
- package/dist/client/index.js +1 -1
- package/dist/client/legacy/image.js.map +1 -1
- package/dist/client/remove-base-path.js +2 -0
- package/dist/client/remove-base-path.js.map +1 -1
- package/dist/client/route-loader.d.ts +1 -0
- package/dist/client/route-loader.js.map +1 -1
- package/dist/compiled/@next/font/dist/google/font-data.json +465 -45
- package/dist/compiled/@next/font/dist/google/index.d.ts +311 -47
- package/dist/compiled/babel-packages/packages-bundle.js +2 -2
- package/dist/compiled/minimal-next-server/next-server.js +1 -1
- package/dist/compiled/minimal-next-server/next-server.js.cache +0 -0
- package/dist/compiled/sass-loader/cjs.js +1 -1
- package/dist/compiled/webpack/bundle5.js +1 -1
- package/dist/esm/build/analysis/get-page-static-info.js +17 -4
- package/dist/esm/build/analysis/get-page-static-info.js.map +1 -1
- package/dist/esm/build/index.js +9 -4
- package/dist/esm/build/index.js.map +1 -1
- package/dist/esm/build/swc/index.js +2 -2
- package/dist/esm/build/swc/index.js.map +1 -1
- package/dist/esm/build/swc/options.js +6 -3
- package/dist/esm/build/swc/options.js.map +1 -1
- package/dist/esm/build/webpack/loaders/next-route-loader/templates/app-page.js +3 -1
- package/dist/esm/build/webpack/loaders/next-route-loader/templates/app-page.js.map +1 -1
- package/dist/esm/build/webpack/loaders/next-route-loader/templates/app-route.js +3 -1
- package/dist/esm/build/webpack/loaders/next-route-loader/templates/app-route.js.map +1 -1
- package/dist/esm/build/webpack/loaders/next-route-loader/templates/pages-api.js +3 -1
- package/dist/esm/build/webpack/loaders/next-route-loader/templates/pages-api.js.map +1 -1
- package/dist/esm/build/webpack/loaders/next-route-loader/templates/pages.js +3 -1
- package/dist/esm/build/webpack/loaders/next-route-loader/templates/pages.js.map +1 -1
- package/dist/esm/build/webpack/plugins/middleware-plugin.js +4 -1
- package/dist/esm/build/webpack/plugins/middleware-plugin.js.map +1 -1
- package/dist/esm/build/webpack-config.js +12 -2
- package/dist/esm/build/webpack-config.js.map +1 -1
- package/dist/esm/client/app-bootstrap.js +1 -1
- package/dist/esm/client/components/app-router.js +6 -3
- package/dist/esm/client/components/app-router.js.map +1 -1
- package/dist/esm/client/index.js +1 -1
- package/dist/esm/client/legacy/image.js.map +1 -1
- package/dist/esm/client/remove-base-path.js +2 -0
- package/dist/esm/client/remove-base-path.js.map +1 -1
- package/dist/esm/client/route-loader.js.map +1 -1
- package/dist/esm/lib/format-server-error.js +5 -2
- package/dist/esm/lib/format-server-error.js.map +1 -1
- package/dist/esm/lib/metadata/metadata.js +85 -56
- package/dist/esm/lib/metadata/metadata.js.map +1 -1
- package/dist/esm/server/app-render/app-render.js +81 -66
- package/dist/esm/server/app-render/app-render.js.map +1 -1
- package/dist/esm/server/async-storage/request-async-storage-wrapper.js +8 -3
- package/dist/esm/server/async-storage/request-async-storage-wrapper.js.map +1 -1
- package/dist/esm/server/base-server.js +17 -23
- package/dist/esm/server/base-server.js.map +1 -1
- package/dist/esm/server/config-utils.js +0 -4
- package/dist/esm/server/config-utils.js.map +1 -1
- package/dist/esm/server/config.js +16 -0
- package/dist/esm/server/config.js.map +1 -1
- package/dist/esm/server/dev/hot-reloader.js +1 -1
- package/dist/esm/server/dev/next-dev-server.js +1 -3
- package/dist/esm/server/dev/next-dev-server.js.map +1 -1
- package/dist/esm/server/future/route-matches/route-match.js +1 -25
- package/dist/esm/server/future/route-matches/route-match.js.map +1 -1
- package/dist/esm/server/future/route-modules/app-page/module.js +0 -3
- package/dist/esm/server/future/route-modules/app-page/module.js.map +1 -1
- package/dist/esm/server/future/route-modules/app-route/helpers/parsed-url-query-to-params.js +15 -0
- package/dist/esm/server/future/route-modules/app-route/helpers/parsed-url-query-to-params.js.map +1 -0
- package/dist/esm/server/future/route-modules/app-route/module.js +2 -1
- package/dist/esm/server/future/route-modules/app-route/module.js.map +1 -1
- package/dist/esm/server/future/route-modules/pages/module.js +0 -3
- package/dist/esm/server/future/route-modules/pages/module.js.map +1 -1
- package/dist/esm/server/future/route-modules/pages-api/module.js +0 -3
- package/dist/esm/server/future/route-modules/pages-api/module.js.map +1 -1
- package/dist/esm/server/future/route-modules/route-module.js.map +1 -1
- package/dist/esm/server/lib/incremental-cache/file-system-cache.js +4 -1
- package/dist/esm/server/lib/incremental-cache/file-system-cache.js.map +1 -1
- package/dist/esm/server/lib/patch-fetch.js +1 -1
- package/dist/esm/server/lib/patch-fetch.js.map +1 -1
- package/dist/esm/server/lib/router-server.js +3 -0
- package/dist/esm/server/lib/router-server.js.map +1 -1
- package/dist/esm/server/lib/router-utils/setup-dev.js +1 -1
- package/dist/esm/server/lib/router-utils/setup-dev.js.map +1 -1
- package/dist/esm/server/lib/start-server.js +1 -0
- package/dist/esm/server/lib/start-server.js.map +1 -1
- package/dist/esm/server/next-server.js +14 -1
- package/dist/esm/server/next-server.js.map +1 -1
- package/dist/esm/server/require-hook.js +3 -2
- package/dist/esm/server/require-hook.js.map +1 -1
- package/dist/esm/server/typescript/constant.js +3 -1
- package/dist/esm/server/typescript/constant.js.map +1 -1
- package/dist/esm/server/web/adapter.js +27 -1
- package/dist/esm/server/web/adapter.js.map +1 -1
- package/dist/esm/server/web/edge-route-module-wrapper.js +3 -2
- package/dist/esm/server/web/edge-route-module-wrapper.js.map +1 -1
- package/dist/esm/server/web/spec-extension/adapters/request-cookies.js +3 -3
- package/dist/esm/server/web/spec-extension/adapters/request-cookies.js.map +1 -1
- package/dist/lib/format-server-error.js +5 -2
- package/dist/lib/format-server-error.js.map +1 -1
- package/dist/lib/metadata/metadata.d.ts +2 -2
- package/dist/lib/metadata/metadata.js +81 -57
- package/dist/lib/metadata/metadata.js.map +1 -1
- package/dist/server/app-render/app-render.js +80 -65
- package/dist/server/app-render/app-render.js.map +1 -1
- package/dist/server/app-render/types.d.ts +1 -0
- package/dist/server/async-storage/request-async-storage-wrapper.js +8 -3
- package/dist/server/async-storage/request-async-storage-wrapper.js.map +1 -1
- package/dist/server/base-server.d.ts +0 -3
- package/dist/server/base-server.js +16 -22
- package/dist/server/base-server.js.map +1 -1
- package/dist/server/config-shared.d.ts +2 -2
- package/dist/server/config-utils.js +0 -4
- package/dist/server/config-utils.js.map +1 -1
- package/dist/server/config.js +16 -0
- package/dist/server/config.js.map +1 -1
- package/dist/server/dev/hot-reloader.js +1 -1
- package/dist/server/dev/next-dev-server.d.ts +0 -1
- package/dist/server/dev/next-dev-server.js +1 -3
- package/dist/server/dev/next-dev-server.js.map +1 -1
- package/dist/server/future/route-matches/route-match.d.ts +0 -20
- package/dist/server/future/route-matches/route-match.js +0 -29
- package/dist/server/future/route-matches/route-match.js.map +1 -1
- package/dist/server/future/route-modules/app-page/module.d.ts +0 -1
- package/dist/server/future/route-modules/app-page/module.js +0 -3
- package/dist/server/future/route-modules/app-page/module.js.map +1 -1
- package/dist/server/future/route-modules/app-route/helpers/parsed-url-query-to-params.d.ts +9 -0
- package/dist/server/future/route-modules/app-route/helpers/parsed-url-query-to-params.js +20 -0
- package/dist/server/future/route-modules/app-route/helpers/parsed-url-query-to-params.js.map +1 -0
- package/dist/server/future/route-modules/app-route/module.js +2 -1
- package/dist/server/future/route-modules/app-route/module.js.map +1 -1
- package/dist/server/future/route-modules/pages/module.d.ts +0 -1
- package/dist/server/future/route-modules/pages/module.js +0 -3
- package/dist/server/future/route-modules/pages/module.js.map +1 -1
- package/dist/server/future/route-modules/pages-api/module.d.ts +0 -1
- package/dist/server/future/route-modules/pages-api/module.js +0 -3
- package/dist/server/future/route-modules/pages-api/module.js.map +1 -1
- package/dist/server/future/route-modules/route-module.d.ts +1 -6
- package/dist/server/future/route-modules/route-module.js.map +1 -1
- package/dist/server/lib/incremental-cache/file-system-cache.js +4 -1
- package/dist/server/lib/incremental-cache/file-system-cache.js.map +1 -1
- package/dist/server/lib/patch-fetch.js +1 -1
- package/dist/server/lib/patch-fetch.js.map +1 -1
- package/dist/server/lib/router-server.js +3 -0
- package/dist/server/lib/router-server.js.map +1 -1
- package/dist/server/lib/router-utils/setup-dev.js +1 -1
- package/dist/server/lib/router-utils/setup-dev.js.map +1 -1
- package/dist/server/lib/start-server.js +1 -0
- package/dist/server/lib/start-server.js.map +1 -1
- package/dist/server/next-server.js +14 -1
- package/dist/server/next-server.js.map +1 -1
- package/dist/server/require-hook.d.ts +1 -1
- package/dist/server/require-hook.js +2 -2
- package/dist/server/require-hook.js.map +1 -1
- package/dist/server/typescript/constant.js +3 -1
- package/dist/server/typescript/constant.js.map +1 -1
- package/dist/server/web/adapter.js +27 -1
- package/dist/server/web/adapter.js.map +1 -1
- package/dist/server/web/edge-route-module-wrapper.d.ts +2 -3
- package/dist/server/web/edge-route-module-wrapper.js +3 -2
- package/dist/server/web/edge-route-module-wrapper.js.map +1 -1
- package/dist/server/web/spec-extension/adapters/request-cookies.d.ts +1 -4
- package/dist/server/web/spec-extension/adapters/request-cookies.js +3 -3
- package/dist/server/web/spec-extension/adapters/request-cookies.js.map +1 -1
- package/dist/telemetry/anonymous-meta.js +1 -1
- package/dist/telemetry/events/session-stopped.js +2 -2
- package/dist/telemetry/events/version.js +2 -2
- package/package.json +16 -22
- package/dist/esm/server/future/route-handler-managers/route-handler-manager.js +0 -18
- package/dist/esm/server/future/route-handler-managers/route-handler-manager.js.map +0 -1
- package/dist/server/future/route-handler-managers/route-handler-manager.d.ts +0 -13
- package/dist/server/future/route-handler-managers/route-handler-manager.js +0 -28
- package/dist/server/future/route-handler-managers/route-handler-manager.js.map +0 -1
package/dist/cli/next-info.js
CHANGED
|
@@ -22,6 +22,16 @@ function _interop_require_default(obj) {
|
|
|
22
22
|
}
|
|
23
23
|
const { fetch } = require("next/dist/compiled/undici");
|
|
24
24
|
const dir = process.cwd();
|
|
25
|
+
/**
|
|
26
|
+
* Supported CLI arguments.
|
|
27
|
+
*/ const validArgs = {
|
|
28
|
+
// Types
|
|
29
|
+
"--help": Boolean,
|
|
30
|
+
// Aliases
|
|
31
|
+
"-h": "--help",
|
|
32
|
+
// Detailed diagnostics
|
|
33
|
+
"--verbose": Boolean
|
|
34
|
+
};
|
|
25
35
|
function getPackageVersion(packageName) {
|
|
26
36
|
try {
|
|
27
37
|
return require(`${packageName}/package.json`).version;
|
|
@@ -35,7 +45,10 @@ async function getNextConfig() {
|
|
|
35
45
|
output: config.output ?? "N/A"
|
|
36
46
|
};
|
|
37
47
|
}
|
|
38
|
-
|
|
48
|
+
/**
|
|
49
|
+
* Returns the version of the specified binary, by supplying `--version` argument.
|
|
50
|
+
* N/A if it fails to run the binary.
|
|
51
|
+
*/ function getBinaryVersion(binaryName) {
|
|
39
52
|
try {
|
|
40
53
|
return _child_process.default.execFileSync(binaryName, [
|
|
41
54
|
"--version"
|
|
@@ -44,28 +57,23 @@ function getBinaryVersion(binaryName) {
|
|
|
44
57
|
return "N/A";
|
|
45
58
|
}
|
|
46
59
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
// Aliases
|
|
52
|
-
"-h": "--help"
|
|
53
|
-
};
|
|
54
|
-
const args = (0, _getvalidatedargs.getValidatedArgs)(validArgs, argv);
|
|
55
|
-
if (args["--help"]) {
|
|
56
|
-
console.log(`
|
|
57
|
-
Description
|
|
58
|
-
Prints relevant details about the current system which can be used to report Next.js bugs
|
|
60
|
+
function printHelp() {
|
|
61
|
+
console.log(`
|
|
62
|
+
Description
|
|
63
|
+
Prints relevant details about the current system which can be used to report Next.js bugs
|
|
59
64
|
|
|
60
|
-
|
|
61
|
-
|
|
65
|
+
Usage
|
|
66
|
+
$ next info
|
|
62
67
|
|
|
63
|
-
|
|
64
|
-
|
|
68
|
+
Options
|
|
69
|
+
--help, -h Displays this message
|
|
70
|
+
--verbose Collect additional information for debugging
|
|
65
71
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
72
|
+
Learn more: ${_chalk.default.cyan("https://nextjs.org/docs/api-reference/cli#info")}`);
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Collect basic next.js installation information and print it to stdout.
|
|
76
|
+
*/ async function printDefaultInfo() {
|
|
69
77
|
const installedRelease = getPackageVersion("next");
|
|
70
78
|
const nextConfig = await getNextConfig();
|
|
71
79
|
console.log(`
|
|
@@ -103,6 +111,370 @@ const nextInfo = async (argv)=>{
|
|
|
103
111
|
Make sure to try the latest canary version (eg.: \`npm install next@canary\`) to confirm the issue still exists before creating a new issue.
|
|
104
112
|
Read more - https://nextjs.org/docs/messages/opening-an-issue`);
|
|
105
113
|
}
|
|
114
|
+
}
|
|
115
|
+
/**
|
|
116
|
+
* Using system-installed tools per each platform, trying to read shared dependencies of next-swc.
|
|
117
|
+
* This is mainly for debugging DLOPEN failure.
|
|
118
|
+
*
|
|
119
|
+
* We don't / can't install these tools by ourselves, will skip the check if we can't find them.
|
|
120
|
+
*/ async function runSharedDependencyCheck(tools, skipMessage) {
|
|
121
|
+
var _getSupportedArchTriples_currentPlatform;
|
|
122
|
+
const currentPlatform = _os.default.platform();
|
|
123
|
+
const spawn = require("next/dist/compiled/cross-spawn");
|
|
124
|
+
const { getSupportedArchTriples } = require("../build/swc");
|
|
125
|
+
const triples = ((_getSupportedArchTriples_currentPlatform = getSupportedArchTriples()[currentPlatform]) == null ? void 0 : _getSupportedArchTriples_currentPlatform[_os.default.arch()]) ?? [];
|
|
126
|
+
// First, check if system have a tool installed. We can't install these by our own.
|
|
127
|
+
const availableTools = [];
|
|
128
|
+
for (const tool of tools){
|
|
129
|
+
try {
|
|
130
|
+
const check = spawn.sync(tool.bin, tool.checkArgs);
|
|
131
|
+
if (check.status === 0) {
|
|
132
|
+
availableTools.push(tool);
|
|
133
|
+
}
|
|
134
|
+
} catch {
|
|
135
|
+
// ignore if existence check fails
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
if (availableTools.length === 0) {
|
|
139
|
+
return {
|
|
140
|
+
messages: skipMessage,
|
|
141
|
+
result: "skipped"
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
const outputs = [];
|
|
145
|
+
let result = "fail";
|
|
146
|
+
for (const triple of triples){
|
|
147
|
+
const triplePkgName = `@next/swc-${triple.platformArchABI}`;
|
|
148
|
+
let resolved;
|
|
149
|
+
try {
|
|
150
|
+
resolved = require.resolve(triplePkgName);
|
|
151
|
+
} catch (e) {
|
|
152
|
+
return {
|
|
153
|
+
messages: "Cannot find next-swc installation, skipping dependencies check",
|
|
154
|
+
result: "skipped"
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
for (const tool of availableTools){
|
|
158
|
+
const proc = spawn(tool.bin, [
|
|
159
|
+
...tool.args,
|
|
160
|
+
resolved
|
|
161
|
+
]);
|
|
162
|
+
outputs.push(`Running ${tool.bin} ------------- `);
|
|
163
|
+
// Captures output, doesn't matter if it fails or not since we'll forward both to output.
|
|
164
|
+
const procPromise = new Promise((resolve)=>{
|
|
165
|
+
proc.stdout.on("data", function(data) {
|
|
166
|
+
outputs.push(data);
|
|
167
|
+
});
|
|
168
|
+
proc.stderr.on("data", function(data) {
|
|
169
|
+
outputs.push(data);
|
|
170
|
+
});
|
|
171
|
+
proc.on("close", (c)=>resolve(c));
|
|
172
|
+
});
|
|
173
|
+
let code = await procPromise;
|
|
174
|
+
if (code === 0) {
|
|
175
|
+
result = "pass";
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
return {
|
|
180
|
+
output: outputs.join("\n"),
|
|
181
|
+
result
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* Collect additional diagnostics information.
|
|
186
|
+
*/ async function printVerbose() {
|
|
187
|
+
const fs = require("fs");
|
|
188
|
+
const currentPlatform = _os.default.platform();
|
|
189
|
+
if (currentPlatform !== "win32" && currentPlatform !== "linux" && currentPlatform !== "darwin") {
|
|
190
|
+
console.log("Unsupported platform, only win32, linux, darwin are supported.");
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
// List of tasks to run.
|
|
194
|
+
const tasks = [
|
|
195
|
+
{
|
|
196
|
+
title: "Host system information",
|
|
197
|
+
scripts: {
|
|
198
|
+
default: async ()=>{
|
|
199
|
+
// Node.js diagnostic report contains basic information, i.e OS version, CPU architecture, etc.
|
|
200
|
+
// Only collect few addtional details here.
|
|
201
|
+
const isWsl = require("next/dist/compiled/is-wsl");
|
|
202
|
+
const ciInfo = require("next/dist/compiled/ci-info");
|
|
203
|
+
const isDocker = require("next/dist/compiled/is-docker");
|
|
204
|
+
const output = `
|
|
205
|
+
WSL: ${isWsl}
|
|
206
|
+
Docker: ${isDocker()}
|
|
207
|
+
CI: ${ciInfo.isCI ? ciInfo.name || "unknown" : "false"}
|
|
208
|
+
`;
|
|
209
|
+
return {
|
|
210
|
+
output,
|
|
211
|
+
result: "pass"
|
|
212
|
+
};
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
},
|
|
216
|
+
{
|
|
217
|
+
title: "Next.js installation",
|
|
218
|
+
scripts: {
|
|
219
|
+
default: async ()=>{
|
|
220
|
+
const installedRelease = getPackageVersion("next");
|
|
221
|
+
const nextConfig = await getNextConfig();
|
|
222
|
+
const output = `
|
|
223
|
+
Binaries:
|
|
224
|
+
Node: ${process.versions.node}
|
|
225
|
+
npm: ${getBinaryVersion("npm")}
|
|
226
|
+
Yarn: ${getBinaryVersion("yarn")}
|
|
227
|
+
pnpm: ${getBinaryVersion("pnpm")}
|
|
228
|
+
Relevant Packages:
|
|
229
|
+
next: ${installedRelease}
|
|
230
|
+
eslint-config-next: ${getPackageVersion("eslint-config-next")}
|
|
231
|
+
react: ${getPackageVersion("react")}
|
|
232
|
+
react-dom: ${getPackageVersion("react-dom")}
|
|
233
|
+
typescript: ${getPackageVersion("typescript")}
|
|
234
|
+
Next.js Config:
|
|
235
|
+
output: ${nextConfig.output}
|
|
236
|
+
|
|
237
|
+
`;
|
|
238
|
+
return {
|
|
239
|
+
output,
|
|
240
|
+
result: "pass"
|
|
241
|
+
};
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
},
|
|
245
|
+
{
|
|
246
|
+
title: "Node.js diagnostic report",
|
|
247
|
+
scripts: {
|
|
248
|
+
default: async ()=>{
|
|
249
|
+
var _process_report;
|
|
250
|
+
const report = (_process_report = process.report) == null ? void 0 : _process_report.getReport();
|
|
251
|
+
if (!report) {
|
|
252
|
+
return {
|
|
253
|
+
messages: "Node.js diagnostic report is not available.",
|
|
254
|
+
result: "fail"
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
const { header , javascriptHeap , sharedObjects } = report;
|
|
258
|
+
// Delete some fields potentially containing sensitive information.
|
|
259
|
+
header == null ? void 0 : delete header.cwd;
|
|
260
|
+
header == null ? void 0 : delete header.commandLine;
|
|
261
|
+
header == null ? void 0 : delete header.host;
|
|
262
|
+
header == null ? void 0 : delete header.cpus;
|
|
263
|
+
header == null ? void 0 : delete header.networkInterfaces;
|
|
264
|
+
const reportSummary = {
|
|
265
|
+
header,
|
|
266
|
+
javascriptHeap,
|
|
267
|
+
sharedObjects
|
|
268
|
+
};
|
|
269
|
+
return {
|
|
270
|
+
output: JSON.stringify(reportSummary, null, 2),
|
|
271
|
+
result: "pass"
|
|
272
|
+
};
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
},
|
|
276
|
+
{
|
|
277
|
+
title: "next-swc installation",
|
|
278
|
+
scripts: {
|
|
279
|
+
default: async ()=>{
|
|
280
|
+
var _platformArchTriples_currentPlatform;
|
|
281
|
+
const output = [];
|
|
282
|
+
// First, try to load next-swc via loadBindings.
|
|
283
|
+
try {
|
|
284
|
+
const { loadBindings } = require("../build/swc");
|
|
285
|
+
const bindings = await loadBindings();
|
|
286
|
+
// Run arbitary function to verify the bindings are loaded correctly.
|
|
287
|
+
const target = bindings.getTargetTriple();
|
|
288
|
+
// We think next-swc is installed correctly if getTargetTriple returns.
|
|
289
|
+
return {
|
|
290
|
+
output: `next-swc is installed correctly for ${target}`,
|
|
291
|
+
result: "pass"
|
|
292
|
+
};
|
|
293
|
+
} catch (e) {
|
|
294
|
+
output.push(`loadBindings() failed: ${e.message}`);
|
|
295
|
+
}
|
|
296
|
+
const { platformArchTriples } = require("next/dist/compiled/@napi-rs/triples");
|
|
297
|
+
const triples = (_platformArchTriples_currentPlatform = platformArchTriples[currentPlatform]) == null ? void 0 : _platformArchTriples_currentPlatform[_os.default.arch()];
|
|
298
|
+
if (!triples || triples.length === 0) {
|
|
299
|
+
return {
|
|
300
|
+
messages: `No target triples found for ${currentPlatform} / ${_os.default.arch()}`,
|
|
301
|
+
result: "fail"
|
|
302
|
+
};
|
|
303
|
+
}
|
|
304
|
+
// Trying to manually resolve corresponding target triples to see if bindings are physically located.
|
|
305
|
+
const path = require("path");
|
|
306
|
+
let fallbackBindingsDirectory;
|
|
307
|
+
try {
|
|
308
|
+
const nextPath = path.dirname(require.resolve("next/package.json"));
|
|
309
|
+
fallbackBindingsDirectory = path.join(nextPath, "next-swc-fallback");
|
|
310
|
+
} catch (e) {
|
|
311
|
+
// Not able to locate next package from current running location, skipping fallback bindings check.
|
|
312
|
+
}
|
|
313
|
+
const tryResolve = (pkgName)=>{
|
|
314
|
+
try {
|
|
315
|
+
const resolved = require.resolve(pkgName);
|
|
316
|
+
const fileExists = fs.existsSync(resolved);
|
|
317
|
+
let loadError;
|
|
318
|
+
let loadSuccess;
|
|
319
|
+
try {
|
|
320
|
+
loadSuccess = !!require(resolved).getTargetTriple();
|
|
321
|
+
} catch (e) {
|
|
322
|
+
loadError = e.message;
|
|
323
|
+
}
|
|
324
|
+
output.push(`${pkgName} exists: ${fileExists} for the triple ${loadSuccess}`);
|
|
325
|
+
if (loadError) {
|
|
326
|
+
output.push(`${pkgName} load failed: ${loadError ?? "unknown"}`);
|
|
327
|
+
}
|
|
328
|
+
if (loadSuccess) {
|
|
329
|
+
return true;
|
|
330
|
+
}
|
|
331
|
+
} catch (e) {
|
|
332
|
+
output.push(`${pkgName} resolve failed: ${e.message ?? "unknown"}`);
|
|
333
|
+
}
|
|
334
|
+
return false;
|
|
335
|
+
};
|
|
336
|
+
for (const triple of triples){
|
|
337
|
+
const triplePkgName = `@next/swc-${triple.platformArchABI}`;
|
|
338
|
+
// Check installed optional dependencies. This is the normal way package being installed.
|
|
339
|
+
// For the targets have multiple triples (gnu / musl), if any of them loads successfully, we consider as installed.
|
|
340
|
+
if (tryResolve(triplePkgName)) {
|
|
341
|
+
break;
|
|
342
|
+
}
|
|
343
|
+
// Check if fallback binaries are installed.
|
|
344
|
+
if (!fallbackBindingsDirectory) {
|
|
345
|
+
continue;
|
|
346
|
+
}
|
|
347
|
+
tryResolve(path.join(fallbackBindingsDirectory, triplePkgName));
|
|
348
|
+
}
|
|
349
|
+
return {
|
|
350
|
+
output: output.join("\n"),
|
|
351
|
+
result: "pass"
|
|
352
|
+
};
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
},
|
|
356
|
+
{
|
|
357
|
+
// For the simplicity, we only check the correctly installed optional dependencies -
|
|
358
|
+
// as this is mainly for checking DLOPEN failure. If user hit MODULE_NOT_FOUND,
|
|
359
|
+
// expect above next-swc installation would give some hint instead.
|
|
360
|
+
title: "next-swc shared object dependencies",
|
|
361
|
+
scripts: {
|
|
362
|
+
linux: async ()=>{
|
|
363
|
+
const skipMessage = "This diagnostics uses system-installed tools (ldd) to check next-swc dependencies, but it is not found. Skipping dependencies check.";
|
|
364
|
+
return await runSharedDependencyCheck([
|
|
365
|
+
{
|
|
366
|
+
bin: "ldd",
|
|
367
|
+
checkArgs: [
|
|
368
|
+
"--help"
|
|
369
|
+
],
|
|
370
|
+
args: [
|
|
371
|
+
"--verbose"
|
|
372
|
+
]
|
|
373
|
+
}
|
|
374
|
+
], skipMessage);
|
|
375
|
+
},
|
|
376
|
+
win32: async ()=>{
|
|
377
|
+
const skipMessage = `This diagnostics uses system-installed tools (dumpbin.exe) to check next-swc dependencies, but it was not found in the path. Skipping dependencies check.
|
|
378
|
+
dumpbin (https://learn.microsoft.com/en-us/cpp/build/reference/dumpbin-reference) is a part of Microsoft VC toolset,
|
|
379
|
+
can be installed with Windows SDK, Windows Build tools or Visual Studio.
|
|
380
|
+
|
|
381
|
+
Please make sure you have one of them installed and dumpbin.exe is in the path.
|
|
382
|
+
`;
|
|
383
|
+
return await runSharedDependencyCheck([
|
|
384
|
+
{
|
|
385
|
+
bin: "dumpbin.exe",
|
|
386
|
+
checkArgs: [
|
|
387
|
+
"/summary"
|
|
388
|
+
],
|
|
389
|
+
args: [
|
|
390
|
+
"/imports"
|
|
391
|
+
]
|
|
392
|
+
}
|
|
393
|
+
], skipMessage);
|
|
394
|
+
},
|
|
395
|
+
darwin: async ()=>{
|
|
396
|
+
const skipMessage = "This diagnostics uses system-installed tools (otools, dyld_info) to check next-swc dependencies, but none of them are found. Skipping dependencies check.";
|
|
397
|
+
return await runSharedDependencyCheck([
|
|
398
|
+
{
|
|
399
|
+
bin: "otool",
|
|
400
|
+
checkArgs: [
|
|
401
|
+
"--version"
|
|
402
|
+
],
|
|
403
|
+
args: [
|
|
404
|
+
"-L"
|
|
405
|
+
]
|
|
406
|
+
},
|
|
407
|
+
{
|
|
408
|
+
bin: "dyld_info",
|
|
409
|
+
checkArgs: [],
|
|
410
|
+
args: []
|
|
411
|
+
}
|
|
412
|
+
], skipMessage);
|
|
413
|
+
}
|
|
414
|
+
}
|
|
415
|
+
}
|
|
416
|
+
];
|
|
417
|
+
// Collected output after running all tasks.
|
|
418
|
+
const report = [];
|
|
419
|
+
console.log("\n");
|
|
420
|
+
for (const task of tasks){
|
|
421
|
+
if (task.targetPlatform && task.targetPlatform !== currentPlatform) {
|
|
422
|
+
report.push({
|
|
423
|
+
title: task.title,
|
|
424
|
+
result: {
|
|
425
|
+
messages: undefined,
|
|
426
|
+
output: `[SKIPPED (${_os.default.platform()} / ${task.targetPlatform})] ${task.title}`,
|
|
427
|
+
result: "skipped"
|
|
428
|
+
}
|
|
429
|
+
});
|
|
430
|
+
continue;
|
|
431
|
+
}
|
|
432
|
+
const taskScript = task.scripts[currentPlatform] ?? task.scripts.default;
|
|
433
|
+
let taskResult;
|
|
434
|
+
try {
|
|
435
|
+
taskResult = await taskScript();
|
|
436
|
+
} catch (e) {
|
|
437
|
+
taskResult = {
|
|
438
|
+
messages: `Unexpected failure while running diagnostics: ${e.message}`,
|
|
439
|
+
result: "fail"
|
|
440
|
+
};
|
|
441
|
+
}
|
|
442
|
+
console.log(`- ${task.title}: ${taskResult.result}`);
|
|
443
|
+
if (taskResult.messages) {
|
|
444
|
+
console.log(` ${taskResult.messages}`);
|
|
445
|
+
}
|
|
446
|
+
report.push({
|
|
447
|
+
title: task.title,
|
|
448
|
+
result: taskResult
|
|
449
|
+
});
|
|
450
|
+
}
|
|
451
|
+
console.log(`\n${_chalk.default.bold("Generated diagnostics report")}`);
|
|
452
|
+
console.log(`\nPlease copy below report and paste it into your issue.`);
|
|
453
|
+
for (const { title , result } of report){
|
|
454
|
+
console.log(`\n### ${title}`);
|
|
455
|
+
if (result.messages) {
|
|
456
|
+
console.log(result.messages);
|
|
457
|
+
}
|
|
458
|
+
if (result.output) {
|
|
459
|
+
console.log(result.output);
|
|
460
|
+
}
|
|
461
|
+
}
|
|
462
|
+
}
|
|
463
|
+
/**
|
|
464
|
+
* Runs few scripts to collect system information to help with debugging next.js installation issues.
|
|
465
|
+
* There are 2 modes, by default it collects basic next.js installation with runtime information. If
|
|
466
|
+
* `--verbose` mode is enabled it'll try to collect, verify more data for next-swc installation and others.
|
|
467
|
+
*/ const nextInfo = async (argv)=>{
|
|
468
|
+
const args = (0, _getvalidatedargs.getValidatedArgs)(validArgs, argv);
|
|
469
|
+
if (args["--help"]) {
|
|
470
|
+
printHelp();
|
|
471
|
+
return;
|
|
472
|
+
}
|
|
473
|
+
if (!args["--verbose"]) {
|
|
474
|
+
await printDefaultInfo();
|
|
475
|
+
} else {
|
|
476
|
+
await printVerbose();
|
|
477
|
+
}
|
|
106
478
|
};
|
|
107
479
|
|
|
108
480
|
//# sourceMappingURL=next-info.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/cli/next-info.ts"],"names":["nextInfo","fetch","require","dir","process","cwd","getPackageVersion","packageName","version","getNextConfig","config","loadConfig","PHASE_INFO","undefined","output","getBinaryVersion","binaryName","childProcess","execFileSync","toString","trim","argv","validArgs","Boolean","args","getValidatedArgs","console","log","chalk","cyan","installedRelease","nextConfig","os","platform","arch","versions","node","res","releases","json","newestRelease","tag_name","replace","warn","yellow","bold","e","message"],"mappings":";;;;;+BA8HSA;;;eAAAA;;;2DA5HM;sEACU;8DAEP;2BAMS;+DACJ;kCACU;;;;;;AANjC,MAAM,EAAEC,MAAK,EAAE,GAAGC,QAAQ;AAQ1B,MAAMC,MAAMC,QAAQC,GAAG;AAEvB,SAASC,kBAAkBC,WAAmB,EAAE;IAC9C,IAAI;QACF,OAAOL,QAAQ,CAAC,EAAEK,YAAY,aAAa,CAAC,EAAEC,OAAO;IACvD,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,eAAeC,gBAAgB;IAC7B,MAAMC,SAAS,MAAMC,IAAAA,eAAU,EAACC,qBAAU,EAAET,KAAKU,WAAWA,WAAW,IAAI;IAE3E,OAAO;QACLC,QAAQJ,OAAOI,MAAM,IAAI;IAC3B;AACF;AAEA,SAASC,iBAAiBC,UAAkB,EAAE;IAC5C,IAAI;QACF,OAAOC,sBAAY,CAChBC,YAAY,CAACF,YAAY;YAAC;SAAY,EACtCG,QAAQ,GACRC,IAAI;IACT,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,MAAMpB,WAAuB,OAAOqB,OAAS;IAC3C,MAAMC,YAAsB;QAC1B,QAAQ;QACR,UAAUC;QACV,UAAU;QACV,MAAM;IACR;IACA,MAAMC,OAAOC,IAAAA,kCAAgB,EAACH,WAAWD;IAEzC,IAAIG,IAAI,CAAC,SAAS,EAAE;QAClBE,QAAQC,GAAG,CACT,CAAC;;;;;;;;;;kBAUW,EAAEC,cAAK,CAACC,IAAI,CACtB,kDACA,CAAC;QAEL;IACF,CAAC;IAED,MAAMC,mBAAmBxB,kBAAkB;IAC3C,MAAMyB,aAAa,MAAMtB;IAEzBiB,QAAQC,GAAG,CAAC,CAAC;;gBAEC,EAAEK,WAAE,CAACC,QAAQ,GAAG;YACpB,EAAED,WAAE,CAACE,IAAI,GAAG;eACT,EAAEF,WAAE,CAACxB,OAAO,GAAG;;YAElB,EAAEJ,QAAQ+B,QAAQ,CAACC,IAAI,CAAC;WACzB,EAAErB,iBAAiB,OAAO;YACzB,EAAEA,iBAAiB,QAAQ;YAC3B,EAAEA,iBAAiB,QAAQ;;YAE3B,EAAEe,iBAAiB;0BACL,EAAExB,kBAAkB,sBAAsB;aACvD,EAAEA,kBAAkB,SAAS;iBACzB,EAAEA,kBAAkB,aAAa;kBAChC,EAAEA,kBAAkB,cAAc;;cAEtC,EAAEyB,WAAWjB,MAAM,CAAC;;AAElC,CAAC;IAEC,IAAI;QACF,MAAMuB,MAAM,MAAMpC,MAChB;QAEF,MAAMqC,WAAW,MAAMD,IAAIE,IAAI;QAC/B,MAAMC,gBAAgBF,QAAQ,CAAC,EAAE,CAACG,QAAQ,CAACC,OAAO,CAAC,MAAM;QAEzD,IAAIZ,qBAAqBU,eAAe;YACtCd,QAAQiB,IAAI,CACV,CAAC,EAAEf,cAAK,CAACgB,MAAM,CACbhB,cAAK,CAACiB,IAAI,CAAC,SACX,mDAAmD,EAAEf,iBAAiB,YAAY,EAAEU,cAAc;;qEAEvC,CAAC;QAElE,CAAC;IACH,EAAE,OAAOM,GAAG;QACVpB,QAAQiB,IAAI,CACV,CAAC,EAAEf,cAAK,CAACgB,MAAM,CACbhB,cAAK,CAACiB,IAAI,CAAC,SACX,oDAAoD,EACpD,AAACC,EAAYC,OAAO,CACrB;gBACS,EAAEjB,iBAAiB;;mEAEgC,CAAC;IAElE;AACF"}
|
|
1
|
+
{"version":3,"sources":["../../src/cli/next-info.ts"],"names":["nextInfo","fetch","require","dir","process","cwd","validArgs","Boolean","getPackageVersion","packageName","version","getNextConfig","config","loadConfig","PHASE_INFO","undefined","output","getBinaryVersion","binaryName","childProcess","execFileSync","toString","trim","printHelp","console","log","chalk","cyan","printDefaultInfo","installedRelease","nextConfig","os","platform","arch","versions","node","res","releases","json","newestRelease","tag_name","replace","warn","yellow","bold","e","message","runSharedDependencyCheck","tools","skipMessage","getSupportedArchTriples","currentPlatform","spawn","triples","availableTools","tool","check","sync","bin","checkArgs","status","push","length","messages","result","outputs","triple","triplePkgName","platformArchABI","resolved","resolve","proc","args","procPromise","Promise","stdout","on","data","stderr","c","code","join","printVerbose","fs","tasks","title","scripts","default","isWsl","ciInfo","isDocker","isCI","name","report","getReport","header","javascriptHeap","sharedObjects","commandLine","host","cpus","networkInterfaces","reportSummary","JSON","stringify","platformArchTriples","loadBindings","bindings","target","getTargetTriple","path","fallbackBindingsDirectory","nextPath","dirname","tryResolve","pkgName","fileExists","existsSync","loadError","loadSuccess","linux","win32","darwin","task","targetPlatform","taskScript","taskResult","argv","getValidatedArgs"],"mappings":"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"}
|
|
@@ -42,6 +42,8 @@ const _redirectboundary = require("./redirect-boundary");
|
|
|
42
42
|
const _findheadincache = require("./router-reducer/reducers/find-head-in-cache");
|
|
43
43
|
const _infinitepromise = require("./infinite-promise");
|
|
44
44
|
const _approuterheaders = require("./app-router-headers");
|
|
45
|
+
const _removebasepath = require("../remove-base-path");
|
|
46
|
+
const _hasbasepath = require("../has-base-path");
|
|
45
47
|
|
|
46
48
|
const isServer = typeof window === "undefined";
|
|
47
49
|
// Ensure the initialParallelRoutes are not combined because of double-rendering in the browser with Strict Mode.
|
|
@@ -180,7 +182,7 @@ function useNavigate(dispatch) {
|
|
|
180
182
|
return {
|
|
181
183
|
// This is turned into a readonly class in `useSearchParams`
|
|
182
184
|
searchParams: url.searchParams,
|
|
183
|
-
pathname: url.pathname
|
|
185
|
+
pathname: (0, _hasbasepath.hasBasePath)(url.pathname) ? (0, _removebasepath.removeBasePath)(url.pathname) : url.pathname
|
|
184
186
|
};
|
|
185
187
|
}, [
|
|
186
188
|
canonicalUrl
|
|
@@ -195,8 +197,9 @@ function useNavigate(dispatch) {
|
|
|
195
197
|
back: ()=>window.history.back(),
|
|
196
198
|
forward: ()=>window.history.forward(),
|
|
197
199
|
prefetch: (href, options)=>{
|
|
198
|
-
//
|
|
199
|
-
|
|
200
|
+
// Don't prefetch for bots as they don't navigate.
|
|
201
|
+
// Don't prefetch during development (improves compilation performance)
|
|
202
|
+
if ((0, _isbot.isBot)(window.navigator.userAgent) || process.env.NODE_ENV === "development") {
|
|
200
203
|
return;
|
|
201
204
|
}
|
|
202
205
|
const url = new URL((0, _addbasepath.addBasePath)(href), location.href);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/client/components/app-router.tsx"],"names":["getServerActionDispatcher","urlToUrlWithoutFlightMarker","AppRouter","isServer","window","initialParallelRoutes","Map","globalServerActionDispatcher","url","urlWithoutFlightParameters","URL","location","origin","searchParams","delete","NEXT_RSC_UNION_QUERY","process","env","NODE_ENV","__NEXT_CONFIG_OUTPUT","pathname","endsWith","length","slice","isExternalURL","HistoryUpdater","tree","pushRef","canonicalUrl","sync","useInsertionEffect","historyState","__NA","pendingPush","createHrefFromUrl","href","history","pushState","replaceState","createEmptyCacheNode","status","CacheStates","LAZY_INITIALIZED","data","subTreeData","parallelRoutes","useServerActionDispatcher","dispatch","serverActionDispatcher","useCallback","actionPayload","startTransition","type","ACTION_SERVER_ACTION","mutable","cache","useChangeByServerResponse","previousTree","flightData","overrideCanonicalUrl","ACTION_SERVER_PATCH","useNavigate","navigateType","forceOptimisticNavigation","shouldScroll","addBasePath","ACTION_NAVIGATE","isExternalUrl","locationSearch","search","Router","buildId","initialHead","initialTree","initialCanonicalUrl","children","assetPrefix","initialState","useMemo","createInitialRouterState","prefetchCache","focusAndScrollRef","nextUrl","useReducerWithReduxDevtools","reducer","useEffect","changeByServerResponse","navigate","appRouter","routerInstance","back","forward","prefetch","options","isBot","navigator","userAgent","ACTION_PREFETCH","kind","PrefetchKind","FULL","replace","Boolean","scroll","push","refresh","ACTION_REFRESH","fastRefresh","Error","ACTION_FAST_REFRESH","next","router","nd","mpaNavigation","assign","use","createInfinitePromise","onPopState","state","reload","ACTION_RESTORE","addEventListener","removeEventListener","head","findHeadInCache","content","RedirectBoundary","AppRouterAnnouncer","DevRootNotFoundBoundary","require","HotReloader","default","PathnameContext","Provider","value","SearchParamsContext","GlobalLayoutRouterContext","AppRouterContext","LayoutRouterContext","childNodes","props","globalErrorComponent","rest","ErrorBoundary","errorComponent"],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../src/client/components/app-router.tsx"],"names":["getServerActionDispatcher","urlToUrlWithoutFlightMarker","AppRouter","isServer","window","initialParallelRoutes","Map","globalServerActionDispatcher","url","urlWithoutFlightParameters","URL","location","origin","searchParams","delete","NEXT_RSC_UNION_QUERY","process","env","NODE_ENV","__NEXT_CONFIG_OUTPUT","pathname","endsWith","length","slice","isExternalURL","HistoryUpdater","tree","pushRef","canonicalUrl","sync","useInsertionEffect","historyState","__NA","pendingPush","createHrefFromUrl","href","history","pushState","replaceState","createEmptyCacheNode","status","CacheStates","LAZY_INITIALIZED","data","subTreeData","parallelRoutes","useServerActionDispatcher","dispatch","serverActionDispatcher","useCallback","actionPayload","startTransition","type","ACTION_SERVER_ACTION","mutable","cache","useChangeByServerResponse","previousTree","flightData","overrideCanonicalUrl","ACTION_SERVER_PATCH","useNavigate","navigateType","forceOptimisticNavigation","shouldScroll","addBasePath","ACTION_NAVIGATE","isExternalUrl","locationSearch","search","Router","buildId","initialHead","initialTree","initialCanonicalUrl","children","assetPrefix","initialState","useMemo","createInitialRouterState","prefetchCache","focusAndScrollRef","nextUrl","useReducerWithReduxDevtools","reducer","useEffect","hasBasePath","removeBasePath","changeByServerResponse","navigate","appRouter","routerInstance","back","forward","prefetch","options","isBot","navigator","userAgent","ACTION_PREFETCH","kind","PrefetchKind","FULL","replace","Boolean","scroll","push","refresh","ACTION_REFRESH","fastRefresh","Error","ACTION_FAST_REFRESH","next","router","nd","mpaNavigation","assign","use","createInfinitePromise","onPopState","state","reload","ACTION_RESTORE","addEventListener","removeEventListener","head","findHeadInCache","content","RedirectBoundary","AppRouterAnnouncer","DevRootNotFoundBoundary","require","HotReloader","default","PathnameContext","Provider","value","SearchParamsContext","GlobalLayoutRouterContext","AppRouterContext","LayoutRouterContext","childNodes","props","globalErrorComponent","rest","ErrorBoundary","errorComponent"],"mappings":"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"}
|
package/dist/client/index.js
CHANGED
|
@@ -58,7 +58,7 @@ const _approutercontext = require("../shared/lib/app-router-context");
|
|
|
58
58
|
const _adapters = require("../shared/lib/router/adapters");
|
|
59
59
|
const _hooksclientcontext = require("../shared/lib/hooks-client-context");
|
|
60
60
|
const _onrecoverableerror = /*#__PURE__*/ _interop_require_default._(require("./on-recoverable-error"));
|
|
61
|
-
const version = "13.4.13
|
|
61
|
+
const version = "13.4.13";
|
|
62
62
|
let router;
|
|
63
63
|
const emitter = (0, _mitt.default)();
|
|
64
64
|
const looseToArray = (input)=>[].slice.call(input);
|