next 13.4.3-canary.2 → 13.4.3
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 -8
- package/dist/build/index.js.map +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/components/error-boundary.d.ts +10 -3
- package/dist/client/components/error-boundary.js +22 -1
- package/dist/client/components/error-boundary.js.map +1 -1
- package/dist/client/components/layout-router.js +2 -0
- package/dist/client/components/layout-router.js.map +1 -1
- package/dist/client/components/not-found-boundary.js +22 -1
- package/dist/client/components/not-found-boundary.js.map +1 -1
- package/dist/client/components/redirect.d.ts +2 -0
- package/dist/client/components/redirect.js +5 -1
- package/dist/client/components/redirect.js.map +1 -1
- package/dist/client/index.js +1 -1
- package/dist/esm/build/index.js +1 -8
- package/dist/esm/build/index.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/error-boundary.js +22 -1
- package/dist/esm/client/components/error-boundary.js.map +1 -1
- package/dist/esm/client/components/layout-router.js +2 -0
- package/dist/esm/client/components/layout-router.js.map +1 -1
- package/dist/esm/client/components/not-found-boundary.js +22 -1
- package/dist/esm/client/components/not-found-boundary.js.map +1 -1
- package/dist/esm/client/components/redirect.js +5 -1
- package/dist/esm/client/components/redirect.js.map +1 -1
- package/dist/esm/client/index.js +1 -1
- package/dist/esm/lib/server-external-packages.json +1 -0
- package/dist/esm/server/app-render/action-handler.js +9 -0
- package/dist/esm/server/app-render/action-handler.js.map +1 -1
- package/dist/esm/server/app-render/app-render.js +9 -0
- package/dist/esm/server/app-render/app-render.js.map +1 -1
- package/dist/esm/server/async-storage/request-async-storage-wrapper.js +1 -1
- package/dist/esm/server/async-storage/request-async-storage-wrapper.js.map +1 -1
- package/dist/esm/server/config-shared.js +1 -1
- package/dist/esm/server/config-shared.js.map +1 -1
- package/dist/esm/server/dev/hot-reloader.js +1 -1
- package/dist/esm/server/future/helpers/module-loader/node-module-loader.js +4 -3
- package/dist/esm/server/future/helpers/module-loader/node-module-loader.js.map +1 -1
- package/dist/esm/server/future/helpers/module-loader/route-module-loader.js +2 -2
- package/dist/esm/server/future/helpers/module-loader/route-module-loader.js.map +1 -1
- package/dist/esm/server/future/route-handler-managers/route-handler-manager.js +1 -1
- package/dist/esm/server/future/route-handler-managers/route-handler-manager.js.map +1 -1
- package/dist/esm/server/future/route-modules/app-route/helpers/resolve-handler-error.js +1 -1
- package/dist/esm/server/future/route-modules/app-route/helpers/resolve-handler-error.js.map +1 -1
- package/dist/esm/server/future/route-modules/app-route/module.js +4 -34
- package/dist/esm/server/future/route-modules/app-route/module.js.map +1 -1
- package/dist/esm/server/future/route-modules/helpers/response-handlers.js +12 -14
- package/dist/esm/server/future/route-modules/helpers/response-handlers.js.map +1 -1
- package/dist/esm/server/lib/patch-fetch.js +7 -7
- package/dist/esm/server/lib/patch-fetch.js.map +1 -1
- package/dist/esm/server/lib/render-server-standalone.js +2 -2
- package/dist/esm/server/lib/render-server-standalone.js.map +1 -1
- package/dist/esm/server/next-server.js +3 -1
- package/dist/esm/server/next-server.js.map +1 -1
- package/dist/esm/server/next.js +92 -11
- package/dist/esm/server/next.js.map +1 -1
- package/dist/esm/server/web/spec-extension/adapters/request-cookies.js +29 -2
- package/dist/esm/server/web/spec-extension/adapters/request-cookies.js.map +1 -1
- package/dist/export/worker.js +1 -1
- package/dist/export/worker.js.map +1 -1
- package/dist/lib/server-external-packages.json +1 -0
- package/dist/server/app-render/action-handler.js +9 -0
- package/dist/server/app-render/action-handler.js.map +1 -1
- package/dist/server/app-render/app-render.js +9 -0
- package/dist/server/app-render/app-render.js.map +1 -1
- package/dist/server/async-storage/request-async-storage-wrapper.js +1 -1
- package/dist/server/async-storage/request-async-storage-wrapper.js.map +1 -1
- package/dist/server/config-shared.js +1 -1
- package/dist/server/config-shared.js.map +1 -1
- package/dist/server/dev/hot-reloader.js +1 -1
- package/dist/server/future/helpers/module-loader/module-loader.d.ts +1 -1
- package/dist/server/future/helpers/module-loader/node-module-loader.d.ts +2 -2
- package/dist/server/future/helpers/module-loader/node-module-loader.js +3 -2
- package/dist/server/future/helpers/module-loader/node-module-loader.js.map +1 -1
- package/dist/server/future/helpers/module-loader/route-module-loader.d.ts +1 -1
- package/dist/server/future/helpers/module-loader/route-module-loader.js +2 -2
- package/dist/server/future/helpers/module-loader/route-module-loader.js.map +1 -1
- package/dist/server/future/route-handler-managers/route-handler-manager.js +1 -1
- package/dist/server/future/route-handler-managers/route-handler-manager.js.map +1 -1
- package/dist/server/future/route-modules/app-route/helpers/resolve-handler-error.js +1 -1
- package/dist/server/future/route-modules/app-route/helpers/resolve-handler-error.js.map +1 -1
- package/dist/server/future/route-modules/app-route/module.js +3 -33
- package/dist/server/future/route-modules/app-route/module.js.map +1 -1
- package/dist/server/future/route-modules/helpers/response-handlers.d.ts +2 -1
- package/dist/server/future/route-modules/helpers/response-handlers.js +12 -14
- package/dist/server/future/route-modules/helpers/response-handlers.js.map +1 -1
- package/dist/server/lib/patch-fetch.js +7 -7
- package/dist/server/lib/patch-fetch.js.map +1 -1
- package/dist/server/lib/render-server-standalone.d.ts +2 -1
- package/dist/server/lib/render-server-standalone.js +2 -2
- package/dist/server/lib/render-server-standalone.js.map +1 -1
- package/dist/server/next-server.js +3 -1
- package/dist/server/next-server.js.map +1 -1
- package/dist/server/next.d.ts +8 -3
- package/dist/server/next.js +90 -9
- package/dist/server/next.js.map +1 -1
- package/dist/server/web/spec-extension/adapters/request-cookies.d.ts +2 -2
- package/dist/server/web/spec-extension/adapters/request-cookies.js +31 -4
- 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 -16
|
@@ -13,9 +13,7 @@ import { RouteKind } from "../../route-kind";
|
|
|
13
13
|
import * as Log from "../../../../build/output/log";
|
|
14
14
|
import { autoImplementMethods } from "./helpers/auto-implement-methods";
|
|
15
15
|
import { getNonStaticMethods } from "./helpers/get-non-static-methods";
|
|
16
|
-
import {
|
|
17
|
-
import { ResponseCookies } from "../../../web/spec-extension/cookies";
|
|
18
|
-
import { HeadersAdapter } from "../../../web/spec-extension/adapters/headers";
|
|
16
|
+
import { appendMutableCookies } from "../../../web/spec-extension/adapters/request-cookies";
|
|
19
17
|
/**
|
|
20
18
|
* AppRouteRouteHandler is the handler for app routes.
|
|
21
19
|
*/ export class AppRouteRouteModule extends RouteModule {
|
|
@@ -196,42 +194,14 @@ import { HeadersAdapter } from "../../../web/spec-extension/adapters/headers";
|
|
|
196
194
|
// It's possible cookies were set in the handler, so we need
|
|
197
195
|
// to merge the modified cookies and the returned response
|
|
198
196
|
// here.
|
|
199
|
-
// TODO: Move this into a helper function.
|
|
200
197
|
const requestStore = this.requestAsyncStorage.getStore();
|
|
201
198
|
if (requestStore && requestStore.mutableCookies) {
|
|
202
|
-
const
|
|
203
|
-
if (
|
|
204
|
-
// Return a new response that extends the response with
|
|
205
|
-
// the modified cookies as fallbacks. `res`' cookies
|
|
206
|
-
// will still take precedence.
|
|
207
|
-
const resCookies = new ResponseCookies(HeadersAdapter.from(res.headers));
|
|
208
|
-
const returnedCookies = resCookies.getAll();
|
|
209
|
-
// Set the modified cookies as fallbacks.
|
|
210
|
-
for (const cookie of modifiedCookieValues){
|
|
211
|
-
resCookies.set(cookie);
|
|
212
|
-
}
|
|
213
|
-
// Set the original cookies as the final values.
|
|
214
|
-
for (const cookie of returnedCookies){
|
|
215
|
-
resCookies.set(cookie);
|
|
216
|
-
}
|
|
217
|
-
const responseHeaders = new Headers({});
|
|
218
|
-
// Set all the headers except for the cookies.
|
|
219
|
-
res.headers.forEach((value, key)=>{
|
|
220
|
-
if (key.toLowerCase() !== "set-cookie") {
|
|
221
|
-
responseHeaders.append(key, value);
|
|
222
|
-
}
|
|
223
|
-
});
|
|
224
|
-
// Set the final cookies, need to append cookies one
|
|
225
|
-
// at a time otherwise it might not work in some browsers.
|
|
226
|
-
resCookies.getAll().forEach((cookie)=>{
|
|
227
|
-
const tempCookies = new ResponseCookies(new Headers());
|
|
228
|
-
tempCookies.set(cookie);
|
|
229
|
-
responseHeaders.append("Set-Cookie", tempCookies.toString());
|
|
230
|
-
});
|
|
199
|
+
const headers = new Headers(res.headers);
|
|
200
|
+
if (appendMutableCookies(headers, requestStore.mutableCookies)) {
|
|
231
201
|
return new Response(res.body, {
|
|
232
202
|
status: res.status,
|
|
233
203
|
statusText: res.statusText,
|
|
234
|
-
headers
|
|
204
|
+
headers
|
|
235
205
|
});
|
|
236
206
|
}
|
|
237
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/server/future/route-modules/app-route/module.ts"],"names":["RouteModule","RequestAsyncStorageWrapper","StaticGenerationAsyncStorageWrapper","handleBadRequestResponse","handleInternalServerErrorResponse","HTTP_METHODS","isHTTPMethod","addImplicitTags","patchFetch","getTracer","AppRouteRouteHandlersSpan","getPathnameFromAbsolutePath","proxyRequest","resolveHandlerError","RouteKind","Log","autoImplementMethods","getNonStaticMethods","
|
|
1
|
+
{"version":3,"sources":["../../../../../src/server/future/route-modules/app-route/module.ts"],"names":["RouteModule","RequestAsyncStorageWrapper","StaticGenerationAsyncStorageWrapper","handleBadRequestResponse","handleInternalServerErrorResponse","HTTP_METHODS","isHTTPMethod","addImplicitTags","patchFetch","getTracer","AppRouteRouteHandlersSpan","getPathnameFromAbsolutePath","proxyRequest","resolveHandlerError","RouteKind","Log","autoImplementMethods","getNonStaticMethods","appendMutableCookies","AppRouteRouteModule","constructor","userland","pathname","resolvedPagePath","nextConfigOutput","hasSetup","definition","kind","APP_ROUTE","page","bundlePath","filename","methods","nonStaticMethods","dynamic","Error","setup","process","env","NODE_ENV","lowercased","map","method","toLowerCase","error","toUpperCase","some","resolve","execute","request","context","handler","requestContext","req","renderOpts","previewProps","prerenderManifest","preview","staticGenerationContext","supportsDynamicHTML","fetchCache","response","actionAsyncStorage","run","isAppRoute","wrap","requestAsyncStorage","staticGenerationAsyncStorage","staticGenerationStore","staticGenerationBailout","join","forceDynamic","forceStatic","dynamicShouldError","revalidate","wrappedRequest","headerHooks","serverHooks","route","getRootSpanAttributes","set","trace","runHandler","spanName","attributes","res","params","fetchMetrics","Promise","all","pendingRevalidates","fetchTags","tags","requestStore","getStore","mutableCookies","headers","Headers","Response","body","status","statusText","has","get","handle","err"],"mappings":"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"}
|
|
@@ -1,34 +1,32 @@
|
|
|
1
|
-
|
|
1
|
+
import { appendMutableCookies } from "../../../web/spec-extension/adapters/request-cookies";
|
|
2
|
+
export function handleTemporaryRedirectResponse(url, mutableCookies) {
|
|
3
|
+
const headers = new Headers({
|
|
4
|
+
location: url
|
|
5
|
+
});
|
|
6
|
+
appendMutableCookies(headers, mutableCookies);
|
|
2
7
|
return new Response(null, {
|
|
3
|
-
status:
|
|
4
|
-
|
|
5
|
-
headers: {
|
|
6
|
-
location: url
|
|
7
|
-
}
|
|
8
|
+
status: 307,
|
|
9
|
+
headers
|
|
8
10
|
});
|
|
9
11
|
}
|
|
10
12
|
export function handleBadRequestResponse() {
|
|
11
13
|
return new Response(null, {
|
|
12
|
-
status: 400
|
|
13
|
-
statusText: "Bad Request"
|
|
14
|
+
status: 400
|
|
14
15
|
});
|
|
15
16
|
}
|
|
16
17
|
export function handleNotFoundResponse() {
|
|
17
18
|
return new Response(null, {
|
|
18
|
-
status: 404
|
|
19
|
-
statusText: "Not Found"
|
|
19
|
+
status: 404
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
export function handleMethodNotAllowedResponse() {
|
|
23
23
|
return new Response(null, {
|
|
24
|
-
status: 405
|
|
25
|
-
statusText: "Method Not Allowed"
|
|
24
|
+
status: 405
|
|
26
25
|
});
|
|
27
26
|
}
|
|
28
27
|
export function handleInternalServerErrorResponse() {
|
|
29
28
|
return new Response(null, {
|
|
30
|
-
status: 500
|
|
31
|
-
statusText: "Internal Server Error"
|
|
29
|
+
status: 500
|
|
32
30
|
});
|
|
33
31
|
}
|
|
34
32
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/server/future/route-modules/helpers/response-handlers.ts"],"names":["handleTemporaryRedirectResponse","url","
|
|
1
|
+
{"version":3,"sources":["../../../../../src/server/future/route-modules/helpers/response-handlers.ts"],"names":["appendMutableCookies","handleTemporaryRedirectResponse","url","mutableCookies","headers","Headers","location","Response","status","handleBadRequestResponse","handleNotFoundResponse","handleMethodNotAllowedResponse","handleInternalServerErrorResponse"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,uDAAsD;AAG3F,OAAO,SAASC,gCACdC,GAAW,EACXC,cAA+B,EACrB;IACV,MAAMC,UAAU,IAAIC,QAAQ;QAAEC,UAAUJ;IAAI;IAE5CF,qBAAqBI,SAASD;IAE9B,OAAO,IAAII,SAAS,IAAI,EAAE;QAAEC,QAAQ;QAAKJ;IAAQ;AACnD,CAAC;AAED,OAAO,SAASK,2BAAqC;IACnD,OAAO,IAAIF,SAAS,IAAI,EAAE;QAAEC,QAAQ;IAAI;AAC1C,CAAC;AAED,OAAO,SAASE,yBAAmC;IACjD,OAAO,IAAIH,SAAS,IAAI,EAAE;QAAEC,QAAQ;IAAI;AAC1C,CAAC;AAED,OAAO,SAASG,iCAA2C;IACzD,OAAO,IAAIJ,SAAS,IAAI,EAAE;QAAEC,QAAQ;IAAI;AAC1C,CAAC;AAED,OAAO,SAASI,oCAA8C;IAC5D,OAAO,IAAIL,SAAS,IAAI,EAAE;QAAEC,QAAQ;IAAI;AAC1C,CAAC"}
|
|
@@ -60,6 +60,7 @@ export function patchFetch({ serverHooks , staticGenerationAsyncStorage }) {
|
|
|
60
60
|
// Error caused by malformed URL should be handled by native fetch
|
|
61
61
|
url = undefined;
|
|
62
62
|
}
|
|
63
|
+
const fetchUrl = (url == null ? void 0 : url.href) ?? "";
|
|
63
64
|
const fetchStart = Date.now();
|
|
64
65
|
const method = (init == null ? void 0 : (_init_method = init.method) == null ? void 0 : _init_method.toUpperCase()) || "GET";
|
|
65
66
|
return await getTracer().trace(AppRenderSpan.fetch, {
|
|
@@ -67,10 +68,10 @@ export function patchFetch({ serverHooks , staticGenerationAsyncStorage }) {
|
|
|
67
68
|
spanName: [
|
|
68
69
|
"fetch",
|
|
69
70
|
method,
|
|
70
|
-
|
|
71
|
+
fetchUrl
|
|
71
72
|
].filter(Boolean).join(" "),
|
|
72
73
|
attributes: {
|
|
73
|
-
"http.url":
|
|
74
|
+
"http.url": fetchUrl,
|
|
74
75
|
"http.method": method,
|
|
75
76
|
"net.peer.name": url == null ? void 0 : url.hostname,
|
|
76
77
|
"net.peer.port": (url == null ? void 0 : url.port) || undefined
|
|
@@ -122,7 +123,7 @@ export function patchFetch({ serverHooks , staticGenerationAsyncStorage }) {
|
|
|
122
123
|
const isForceNoStore = staticGenerationStore.fetchCache === "force-no-store";
|
|
123
124
|
let _cache = getRequestMeta("cache");
|
|
124
125
|
if (typeof _cache === "string" && typeof curRevalidate !== "undefined") {
|
|
125
|
-
console.warn(`Warning: fetch for ${
|
|
126
|
+
console.warn(`Warning: fetch for ${fetchUrl} on ${staticGenerationStore.pathname} specified "cache: ${_cache}" and "revalidate: ${curRevalidate}", only one should be specified.`);
|
|
126
127
|
_cache = undefined;
|
|
127
128
|
}
|
|
128
129
|
if (_cache === "force-cache") {
|
|
@@ -155,13 +156,13 @@ export function patchFetch({ serverHooks , staticGenerationAsyncStorage }) {
|
|
|
155
156
|
}
|
|
156
157
|
if (isOnlyNoStore) {
|
|
157
158
|
if (_cache === "force-cache" || revalidate === 0) {
|
|
158
|
-
throw new Error(`cache: 'force-cache' used on fetch for ${
|
|
159
|
+
throw new Error(`cache: 'force-cache' used on fetch for ${fetchUrl} with 'export const fetchCache = 'only-no-store'`);
|
|
159
160
|
}
|
|
160
161
|
revalidate = 0;
|
|
161
162
|
cacheReason = "fetchCache = only-no-store";
|
|
162
163
|
}
|
|
163
164
|
if (isOnlyCache && _cache === "no-store") {
|
|
164
|
-
throw new Error(`cache: 'no-store' used on fetch for ${
|
|
165
|
+
throw new Error(`cache: 'no-store' used on fetch for ${fetchUrl} with 'export const fetchCache = 'only-cache'`);
|
|
165
166
|
}
|
|
166
167
|
if (isForceCache && (typeof curRevalidate === "undefined" || curRevalidate === 0)) {
|
|
167
168
|
cacheReason = "fetchCache = force-cache";
|
|
@@ -193,7 +194,7 @@ export function patchFetch({ serverHooks , staticGenerationAsyncStorage }) {
|
|
|
193
194
|
let cacheKey;
|
|
194
195
|
if (staticGenerationStore.incrementalCache && isCacheableRevalidate) {
|
|
195
196
|
try {
|
|
196
|
-
cacheKey = await staticGenerationStore.incrementalCache.fetchCacheKey(
|
|
197
|
+
cacheKey = await staticGenerationStore.incrementalCache.fetchCacheKey(fetchUrl, isRequestInput ? input : init);
|
|
197
198
|
} catch (err) {
|
|
198
199
|
console.error(`Failed to generate cache key for`, input);
|
|
199
200
|
}
|
|
@@ -233,7 +234,6 @@ export function patchFetch({ serverHooks , staticGenerationAsyncStorage }) {
|
|
|
233
234
|
init[field] = initialInit[field];
|
|
234
235
|
}
|
|
235
236
|
}
|
|
236
|
-
const fetchUrl = (url == null ? void 0 : url.toString()) ?? "";
|
|
237
237
|
const fetchIdx = staticGenerationStore.nextFetchId ?? 1;
|
|
238
238
|
staticGenerationStore.nextFetchId = fetchIdx + 1;
|
|
239
239
|
const normalizedRevalidate = typeof revalidate !== "number" ? CACHE_ONE_YEAR : revalidate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/server/lib/patch-fetch.ts"],"names":["AppRenderSpan","getTracer","SpanKind","CACHE_ONE_YEAR","isEdgeRuntime","process","env","NEXT_RUNTIME","addImplicitTags","staticGenerationStore","newTags","pathname","originalPathname","Array","isArray","tags","includes","push","trackFetchMetric","ctx","fetchMetrics","dedupeFields","some","metric","every","field","url","cacheStatus","status","method","start","end","Date","now","idx","nextFetchId","patchFetch","serverHooks","staticGenerationAsyncStorage","globalThis","fetch","__nextPatched","DynamicServerError","originFetch","input","init","URL","Request","username","password","undefined","fetchStart","toUpperCase","trace","kind","CLIENT","spanName","toString","filter","Boolean","join","attributes","hostname","port","getRequestMeta","getStore","isRequestInput","value","next","internal","revalidate","getNextField","curRevalidate","tag","implicitTags","isOnlyCache","fetchCache","isForceCache","isDefaultCache","isDefaultNoStore","isOnlyNoStore","isForceNoStore","_cache","console","warn","cacheReason","_headers","initHeaders","get","Headers","hasUnCacheableHeader","isUnCacheableMethod","toLowerCase","autoNoCache","Error","isCacheableRevalidate","cacheKey","incrementalCache","fetchCacheKey","err","error","requestInputFields","reqInput","reqOptions","body","_ogBody","initialInit","fetchUrl","fetchIdx","normalizedRevalidate","doOriginalFetch","isStale","clonedInit","fetchType","then","res","bodyBuffer","Buffer","from","arrayBuffer","set","data","headers","Object","fromEntries","entries","Response","entry","isOnDemandRevalidate","currentTags","isRevalidate","pendingRevalidates","catch","resData","decodedBody","decode","require","subarray","isStaticGeneration","cache","dynamicUsageReason","dynamicUsageStack","stack","dynamicUsageDescription","hasNextConfig","forceDynamic","__nextGetStaticStore"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/server/lib/patch-fetch.ts"],"names":["AppRenderSpan","getTracer","SpanKind","CACHE_ONE_YEAR","isEdgeRuntime","process","env","NEXT_RUNTIME","addImplicitTags","staticGenerationStore","newTags","pathname","originalPathname","Array","isArray","tags","includes","push","trackFetchMetric","ctx","fetchMetrics","dedupeFields","some","metric","every","field","url","cacheStatus","status","method","start","end","Date","now","idx","nextFetchId","patchFetch","serverHooks","staticGenerationAsyncStorage","globalThis","fetch","__nextPatched","DynamicServerError","originFetch","input","init","URL","Request","username","password","undefined","fetchUrl","href","fetchStart","toUpperCase","trace","kind","CLIENT","spanName","filter","Boolean","join","attributes","hostname","port","getRequestMeta","getStore","isRequestInput","value","next","internal","revalidate","getNextField","curRevalidate","tag","implicitTags","isOnlyCache","fetchCache","isForceCache","isDefaultCache","isDefaultNoStore","isOnlyNoStore","isForceNoStore","_cache","console","warn","cacheReason","_headers","initHeaders","get","Headers","hasUnCacheableHeader","isUnCacheableMethod","toLowerCase","autoNoCache","Error","isCacheableRevalidate","cacheKey","incrementalCache","fetchCacheKey","err","error","requestInputFields","reqInput","reqOptions","body","_ogBody","initialInit","fetchIdx","normalizedRevalidate","doOriginalFetch","isStale","clonedInit","fetchType","then","res","bodyBuffer","Buffer","from","arrayBuffer","set","data","headers","Object","fromEntries","entries","toString","Response","entry","isOnDemandRevalidate","currentTags","isRevalidate","pendingRevalidates","catch","resData","decodedBody","decode","require","subarray","isStaticGeneration","cache","dynamicUsageReason","dynamicUsageStack","stack","dynamicUsageDescription","hasNextConfig","forceDynamic","__nextGetStaticStore"],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import httpProxy from "next/dist/compiled/http-proxy";
|
|
|
2
2
|
import { Worker } from "next/dist/compiled/jest-worker";
|
|
3
3
|
import { normalizeRepeatedSlashes } from "../../shared/lib/utils";
|
|
4
4
|
const renderServerPath = require.resolve("./render-server");
|
|
5
|
-
export const createServerHandler = async ({ port , hostname , dir , minimalMode })=>{
|
|
5
|
+
export const createServerHandler = async ({ port , hostname , dir , dev =false , minimalMode })=>{
|
|
6
6
|
var _routerWorker__workerPool;
|
|
7
7
|
const routerWorker = new Worker(renderServerPath, {
|
|
8
8
|
numWorkers: 1,
|
|
@@ -39,7 +39,7 @@ export const createServerHandler = async ({ port , hostname , dir , minimalMode
|
|
|
39
39
|
const { port: routerPort } = await routerWorker.initialize({
|
|
40
40
|
dir,
|
|
41
41
|
port,
|
|
42
|
-
dev
|
|
42
|
+
dev,
|
|
43
43
|
hostname,
|
|
44
44
|
minimalMode,
|
|
45
45
|
workerType: "router"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/server/lib/render-server-standalone.ts"],"names":["httpProxy","Worker","normalizeRepeatedSlashes","renderServerPath","require","resolve","createServerHandler","port","hostname","dir","minimalMode","routerWorker","numWorkers","maxRetries","forkOptions","env","FORCE_COLOR","process","exposedMethods","didInitialize","_worker","_workerPool","_workers","_child","on","code","signal","end","exit","workerStdout","getStdout","workerStderr","getStderr","data","stdout","write","stderr","routerPort","initialize","
|
|
1
|
+
{"version":3,"sources":["../../../src/server/lib/render-server-standalone.ts"],"names":["httpProxy","Worker","normalizeRepeatedSlashes","renderServerPath","require","resolve","createServerHandler","port","hostname","dir","dev","minimalMode","routerWorker","numWorkers","maxRetries","forkOptions","env","FORCE_COLOR","process","exposedMethods","didInitialize","_worker","_workerPool","_workers","_child","on","code","signal","end","exit","workerStdout","getStdout","workerStderr","getStderr","data","stdout","write","stderr","routerPort","initialize","workerType","getProxyServer","pathname","targetUrl","proxyServer","createProxy","target","changeOrigin","ignorePath","xfwd","ws","followRedirects","req","res","urlParts","url","split","urlNoQuery","match","cleanUrl","statusCode","setHeader","web","err","console","error"],"mappings":"AAGA,OAAOA,eAAe,gCAA+B;AACrD,SAASC,MAAM,QAAQ,iCAAgC;AACvD,SAASC,wBAAwB,QAAQ,yBAAwB;AAEjE,MAAMC,mBAAmBC,QAAQC,OAAO,CAAC;AAEzC,OAAO,MAAMC,sBAAsB,OAAO,EACxCC,KAAI,EACJC,SAAQ,EACRC,IAAG,EACHC,KAAM,KAAK,CAAA,EACXC,YAAW,EAOZ,GAAK;QAiBmB;IAhBvB,MAAMC,eAAe,IAAIX,OAAOE,kBAAkB;QAChDU,YAAY;QACZC,YAAY;QACZC,aAAa;YACXC,KAAK;gBACHC,aAAa;gBACb,GAAGC,QAAQF,GAAG;YAChB;QACF;QACAG,gBAAgB;YAAC;SAAa;IAChC;IAIA,IAAIC,gBAAgB,KAAK;IAEzB,KAAK,MAAMC,WAAY,CAAA,CAAA,4BAAA,AAACT,aAAqBU,WAAW,YAAjC,KAAA,IAAA,0BAAmCC,QAAQ,AAAD,KAAK,EAAE,CAEnE;QACH,wCAAwC;QACxCF,QAAQG,MAAM,CAACC,EAAE,CAAC,QAAQ,CAACC,MAAMC,SAAW;YAC1C,0CAA0C;YAC1C,IAAI,AAACD,CAAAA,QAAQC,MAAK,KAAM,CAACP,eAAe;gBACtCR,uBAAAA,KAAAA,IAAAA,aAAcgB,GAAG;gBACjBV,QAAQW,IAAI,CAAC;YACf,CAAC;QACH;IACF;IAEA,MAAMC,eAAelB,aAAamB,SAAS;IAC3C,MAAMC,eAAepB,aAAaqB,SAAS;IAE3CH,aAAaL,EAAE,CAAC,QAAQ,CAACS,OAAS;QAChChB,QAAQiB,MAAM,CAACC,KAAK,CAACF;IACvB;IACAF,aAAaP,EAAE,CAAC,QAAQ,CAACS,OAAS;QAChChB,QAAQmB,MAAM,CAACD,KAAK,CAACF;IACvB;IAEA,MAAM,EAAE3B,MAAM+B,WAAU,EAAE,GAAG,MAAM1B,aAAa2B,UAAU,CAAC;QACzD9B;QACAF;QACAG;QACAF;QACAG;QACA6B,YAAY;IACd;IACApB,gBAAgB,IAAI;IAEpB,MAAMqB,iBAAiB,CAACC,WAAqB;QAC3C,MAAMC,YAAY,CAAC,OAAO,EAAEnC,SAAS,CAAC,EAAE8B,WAAW,EAAEI,SAAS,CAAC;QAC/D,MAAME,cAAc5C,UAAU6C,WAAW,CAAC;YACxCC,QAAQH;YACRI,cAAc,KAAK;YACnBC,YAAY,IAAI;YAChBC,MAAM,IAAI;YACVC,IAAI,IAAI;YACRC,iBAAiB,KAAK;QACxB;QACA,OAAOP;IACT;IAEA,yBAAyB;IACzB,OAAO,OAAOQ,KAAsBC,MAAwB;QAC1D,MAAMC,WAAW,AAACF,CAAAA,IAAIG,GAAG,IAAI,EAAC,EAAGC,KAAK,CAAC;QACvC,MAAMC,aAAaH,QAAQ,CAAC,EAAE;QAE9B,oEAAoE;QACpE,+DAA+D;QAC/D,wEAAwE;QACxE,WAAW;QACX,IAAIG,qBAAAA,KAAAA,IAAAA,WAAYC,KAAK,CAAC,cAAc;YAClC,MAAMC,WAAWzD,yBAAyBkD,IAAIG,GAAG;YACjDF,IAAIO,UAAU,GAAG;YACjBP,IAAIQ,SAAS,CAAC,YAAYF;YAC1BN,IAAIzB,GAAG,CAAC+B;YACR;QACF,CAAC;QACD,MAAMf,cAAcH,eAAeW,IAAIG,GAAG,IAAI;QAC9CX,YAAYkB,GAAG,CAACV,KAAKC;QACrBT,YAAYnB,EAAE,CAAC,SAAS,CAACsC,MAAQ;YAC/BV,IAAIO,UAAU,GAAG;YACjBP,IAAIzB,GAAG,CAAC;YACRoC,QAAQC,KAAK,CAACF;QAChB;IACF;AACF,EAAC"}
|
|
@@ -125,7 +125,9 @@ export default class NextNodeServer extends BaseServer {
|
|
|
125
125
|
if (!this.minimalMode) {
|
|
126
126
|
this.imageResponseCache = new ResponseCache(this.minimalMode);
|
|
127
127
|
}
|
|
128
|
-
|
|
128
|
+
const { appDocumentPreloading } = this.nextConfig.experimental;
|
|
129
|
+
const isDefaultEnabled = typeof appDocumentPreloading === "undefined";
|
|
130
|
+
if (!options.dev && (appDocumentPreloading === true || !(this.minimalMode && isDefaultEnabled))) {
|
|
129
131
|
// pre-warm _document and _app as these will be
|
|
130
132
|
// needed for most requests
|
|
131
133
|
loadComponents({
|