next 14.0.2-canary.6 → 14.0.2-canary.7
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/swc/index.js +1 -1
- package/dist/build/webpack-config.js +2 -2
- package/dist/client/app-bootstrap.js +1 -1
- package/dist/client/app-index.js +5 -1
- package/dist/client/app-index.js.map +1 -1
- package/dist/client/components/app-router.d.ts +7 -0
- package/dist/client/components/app-router.js +17 -27
- package/dist/client/components/app-router.js.map +1 -1
- package/dist/client/components/router-reducer/reducers/fast-refresh-reducer.js +43 -42
- package/dist/client/components/router-reducer/reducers/fast-refresh-reducer.js.map +1 -1
- package/dist/client/components/router-reducer/reducers/navigate-reducer.d.ts +1 -1
- package/dist/client/components/router-reducer/reducers/navigate-reducer.js +73 -73
- package/dist/client/components/router-reducer/reducers/navigate-reducer.js.map +1 -1
- package/dist/client/components/router-reducer/reducers/prune-prefetch-cache.d.ts +2 -2
- package/dist/client/components/router-reducer/reducers/prune-prefetch-cache.js.map +1 -1
- package/dist/client/components/router-reducer/reducers/refresh-reducer.js +47 -46
- package/dist/client/components/router-reducer/reducers/refresh-reducer.js.map +1 -1
- package/dist/client/components/router-reducer/reducers/server-action-reducer.js +6 -25
- 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 +16 -7
- package/dist/client/components/router-reducer/router-reducer-types.js +8 -1
- package/dist/client/components/router-reducer/router-reducer-types.js.map +1 -1
- package/dist/client/components/use-reducer-with-devtools.d.ts +8 -7
- package/dist/client/components/use-reducer-with-devtools.js +50 -18
- package/dist/client/components/use-reducer-with-devtools.js.map +1 -1
- package/dist/client/index.js +1 -1
- package/dist/esm/build/index.js +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/app-index.js +5 -1
- package/dist/esm/client/app-index.js.map +1 -1
- package/dist/esm/client/components/app-router.js +15 -29
- package/dist/esm/client/components/app-router.js.map +1 -1
- package/dist/esm/client/components/router-reducer/reducers/fast-refresh-reducer.js +43 -42
- package/dist/esm/client/components/router-reducer/reducers/fast-refresh-reducer.js.map +1 -1
- package/dist/esm/client/components/router-reducer/reducers/navigate-reducer.js +73 -73
- package/dist/esm/client/components/router-reducer/reducers/navigate-reducer.js.map +1 -1
- package/dist/esm/client/components/router-reducer/reducers/prune-prefetch-cache.js.map +1 -1
- package/dist/esm/client/components/router-reducer/reducers/refresh-reducer.js +47 -46
- package/dist/esm/client/components/router-reducer/reducers/refresh-reducer.js.map +1 -1
- package/dist/esm/client/components/router-reducer/reducers/server-action-reducer.js +6 -25
- 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 +3 -0
- package/dist/esm/client/components/router-reducer/router-reducer-types.js.map +1 -1
- package/dist/esm/client/components/use-reducer-with-devtools.js +35 -15
- package/dist/esm/client/components/use-reducer-with-devtools.js.map +1 -1
- package/dist/esm/client/index.js +1 -1
- package/dist/esm/server/dev/hot-reloader-webpack.js +1 -1
- package/dist/esm/server/lib/app-info-log.js +1 -1
- package/dist/esm/shared/lib/router/action-queue.js +129 -0
- package/dist/esm/shared/lib/router/action-queue.js.map +1 -0
- package/dist/server/dev/hot-reloader-webpack.js +1 -1
- package/dist/server/lib/app-info-log.js +1 -1
- package/dist/shared/lib/router/action-queue.d.ts +22 -0
- package/dist/shared/lib/router/action-queue.js +152 -0
- package/dist/shared/lib/router/action-queue.js.map +1 -0
- 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 -16
- package/dist/client/components/router-reducer/read-record-value.d.ts +0 -5
- package/dist/client/components/router-reducer/read-record-value.js +0 -25
- package/dist/client/components/router-reducer/read-record-value.js.map +0 -1
- package/dist/client/components/router-reducer/read-record-value.test.d.ts +0 -1
- package/dist/esm/client/components/router-reducer/read-record-value.js +0 -11
- package/dist/esm/client/components/router-reducer/read-record-value.js.map +0 -1
package/dist/bin/next
CHANGED
|
@@ -69,7 +69,7 @@ const args = (0, _index.default)({
|
|
|
69
69
|
});
|
|
70
70
|
// Version is inlined into the file using taskr build pipeline
|
|
71
71
|
if (args["--version"]) {
|
|
72
|
-
console.log(`Next.js v${"14.0.2-canary.
|
|
72
|
+
console.log(`Next.js v${"14.0.2-canary.7"}`);
|
|
73
73
|
process.exit(0);
|
|
74
74
|
}
|
|
75
75
|
// Check if we are running `next <subcommand>` or `next`
|
package/dist/build/index.js
CHANGED
|
@@ -177,7 +177,7 @@ async function build(dir, reactProductionProfiling = false, debugOutput = false,
|
|
|
177
177
|
const nextBuildSpan = (0, _trace.trace)("next-build", undefined, {
|
|
178
178
|
buildMode: buildMode,
|
|
179
179
|
isTurboBuild: String(turboNextBuild),
|
|
180
|
-
version: "14.0.2-canary.
|
|
180
|
+
version: "14.0.2-canary.7"
|
|
181
181
|
});
|
|
182
182
|
_buildcontext.NextBuildContext.nextBuildSpan = nextBuildSpan;
|
|
183
183
|
_buildcontext.NextBuildContext.dir = dir;
|
package/dist/build/swc/index.js
CHANGED
|
@@ -131,7 +131,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
131
131
|
}
|
|
132
132
|
return newObj;
|
|
133
133
|
}
|
|
134
|
-
const nextVersion = "14.0.2-canary.
|
|
134
|
+
const nextVersion = "14.0.2-canary.7";
|
|
135
135
|
const ArchName = (0, _os.arch)();
|
|
136
136
|
const PlatformName = (0, _os.platform)();
|
|
137
137
|
const infoLog = (...args)=>{
|
|
@@ -1407,7 +1407,7 @@ async function getBaseWebpackConfig(dir, { buildId, config, compilerType, dev =
|
|
|
1407
1407
|
new _wellknownerrorsplugin.WellKnownErrorsPlugin(),
|
|
1408
1408
|
isClient && new _copyfileplugin.CopyFilePlugin({
|
|
1409
1409
|
filePath: require.resolve("./polyfills/polyfill-nomodule"),
|
|
1410
|
-
cacheKey: "14.0.2-canary.
|
|
1410
|
+
cacheKey: "14.0.2-canary.7",
|
|
1411
1411
|
name: `static/chunks/polyfills${dev ? "" : "-[hash]"}.js`,
|
|
1412
1412
|
minimize: false,
|
|
1413
1413
|
info: {
|
|
@@ -1630,7 +1630,7 @@ async function getBaseWebpackConfig(dir, { buildId, config, compilerType, dev =
|
|
|
1630
1630
|
// Includes:
|
|
1631
1631
|
// - Next.js version
|
|
1632
1632
|
// - next.config.js keys that affect compilation
|
|
1633
|
-
version: `${"14.0.2-canary.
|
|
1633
|
+
version: `${"14.0.2-canary.7"}|${configVars}`,
|
|
1634
1634
|
cacheDirectory: _path.default.join(distDir, "cache", "webpack"),
|
|
1635
1635
|
// For production builds, it's more efficient to compress all cache files together instead of compression each one individually.
|
|
1636
1636
|
// So we disable compression here and allow the build runner to take care of compressing the cache as a whole.
|
package/dist/client/app-index.js
CHANGED
|
@@ -19,6 +19,7 @@ const _approutercontextsharedruntime = require("../shared/lib/app-router-context
|
|
|
19
19
|
const _onrecoverableerror = /*#__PURE__*/ _interop_require_default._(require("./on-recoverable-error"));
|
|
20
20
|
const _appcallserver = require("./app-call-server");
|
|
21
21
|
const _isnextroutererror = require("./components/is-next-router-error");
|
|
22
|
+
const _actionqueue = require("../shared/lib/router/action-queue");
|
|
22
23
|
// Since React doesn't call onerror for errors caught in error boundaries.
|
|
23
24
|
const origConsoleError = window.console.error;
|
|
24
25
|
window.console.error = function() {
|
|
@@ -184,11 +185,14 @@ function hydrate() {
|
|
|
184
185
|
return;
|
|
185
186
|
}
|
|
186
187
|
}
|
|
188
|
+
const actionQueue = (0, _actionqueue.createMutableActionQueue)();
|
|
187
189
|
const reactEl = /*#__PURE__*/ _react.default.createElement(StrictModeIfEnabled, null, /*#__PURE__*/ _react.default.createElement(_headmanagercontextsharedruntime.HeadManagerContext.Provider, {
|
|
188
190
|
value: {
|
|
189
191
|
appDir: true
|
|
190
192
|
}
|
|
191
|
-
}, /*#__PURE__*/ _react.default.createElement(
|
|
193
|
+
}, /*#__PURE__*/ _react.default.createElement(_actionqueue.ActionQueueContext.Provider, {
|
|
194
|
+
value: actionQueue
|
|
195
|
+
}, /*#__PURE__*/ _react.default.createElement(Root, null, /*#__PURE__*/ _react.default.createElement(RSCComponent, null)))));
|
|
192
196
|
const options = {
|
|
193
197
|
onRecoverableError: _onrecoverableerror.default
|
|
194
198
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/client/app-index.tsx"],"names":["hydrate","origConsoleError","window","console","error","args","isNextRouterError","apply","addEventListener","ev","preventDefault","appElement","document","getCacheKey","pathname","search","location","encoder","TextEncoder","initialServerDataBuffer","undefined","initialServerDataWriter","initialServerDataLoaded","initialServerDataFlushed","initialFormStateData","nextServerDataCallback","seg","Error","enqueue","encode","push","nextServerDataRegisterWriter","ctr","forEach","val","close","DOMContentLoaded","readyState","nextServerDataLoadingGlobal","self","__next_f","createResponseCache","Map","rscCache","useInitialServerResponse","cacheKey","response","get","readable","ReadableStream","start","controller","newResponse","createFromReadableStream","callServer","set","ServerRoot","React","useEffect","delete","root","use","StrictModeIfEnabled","process","env","__NEXT_STRICT_MODE_APP","StrictMode","Fragment","Root","children","__NEXT_ANALYTICS_ID","require","__NEXT_TEST_MODE","__NEXT_HYDRATED","__NEXT_HYDRATED_CB","RSCComponent","props","NODE_ENV","rootLayoutMissingTagsError","__next_root_layout_missing_tags_error","HotReload","default","reactRootElement","createElement","body","appendChild","reactRoot","ReactDOMClient","createRoot","onRecoverableError","render","GlobalLayoutRouterContext","Provider","value","buildId","tree","changeByServerResponse","focusAndScrollRef","onlyHashChange","hashFragment","segmentPaths","nextUrl","assetPrefix","reactEl","HeadManagerContext","appDir","options","isError","documentElement","id","patchConsoleError","ReactDevOverlay","INITIAL_OVERLAY_STATE","getSocketUrl","errorTree","state","onReactError","socketUrl","__NEXT_ASSET_PREFIX","socket","WebSocket","handler","event","obj","JSON","parse","data","action","reload","startTransition","hydrateRoot","formState","linkGc"],"mappings":"AAAA,mBAAmB;;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/client/app-index.tsx"],"names":["hydrate","origConsoleError","window","console","error","args","isNextRouterError","apply","addEventListener","ev","preventDefault","appElement","document","getCacheKey","pathname","search","location","encoder","TextEncoder","initialServerDataBuffer","undefined","initialServerDataWriter","initialServerDataLoaded","initialServerDataFlushed","initialFormStateData","nextServerDataCallback","seg","Error","enqueue","encode","push","nextServerDataRegisterWriter","ctr","forEach","val","close","DOMContentLoaded","readyState","nextServerDataLoadingGlobal","self","__next_f","createResponseCache","Map","rscCache","useInitialServerResponse","cacheKey","response","get","readable","ReadableStream","start","controller","newResponse","createFromReadableStream","callServer","set","ServerRoot","React","useEffect","delete","root","use","StrictModeIfEnabled","process","env","__NEXT_STRICT_MODE_APP","StrictMode","Fragment","Root","children","__NEXT_ANALYTICS_ID","require","__NEXT_TEST_MODE","__NEXT_HYDRATED","__NEXT_HYDRATED_CB","RSCComponent","props","NODE_ENV","rootLayoutMissingTagsError","__next_root_layout_missing_tags_error","HotReload","default","reactRootElement","createElement","body","appendChild","reactRoot","ReactDOMClient","createRoot","onRecoverableError","render","GlobalLayoutRouterContext","Provider","value","buildId","tree","changeByServerResponse","focusAndScrollRef","onlyHashChange","hashFragment","segmentPaths","nextUrl","assetPrefix","actionQueue","createMutableActionQueue","reactEl","HeadManagerContext","appDir","ActionQueueContext","options","isError","documentElement","id","patchConsoleError","ReactDevOverlay","INITIAL_OVERLAY_STATE","getSocketUrl","errorTree","state","onReactError","socketUrl","__NEXT_ASSET_PREFIX","socket","WebSocket","handler","event","obj","JSON","parse","data","action","reload","startTransition","hydrateRoot","formState","linkGc"],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ReactNode } from 'react';
|
|
2
2
|
import React from 'react';
|
|
3
|
+
import { CacheStates } from '../../shared/lib/app-router-context.shared-runtime';
|
|
3
4
|
import type { ErrorComponent } from './error-boundary';
|
|
4
5
|
import type { ServerActionDispatcher } from './router-reducer/router-reducer-types';
|
|
5
6
|
import type { InitialRouterStateParameters } from './router-reducer/create-initial-router-state';
|
|
@@ -10,6 +11,12 @@ type AppRouterProps = Omit<Omit<InitialRouterStateParameters, 'isServer' | 'loca
|
|
|
10
11
|
initialHead: ReactNode;
|
|
11
12
|
assetPrefix: string;
|
|
12
13
|
};
|
|
14
|
+
export declare const createEmptyCacheNode: () => {
|
|
15
|
+
status: CacheStates;
|
|
16
|
+
data: null;
|
|
17
|
+
subTreeData: null;
|
|
18
|
+
parallelRoutes: Map<any, any>;
|
|
19
|
+
};
|
|
13
20
|
export default function AppRouter(props: AppRouterProps & {
|
|
14
21
|
globalErrorComponent: ErrorComponent;
|
|
15
22
|
}): React.JSX.Element;
|
|
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
0 && (module.exports = {
|
|
8
8
|
getServerActionDispatcher: null,
|
|
9
9
|
urlToUrlWithoutFlightMarker: null,
|
|
10
|
+
createEmptyCacheNode: null,
|
|
10
11
|
default: null
|
|
11
12
|
});
|
|
12
13
|
function _export(target, all) {
|
|
@@ -22,6 +23,9 @@ _export(exports, {
|
|
|
22
23
|
urlToUrlWithoutFlightMarker: function() {
|
|
23
24
|
return urlToUrlWithoutFlightMarker;
|
|
24
25
|
},
|
|
26
|
+
createEmptyCacheNode: function() {
|
|
27
|
+
return createEmptyCacheNode;
|
|
28
|
+
},
|
|
25
29
|
default: function() {
|
|
26
30
|
return AppRouter;
|
|
27
31
|
}
|
|
@@ -29,7 +33,6 @@ _export(exports, {
|
|
|
29
33
|
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
|
|
30
34
|
const _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
|
|
31
35
|
const _approutercontextsharedruntime = require("../../shared/lib/app-router-context.shared-runtime");
|
|
32
|
-
const _routerreducer = require("./router-reducer/router-reducer");
|
|
33
36
|
const _routerreducertypes = require("./router-reducer/router-reducer-types");
|
|
34
37
|
const _createhreffromurl = require("./router-reducer/create-href-from-url");
|
|
35
38
|
const _hooksclientcontextsharedruntime = require("../../shared/lib/hooks-client-context.shared-runtime");
|
|
@@ -52,9 +55,7 @@ let globalServerActionDispatcher = null;
|
|
|
52
55
|
function getServerActionDispatcher() {
|
|
53
56
|
return globalServerActionDispatcher;
|
|
54
57
|
}
|
|
55
|
-
|
|
56
|
-
refresh: ()=>{}
|
|
57
|
-
};
|
|
58
|
+
const globalMutable = {};
|
|
58
59
|
function urlToUrlWithoutFlightMarker(url) {
|
|
59
60
|
const urlWithoutFlightParameters = new URL(url, location.origin);
|
|
60
61
|
urlWithoutFlightParameters.searchParams.delete(_approuterheaders.NEXT_RSC_UNION_QUERY);
|
|
@@ -109,9 +110,7 @@ function useServerActionDispatcher(dispatch) {
|
|
|
109
110
|
dispatch({
|
|
110
111
|
...actionPayload,
|
|
111
112
|
type: _routerreducertypes.ACTION_SERVER_ACTION,
|
|
112
|
-
mutable: {
|
|
113
|
-
globalMutable
|
|
114
|
-
},
|
|
113
|
+
mutable: {},
|
|
115
114
|
cache: createEmptyCacheNode()
|
|
116
115
|
});
|
|
117
116
|
});
|
|
@@ -131,9 +130,7 @@ function useServerActionDispatcher(dispatch) {
|
|
|
131
130
|
previousTree,
|
|
132
131
|
overrideCanonicalUrl,
|
|
133
132
|
cache: createEmptyCacheNode(),
|
|
134
|
-
mutable: {
|
|
135
|
-
globalMutable
|
|
136
|
-
}
|
|
133
|
+
mutable: {}
|
|
137
134
|
});
|
|
138
135
|
});
|
|
139
136
|
}, [
|
|
@@ -143,7 +140,6 @@ function useServerActionDispatcher(dispatch) {
|
|
|
143
140
|
function useNavigate(dispatch) {
|
|
144
141
|
return (0, _react.useCallback)((href, navigateType, forceOptimisticNavigation, shouldScroll)=>{
|
|
145
142
|
const url = new URL((0, _addbasepath.addBasePath)(href), location.href);
|
|
146
|
-
globalMutable.pendingNavigatePath = (0, _createhreffromurl.createHrefFromUrl)(url);
|
|
147
143
|
return dispatch({
|
|
148
144
|
type: _routerreducertypes.ACTION_NAVIGATE,
|
|
149
145
|
url,
|
|
@@ -153,9 +149,7 @@ function useNavigate(dispatch) {
|
|
|
153
149
|
shouldScroll: shouldScroll != null ? shouldScroll : true,
|
|
154
150
|
navigateType,
|
|
155
151
|
cache: createEmptyCacheNode(),
|
|
156
|
-
mutable: {
|
|
157
|
-
globalMutable
|
|
158
|
-
}
|
|
152
|
+
mutable: {}
|
|
159
153
|
});
|
|
160
154
|
}, [
|
|
161
155
|
dispatch
|
|
@@ -181,11 +175,12 @@ function useNavigate(dispatch) {
|
|
|
181
175
|
initialTree,
|
|
182
176
|
initialHead
|
|
183
177
|
]);
|
|
184
|
-
const [
|
|
178
|
+
const [reducerState, dispatch, sync] = (0, _usereducerwithdevtools.useReducerWithReduxDevtools)(initialState);
|
|
185
179
|
(0, _react.useEffect)(()=>{
|
|
186
180
|
// Ensure initialParallelRoutes is cleaned up from memory once it's used.
|
|
187
181
|
initialParallelRoutes = null;
|
|
188
182
|
}, []);
|
|
183
|
+
const { canonicalUrl } = (0, _usereducerwithdevtools.useUnwrapState)(reducerState);
|
|
189
184
|
// Add memoized pathname/query for useSearchParams and usePathname.
|
|
190
185
|
const { searchParams, pathname } = (0, _react.useMemo)(()=>{
|
|
191
186
|
const url = new URL(canonicalUrl, typeof window === "undefined" ? "http://n" : window.location.href);
|
|
@@ -245,9 +240,7 @@ function useNavigate(dispatch) {
|
|
|
245
240
|
dispatch({
|
|
246
241
|
type: _routerreducertypes.ACTION_REFRESH,
|
|
247
242
|
cache: createEmptyCacheNode(),
|
|
248
|
-
mutable: {
|
|
249
|
-
globalMutable
|
|
250
|
-
},
|
|
243
|
+
mutable: {},
|
|
251
244
|
origin: window.location.origin
|
|
252
245
|
});
|
|
253
246
|
});
|
|
@@ -261,9 +254,7 @@ function useNavigate(dispatch) {
|
|
|
261
254
|
dispatch({
|
|
262
255
|
type: _routerreducertypes.ACTION_FAST_REFRESH,
|
|
263
256
|
cache: createEmptyCacheNode(),
|
|
264
|
-
mutable: {
|
|
265
|
-
globalMutable
|
|
266
|
-
},
|
|
257
|
+
mutable: {},
|
|
267
258
|
origin: window.location.origin
|
|
268
259
|
});
|
|
269
260
|
});
|
|
@@ -283,12 +274,9 @@ function useNavigate(dispatch) {
|
|
|
283
274
|
}, [
|
|
284
275
|
appRouter
|
|
285
276
|
]);
|
|
286
|
-
(0, _react.useEffect)(()=>{
|
|
287
|
-
globalMutable.refresh = appRouter.refresh;
|
|
288
|
-
}, [
|
|
289
|
-
appRouter.refresh
|
|
290
|
-
]);
|
|
291
277
|
if (process.env.NODE_ENV !== "production") {
|
|
278
|
+
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
279
|
+
const { cache, prefetchCache, tree } = (0, _usereducerwithdevtools.useUnwrapState)(reducerState);
|
|
292
280
|
// This hook is in a conditional but that is ok because `process.env.NODE_ENV` never changes
|
|
293
281
|
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
294
282
|
(0, _react.useEffect)(()=>{
|
|
@@ -339,6 +327,7 @@ function useNavigate(dispatch) {
|
|
|
339
327
|
// probably safe because we know this is a singleton component and it's never
|
|
340
328
|
// in <Offscreen>. At least I hope so. (It will run twice in dev strict mode,
|
|
341
329
|
// but that's... fine?)
|
|
330
|
+
const { pushRef } = (0, _usereducerwithdevtools.useUnwrapState)(reducerState);
|
|
342
331
|
if (pushRef.mpaNavigation) {
|
|
343
332
|
// if there's a re-render, we don't want to trigger another redirect if one is already in flight to the same URL
|
|
344
333
|
if (globalMutable.pendingMpaPath !== canonicalUrl) {
|
|
@@ -392,6 +381,7 @@ function useNavigate(dispatch) {
|
|
|
392
381
|
}, [
|
|
393
382
|
onPopState
|
|
394
383
|
]);
|
|
384
|
+
const { cache, tree, nextUrl, focusAndScrollRef } = (0, _usereducerwithdevtools.useUnwrapState)(reducerState);
|
|
395
385
|
const head = (0, _react.useMemo)(()=>{
|
|
396
386
|
return (0, _findheadincache.findHeadInCache)(cache, tree[1]);
|
|
397
387
|
}, [
|
|
@@ -433,7 +423,7 @@ function useNavigate(dispatch) {
|
|
|
433
423
|
}, /*#__PURE__*/ _react.default.createElement(_approutercontextsharedruntime.LayoutRouterContext.Provider, {
|
|
434
424
|
value: {
|
|
435
425
|
childNodes: cache.parallelRoutes,
|
|
436
|
-
tree
|
|
426
|
+
tree,
|
|
437
427
|
// Root node always has `url`
|
|
438
428
|
// Provided in AppTreeContext to ensure it can be overwritten in layout-router
|
|
439
429
|
url: canonicalUrl
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/client/components/app-router.tsx"],"names":["getServerActionDispatcher","urlToUrlWithoutFlightMarker","AppRouter","isServer","window","initialParallelRoutes","Map","globalServerActionDispatcher","globalMutable","
|
|
1
|
+
{"version":3,"sources":["../../../src/client/components/app-router.tsx"],"names":["getServerActionDispatcher","urlToUrlWithoutFlightMarker","createEmptyCacheNode","AppRouter","isServer","window","initialParallelRoutes","Map","globalServerActionDispatcher","globalMutable","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","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","reducerState","useReducerWithReduxDevtools","useEffect","useUnwrapState","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","prefetchCache","nd","handlePageShow","event","persisted","state","ACTION_RESTORE","addEventListener","removeEventListener","mpaNavigation","pendingMpaPath","assign","use","createInfinitePromise","onPopState","reload","nextUrl","focusAndScrollRef","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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"}
|
|
@@ -10,7 +10,6 @@ Object.defineProperty(exports, "fastRefreshReducer", {
|
|
|
10
10
|
});
|
|
11
11
|
const _fetchserverresponse = require("../fetch-server-response");
|
|
12
12
|
const _createrecordfromthenable = require("../create-record-from-thenable");
|
|
13
|
-
const _readrecordvalue = require("../read-record-value");
|
|
14
13
|
const _createhreffromurl = require("../create-href-from-url");
|
|
15
14
|
const _applyrouterstatepatchtotree = require("../apply-router-state-patch-to-tree");
|
|
16
15
|
const _isnavigatingtonewrootlayout = require("../is-navigating-to-new-root-layout");
|
|
@@ -35,49 +34,51 @@ function fastRefreshReducerImpl(state, action) {
|
|
|
35
34
|
"refetch"
|
|
36
35
|
], state.nextUrl, state.buildId));
|
|
37
36
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
// Remove cache.data as it has been resolved at this point.
|
|
44
|
-
cache.data = null;
|
|
45
|
-
let currentTree = state.tree;
|
|
46
|
-
let currentCache = state.cache;
|
|
47
|
-
for (const flightDataPath of flightData){
|
|
48
|
-
// FlightDataPath with more than two items means unexpected Flight data was returned
|
|
49
|
-
if (flightDataPath.length !== 3) {
|
|
50
|
-
// TODO-APP: handle this case better
|
|
51
|
-
console.log("REFRESH FAILED");
|
|
52
|
-
return state;
|
|
53
|
-
}
|
|
54
|
-
// Given the path can only have two items the items are only the router state and subTreeData for the root.
|
|
55
|
-
const [treePatch] = flightDataPath;
|
|
56
|
-
const newTree = (0, _applyrouterstatepatchtotree.applyRouterStatePatchToTree)(// TODO-APP: remove ''
|
|
57
|
-
[
|
|
58
|
-
""
|
|
59
|
-
], currentTree, treePatch);
|
|
60
|
-
if (newTree === null) {
|
|
61
|
-
throw new Error("SEGMENT MISMATCH");
|
|
62
|
-
}
|
|
63
|
-
if ((0, _isnavigatingtonewrootlayout.isNavigatingToNewRootLayout)(currentTree, newTree)) {
|
|
64
|
-
return (0, _navigatereducer.handleExternalUrl)(state, mutable, href, state.pushRef.pendingPush);
|
|
37
|
+
return cache.data.then((param)=>{
|
|
38
|
+
let [flightData, canonicalUrlOverride] = param;
|
|
39
|
+
// Handle case when navigating to page in `pages` from `app`
|
|
40
|
+
if (typeof flightData === "string") {
|
|
41
|
+
return (0, _navigatereducer.handleExternalUrl)(state, mutable, flightData, state.pushRef.pendingPush);
|
|
65
42
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
43
|
+
// Remove cache.data as it has been resolved at this point.
|
|
44
|
+
cache.data = null;
|
|
45
|
+
let currentTree = state.tree;
|
|
46
|
+
let currentCache = state.cache;
|
|
47
|
+
for (const flightDataPath of flightData){
|
|
48
|
+
// FlightDataPath with more than two items means unexpected Flight data was returned
|
|
49
|
+
if (flightDataPath.length !== 3) {
|
|
50
|
+
// TODO-APP: handle this case better
|
|
51
|
+
console.log("REFRESH FAILED");
|
|
52
|
+
return state;
|
|
53
|
+
}
|
|
54
|
+
// Given the path can only have two items the items are only the router state and subTreeData for the root.
|
|
55
|
+
const [treePatch] = flightDataPath;
|
|
56
|
+
const newTree = (0, _applyrouterstatepatchtotree.applyRouterStatePatchToTree)(// TODO-APP: remove ''
|
|
57
|
+
[
|
|
58
|
+
""
|
|
59
|
+
], currentTree, treePatch);
|
|
60
|
+
if (newTree === null) {
|
|
61
|
+
throw new Error("SEGMENT MISMATCH");
|
|
62
|
+
}
|
|
63
|
+
if ((0, _isnavigatingtonewrootlayout.isNavigatingToNewRootLayout)(currentTree, newTree)) {
|
|
64
|
+
return (0, _navigatereducer.handleExternalUrl)(state, mutable, href, state.pushRef.pendingPush);
|
|
65
|
+
}
|
|
66
|
+
const canonicalUrlOverrideHref = canonicalUrlOverride ? (0, _createhreffromurl.createHrefFromUrl)(canonicalUrlOverride) : undefined;
|
|
67
|
+
if (canonicalUrlOverride) {
|
|
68
|
+
mutable.canonicalUrl = canonicalUrlOverrideHref;
|
|
69
|
+
}
|
|
70
|
+
const applied = (0, _applyflightdata.applyFlightData)(currentCache, cache, flightDataPath);
|
|
71
|
+
if (applied) {
|
|
72
|
+
mutable.cache = cache;
|
|
73
|
+
currentCache = cache;
|
|
74
|
+
}
|
|
75
|
+
mutable.previousTree = currentTree;
|
|
76
|
+
mutable.patchedTree = newTree;
|
|
77
|
+
mutable.canonicalUrl = href;
|
|
78
|
+
currentTree = newTree;
|
|
69
79
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
mutable.cache = cache;
|
|
73
|
-
currentCache = cache;
|
|
74
|
-
}
|
|
75
|
-
mutable.previousTree = currentTree;
|
|
76
|
-
mutable.patchedTree = newTree;
|
|
77
|
-
mutable.canonicalUrl = href;
|
|
78
|
-
currentTree = newTree;
|
|
79
|
-
}
|
|
80
|
-
return (0, _handlemutable.handleMutable)(state, mutable);
|
|
80
|
+
return (0, _handlemutable.handleMutable)(state, mutable);
|
|
81
|
+
}, ()=>state);
|
|
81
82
|
}
|
|
82
83
|
function fastRefreshReducerNoop(state, _action) {
|
|
83
84
|
return state;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/client/components/router-reducer/reducers/fast-refresh-reducer.ts"],"names":["fastRefreshReducer","fastRefreshReducerImpl","state","action","cache","mutable","origin","href","canonicalUrl","isForCurrentTree","JSON","stringify","previousTree","tree","handleMutable","data","createRecordFromThenable","fetchServerResponse","URL","nextUrl","buildId","
|
|
1
|
+
{"version":3,"sources":["../../../../../src/client/components/router-reducer/reducers/fast-refresh-reducer.ts"],"names":["fastRefreshReducer","fastRefreshReducerImpl","state","action","cache","mutable","origin","href","canonicalUrl","isForCurrentTree","JSON","stringify","previousTree","tree","handleMutable","data","createRecordFromThenable","fetchServerResponse","URL","nextUrl","buildId","then","flightData","canonicalUrlOverride","handleExternalUrl","pushRef","pendingPush","currentTree","currentCache","flightDataPath","length","console","log","treePatch","newTree","applyRouterStatePatchToTree","Error","isNavigatingToNewRootLayout","canonicalUrlOverrideHref","createHrefFromUrl","undefined","applied","applyFlightData","patchedTree","fastRefreshReducerNoop","_action","process","env","NODE_ENV"],"mappings":";;;;+BA2HaA;;;eAAAA;;;qCA3HuB;0CACK;mCACP;6CACU;6CACA;iCAMV;+BACJ;iCACE;AAEhC,wFAAwF;AACxF,SAASC,uBACPC,KAA2B,EAC3BC,MAAyB;IAEzB,MAAM,EAAEC,KAAK,EAAEC,OAAO,EAAEC,MAAM,EAAE,GAAGH;IACnC,MAAMI,OAAOL,MAAMM,YAAY;IAE/B,MAAMC,mBACJC,KAAKC,SAAS,CAACN,QAAQO,YAAY,MAAMF,KAAKC,SAAS,CAACT,MAAMW,IAAI;IAEpE,IAAIJ,kBAAkB;QACpB,OAAOK,IAAAA,4BAAa,EAACZ,OAAOG;IAC9B;IAEA,IAAI,CAACD,MAAMW,IAAI,EAAE;QACf,uDAAuD;QACvD,wCAAwC;QACxCX,MAAMW,IAAI,GAAGC,IAAAA,kDAAwB,EACnCC,IAAAA,wCAAmB,EACjB,IAAIC,IAAIX,MAAMD,SACd;YAACJ,MAAMW,IAAI,CAAC,EAAE;YAAEX,MAAMW,IAAI,CAAC,EAAE;YAAEX,MAAMW,IAAI,CAAC,EAAE;YAAE;SAAU,EACxDX,MAAMiB,OAAO,EACbjB,MAAMkB,OAAO;IAGnB;IAEA,OAAOhB,MAAMW,IAAI,CAACM,IAAI,CACpB;YAAC,CAACC,YAAYC,qBAAqB;QACjC,4DAA4D;QAC5D,IAAI,OAAOD,eAAe,UAAU;YAClC,OAAOE,IAAAA,kCAAiB,EACtBtB,OACAG,SACAiB,YACApB,MAAMuB,OAAO,CAACC,WAAW;QAE7B;QAEA,2DAA2D;QAC3DtB,MAAMW,IAAI,GAAG;QAEb,IAAIY,cAAczB,MAAMW,IAAI;QAC5B,IAAIe,eAAe1B,MAAME,KAAK;QAE9B,KAAK,MAAMyB,kBAAkBP,WAAY;YACvC,oFAAoF;YACpF,IAAIO,eAAeC,MAAM,KAAK,GAAG;gBAC/B,oCAAoC;gBACpCC,QAAQC,GAAG,CAAC;gBACZ,OAAO9B;YACT;YAEA,2GAA2G;YAC3G,MAAM,CAAC+B,UAAU,GAAGJ;YACpB,MAAMK,UAAUC,IAAAA,wDAA2B,EACzC,sBAAsB;YACtB;gBAAC;aAAG,EACJR,aACAM;YAGF,IAAIC,YAAY,MAAM;gBACpB,MAAM,IAAIE,MAAM;YAClB;YAEA,IAAIC,IAAAA,wDAA2B,EAACV,aAAaO,UAAU;gBACrD,OAAOV,IAAAA,kCAAiB,EACtBtB,OACAG,SACAE,MACAL,MAAMuB,OAAO,CAACC,WAAW;YAE7B;YAEA,MAAMY,2BAA2Bf,uBAC7BgB,IAAAA,oCAAiB,EAAChB,wBAClBiB;YAEJ,IAAIjB,sBAAsB;gBACxBlB,QAAQG,YAAY,GAAG8B;YACzB;YACA,MAAMG,UAAUC,IAAAA,gCAAe,EAACd,cAAcxB,OAAOyB;YAErD,IAAIY,SAAS;gBACXpC,QAAQD,KAAK,GAAGA;gBAChBwB,eAAexB;YACjB;YAEAC,QAAQO,YAAY,GAAGe;YACvBtB,QAAQsC,WAAW,GAAGT;YACtB7B,QAAQG,YAAY,GAAGD;YAEvBoB,cAAcO;QAChB;QACA,OAAOpB,IAAAA,4BAAa,EAACZ,OAAOG;IAC9B,GACA,IAAMH;AAEV;AAEA,SAAS0C,uBACP1C,KAA2B,EAC3B2C,OAA0B;IAE1B,OAAO3C;AACT;AAEO,MAAMF,qBACX8C,QAAQC,GAAG,CAACC,QAAQ,KAAK,eACrBJ,yBACA3C"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Mutable, NavigateAction, ReadonlyReducerState, ReducerState } from '../router-reducer-types';
|
|
2
|
-
export declare function handleExternalUrl(state: ReadonlyReducerState, mutable: Mutable, url: string, pendingPush: boolean):
|
|
2
|
+
export declare function handleExternalUrl(state: ReadonlyReducerState, mutable: Mutable, url: string, pendingPush: boolean): ReducerState;
|
|
3
3
|
export declare function navigateReducer(state: ReadonlyReducerState, action: NavigateAction): ReducerState;
|