next 13.5.2 → 13.5.3-canary.1
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 +1 -1
- package/dist/build/index.js +1 -1
- package/dist/build/output/store.js +1 -1
- package/dist/build/spinner.js +2 -2
- package/dist/build/spinner.js.map +1 -1
- package/dist/build/swc/index.js +1 -1
- package/dist/build/webpack-config.js +2 -2
- package/dist/cli/next-dev.js +0 -1
- package/dist/cli/next-dev.js.map +1 -1
- package/dist/cli/next-info.js +25 -25
- package/dist/cli/next-info.js.map +1 -1
- package/dist/client/app-bootstrap.js +1 -1
- package/dist/client/components/layout-router.js +2 -1
- package/dist/client/components/layout-router.js.map +1 -1
- package/dist/client/components/promise-queue.d.ts +2 -1
- package/dist/client/components/promise-queue.js +1 -6
- package/dist/client/components/promise-queue.js.map +1 -1
- package/dist/client/components/router-reducer/create-record-from-thenable.d.ts +2 -1
- package/dist/client/components/router-reducer/create-record-from-thenable.js +3 -5
- package/dist/client/components/router-reducer/create-record-from-thenable.js.map +1 -1
- package/dist/client/components/router-reducer/fetch-server-response.d.ts +1 -2
- package/dist/client/components/router-reducer/fill-cache-with-data-property.d.ts +3 -2
- package/dist/client/components/router-reducer/fill-cache-with-data-property.js.map +1 -1
- package/dist/client/components/router-reducer/read-record-value.d.ts +2 -1
- package/dist/client/components/router-reducer/read-record-value.js +1 -5
- package/dist/client/components/router-reducer/read-record-value.js.map +1 -1
- package/dist/client/components/router-reducer/reducers/navigate-reducer.js +3 -3
- package/dist/client/components/router-reducer/reducers/navigate-reducer.js.map +1 -1
- package/dist/client/components/router-reducer/reducers/server-action-reducer.js +2 -2
- package/dist/client/components/router-reducer/reducers/server-action-reducer.js.map +1 -1
- package/dist/client/components/router-reducer/router-reducer-types.d.ts +5 -3
- package/dist/client/components/router-reducer/router-reducer-types.js.map +1 -1
- package/dist/client/index.js +1 -1
- package/dist/compiled/@next/react-refresh-utils/dist/internal/ReactRefreshModule.runtime.js +8 -7
- package/dist/compiled/@next/react-refresh-utils/dist/internal/helpers.js +1 -3
- package/dist/compiled/next-server/app-page-experimental.runtime.dev.js +1 -1
- package/dist/compiled/next-server/app-page-experimental.runtime.prod.js +1 -1
- package/dist/compiled/next-server/app-page-turbo-experimental.runtime.prod.js +1 -1
- package/dist/compiled/next-server/app-page-turbo.runtime.prod.js +1 -1
- package/dist/compiled/next-server/app-page.runtime.dev.js +1 -1
- package/dist/compiled/next-server/app-page.runtime.prod.js +1 -1
- package/dist/compiled/next-server/pages-turbo.runtime.prod.js +1 -1
- package/dist/compiled/next-server/pages.runtime.dev.js +1 -1
- package/dist/compiled/next-server/pages.runtime.prod.js +1 -1
- package/dist/compiled/next-server/server.runtime.prod.js +1 -1
- package/dist/esm/build/index.js +1 -1
- package/dist/esm/build/output/store.js +1 -1
- package/dist/esm/build/spinner.js +2 -2
- package/dist/esm/build/spinner.js.map +1 -1
- package/dist/esm/build/swc/index.js +1 -1
- package/dist/esm/build/webpack-config.js +2 -2
- package/dist/esm/client/app-bootstrap.js +1 -1
- package/dist/esm/client/components/layout-router.js +2 -1
- package/dist/esm/client/components/layout-router.js.map +1 -1
- package/dist/esm/client/components/promise-queue.js +4 -4
- package/dist/esm/client/components/promise-queue.js.map +1 -1
- package/dist/esm/client/components/router-reducer/create-record-from-thenable.js +3 -3
- package/dist/esm/client/components/router-reducer/create-record-from-thenable.js.map +1 -1
- package/dist/esm/client/components/router-reducer/fill-cache-with-data-property.js.map +1 -1
- package/dist/esm/client/components/router-reducer/read-record-value.js +0 -2
- package/dist/esm/client/components/router-reducer/read-record-value.js.map +1 -1
- package/dist/esm/client/components/router-reducer/reducers/navigate-reducer.js +3 -3
- package/dist/esm/client/components/router-reducer/reducers/navigate-reducer.js.map +1 -1
- package/dist/esm/client/components/router-reducer/reducers/server-action-reducer.js +2 -2
- package/dist/esm/client/components/router-reducer/reducers/server-action-reducer.js.map +1 -1
- package/dist/esm/client/components/router-reducer/router-reducer-types.js.map +1 -1
- package/dist/esm/client/index.js +1 -1
- package/dist/esm/lib/eslint/runLintCheck.js +2 -2
- package/dist/esm/lib/eslint/runLintCheck.js.map +1 -1
- package/dist/esm/lib/find-pages-dir.js +2 -10
- package/dist/esm/lib/find-pages-dir.js.map +1 -1
- package/dist/esm/lib/helpers/get-online.js +21 -22
- package/dist/esm/lib/helpers/get-online.js.map +1 -1
- package/dist/esm/lib/turbopack-warning.js +6 -15
- package/dist/esm/lib/turbopack-warning.js.map +1 -1
- package/dist/esm/server/app-render/app-render.js +4 -4
- package/dist/esm/server/app-render/app-render.js.map +1 -1
- package/dist/esm/server/app-render/types.js.map +1 -1
- package/dist/esm/server/dev/hot-reloader-webpack.js +1 -1
- package/dist/esm/server/lib/mock-request.js.map +1 -1
- package/dist/esm/server/lib/start-server.js +1 -1
- package/dist/esm/server/pipe-readable.js +1 -1
- package/dist/esm/server/pipe-readable.js.map +1 -1
- package/dist/esm/server/render-result.js.map +1 -1
- package/dist/esm/server/render.js +3 -3
- package/dist/esm/server/render.js.map +1 -1
- package/dist/esm/shared/lib/app-router-context.shared-runtime.js.map +1 -1
- package/dist/export/helpers/create-incremental-cache.d.ts +2 -0
- package/dist/export/helpers/create-incremental-cache.js +62 -0
- package/dist/export/helpers/create-incremental-cache.js.map +1 -0
- package/dist/export/helpers/get-params.d.ts +7 -0
- package/dist/export/helpers/get-params.js +32 -0
- package/dist/export/helpers/get-params.js.map +1 -0
- package/dist/export/helpers/is-dynamic-usage-error.d.ts +1 -0
- package/dist/export/helpers/is-dynamic-usage-error.js +17 -0
- package/dist/export/helpers/is-dynamic-usage-error.js.map +1 -0
- package/dist/export/index.js +15 -14
- package/dist/export/index.js.map +1 -1
- package/dist/export/routes/app-page.d.ts +6 -0
- package/dist/export/routes/app-page.js +116 -0
- package/dist/export/routes/app-page.js.map +1 -0
- package/dist/export/routes/app-route.d.ts +6 -0
- package/dist/export/routes/app-route.js +103 -0
- package/dist/export/routes/app-route.js.map +1 -0
- package/dist/export/routes/pages.d.ts +6 -0
- package/dist/export/routes/pages.js +148 -0
- package/dist/export/routes/pages.js.map +1 -0
- package/dist/export/types.d.ts +25 -0
- package/dist/export/types.js +6 -0
- package/dist/export/types.js.map +1 -0
- package/dist/export/worker.d.ts +9 -49
- package/dist/export/worker.js +168 -529
- package/dist/export/worker.js.map +1 -1
- package/dist/lib/eslint/runLintCheck.js +1 -1
- package/dist/lib/eslint/runLintCheck.js.map +1 -1
- package/dist/lib/find-pages-dir.d.ts +0 -1
- package/dist/lib/find-pages-dir.js +2 -14
- package/dist/lib/find-pages-dir.js.map +1 -1
- package/dist/lib/helpers/get-online.js +21 -22
- package/dist/lib/helpers/get-online.js.map +1 -1
- package/dist/lib/turbopack-warning.d.ts +1 -2
- package/dist/lib/turbopack-warning.js +6 -15
- package/dist/lib/turbopack-warning.js.map +1 -1
- package/dist/server/app-render/app-render.d.ts +2 -1
- package/dist/server/app-render/app-render.js +4 -4
- package/dist/server/app-render/app-render.js.map +1 -1
- package/dist/server/app-render/types.d.ts +3 -0
- package/dist/server/app-render/types.js.map +1 -1
- package/dist/server/dev/hot-reloader-webpack.js +1 -1
- package/dist/server/lib/mock-request.d.ts +3 -3
- package/dist/server/lib/mock-request.js.map +1 -1
- package/dist/server/lib/start-server.js +1 -1
- package/dist/server/pipe-readable.d.ts +3 -3
- package/dist/server/pipe-readable.js +1 -1
- package/dist/server/pipe-readable.js.map +1 -1
- package/dist/server/render-result.d.ts +2 -2
- package/dist/server/render-result.js.map +1 -1
- package/dist/server/render.d.ts +8 -2
- package/dist/server/render.js +3 -3
- package/dist/server/render.js.map +1 -1
- package/dist/shared/lib/app-router-context.shared-runtime.d.ts +3 -3
- package/dist/shared/lib/app-router-context.shared-runtime.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/index.d.ts +1 -0
- package/package.json +17 -17
package/dist/bin/next
CHANGED
|
@@ -68,7 +68,7 @@ const args = (0, _index.default)({
|
|
|
68
68
|
});
|
|
69
69
|
// Version is inlined into the file using taskr build pipeline
|
|
70
70
|
if (args["--version"]) {
|
|
71
|
-
console.log(`Next.js v${"13.5.
|
|
71
|
+
console.log(`Next.js v${"13.5.3-canary.1"}`);
|
|
72
72
|
process.exit(0);
|
|
73
73
|
}
|
|
74
74
|
// Check if we are running `next <subcommand>` or `next`
|
package/dist/build/index.js
CHANGED
|
@@ -175,7 +175,7 @@ async function build(dir, reactProductionProfiling = false, debugOutput = false,
|
|
|
175
175
|
let hasAppDir = false;
|
|
176
176
|
try {
|
|
177
177
|
const nextBuildSpan = (0, _trace.trace)("next-build", undefined, {
|
|
178
|
-
version: "13.5.
|
|
178
|
+
version: "13.5.3-canary.1"
|
|
179
179
|
});
|
|
180
180
|
_buildcontext.NextBuildContext.nextBuildSpan = nextBuildSpan;
|
|
181
181
|
_buildcontext.NextBuildContext.dir = dir;
|
|
@@ -98,7 +98,7 @@ store.subscribe((state)=>{
|
|
|
98
98
|
if (!loadingLogTimer) {
|
|
99
99
|
// Only log compiling if compiled is not finished in 3 seconds
|
|
100
100
|
loadingLogTimer = setTimeout(()=>{
|
|
101
|
-
_log.wait(`
|
|
101
|
+
_log.wait(`Compiling ${trigger} ...`);
|
|
102
102
|
}, MAX_DURATION);
|
|
103
103
|
}
|
|
104
104
|
}
|
package/dist/build/spinner.js
CHANGED
|
@@ -64,9 +64,9 @@ const dotsSpinner = {
|
|
|
64
64
|
};
|
|
65
65
|
function createSpinner(text, options = {}, logFn = console.log) {
|
|
66
66
|
let spinner;
|
|
67
|
-
const prefixText = ` ${_log.prefixes.info} ${text}`;
|
|
67
|
+
const prefixText = ` ${_log.prefixes.info} ${text} `;
|
|
68
68
|
// Add \r at beginning to reset the current line of loading status text
|
|
69
|
-
const suffixText = `\r ${_log.prefixes.event} ${text}`;
|
|
69
|
+
const suffixText = `\r ${_log.prefixes.event} ${text} `;
|
|
70
70
|
if (process.stdout.isTTY) {
|
|
71
71
|
spinner = (0, _ora.default)({
|
|
72
72
|
text: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/build/spinner.ts"],"names":["createSpinner","dotsSpinner","frames","interval","text","options","logFn","console","log","spinner","prefixText","Log","prefixes","info","suffixText","event","process","stdout","isTTY","ora","undefined","stream","start","origLog","origWarn","warn","origError","error","origStop","stop","bind","origStopAndPersist","stopAndPersist","logHandle","method","args","resetLog"],"mappings":";;;;+BAQA;;;eAAwBA;;;4DARR;6DACK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErB,MAAMC,cAAc;IAClBC,QAAQ;QAAC;QAAK;QAAM;KAAM;IAC1BC,UAAU;AACZ;AAEe,SAASH,cACtBI,IAAY,EACZC,UAAuB,CAAC,CAAC,EACzBC,QAAkCC,QAAQC,GAAG;IAE7C,IAAIC;IAEJ,MAAMC,aAAa,CAAC,CAAC,EAAEC,KAAIC,QAAQ,CAACC,IAAI,CAAC,CAAC,EAAET,KAAK,CAAC;
|
|
1
|
+
{"version":3,"sources":["../../src/build/spinner.ts"],"names":["createSpinner","dotsSpinner","frames","interval","text","options","logFn","console","log","spinner","prefixText","Log","prefixes","info","suffixText","event","process","stdout","isTTY","ora","undefined","stream","start","origLog","origWarn","warn","origError","error","origStop","stop","bind","origStopAndPersist","stopAndPersist","logHandle","method","args","resetLog"],"mappings":";;;;+BAQA;;;eAAwBA;;;4DARR;6DACK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErB,MAAMC,cAAc;IAClBC,QAAQ;QAAC;QAAK;QAAM;KAAM;IAC1BC,UAAU;AACZ;AAEe,SAASH,cACtBI,IAAY,EACZC,UAAuB,CAAC,CAAC,EACzBC,QAAkCC,QAAQC,GAAG;IAE7C,IAAIC;IAEJ,MAAMC,aAAa,CAAC,CAAC,EAAEC,KAAIC,QAAQ,CAACC,IAAI,CAAC,CAAC,EAAET,KAAK,CAAC,CAAC;IACnD,uEAAuE;IACvE,MAAMU,aAAa,CAAC,GAAG,EAAEH,KAAIC,QAAQ,CAACG,KAAK,CAAC,CAAC,EAAEX,KAAK,CAAC,CAAC;IAEtD,IAAIY,QAAQC,MAAM,CAACC,KAAK,EAAE;QACxBT,UAAUU,IAAAA,YAAG,EAAC;YACZf,MAAMgB;YACNV;YACAD,SAASR;YACToB,QAAQL,QAAQC,MAAM;YACtB,GAAGZ,OAAO;QACZ,GAAGiB,KAAK;QAER,2DAA2D;QAC3D,+DAA+D;QAC/D,MAAMC,UAAUhB,QAAQC,GAAG;QAC3B,MAAMgB,WAAWjB,QAAQkB,IAAI;QAC7B,MAAMC,YAAYnB,QAAQoB,KAAK;QAC/B,MAAMC,WAAWnB,QAAQoB,IAAI,CAACC,IAAI,CAACrB;QACnC,MAAMsB,qBAAqBtB,QAAQuB,cAAc,CAACF,IAAI,CAACrB;QAEvD,MAAMwB,YAAY,CAACC,QAAaC;YAC9BP;YACAM,UAAUC;YACV1B,QAASa,KAAK;QAChB;QAEAf,QAAQC,GAAG,GAAG,CAAC,GAAG2B,OAAcF,UAAUV,SAASY;QACnD5B,QAAQkB,IAAI,GAAG,CAAC,GAAGU,OAAcF,UAAUT,UAAUW;QACrD5B,QAAQoB,KAAK,GAAG,CAAC,GAAGQ,OAAcF,UAAUP,WAAWS;QAEvD,MAAMC,WAAW;YACf7B,QAAQC,GAAG,GAAGe;YACdhB,QAAQkB,IAAI,GAAGD;YACfjB,QAAQoB,KAAK,GAAGD;QAClB;QACAjB,QAAQoB,IAAI,GAAG;YACbD;YACAQ;YACA,OAAO3B;QACT;QACAA,QAAQuB,cAAc,GAAG;YACvB,IAAIlB,YAAY;gBACd,IAAIL,SAAS;oBACXA,QAAQL,IAAI,GAAGU;gBACjB,OAAO;oBACLR,MAAMQ;gBACR;YACF;YACAiB;YACAK;YACA,OAAO3B;QACT;IACF,OAAO,IAAIC,cAAcN,MAAM;QAC7BE,MAAMI,aAAaA,aAAa,QAAQN;IAC1C;IAEA,OAAOK;AACT"}
|
package/dist/build/swc/index.js
CHANGED
|
@@ -130,7 +130,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
130
130
|
}
|
|
131
131
|
return newObj;
|
|
132
132
|
}
|
|
133
|
-
const nextVersion = "13.5.
|
|
133
|
+
const nextVersion = "13.5.3-canary.1";
|
|
134
134
|
const ArchName = (0, _os.arch)();
|
|
135
135
|
const PlatformName = (0, _os.platform)();
|
|
136
136
|
const infoLog = (...args)=>{
|
|
@@ -1981,7 +1981,7 @@ async function getBaseWebpackConfig(dir, { buildId, config, compilerType, dev =
|
|
|
1981
1981
|
new _wellknownerrorsplugin.WellKnownErrorsPlugin(),
|
|
1982
1982
|
isClient && new _copyfileplugin.CopyFilePlugin({
|
|
1983
1983
|
filePath: require.resolve("./polyfills/polyfill-nomodule"),
|
|
1984
|
-
cacheKey: "13.5.
|
|
1984
|
+
cacheKey: "13.5.3-canary.1",
|
|
1985
1985
|
name: `static/chunks/polyfills${dev ? "" : "-[hash]"}.js`,
|
|
1986
1986
|
minimize: false,
|
|
1987
1987
|
info: {
|
|
@@ -2206,7 +2206,7 @@ async function getBaseWebpackConfig(dir, { buildId, config, compilerType, dev =
|
|
|
2206
2206
|
// Includes:
|
|
2207
2207
|
// - Next.js version
|
|
2208
2208
|
// - next.config.js keys that affect compilation
|
|
2209
|
-
version: `${"13.5.
|
|
2209
|
+
version: `${"13.5.3-canary.1"}|${configVars}`,
|
|
2210
2210
|
cacheDirectory: _path.default.join(distDir, "cache", "webpack"),
|
|
2211
2211
|
// For production builds, it's more efficient to compress all cache files together instead of compression each one individually.
|
|
2212
2212
|
// So we disable compression here and allow the build runner to take care of compressing the cache as a whole.
|
package/dist/cli/next-dev.js
CHANGED
package/dist/cli/next-dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/cli/next-dev.ts"],"names":["nextDev","dir","child","config","isTurboSession","traceUploadUrl","sessionStopHandled","sessionStarted","Date","now","handleSessionStop","signal","kill","eventCliSessionStopped","require","loadConfig","PHASE_DEVELOPMENT_SERVER","telemetry","traceGlobals","get","Telemetry","distDir","path","join","pagesDir","appDir","pagesResult","findPagesDir","record","cliCommand","turboFlag","durationMilliseconds","flushDetached","_","uploadTrace","mode","projectDir","process","stdout","write","exit","on","args","console","log","getProjectDir","env","NEXT_PRIVATE_DEV_DIR","fileExists","FileType","Directory","printAndExit","preflight","skipOnReboot","getPackageVersion","getDependencies","Promise","resolve","sassVersion","nodeSassVersion","all","cwd","name","Log","warn","dependencies","devDependencies","command","getNpxCommand","port","getPort","isPortIsReserved","getReservedPortExplanation","allowRetry","undefined","PORT","host","loadedEnvFiles","loadEnvConfig","expFeatureInfo","onLoadUserConfig","userConfig","userNextConfigExperimental","getEnabledExperimentalFeatures","experimental","sort","a","b","length","__NEXT_PRIVATE_PREBUNDLED_REACT","needsExperimentalReact","envInfo","map","f","isExperimentalTestProxy","devServerOptions","isDev","hostname","TURBOPACK","validateTurboNextConfig","
|
|
1
|
+
{"version":3,"sources":["../../src/cli/next-dev.ts"],"names":["nextDev","dir","child","config","isTurboSession","traceUploadUrl","sessionStopHandled","sessionStarted","Date","now","handleSessionStop","signal","kill","eventCliSessionStopped","require","loadConfig","PHASE_DEVELOPMENT_SERVER","telemetry","traceGlobals","get","Telemetry","distDir","path","join","pagesDir","appDir","pagesResult","findPagesDir","record","cliCommand","turboFlag","durationMilliseconds","flushDetached","_","uploadTrace","mode","projectDir","process","stdout","write","exit","on","args","console","log","getProjectDir","env","NEXT_PRIVATE_DEV_DIR","fileExists","FileType","Directory","printAndExit","preflight","skipOnReboot","getPackageVersion","getDependencies","Promise","resolve","sassVersion","nodeSassVersion","all","cwd","name","Log","warn","dependencies","devDependencies","command","getNpxCommand","port","getPort","isPortIsReserved","getReservedPortExplanation","allowRetry","undefined","PORT","host","loadedEnvFiles","loadEnvConfig","expFeatureInfo","onLoadUserConfig","userConfig","userNextConfigExperimental","getEnabledExperimentalFeatures","experimental","sort","a","b","length","__NEXT_PRIVATE_PREBUNDLED_REACT","needsExperimentalReact","envInfo","map","f","isExperimentalTestProxy","devServerOptions","isDev","hostname","TURBOPACK","validateTurboNextConfig","setGlobal","startServerPath","startServer","options","resolved","fork","stdio","initialEnv","NEXT_PRIVATE_WORKER","msg","nextWorkerReady","send","nextWorkerOptions","nextServerReady","code","RESTART_EXIT_CODE","runDevServer","reboot","certificate","key","cert","createSelfSignedCertificate","selfSignedCertificate","err","error","trace","traceAsyncFn","cleanup"],"mappings":"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"}
|
package/dist/cli/next-info.js
CHANGED
|
@@ -48,17 +48,17 @@ async function getNextConfig() {
|
|
|
48
48
|
}
|
|
49
49
|
function printHelp() {
|
|
50
50
|
console.log(`
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
Description
|
|
52
|
+
Prints relevant details about the current system which can be used to report Next.js bugs
|
|
53
53
|
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
Usage
|
|
55
|
+
$ next info
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
Options
|
|
58
|
+
--help, -h Displays this message
|
|
59
|
+
--verbose Collect additional information for debugging
|
|
60
60
|
|
|
61
|
-
|
|
61
|
+
Learn more: ${_chalk.default.cyan("https://nextjs.org/docs/api-reference/cli#info")}`);
|
|
62
62
|
}
|
|
63
63
|
/**
|
|
64
64
|
* Collect basic next.js installation information and print it to stdout.
|
|
@@ -66,23 +66,23 @@ function printHelp() {
|
|
|
66
66
|
const installedRelease = getPackageVersion("next");
|
|
67
67
|
const nextConfig = await getNextConfig();
|
|
68
68
|
console.log(`
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
69
|
+
Operating System:
|
|
70
|
+
Platform: ${_os.default.platform()}
|
|
71
|
+
Arch: ${_os.default.arch()}
|
|
72
|
+
Version: ${_os.default.version()}
|
|
73
|
+
Binaries:
|
|
74
|
+
Node: ${process.versions.node}
|
|
75
|
+
npm: ${getBinaryVersion("npm")}
|
|
76
|
+
Yarn: ${getBinaryVersion("yarn")}
|
|
77
|
+
pnpm: ${getBinaryVersion("pnpm")}
|
|
78
|
+
Relevant Packages:
|
|
79
|
+
next: ${installedRelease}
|
|
80
|
+
eslint-config-next: ${getPackageVersion("eslint-config-next")}
|
|
81
|
+
react: ${getPackageVersion("react")}
|
|
82
|
+
react-dom: ${getPackageVersion("react-dom")}
|
|
83
|
+
typescript: ${getPackageVersion("typescript")}
|
|
84
|
+
Next.js Config:
|
|
85
|
+
output: ${nextConfig.output}
|
|
86
86
|
|
|
87
87
|
`);
|
|
88
88
|
try {
|
|
@@ -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","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","undefined","taskScript","taskResult"],"mappings":";;;;;+BA+kBSA;;;eAAAA;;;2DA7kBM;sEACU;8DAEP;2BAKS;+DACJ;;;;;;AALvB,MAAM,EAAEC,KAAK,EAAE,GAAGC,QAAQ;AAO1B,MAAMC,MAAMC,QAAQC,GAAG;AAsCvB,SAASC,kBAAkBC,WAAmB;IAC5C,IAAI;QACF,OAAOL,QAAQ,CAAC,EAAEK,YAAY,aAAa,CAAC,EAAEC,OAAO;IACvD,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,eAAeC;IACb,MAAMC,SAAS,MAAMC,IAAAA,eAAU,EAACC,qBAAU,EAAET;IAE5C,OAAO;QACLU,QAAQH,OAAOG,MAAM,IAAI;IAC3B;AACF;AAEA;;;CAGC,GACD,SAASC,iBAAiBC,UAAkB;IAC1C,IAAI;QACF,OAAOC,sBAAY,CAChBC,YAAY,CAACF,YAAY;YAAC;SAAY,EACtCG,QAAQ,GACRC,IAAI;IACT,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,SAASC;IACPC,QAAQC,GAAG,CACT,CAAC;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/cli/next-info.ts"],"names":["nextInfo","fetch","require","dir","process","cwd","getPackageVersion","packageName","version","getNextConfig","config","loadConfig","PHASE_INFO","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","undefined","taskScript","taskResult"],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ const _redirectboundary = require("./redirect-boundary");
|
|
|
27
27
|
const _notfoundboundary = require("./not-found-boundary");
|
|
28
28
|
const _getsegmentvalue = require("./router-reducer/reducers/get-segment-value");
|
|
29
29
|
const _createroutercachekey = require("./router-reducer/create-router-cache-key");
|
|
30
|
+
const _createrecordfromthenable = require("./router-reducer/create-record-from-thenable");
|
|
30
31
|
/**
|
|
31
32
|
* Add refetch marker to router state at the point of the current layout segment.
|
|
32
33
|
* This ensures the response returned is not further down than the current layout segment.
|
|
@@ -285,7 +286,7 @@ function ScrollAndFocusHandler(param) {
|
|
|
285
286
|
], fullTree);
|
|
286
287
|
childNode = {
|
|
287
288
|
status: _approutercontextsharedruntime.CacheStates.DATA_FETCH,
|
|
288
|
-
data: (0, _fetchserverresponse.fetchServerResponse)(new URL(url, location.origin), refetchTree, context.nextUrl, buildId),
|
|
289
|
+
data: (0, _createrecordfromthenable.createRecordFromThenable)((0, _fetchserverresponse.fetchServerResponse)(new URL(url, location.origin), refetchTree, context.nextUrl, buildId)),
|
|
289
290
|
subTreeData: null,
|
|
290
291
|
head: childNode && childNode.status === _approutercontextsharedruntime.CacheStates.LAZY_INITIALIZED ? childNode.head : undefined,
|
|
291
292
|
parallelRoutes: childNode && childNode.status === _approutercontextsharedruntime.CacheStates.LAZY_INITIALIZED ? childNode.parallelRoutes : new Map()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/client/components/layout-router.tsx"],"names":["OuterLayoutRouter","walkAddRefetch","segmentPathToWalk","treeToRecreate","segment","parallelRouteKey","isLast","length","matchSegment","hasOwnProperty","subTree","undefined","slice","findDOMNode","instance","window","process","env","NODE_ENV","originalConsoleError","console","error","messages","includes","ReactDOM","rectProperties","shouldSkipElement","element","getComputedStyle","position","warn","rect","getBoundingClientRect","every","item","topOfElementInViewport","viewportHeight","top","getHashFragmentDomNode","hashFragment","document","body","getElementById","getElementsByName","InnerScrollAndFocusHandler","React","Component","componentDidMount","handlePotentialScroll","componentDidUpdate","props","focusAndScrollRef","apply","render","children","segmentPath","segmentPaths","some","scrollRefSegmentPath","index","domNode","Element","HTMLElement","nextElementSibling","handleSmoothScroll","scrollIntoView","htmlElement","documentElement","clientHeight","scrollTop","dontForceLayout","onlyHashChange","focus","ScrollAndFocusHandler","context","useContext","GlobalLayoutRouterContext","Error","InnerLayoutRouter","parallelRouterKey","url","childNodes","childProp","tree","cacheKey","buildId","changeByServerResponse","fullTree","childNode","get","current","status","CacheStates","READY","data","subTreeData","parallelRoutes","Map","set","LAZY_INITIALIZED","refetchTree","DATA_FETCH","fetchServerResponse","URL","location","origin","nextUrl","head","flightData","overrideCanonicalUrl","use","setTimeout","startTransition","createInfinitePromise","subtree","LayoutRouterContext","Provider","value","LoadingBoundary","loading","loadingStyles","hasLoading","Suspense","fallback","errorStyles","templateStyles","template","notFound","notFoundStyles","styles","childNodesForParallelRouter","treeSegment","childPropSegment","currentChildSegmentValue","getSegmentValue","preservedSegments","map","preservedSegment","isChildPropSegment","preservedSegmentValue","createRouterCacheKey","TemplateContext","key","ErrorBoundary","errorComponent","NotFoundBoundary","RedirectBoundary","isActive"],"mappings":"AAAA;;;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/client/components/layout-router.tsx"],"names":["OuterLayoutRouter","walkAddRefetch","segmentPathToWalk","treeToRecreate","segment","parallelRouteKey","isLast","length","matchSegment","hasOwnProperty","subTree","undefined","slice","findDOMNode","instance","window","process","env","NODE_ENV","originalConsoleError","console","error","messages","includes","ReactDOM","rectProperties","shouldSkipElement","element","getComputedStyle","position","warn","rect","getBoundingClientRect","every","item","topOfElementInViewport","viewportHeight","top","getHashFragmentDomNode","hashFragment","document","body","getElementById","getElementsByName","InnerScrollAndFocusHandler","React","Component","componentDidMount","handlePotentialScroll","componentDidUpdate","props","focusAndScrollRef","apply","render","children","segmentPath","segmentPaths","some","scrollRefSegmentPath","index","domNode","Element","HTMLElement","nextElementSibling","handleSmoothScroll","scrollIntoView","htmlElement","documentElement","clientHeight","scrollTop","dontForceLayout","onlyHashChange","focus","ScrollAndFocusHandler","context","useContext","GlobalLayoutRouterContext","Error","InnerLayoutRouter","parallelRouterKey","url","childNodes","childProp","tree","cacheKey","buildId","changeByServerResponse","fullTree","childNode","get","current","status","CacheStates","READY","data","subTreeData","parallelRoutes","Map","set","LAZY_INITIALIZED","refetchTree","DATA_FETCH","createRecordFromThenable","fetchServerResponse","URL","location","origin","nextUrl","head","flightData","overrideCanonicalUrl","use","setTimeout","startTransition","createInfinitePromise","subtree","LayoutRouterContext","Provider","value","LoadingBoundary","loading","loadingStyles","hasLoading","Suspense","fallback","errorStyles","templateStyles","template","notFound","notFoundStyles","styles","childNodesForParallelRouter","treeSegment","childPropSegment","currentChildSegmentValue","getSegmentValue","preservedSegments","map","preservedSegment","isChildPropSegment","preservedSegmentValue","createRouterCacheKey","TemplateContext","key","ErrorBoundary","errorComponent","NotFoundBoundary","RedirectBoundary","isActive"],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import type { ThenableRecord } from './router-reducer/router-reducer-types';
|
|
1
2
|
export declare class PromiseQueue {
|
|
2
3
|
#private;
|
|
3
4
|
constructor(maxConcurrency?: number);
|
|
4
5
|
enqueue<T>(promiseFn: () => Promise<T>): Promise<T>;
|
|
5
|
-
bump(promiseFn: Promise<any>): void;
|
|
6
|
+
bump(promiseFn: ThenableRecord<any> | Promise<any>): void;
|
|
6
7
|
}
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
This is a simple promise queue that allows you to limit the number of concurrent promises
|
|
3
|
-
that are running at any given time. It's used to limit the number of concurrent
|
|
4
|
-
prefetch requests that are being made to the server but could be used for other
|
|
5
|
-
things as well.
|
|
6
|
-
*/ "use strict";
|
|
1
|
+
"use strict";
|
|
7
2
|
Object.defineProperty(exports, "__esModule", {
|
|
8
3
|
value: true
|
|
9
4
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/client/components/promise-queue.ts"],"names":["PromiseQueue","enqueue","promiseFn","taskResolve","taskReject","taskPromise","Promise","resolve","reject","task","runningCount","result","error","processNext","enqueueResult","queue","push","bump","index","findIndex","item","bumpedItem","splice","unshift","constructor","maxConcurrency","forced","length","shift"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/client/components/promise-queue.ts"],"names":["PromiseQueue","enqueue","promiseFn","taskResolve","taskReject","taskPromise","Promise","resolve","reject","task","runningCount","result","error","processNext","enqueueResult","queue","push","bump","index","findIndex","item","bumpedItem","splice","unshift","constructor","maxConcurrency","forced","length","shift"],"mappings":";;;;+BAQaA;;;eAAAA;;;;;IACX,qFACA,iFACA,mEAmDA;AAtDK,MAAMA;IAcXC,QAAWC,SAA2B,EAAc;QAClD,IAAIC;QACJ,IAAIC;QAEJ,MAAMC,cAAc,IAAIC,QAAQ,CAACC,SAASC;YACxCL,cAAcI;YACdH,aAAaI;QACf;QAEA,MAAMC,OAAO;YACX,IAAI;gBACF,kCAAA,IAAI,EAAEC,eAAAA;gBACN,MAAMC,SAAS,MAAMT;gBACrBC,YAAYQ;YACd,EAAE,OAAOC,OAAO;gBACdR,WAAWQ;YACb,SAAU;gBACR,kCAAA,IAAI,EAAEF,eAAAA;gBACN,kCAAA,IAAI,EAAEG,cAAAA;YACR;QACF;QAEA,MAAMC,gBAAgB;YAAEZ,WAAWG;YAAaI;QAAK;QACrD,gDAAgD;QAChD,kCAAA,IAAI,EAAEM,QAAAA,QAAMC,IAAI,CAACF;QACjB,kCAAA,IAAI,EAAED,cAAAA;QAEN,OAAOR;IACT;IAEAY,KAAKf,SAA6C,EAAE;QAClD,MAAMgB,QAAQ,kCAAA,IAAI,EAAEH,QAAAA,QAAMI,SAAS,CAAC,CAACC,OAASA,KAAKlB,SAAS,KAAKA;QAEjE,IAAIgB,QAAQ,CAAC,GAAG;YACd,MAAMG,aAAa,kCAAA,IAAI,EAAEN,QAAAA,QAAMO,MAAM,CAACJ,OAAO,EAAE,CAAC,EAAE;YAClD,kCAAA,IAAI,EAAEH,QAAAA,QAAMQ,OAAO,CAACF;YACpB,kCAAA,IAAI,EAAER,cAAAA,cAAY;QACpB;IACF;IA5CAW,YAAYC,iBAAiB,CAAC,CAAE;QA8ChC,4BAAA;mBAAA;;QArDA,4BAAA;;mBAAA,KAAA;;QACA,4BAAA;;mBAAA,KAAA;;QACA,4BAAA;;mBAAA,KAAA;;QAME,kCAAA,IAAI,EAAEA,iBAAAA,mBAAiBA;QACvB,kCAAA,IAAI,EAAEf,eAAAA,iBAAe;QACrB,kCAAA,IAAI,EAAEK,QAAAA,UAAQ,EAAE;IAClB;AAkDF;AARE,SAAA,YAAaW,MAAc;IAAdA,IAAAA,mBAAAA,SAAS;IACpB,IACE,AAAC,CAAA,kCAAA,IAAI,EAAEhB,eAAAA,iBAAe,kCAAA,IAAI,EAAEe,iBAAAA,oBAAkBC,MAAK,KACnD,kCAAA,IAAI,EAAEX,QAAAA,QAAMY,MAAM,GAAG,GACrB;YACA;SAAA,+CAAA,kCAAA,IAAI,EAAEZ,QAAAA,QAAMa,KAAK,uBAAjB,6CAAqBnB,IAAI;IAC3B;AACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import { ThenableRecord } from './router-reducer-types';
|
|
1
2
|
/**
|
|
2
3
|
* Create data fetching record for Promise.
|
|
3
4
|
*/
|
|
4
|
-
export declare function createRecordFromThenable(
|
|
5
|
+
export declare function createRecordFromThenable<T>(promise: PromiseLike<T>): ThenableRecord<T>;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Create data fetching record for Promise.
|
|
3
|
-
*/ // TODO-APP: change `any` to type inference.
|
|
4
1
|
"use strict";
|
|
5
2
|
Object.defineProperty(exports, "__esModule", {
|
|
6
3
|
value: true
|
|
@@ -11,7 +8,8 @@ Object.defineProperty(exports, "createRecordFromThenable", {
|
|
|
11
8
|
return createRecordFromThenable;
|
|
12
9
|
}
|
|
13
10
|
});
|
|
14
|
-
function createRecordFromThenable(
|
|
11
|
+
function createRecordFromThenable(promise) {
|
|
12
|
+
const thenable = promise;
|
|
15
13
|
thenable.status = "pending";
|
|
16
14
|
thenable.then((value)=>{
|
|
17
15
|
if (thenable.status === "pending") {
|
|
@@ -21,7 +19,7 @@ function createRecordFromThenable(thenable) {
|
|
|
21
19
|
}, (err)=>{
|
|
22
20
|
if (thenable.status === "pending") {
|
|
23
21
|
thenable.status = "rejected";
|
|
24
|
-
thenable.
|
|
22
|
+
thenable.reason = err;
|
|
25
23
|
}
|
|
26
24
|
});
|
|
27
25
|
return thenable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/client/components/router-reducer/create-record-from-thenable.ts"],"names":["createRecordFromThenable","thenable","status","then","value","err"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../../src/client/components/router-reducer/create-record-from-thenable.ts"],"names":["createRecordFromThenable","promise","thenable","status","then","value","err","reason"],"mappings":";;;;+BAMgBA;;;eAAAA;;;AAAT,SAASA,yBACdC,OAAuB;IAEvB,MAAMC,WAAWD;IACjBC,SAASC,MAAM,GAAG;IAClBD,SAASE,IAAI,CACX,CAACC;QACC,IAAIH,SAASC,MAAM,KAAK,WAAW;YACjCD,SAASC,MAAM,GAAG;YAClBD,SAASG,KAAK,GAAGA;QACnB;IACF,GACA,CAACC;QACC,IAAIJ,SAASC,MAAM,KAAK,WAAW;YACjCD,SAASC,MAAM,GAAG;YAClBD,SAASK,MAAM,GAAGD;QACpB;IACF;IAEF,OAAOJ;AACT"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { FlightRouterState, FlightData } from '../../../server/app-render/types';
|
|
2
2
|
import { PrefetchKind } from './router-reducer-types';
|
|
3
|
-
type FetchServerResponseResult = [
|
|
3
|
+
export type FetchServerResponseResult = [
|
|
4
4
|
flightData: FlightData,
|
|
5
5
|
canonicalUrlOverride: URL | undefined
|
|
6
6
|
];
|
|
@@ -8,4 +8,3 @@ type FetchServerResponseResult = [
|
|
|
8
8
|
* Fetch the flight data for the provided url. Takes in the current router state to decide what to render server-side.
|
|
9
9
|
*/
|
|
10
10
|
export declare function fetchServerResponse(url: URL, flightRouterState: FlightRouterState, nextUrl: string | null, currentBuildId: string, prefetchKind?: PrefetchKind): Promise<FetchServerResponseResult>;
|
|
11
|
-
export {};
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import type { FetchServerResponseResult } from './fetch-server-response';
|
|
2
|
+
import type { ThenableRecord } from './router-reducer-types';
|
|
1
3
|
import { FlightSegmentPath } from '../../../server/app-render/types';
|
|
2
4
|
import { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime';
|
|
3
|
-
import { fetchServerResponse } from './fetch-server-response';
|
|
4
5
|
/**
|
|
5
6
|
* Kick off fetch based on the common layout between two routes. Fill cache with data property holding the in-progress fetch.
|
|
6
7
|
*/
|
|
7
|
-
export declare function fillCacheWithDataProperty(newCache: CacheNode, existingCache: CacheNode, flightSegmentPath: FlightSegmentPath, fetchResponse: () =>
|
|
8
|
+
export declare function fillCacheWithDataProperty(newCache: CacheNode, existingCache: CacheNode, flightSegmentPath: FlightSegmentPath, fetchResponse: () => ThenableRecord<FetchServerResponseResult>, bailOnParallelRoutes?: boolean): {
|
|
8
9
|
bailOptimistic: boolean;
|
|
9
10
|
} | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/client/components/router-reducer/fill-cache-with-data-property.ts"],"names":["fillCacheWithDataProperty","newCache","existingCache","flightSegmentPath","fetchResponse","bailOnParallelRoutes","isLastEntry","length","parallelRouteKey","segment","cacheKey","createRouterCacheKey","existingChildSegmentMap","parallelRoutes","get","size","bailOptimistic","childSegmentMap","Map","set","existingChildCacheNode","childCacheNode","data","status","CacheStates","DATA_FETCH","subTreeData","slice"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../../src/client/components/router-reducer/fill-cache-with-data-property.ts"],"names":["fillCacheWithDataProperty","newCache","existingCache","flightSegmentPath","fetchResponse","bailOnParallelRoutes","isLastEntry","length","parallelRouteKey","segment","cacheKey","createRouterCacheKey","existingChildSegmentMap","parallelRoutes","get","size","bailOptimistic","childSegmentMap","Map","set","existingChildCacheNode","childCacheNode","data","status","CacheStates","DATA_FETCH","subTreeData","slice"],"mappings":";;;;+BAYgBA;;;eAAAA;;;+CANT;sCAC8B;AAK9B,SAASA,0BACdC,QAAmB,EACnBC,aAAwB,EACxBC,iBAAoC,EACpCC,aAA8D,EAC9DC,oBAAqC;IAArCA,IAAAA,iCAAAA,uBAAgC;IAEhC,MAAMC,cAAcH,kBAAkBI,MAAM,IAAI;IAEhD,MAAM,CAACC,kBAAkBC,QAAQ,GAAGN;IACpC,MAAMO,WAAWC,IAAAA,0CAAoB,EAACF;IAEtC,MAAMG,0BACJV,cAAcW,cAAc,CAACC,GAAG,CAACN;IAEnC,IACE,CAACI,2BACAP,wBAAwBH,cAAcW,cAAc,CAACE,IAAI,GAAG,GAC7D;QACA,6EAA6E;QAC7E,qDAAqD;QACrD,sEAAsE;QACtE,OAAO;YAAEC,gBAAgB;QAAK;IAChC;IAEA,IAAIC,kBAAkBhB,SAASY,cAAc,CAACC,GAAG,CAACN;IAElD,IAAI,CAACS,mBAAmBA,oBAAoBL,yBAAyB;QACnEK,kBAAkB,IAAIC,IAAIN;QAC1BX,SAASY,cAAc,CAACM,GAAG,CAACX,kBAAkBS;IAChD;IAEA,MAAMG,yBAAyBR,wBAAwBE,GAAG,CAACJ;IAC3D,IAAIW,iBAAiBJ,gBAAgBH,GAAG,CAACJ;IAEzC,yFAAyF;IACzF,IAAIJ,aAAa;QACf,IACE,CAACe,kBACD,CAACA,eAAeC,IAAI,IACpBD,mBAAmBD,wBACnB;YACAH,gBAAgBE,GAAG,CAACT,UAAU;gBAC5Ba,QAAQC,0CAAW,CAACC,UAAU;gBAC9BH,MAAMlB;gBACNsB,aAAa;gBACbb,gBAAgB,IAAIK;YACtB;QACF;QACA;IACF;IAEA,IAAI,CAACG,kBAAkB,CAACD,wBAAwB;QAC9C,+EAA+E;QAC/E,IAAI,CAACC,gBAAgB;YACnBJ,gBAAgBE,GAAG,CAACT,UAAU;gBAC5Ba,QAAQC,0CAAW,CAACC,UAAU;gBAC9BH,MAAMlB;gBACNsB,aAAa;gBACbb,gBAAgB,IAAIK;YACtB;QACF;QACA;IACF;IAEA,IAAIG,mBAAmBD,wBAAwB;QAC7CC,iBAAiB;YACfE,QAAQF,eAAeE,MAAM;YAC7BD,MAAMD,eAAeC,IAAI;YACzBI,aAAaL,eAAeK,WAAW;YACvCb,gBAAgB,IAAIK,IAAIG,eAAeR,cAAc;QACvD;QACAI,gBAAgBE,GAAG,CAACT,UAAUW;IAChC;IAEA,OAAOrB,0BACLqB,gBACAD,wBACAjB,kBAAkBwB,KAAK,CAAC,IACxBvB;AAEJ"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import type { ThenableRecord } from './router-reducer-types';
|
|
1
2
|
/**
|
|
2
3
|
* Read record value or throw Promise if it's not resolved yet.
|
|
3
4
|
*/
|
|
4
|
-
export declare function readRecordValue<T>(thenable:
|
|
5
|
+
export declare function readRecordValue<T>(thenable: ThenableRecord<T>): T;
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
* Read record value or throw Promise if it's not resolved yet.
|
|
3
|
-
*/ "use strict";
|
|
1
|
+
"use strict";
|
|
4
2
|
Object.defineProperty(exports, "__esModule", {
|
|
5
3
|
value: true
|
|
6
4
|
});
|
|
@@ -11,9 +9,7 @@ Object.defineProperty(exports, "readRecordValue", {
|
|
|
11
9
|
}
|
|
12
10
|
});
|
|
13
11
|
function readRecordValue(thenable) {
|
|
14
|
-
// @ts-expect-error TODO: fix type
|
|
15
12
|
if (thenable.status === "fulfilled") {
|
|
16
|
-
// @ts-expect-error TODO: fix type
|
|
17
13
|
return thenable.value;
|
|
18
14
|
} else {
|
|
19
15
|
throw thenable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/client/components/router-reducer/read-record-value.ts"],"names":["readRecordValue","thenable","status","value"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../../src/client/components/router-reducer/read-record-value.ts"],"names":["readRecordValue","thenable","status","value"],"mappings":";;;;+BAKgBA;;;eAAAA;;;AAAT,SAASA,gBAAmBC,QAA2B;IAC5D,IAAIA,SAASC,MAAM,KAAK,aAAa;QACnC,OAAOD,SAASE,KAAK;IACvB,OAAO;QACL,MAAMF;IACR;AACF"}
|
|
@@ -122,7 +122,7 @@ function navigateReducer(state, action) {
|
|
|
122
122
|
temporaryCacheNode.status = _approutercontextsharedruntime.CacheStates.READY;
|
|
123
123
|
temporaryCacheNode.subTreeData = state.cache.subTreeData;
|
|
124
124
|
temporaryCacheNode.parallelRoutes = new Map(state.cache.parallelRoutes);
|
|
125
|
-
let data;
|
|
125
|
+
let data = null;
|
|
126
126
|
const fetchResponse = ()=>{
|
|
127
127
|
if (!data) {
|
|
128
128
|
data = (0, _createrecordfromthenable.createRecordFromThenable)((0, _fetchserverresponse.fetchServerResponse)(url, optimisticTree, state.nextUrl, state.buildId));
|
|
@@ -149,7 +149,7 @@ function navigateReducer(state, action) {
|
|
|
149
149
|
mutable.cache = temporaryCacheNode;
|
|
150
150
|
mutable.canonicalUrl = href;
|
|
151
151
|
state.prefetchCache.set((0, _createhreffromurl.createHrefFromUrl)(url, false), {
|
|
152
|
-
data: (0, _createrecordfromthenable.createRecordFromThenable)(Promise.resolve(data)),
|
|
152
|
+
data: data ? (0, _createrecordfromthenable.createRecordFromThenable)(Promise.resolve(data)) : null,
|
|
153
153
|
// this will make sure that the entry will be discarded after 30s
|
|
154
154
|
kind: _routerreducertypes.PrefetchKind.TEMPORARY,
|
|
155
155
|
prefetchTime: Date.now(),
|
|
@@ -218,7 +218,7 @@ function navigateReducer(state, action) {
|
|
|
218
218
|
let applied = (0, _applyflightdata.applyFlightData)(currentCache, cache, flightDataPath, prefetchValues.kind === "auto" && prefetchEntryCacheStatus === _getprefetchcacheentrystatus.PrefetchCacheEntryStatus.reusable);
|
|
219
219
|
if (!applied && prefetchEntryCacheStatus === _getprefetchcacheentrystatus.PrefetchCacheEntryStatus.stale) {
|
|
220
220
|
applied = addRefetchToLeafSegments(cache, currentCache, flightSegmentPath, treePatch, // eslint-disable-next-line no-loop-func
|
|
221
|
-
()=>(0, _fetchserverresponse.fetchServerResponse)(url, currentTree, state.nextUrl, state.buildId));
|
|
221
|
+
()=>(0, _createrecordfromthenable.createRecordFromThenable)((0, _fetchserverresponse.fetchServerResponse)(url, currentTree, state.nextUrl, state.buildId)));
|
|
222
222
|
}
|
|
223
223
|
const hardNavigate = (0, _shouldhardnavigate.shouldHardNavigate)(// TODO-APP: remove ''
|
|
224
224
|
flightSegmentPathWithLeadingEmpty, currentTree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/client/components/router-reducer/reducers/navigate-reducer.ts"],"names":["handleExternalUrl","navigateReducer","state","mutable","url","pendingPush","previousTree","tree","mpaNavigation","canonicalUrl","scrollableSegments","undefined","handleMutable","generateSegmentsFromPatch","flightRouterPatch","segments","segment","parallelRoutes","Object","keys","length","parallelRouteKey","parallelRoute","entries","childSegment","push","addRefetchToLeafSegments","newCache","currentCache","flightSegmentPath","treePatch","data","appliedPatch","status","CacheStates","READY","subTreeData","Map","segmentPathsToFill","map","segmentPaths","res","fillCacheWithDataProperty","bailOptimistic","action","isExternalUrl","navigateType","cache","forceOptimisticNavigation","shouldScroll","pathname","hash","href","createHrefFromUrl","prunePrefetchCache","prefetchCache","isForCurrentTree","JSON","stringify","toString","prefetchValues","get","kind","PrefetchKind","TEMPORARY","split","optimisticTree","createOptimisticTree","temporaryCacheNode","fetchResponse","createRecordFromThenable","fetchServerResponse","nextUrl","buildId","optimisticFlightSegmentPath","slice","flat","patchedTree","hashFragment","set","Promise","resolve","prefetchTime","Date","now","treeAtTimeOfPrefetch","lastUsedTime","process","env","NODE_ENV","AUTO","newPrefetchValue","prefetchEntryCacheStatus","getPrefetchEntryCacheStatus","prefetchQueue","bump","flightData","canonicalUrlOverride","readRecordValue","currentTree","flightDataPath","flightSegmentPathWithLeadingEmpty","newTree","applyRouterStatePatchToTree","isNavigatingToNewRootLayout","applied","applyFlightData","PrefetchCacheEntryStatus","reusable","stale","hardNavigate","shouldHardNavigate","invalidateCacheBelowFlightSegmentPath","subSegment","scrollableSegmentPath"],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../../../src/client/components/router-reducer/reducers/navigate-reducer.ts"],"names":["handleExternalUrl","navigateReducer","state","mutable","url","pendingPush","previousTree","tree","mpaNavigation","canonicalUrl","scrollableSegments","undefined","handleMutable","generateSegmentsFromPatch","flightRouterPatch","segments","segment","parallelRoutes","Object","keys","length","parallelRouteKey","parallelRoute","entries","childSegment","push","addRefetchToLeafSegments","newCache","currentCache","flightSegmentPath","treePatch","data","appliedPatch","status","CacheStates","READY","subTreeData","Map","segmentPathsToFill","map","segmentPaths","res","fillCacheWithDataProperty","bailOptimistic","action","isExternalUrl","navigateType","cache","forceOptimisticNavigation","shouldScroll","pathname","hash","href","createHrefFromUrl","prunePrefetchCache","prefetchCache","isForCurrentTree","JSON","stringify","toString","prefetchValues","get","kind","PrefetchKind","TEMPORARY","split","optimisticTree","createOptimisticTree","temporaryCacheNode","fetchResponse","createRecordFromThenable","fetchServerResponse","nextUrl","buildId","optimisticFlightSegmentPath","slice","flat","patchedTree","hashFragment","set","Promise","resolve","prefetchTime","Date","now","treeAtTimeOfPrefetch","lastUsedTime","process","env","NODE_ENV","AUTO","newPrefetchValue","prefetchEntryCacheStatus","getPrefetchEntryCacheStatus","prefetchQueue","bump","flightData","canonicalUrlOverride","readRecordValue","currentTree","flightDataPath","flightSegmentPathWithLeadingEmpty","newTree","applyRouterStatePatchToTree","isNavigatingToNewRootLayout","applied","applyFlightData","PrefetchCacheEntryStatus","reusable","stale","hardNavigate","shouldHardNavigate","invalidateCacheBelowFlightSegmentPath","subSegment","scrollableSegmentPath"],"mappings":"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"}
|
|
@@ -109,7 +109,7 @@ function serverActionReducer(state, action) {
|
|
|
109
109
|
mutable.globalMutable.pendingNavigatePath = undefined;
|
|
110
110
|
mutable.globalMutable.refresh();
|
|
111
111
|
mutable.actionResultResolved = true;
|
|
112
|
-
});
|
|
112
|
+
}, ()=>{});
|
|
113
113
|
return state;
|
|
114
114
|
}
|
|
115
115
|
} else {
|
|
@@ -190,7 +190,7 @@ function serverActionReducer(state, action) {
|
|
|
190
190
|
} catch (e) {
|
|
191
191
|
if (e.status === "rejected") {
|
|
192
192
|
if (!mutable.actionResultResolved) {
|
|
193
|
-
reject(e.
|
|
193
|
+
reject(e.reason);
|
|
194
194
|
mutable.actionResultResolved = true;
|
|
195
195
|
}
|
|
196
196
|
// When the server action is rejected we don't update the state and instead call the reject handler of the promise.
|