vinext 0.0.22 → 0.0.24
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/build/static-export.d.ts.map +1 -1
- package/dist/build/static-export.js +9 -7
- package/dist/build/static-export.js.map +1 -1
- package/dist/config/config-matchers.d.ts.map +1 -1
- package/dist/config/config-matchers.js +13 -3
- package/dist/config/config-matchers.js.map +1 -1
- package/dist/config/next-config.d.ts +4 -1
- package/dist/config/next-config.d.ts.map +1 -1
- package/dist/config/next-config.js +10 -5
- package/dist/config/next-config.js.map +1 -1
- package/dist/deploy.d.ts.map +1 -1
- package/dist/deploy.js +83 -24
- package/dist/deploy.js.map +1 -1
- package/dist/index.d.ts +36 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +230 -40
- package/dist/index.js.map +1 -1
- package/dist/routing/app-router.d.ts +2 -1
- package/dist/routing/app-router.d.ts.map +1 -1
- package/dist/routing/app-router.js +73 -66
- package/dist/routing/app-router.js.map +1 -1
- package/dist/routing/file-matcher.d.ts +24 -0
- package/dist/routing/file-matcher.d.ts.map +1 -0
- package/dist/routing/file-matcher.js +75 -0
- package/dist/routing/file-matcher.js.map +1 -0
- package/dist/routing/pages-router.d.ts +3 -2
- package/dist/routing/pages-router.d.ts.map +1 -1
- package/dist/routing/pages-router.js +24 -17
- package/dist/routing/pages-router.js.map +1 -1
- package/dist/server/app-dev-server.d.ts.map +1 -1
- package/dist/server/app-dev-server.js +110 -64
- package/dist/server/app-dev-server.js.map +1 -1
- package/dist/server/dev-server.d.ts +2 -1
- package/dist/server/dev-server.d.ts.map +1 -1
- package/dist/server/dev-server.js +16 -14
- package/dist/server/dev-server.js.map +1 -1
- package/dist/server/prod-server.d.ts +8 -2
- package/dist/server/prod-server.d.ts.map +1 -1
- package/dist/server/prod-server.js +71 -16
- package/dist/server/prod-server.js.map +1 -1
- package/dist/server/worker-utils.d.ts +15 -0
- package/dist/server/worker-utils.d.ts.map +1 -0
- package/dist/server/worker-utils.js +41 -0
- package/dist/server/worker-utils.js.map +1 -0
- package/dist/shims/cache.d.ts +1 -1
- package/dist/shims/cache.d.ts.map +1 -1
- package/dist/shims/cache.js +8 -3
- package/dist/shims/cache.js.map +1 -1
- package/dist/shims/headers.d.ts +6 -0
- package/dist/shims/headers.d.ts.map +1 -1
- package/dist/shims/headers.js +8 -0
- package/dist/shims/headers.js.map +1 -1
- package/dist/shims/metadata.d.ts +1 -0
- package/dist/shims/metadata.d.ts.map +1 -1
- package/dist/shims/metadata.js +5 -1
- package/dist/shims/metadata.js.map +1 -1
- package/dist/utils/project.d.ts +13 -1
- package/dist/utils/project.d.ts.map +1 -1
- package/dist/utils/project.js +63 -13
- package/dist/utils/project.js.map +1 -1
- package/package.json +6 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pages-router.js","sourceRoot":"","sources":["../../src/routing/pages-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { glob } from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { routePrecedence } from \"./utils.js\";\n\nexport interface Route {\n /** URL pattern, e.g. \"/\" or \"/about\" or \"/posts/:id\" */\n pattern: string;\n /** Absolute file path to the page component */\n filePath: string;\n /** Whether this is a dynamic route */\n isDynamic: boolean;\n /** Parameter names for dynamic segments */\n params: string[];\n}\n\n// Route cache — invalidated when pages directory changes\nconst routeCache = new Map<string, { routes: Route[]; promise: Promise<Route[]> }>();\n\n/**\n * Invalidate cached routes for a given pages directory.\n * Called by the file watcher when pages are added/removed.\n */\nexport function invalidateRouteCache(pagesDir: string): void {\n routeCache.delete(`pages:${pagesDir}`);\n routeCache.delete(`api:${pagesDir}`);\n}\n\n/**\n * Scan the pages/ directory and return a list of routes.\n * Results are cached — call invalidateRouteCache() when files change.\n *\n * Follows Next.js Pages Router conventions:\n * - pages/index.tsx -> /\n * - pages/about.tsx -> /about\n * - pages/posts/[id].tsx -> /posts/:id\n * - pages/[...slug].tsx -> /:slug+\n * - Ignores _app.tsx, _document.tsx, _error.tsx, files starting with _\n * - Ignores pages/api/ (handled separately later)\n */\nexport async function pagesRouter(pagesDir: string): Promise<Route[]> {\n const cacheKey = `pages:${pagesDir}`;\n const cached = routeCache.get(cacheKey);\n if (cached) return cached.promise;\n\n const promise = scanPageRoutes(pagesDir);\n routeCache.set(cacheKey, { routes: [], promise });\n const routes = await promise;\n routeCache.set(cacheKey, { routes, promise });\n return routes;\n}\n\nasync function scanPageRoutes(pagesDir: string): Promise<Route[]> {\n const routes: Route[] = [];\n\n // Use function form of exclude for Node < 22.14 compatibility (string arrays require >= 22.14)\n for await (const file of glob(\"**/*.{tsx,ts,jsx,js}\", { cwd: pagesDir, exclude: (name: string) => name === \"api\" || name.startsWith(\"_\") })) {\n const route = fileToRoute(file, pagesDir);\n if (route) routes.push(route);\n }\n\n // Sort: static routes first, then dynamic, then catch-all\n routes.sort((a, b) => {\n const diff = routePrecedence(a.pattern) - routePrecedence(b.pattern);\n return diff !== 0 ? diff : a.pattern.localeCompare(b.pattern);\n });\n\n return routes;\n}\n\n/**\n * Convert a file path relative to pages/ into a Route.\n */\nfunction fileToRoute(file: string, pagesDir: string): Route | null {\n // Remove extension\n const withoutExt = file.replace(/\\.(tsx?|jsx?)$/, \"\");\n\n // Convert to URL segments\n const segments = withoutExt.split(path.sep);\n\n // Handle index files: pages/index.tsx -> /\n const lastSegment = segments[segments.length - 1];\n if (lastSegment === \"index\") {\n segments.pop();\n }\n\n const params: string[] = [];\n let isDynamic = false;\n\n // Convert Next.js dynamic segments to URL patterns\n const urlSegments = segments.map((segment) => {\n // Catch-all: [...slug] -> :slug+ (param names may contain hyphens)\n const catchAllMatch = segment.match(/^\\[\\.\\.\\.([\\w-]+)\\]$/);\n if (catchAllMatch) {\n isDynamic = true;\n params.push(catchAllMatch[1]);\n return `:${catchAllMatch[1]}+`;\n }\n\n // Optional catch-all: [[...slug]] -> :slug* (param names may contain hyphens)\n const optionalCatchAllMatch = segment.match(/^\\[\\[\\.\\.\\.([\\w-]+)\\]\\]$/);\n if (optionalCatchAllMatch) {\n isDynamic = true;\n params.push(optionalCatchAllMatch[1]);\n return `:${optionalCatchAllMatch[1]}*`;\n }\n\n // Dynamic segment: [id] -> :id (param names may contain hyphens)\n const dynamicMatch = segment.match(/^\\[([\\w-]+)\\]$/);\n if (dynamicMatch) {\n isDynamic = true;\n params.push(dynamicMatch[1]);\n return `:${dynamicMatch[1]}`;\n }\n\n return segment;\n });\n\n const pattern = \"/\" + urlSegments.join(\"/\");\n\n return {\n pattern: pattern === \"/\" ? \"/\" : pattern,\n filePath: path.join(pagesDir, file),\n isDynamic,\n params,\n };\n}\n\n/**\n * Match a URL path against a route pattern.\n * Returns the matched params or null if no match.\n */\nexport function matchRoute(\n url: string,\n routes: Route[],\n): { route: Route; params: Record<string, string | string[]> } | null {\n // Normalize: strip query string and trailing slash\n const pathname = url.split(\"?\")[0];\n let normalizedUrl =\n pathname === \"/\" ? \"/\" : pathname.replace(/\\/$/, \"\");\n try { normalizedUrl = decodeURIComponent(normalizedUrl); } catch { /* malformed percent-encoding — match as-is */ }\n\n for (const route of routes) {\n const params = matchPattern(normalizedUrl, route.pattern);\n if (params !== null) {\n return { route, params };\n }\n }\n\n return null;\n}\n\n/**\n * Scan the pages/api/ directory and return API routes.\n * Results are cached — call invalidateRouteCache() when files change.\n *\n * Follows Next.js conventions:\n * - pages/api/hello.ts -> /api/hello\n * - pages/api/users/[id].ts -> /api/users/:id\n */\nexport async function apiRouter(pagesDir: string): Promise<Route[]> {\n const cacheKey = `api:${pagesDir}`;\n const cached = routeCache.get(cacheKey);\n if (cached) return cached.promise;\n\n const promise = scanApiRoutes(pagesDir);\n routeCache.set(cacheKey, { routes: [], promise });\n const routes = await promise;\n routeCache.set(cacheKey, { routes, promise });\n return routes;\n}\n\nasync function scanApiRoutes(pagesDir: string): Promise<Route[]> {\n const apiDir = path.join(pagesDir, \"api\");\n let files: string[];\n try {\n files = [];\n for await (const file of glob(\"**/*.{ts,tsx,js,jsx}\", { cwd: apiDir })) {\n files.push(file);\n }\n } catch {\n files = [];\n }\n\n const routes: Route[] = [];\n\n for (const file of files) {\n // Reuse fileToRoute but pretend the file is under a virtual \"api/\" prefix\n const route = fileToRoute(path.join(\"api\", file), pagesDir);\n if (route) {\n routes.push(route);\n }\n }\n\n // Sort same as page routes\n routes.sort((a, b) => {\n const diff = routePrecedence(a.pattern) - routePrecedence(b.pattern);\n return diff !== 0 ? diff : a.pattern.localeCompare(b.pattern);\n });\n\n return routes;\n}\n\nfunction matchPattern(\n url: string,\n pattern: string,\n): Record<string, string | string[]> | null {\n const urlParts = url.split(\"/\").filter(Boolean);\n const patternParts = pattern.split(\"/\").filter(Boolean);\n\n const params: Record<string, string | string[]> = Object.create(null);\n\n for (let i = 0; i < patternParts.length; i++) {\n const pp = patternParts[i];\n\n // Catch-all: :slug+\n if (pp.endsWith(\"+\")) {\n const paramName = pp.slice(1, -1);\n const remaining = urlParts.slice(i);\n if (remaining.length === 0) return null;\n params[paramName] = remaining;\n return params;\n }\n\n // Optional catch-all: :slug*\n if (pp.endsWith(\"*\")) {\n const paramName = pp.slice(1, -1);\n const remaining = urlParts.slice(i);\n params[paramName] = remaining;\n return params;\n }\n\n // Dynamic segment: :id\n if (pp.startsWith(\":\")) {\n const paramName = pp.slice(1);\n if (i >= urlParts.length) return null;\n params[paramName] = urlParts[i];\n continue;\n }\n\n // Static segment\n if (i >= urlParts.length || urlParts[i] !== pp) return null;\n }\n\n // All pattern parts matched - check url doesn't have extra segments\n if (urlParts.length !== patternParts.length) return null;\n\n return params;\n}\n\n/**\n * Convert internal route pattern (e.g., \"/posts/:id\", \"/docs/:slug+\")\n * to Next.js bracket format (e.g., \"/posts/[id]\", \"/docs/[...slug]\").\n * Used for __NEXT_DATA__.page which apps expect in Next.js format.\n */\nexport function patternToNextFormat(pattern: string): string {\n return pattern\n .replace(/:([\\w-]+)\\*/g, \"[[...$1]]\") // optional catch-all :slug* -> [[...slug]]\n .replace(/:([\\w-]+)\\+/g, \"[...$1]\") // catch-all :slug+ -> [...slug]\n .replace(/:([\\w-]+)/g, \"[$1]\"); // dynamic :id -> [id]\n}\n"]}
|
|
1
|
+
{"version":3,"file":"pages-router.js","sourceRoot":"","sources":["../../src/routing/pages-router.ts"],"names":[],"mappings":"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","sourcesContent":["import path from \"node:path\";\nimport { routePrecedence } from \"./utils.js\";\nimport {\n createValidFileMatcher,\n scanWithExtensions,\n type ValidFileMatcher,\n} from \"./file-matcher.js\";\n\nexport interface Route {\n /** URL pattern, e.g. \"/\" or \"/about\" or \"/posts/:id\" */\n pattern: string;\n /** Absolute file path to the page component */\n filePath: string;\n /** Whether this is a dynamic route */\n isDynamic: boolean;\n /** Parameter names for dynamic segments */\n params: string[];\n}\n\n// Route cache — invalidated when pages directory changes\nconst routeCache = new Map<string, { routes: Route[]; promise: Promise<Route[]> }>();\n\n/**\n * Invalidate cached routes for a given pages directory.\n * Called by the file watcher when pages are added/removed.\n */\nexport function invalidateRouteCache(pagesDir: string): void {\n for (const key of routeCache.keys()) {\n if (key.startsWith(`pages:${pagesDir}:`) || key.startsWith(`api:${pagesDir}:`)) {\n routeCache.delete(key);\n }\n }\n}\n\n/**\n * Scan the pages/ directory and return a list of routes.\n * Results are cached — call invalidateRouteCache() when files change.\n *\n * Follows Next.js Pages Router conventions:\n * - pages/index.tsx -> /\n * - pages/about.tsx -> /about\n * - pages/posts/[id].tsx -> /posts/:id\n * - pages/[...slug].tsx -> /:slug+\n * - Ignores _app.tsx, _document.tsx, _error.tsx, files starting with _\n * - Ignores pages/api/ (handled separately later)\n */\nexport async function pagesRouter(\n pagesDir: string,\n pageExtensions?: readonly string[],\n matcher?: ValidFileMatcher,\n): Promise<Route[]> {\n matcher ??= createValidFileMatcher(pageExtensions);\n const cacheKey = `pages:${pagesDir}:${JSON.stringify(matcher.extensions)}`;\n const cached = routeCache.get(cacheKey);\n if (cached) return cached.promise;\n\n const promise = scanPageRoutes(pagesDir, matcher);\n routeCache.set(cacheKey, { routes: [], promise });\n const routes = await promise;\n routeCache.set(cacheKey, { routes, promise });\n return routes;\n}\n\nasync function scanPageRoutes(\n pagesDir: string,\n matcher: ValidFileMatcher,\n): Promise<Route[]> {\n const routes: Route[] = [];\n\n // Use function form of exclude for Node < 22.14 compatibility (string arrays require >= 22.14)\n for await (const file of scanWithExtensions(\n \"**/*\",\n pagesDir,\n matcher.extensions,\n (name: string) => name === \"api\" || name.startsWith(\"_\"),\n )) {\n const route = fileToRoute(file, pagesDir, matcher);\n if (route) routes.push(route);\n }\n\n // Sort: static routes first, then dynamic, then catch-all\n routes.sort((a, b) => {\n const diff = routePrecedence(a.pattern) - routePrecedence(b.pattern);\n return diff !== 0 ? diff : a.pattern.localeCompare(b.pattern);\n });\n\n return routes;\n}\n\n/**\n * Convert a file path relative to pages/ into a Route.\n */\nfunction fileToRoute(\n file: string,\n pagesDir: string,\n matcher: ValidFileMatcher,\n): Route | null {\n // Remove extension\n const withoutExt = matcher.stripExtension(file);\n if (withoutExt === file) return null;\n\n // Convert to URL segments\n const segments = withoutExt.split(path.sep);\n\n // Handle index files: pages/index.tsx -> /\n const lastSegment = segments[segments.length - 1];\n if (lastSegment === \"index\") {\n segments.pop();\n }\n\n const params: string[] = [];\n let isDynamic = false;\n\n // Convert Next.js dynamic segments to URL patterns\n const urlSegments = segments.map((segment) => {\n // Catch-all: [...slug] -> :slug+ (param names may contain hyphens)\n const catchAllMatch = segment.match(/^\\[\\.\\.\\.([\\w-]+)\\]$/);\n if (catchAllMatch) {\n isDynamic = true;\n params.push(catchAllMatch[1]);\n return `:${catchAllMatch[1]}+`;\n }\n\n // Optional catch-all: [[...slug]] -> :slug* (param names may contain hyphens)\n const optionalCatchAllMatch = segment.match(/^\\[\\[\\.\\.\\.([\\w-]+)\\]\\]$/);\n if (optionalCatchAllMatch) {\n isDynamic = true;\n params.push(optionalCatchAllMatch[1]);\n return `:${optionalCatchAllMatch[1]}*`;\n }\n\n // Dynamic segment: [id] -> :id (param names may contain hyphens)\n const dynamicMatch = segment.match(/^\\[([\\w-]+)\\]$/);\n if (dynamicMatch) {\n isDynamic = true;\n params.push(dynamicMatch[1]);\n return `:${dynamicMatch[1]}`;\n }\n\n return segment;\n });\n\n const pattern = \"/\" + urlSegments.join(\"/\");\n\n return {\n pattern: pattern === \"/\" ? \"/\" : pattern,\n filePath: path.join(pagesDir, file),\n isDynamic,\n params,\n };\n}\n\n/**\n * Match a URL path against a route pattern.\n * Returns the matched params or null if no match.\n */\nexport function matchRoute(\n url: string,\n routes: Route[],\n): { route: Route; params: Record<string, string | string[]> } | null {\n // Normalize: strip query string and trailing slash\n const pathname = url.split(\"?\")[0];\n let normalizedUrl =\n pathname === \"/\" ? \"/\" : pathname.replace(/\\/$/, \"\");\n try { normalizedUrl = decodeURIComponent(normalizedUrl); } catch { /* malformed percent-encoding — match as-is */ }\n\n for (const route of routes) {\n const params = matchPattern(normalizedUrl, route.pattern);\n if (params !== null) {\n return { route, params };\n }\n }\n\n return null;\n}\n\n/**\n * Scan the pages/api/ directory and return API routes.\n * Results are cached — call invalidateRouteCache() when files change.\n *\n * Follows Next.js conventions:\n * - pages/api/hello.ts -> /api/hello\n * - pages/api/users/[id].ts -> /api/users/:id\n */\nexport async function apiRouter(\n pagesDir: string,\n pageExtensions?: readonly string[],\n matcher?: ValidFileMatcher,\n): Promise<Route[]> {\n matcher ??= createValidFileMatcher(pageExtensions);\n const cacheKey = `api:${pagesDir}:${JSON.stringify(matcher.extensions)}`;\n const cached = routeCache.get(cacheKey);\n if (cached) return cached.promise;\n\n const promise = scanApiRoutes(pagesDir, matcher);\n routeCache.set(cacheKey, { routes: [], promise });\n const routes = await promise;\n routeCache.set(cacheKey, { routes, promise });\n return routes;\n}\n\nasync function scanApiRoutes(\n pagesDir: string,\n matcher: ValidFileMatcher,\n): Promise<Route[]> {\n const apiDir = path.join(pagesDir, \"api\");\n let files: string[];\n try {\n files = [];\n for await (const file of scanWithExtensions(\n \"**/*\",\n apiDir,\n matcher.extensions,\n )) {\n files.push(file);\n }\n } catch {\n files = [];\n }\n\n const routes: Route[] = [];\n\n for (const file of files) {\n // Reuse fileToRoute but pretend the file is under a virtual \"api/\" prefix\n const route = fileToRoute(path.join(\"api\", file), pagesDir, matcher);\n if (route) {\n routes.push(route);\n }\n }\n\n // Sort same as page routes\n routes.sort((a, b) => {\n const diff = routePrecedence(a.pattern) - routePrecedence(b.pattern);\n return diff !== 0 ? diff : a.pattern.localeCompare(b.pattern);\n });\n\n return routes;\n}\n\nfunction matchPattern(\n url: string,\n pattern: string,\n): Record<string, string | string[]> | null {\n const urlParts = url.split(\"/\").filter(Boolean);\n const patternParts = pattern.split(\"/\").filter(Boolean);\n\n const params: Record<string, string | string[]> = Object.create(null);\n\n for (let i = 0; i < patternParts.length; i++) {\n const pp = patternParts[i];\n\n // Catch-all: :slug+\n if (pp.endsWith(\"+\")) {\n const paramName = pp.slice(1, -1);\n const remaining = urlParts.slice(i);\n if (remaining.length === 0) return null;\n params[paramName] = remaining;\n return params;\n }\n\n // Optional catch-all: :slug*\n if (pp.endsWith(\"*\")) {\n const paramName = pp.slice(1, -1);\n const remaining = urlParts.slice(i);\n params[paramName] = remaining;\n return params;\n }\n\n // Dynamic segment: :id\n if (pp.startsWith(\":\")) {\n const paramName = pp.slice(1);\n if (i >= urlParts.length) return null;\n params[paramName] = urlParts[i];\n continue;\n }\n\n // Static segment\n if (i >= urlParts.length || urlParts[i] !== pp) return null;\n }\n\n // All pattern parts matched - check url doesn't have extra segments\n if (urlParts.length !== patternParts.length) return null;\n\n return params;\n}\n\n/**\n * Convert internal route pattern (e.g., \"/posts/:id\", \"/docs/:slug+\")\n * to Next.js bracket format (e.g., \"/posts/[id]\", \"/docs/[...slug]\").\n * Used for __NEXT_DATA__.page which apps expect in Next.js format.\n */\nexport function patternToNextFormat(pattern: string): string {\n return pattern\n .replace(/:([\\w-]+)\\*/g, \"[[...$1]]\") // optional catch-all :slug* -> [[...slug]]\n .replace(/:([\\w-]+)\\+/g, \"[...$1]\") // catch-all :slug+ -> [...slug]\n .replace(/:([\\w-]+)/g, \"[$1]\"); // dynamic :id -> [id]\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-dev-server.d.ts","sourceRoot":"","sources":["../../src/server/app-dev-server.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAKtF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,YAAY,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,WAAW,EAAE,CAAC;QAC3B,UAAU,EAAE,WAAW,EAAE,CAAC;QAC1B,QAAQ,EAAE,WAAW,EAAE,CAAC;KACzB,CAAC;IACF,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,4GAA4G;IAC5G,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,uGAAuG;IACvG,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,QAAQ,EAAE,EAClB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,EAC9B,cAAc,CAAC,EAAE,iBAAiB,EAAE,EACpC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,EAC/B,QAAQ,CAAC,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,OAAO,EACvB,MAAM,CAAC,EAAE,eAAe,GACvB,MAAM,
|
|
1
|
+
{"version":3,"file":"app-dev-server.d.ts","sourceRoot":"","sources":["../../src/server/app-dev-server.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAKtF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,YAAY,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,WAAW,EAAE,CAAC;QAC3B,UAAU,EAAE,WAAW,EAAE,CAAC;QAC1B,QAAQ,EAAE,WAAW,EAAE,CAAC;KACzB,CAAC;IACF,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,4GAA4G;IAC5G,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,uGAAuG;IACvG,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,QAAQ,EAAE,EAClB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,EAC9B,cAAc,CAAC,EAAE,iBAAiB,EAAE,EACpC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,EAC/B,QAAQ,CAAC,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,OAAO,EACvB,MAAM,CAAC,EAAE,eAAe,GACvB,MAAM,CAqxER;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAibzC;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CA+T7C"}
|
|
@@ -196,7 +196,7 @@ import {
|
|
|
196
196
|
} from "@vitejs/plugin-rsc/rsc";
|
|
197
197
|
import { createElement, Suspense, Fragment } from "react";
|
|
198
198
|
import { setNavigationContext as _setNavigationContextOrig, getNavigationContext as _getNavigationContext } from "next/navigation";
|
|
199
|
-
import { setHeadersContext, headersContextFromRequest, getDraftModeCookieHeader, getAndClearPendingCookies, consumeDynamicUsage, markDynamicUsage, runWithHeadersContext, applyMiddlewareRequestHeaders } from "next/headers";
|
|
199
|
+
import { setHeadersContext, headersContextFromRequest, getDraftModeCookieHeader, getAndClearPendingCookies, consumeDynamicUsage, markDynamicUsage, runWithHeadersContext, applyMiddlewareRequestHeaders, getHeadersContext } from "next/headers";
|
|
200
200
|
import { NextRequest } from "next/server";
|
|
201
201
|
import { ErrorBoundary, NotFoundBoundary } from "vinext/error-boundary";
|
|
202
202
|
import { LayoutSegmentProvider } from "vinext/layout-segment-context";
|
|
@@ -397,7 +397,7 @@ async function renderHTTPAccessFallbackPage(route, statusCode, isRscRequest, req
|
|
|
397
397
|
}
|
|
398
398
|
}
|
|
399
399
|
const resolvedMetadata = metadataList.length > 0 ? mergeMetadata(metadataList) : null;
|
|
400
|
-
const resolvedViewport =
|
|
400
|
+
const resolvedViewport = mergeViewport(viewportList);
|
|
401
401
|
|
|
402
402
|
// Build element: metadata head + noindex meta + boundary component wrapped in layouts
|
|
403
403
|
// Always include charset and default viewport for parity with Next.js.
|
|
@@ -405,8 +405,7 @@ async function renderHTTPAccessFallbackPage(route, statusCode, isRscRequest, req
|
|
|
405
405
|
const noindexMeta = createElement("meta", { name: "robots", content: "noindex" });
|
|
406
406
|
const headElements = [charsetMeta, noindexMeta];
|
|
407
407
|
if (resolvedMetadata) headElements.push(createElement(MetadataHead, { metadata: resolvedMetadata }));
|
|
408
|
-
|
|
409
|
-
headElements.push(createElement(ViewportHead, { viewport: effectiveViewport }));
|
|
408
|
+
headElements.push(createElement(ViewportHead, { viewport: resolvedViewport }));
|
|
410
409
|
let element = createElement(Fragment, null, ...headElements, createElement(BoundaryComponent));
|
|
411
410
|
if (isRscRequest) {
|
|
412
411
|
// For RSC requests (client-side navigation), wrap the element with the same
|
|
@@ -671,7 +670,7 @@ async function buildPageElement(route, params, opts, searchParams) {
|
|
|
671
670
|
if (pageVp) viewportList.push(pageVp);
|
|
672
671
|
}
|
|
673
672
|
const resolvedMetadata = metadataList.length > 0 ? mergeMetadata(metadataList) : null;
|
|
674
|
-
const resolvedViewport =
|
|
673
|
+
const resolvedViewport = mergeViewport(viewportList);
|
|
675
674
|
|
|
676
675
|
// Build nested layout tree from outermost to innermost.
|
|
677
676
|
// Next.js 16 passes params/searchParams as Promises (async pattern)
|
|
@@ -712,9 +711,7 @@ async function buildPageElement(route, params, opts, searchParams) {
|
|
|
712
711
|
// Always emit <meta charset="utf-8"> — Next.js includes this on every page
|
|
713
712
|
headElements.push(createElement("meta", { charSet: "utf-8" }));
|
|
714
713
|
if (resolvedMetadata) headElements.push(createElement(MetadataHead, { metadata: resolvedMetadata }));
|
|
715
|
-
|
|
716
|
-
const effectiveViewport = resolvedViewport ?? { width: "device-width", initialScale: 1 };
|
|
717
|
-
headElements.push(createElement(ViewportHead, { viewport: effectiveViewport }));
|
|
714
|
+
headElements.push(createElement(ViewportHead, { viewport: resolvedViewport }));
|
|
718
715
|
element = createElement(Fragment, null, ...headElements, element);
|
|
719
716
|
}
|
|
720
717
|
|
|
@@ -1054,6 +1051,28 @@ function __buildRequestContext(request) {
|
|
|
1054
1051
|
};
|
|
1055
1052
|
}
|
|
1056
1053
|
|
|
1054
|
+
/**
|
|
1055
|
+
* Build a request context from the live ALS HeadersContext, which reflects
|
|
1056
|
+
* any x-middleware-request-* header mutations applied by middleware.
|
|
1057
|
+
* Used for afterFiles and fallback rewrite has/missing evaluation — these
|
|
1058
|
+
* run after middleware in the App Router execution order.
|
|
1059
|
+
*/
|
|
1060
|
+
function __buildPostMwRequestContext(request) {
|
|
1061
|
+
const url = new URL(request.url);
|
|
1062
|
+
const ctx = getHeadersContext();
|
|
1063
|
+
if (!ctx) return __buildRequestContext(request);
|
|
1064
|
+
// ctx.cookies is a Map<string, string> (HeadersContext), but RequestContext
|
|
1065
|
+
// requires a plain Record<string, string> for has/missing cookie evaluation
|
|
1066
|
+
// (config-matchers.ts uses obj[key] not Map.get()). Convert here.
|
|
1067
|
+
const cookiesRecord = Object.fromEntries(ctx.cookies);
|
|
1068
|
+
return {
|
|
1069
|
+
headers: ctx.headers,
|
|
1070
|
+
cookies: cookiesRecord,
|
|
1071
|
+
query: url.searchParams,
|
|
1072
|
+
host: ctx.headers.get("host") || url.host,
|
|
1073
|
+
};
|
|
1074
|
+
}
|
|
1075
|
+
|
|
1057
1076
|
function __sanitizeDestination(dest) {
|
|
1058
1077
|
if (dest.startsWith("http://") || dest.startsWith("https://")) return dest;
|
|
1059
1078
|
dest = dest.replace(/^[\\\\/]+/, "/");
|
|
@@ -1188,7 +1207,16 @@ async function __proxyExternalRequest(request, externalUrl) {
|
|
|
1188
1207
|
console.error("[vinext] External rewrite proxy error:", e); return new Response("Bad Gateway", { status: 502 });
|
|
1189
1208
|
}
|
|
1190
1209
|
const respHeaders = new Headers();
|
|
1191
|
-
|
|
1210
|
+
// Node.js fetch() auto-decompresses response bodies, while Workers fetch()
|
|
1211
|
+
// preserves wire encoding. Only strip encoding/length on Node.js to avoid
|
|
1212
|
+
// double-decompression errors without breaking Workers parity.
|
|
1213
|
+
const __isNodeRuntime = typeof process !== "undefined" && !!(process.versions && process.versions.node);
|
|
1214
|
+
upstream.headers.forEach(function(value, key) {
|
|
1215
|
+
var lower = key.toLowerCase();
|
|
1216
|
+
if (__hopByHopHeaders.has(lower)) return;
|
|
1217
|
+
if (__isNodeRuntime && (lower === "content-encoding" || lower === "content-length")) return;
|
|
1218
|
+
respHeaders.append(key, value);
|
|
1219
|
+
});
|
|
1192
1220
|
return new Response(upstream.body, { status: upstream.status, statusText: upstream.statusText, headers: respHeaders });
|
|
1193
1221
|
}
|
|
1194
1222
|
|
|
@@ -1231,18 +1259,41 @@ export default async function handler(request) {
|
|
|
1231
1259
|
_runWithPrivateCache(() =>
|
|
1232
1260
|
runWithFetchCache(async () => {
|
|
1233
1261
|
const __reqCtx = __buildRequestContext(request);
|
|
1234
|
-
|
|
1262
|
+
// Per-request container for middleware state. Passed into
|
|
1263
|
+
// _handleRequest which fills in .headers and .status;
|
|
1264
|
+
// avoids module-level variables that race on Workers.
|
|
1265
|
+
const _mwCtx = { headers: null, status: null };
|
|
1266
|
+
const response = await _handleRequest(request, __reqCtx, _mwCtx);
|
|
1235
1267
|
// Apply custom headers from next.config.js to non-redirect responses.
|
|
1236
1268
|
// Skip redirects (3xx) because Response.redirect() creates immutable headers,
|
|
1237
1269
|
// and Next.js doesn't apply custom headers to redirects anyway.
|
|
1238
|
-
if (
|
|
1239
|
-
|
|
1240
|
-
|
|
1241
|
-
|
|
1242
|
-
|
|
1243
|
-
|
|
1244
|
-
|
|
1245
|
-
|
|
1270
|
+
if (response && response.headers && !(response.status >= 300 && response.status < 400)) {
|
|
1271
|
+
if (__configHeaders.length) {
|
|
1272
|
+
const url = new URL(request.url);
|
|
1273
|
+
let pathname;
|
|
1274
|
+
try { pathname = __normalizePath(decodeURIComponent(url.pathname)); } catch { pathname = url.pathname; }
|
|
1275
|
+
${bp ? `if (pathname.startsWith(${JSON.stringify(bp)})) pathname = pathname.slice(${JSON.stringify(bp)}.length) || "/";` : ""}
|
|
1276
|
+
const extraHeaders = __applyConfigHeaders(pathname, __reqCtx);
|
|
1277
|
+
for (const h of extraHeaders) {
|
|
1278
|
+
// Use append() for headers where multiple values must coexist
|
|
1279
|
+
// (Vary, Set-Cookie). Using set() on these would destroy
|
|
1280
|
+
// existing values like "Vary: RSC, Accept" which are critical
|
|
1281
|
+
// for correct CDN caching behavior.
|
|
1282
|
+
const lk = h.key.toLowerCase();
|
|
1283
|
+
if (lk === "vary" || lk === "set-cookie") {
|
|
1284
|
+
response.headers.append(h.key, h.value);
|
|
1285
|
+
} else {
|
|
1286
|
+
response.headers.set(h.key, h.value);
|
|
1287
|
+
}
|
|
1288
|
+
}
|
|
1289
|
+
}
|
|
1290
|
+
// Merge middleware response headers into the final response.
|
|
1291
|
+
// This runs at the top level so every response path (route
|
|
1292
|
+
// handlers, server actions, metadata, errors, etc.) gets them.
|
|
1293
|
+
if (_mwCtx.headers) {
|
|
1294
|
+
for (const [key, value] of _mwCtx.headers) {
|
|
1295
|
+
response.headers.append(key, value);
|
|
1296
|
+
}
|
|
1246
1297
|
}
|
|
1247
1298
|
}
|
|
1248
1299
|
return response;
|
|
@@ -1253,7 +1304,7 @@ export default async function handler(request) {
|
|
|
1253
1304
|
);
|
|
1254
1305
|
}
|
|
1255
1306
|
|
|
1256
|
-
async function _handleRequest(request, __reqCtx) {
|
|
1307
|
+
async function _handleRequest(request, __reqCtx, _mwCtx) {
|
|
1257
1308
|
const __reqStart = process.env.NODE_ENV !== "production" ? performance.now() : 0;
|
|
1258
1309
|
let __compileEnd;
|
|
1259
1310
|
let __renderEnd;
|
|
@@ -1324,28 +1375,12 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
1324
1375
|
}
|
|
1325
1376
|
}
|
|
1326
1377
|
|
|
1327
|
-
// ── Apply beforeFiles rewrites from next.config.js ────────────────────
|
|
1328
|
-
if (__configRewrites.beforeFiles && __configRewrites.beforeFiles.length) {
|
|
1329
|
-
// Strip .rsc suffix before matching rewrite rules — same reason as redirects above.
|
|
1330
|
-
const __rewritePathname = pathname.endsWith(".rsc") ? pathname.slice(0, -4) : pathname;
|
|
1331
|
-
const __rewritten = __applyConfigRewrites(__rewritePathname, __configRewrites.beforeFiles, __reqCtx);
|
|
1332
|
-
if (__rewritten) {
|
|
1333
|
-
if (__isExternalUrl(__rewritten)) {
|
|
1334
|
-
setHeadersContext(null);
|
|
1335
|
-
setNavigationContext(null);
|
|
1336
|
-
return __proxyExternalRequest(request, __rewritten);
|
|
1337
|
-
}
|
|
1338
|
-
pathname = __rewritten;
|
|
1339
|
-
}
|
|
1340
|
-
}
|
|
1341
|
-
|
|
1342
1378
|
const isRscRequest = pathname.endsWith(".rsc") || request.headers.get("accept")?.includes("text/x-component");
|
|
1343
1379
|
let cleanPathname = pathname.replace(/\\.rsc$/, "");
|
|
1344
1380
|
|
|
1345
|
-
// Middleware response headers
|
|
1346
|
-
|
|
1347
|
-
//
|
|
1348
|
-
let _middlewareRewriteStatus = null;
|
|
1381
|
+
// Middleware response headers and custom rewrite status are stored in
|
|
1382
|
+
// _mwCtx (per-request container) so handler() can merge them into
|
|
1383
|
+
// every response path without module-level state that races on Workers.
|
|
1349
1384
|
|
|
1350
1385
|
${middlewarePath ? `
|
|
1351
1386
|
// Run proxy/middleware if present and path matches.
|
|
@@ -1379,10 +1414,10 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
1379
1414
|
// headers are kept so applyMiddlewareRequestHeaders() can unpack them;
|
|
1380
1415
|
// the blanket strip loop after that call removes every remaining
|
|
1381
1416
|
// x-middleware-* header before the set is merged into the response.
|
|
1382
|
-
|
|
1417
|
+
_mwCtx.headers = new Headers();
|
|
1383
1418
|
for (const [key, value] of mwResponse.headers) {
|
|
1384
1419
|
if (key !== "x-middleware-next" && key !== "x-middleware-rewrite") {
|
|
1385
|
-
|
|
1420
|
+
_mwCtx.headers.append(key, value);
|
|
1386
1421
|
}
|
|
1387
1422
|
}
|
|
1388
1423
|
} else {
|
|
@@ -1397,13 +1432,13 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
1397
1432
|
cleanPathname = rewriteParsed.pathname;
|
|
1398
1433
|
// Capture custom status code from rewrite (e.g. NextResponse.rewrite(url, { status: 403 }))
|
|
1399
1434
|
if (mwResponse.status !== 200) {
|
|
1400
|
-
|
|
1435
|
+
_mwCtx.status = mwResponse.status;
|
|
1401
1436
|
}
|
|
1402
1437
|
// Also save any other headers from the rewrite response
|
|
1403
|
-
|
|
1438
|
+
_mwCtx.headers = new Headers();
|
|
1404
1439
|
for (const [key, value] of mwResponse.headers) {
|
|
1405
1440
|
if (key !== "x-middleware-next" && key !== "x-middleware-rewrite") {
|
|
1406
|
-
|
|
1441
|
+
_mwCtx.headers.append(key, value);
|
|
1407
1442
|
}
|
|
1408
1443
|
}
|
|
1409
1444
|
} else {
|
|
@@ -1423,16 +1458,37 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
1423
1458
|
// request headers. Strip ALL x-middleware-* headers from the set that will
|
|
1424
1459
|
// be merged into the outgoing HTTP response — this prefix is reserved for
|
|
1425
1460
|
// internal routing signals and must never reach clients.
|
|
1426
|
-
if (
|
|
1427
|
-
applyMiddlewareRequestHeaders(
|
|
1428
|
-
for (const key of [...
|
|
1461
|
+
if (_mwCtx.headers) {
|
|
1462
|
+
applyMiddlewareRequestHeaders(_mwCtx.headers);
|
|
1463
|
+
for (const key of [..._mwCtx.headers.keys()]) {
|
|
1429
1464
|
if (key.startsWith("x-middleware-")) {
|
|
1430
|
-
|
|
1465
|
+
_mwCtx.headers.delete(key);
|
|
1431
1466
|
}
|
|
1432
1467
|
}
|
|
1433
1468
|
}
|
|
1434
1469
|
` : ""}
|
|
1435
1470
|
|
|
1471
|
+
// Build post-middleware request context for afterFiles/fallback rewrites.
|
|
1472
|
+
// These run after middleware in the App Router execution order and should
|
|
1473
|
+
// evaluate has/missing conditions against middleware-modified headers.
|
|
1474
|
+
// When no middleware is present, this falls back to __buildRequestContext.
|
|
1475
|
+
const __postMwReqCtx = __buildPostMwRequestContext(request);
|
|
1476
|
+
|
|
1477
|
+
// ── Apply beforeFiles rewrites from next.config.js ────────────────────
|
|
1478
|
+
// In App Router execution order, beforeFiles runs after middleware so that
|
|
1479
|
+
// has/missing conditions can evaluate against middleware-modified headers.
|
|
1480
|
+
if (__configRewrites.beforeFiles && __configRewrites.beforeFiles.length) {
|
|
1481
|
+
const __rewritten = __applyConfigRewrites(cleanPathname, __configRewrites.beforeFiles, __postMwReqCtx);
|
|
1482
|
+
if (__rewritten) {
|
|
1483
|
+
if (__isExternalUrl(__rewritten)) {
|
|
1484
|
+
setHeadersContext(null);
|
|
1485
|
+
setNavigationContext(null);
|
|
1486
|
+
return __proxyExternalRequest(request, __rewritten);
|
|
1487
|
+
}
|
|
1488
|
+
cleanPathname = __rewritten;
|
|
1489
|
+
}
|
|
1490
|
+
}
|
|
1491
|
+
|
|
1436
1492
|
// ── Image optimization passthrough (dev mode — no transformation) ───────
|
|
1437
1493
|
if (cleanPathname === "/_vinext/image") {
|
|
1438
1494
|
const __rawImgUrl = url.searchParams.get("url");
|
|
@@ -1658,7 +1714,7 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
1658
1714
|
|
|
1659
1715
|
// ── Apply afterFiles rewrites from next.config.js ──────────────────────
|
|
1660
1716
|
if (__configRewrites.afterFiles && __configRewrites.afterFiles.length) {
|
|
1661
|
-
const __afterRewritten = __applyConfigRewrites(cleanPathname, __configRewrites.afterFiles,
|
|
1717
|
+
const __afterRewritten = __applyConfigRewrites(cleanPathname, __configRewrites.afterFiles, __postMwReqCtx);
|
|
1662
1718
|
if (__afterRewritten) {
|
|
1663
1719
|
if (__isExternalUrl(__afterRewritten)) {
|
|
1664
1720
|
setHeadersContext(null);
|
|
@@ -1673,7 +1729,7 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
1673
1729
|
|
|
1674
1730
|
// ── Fallback rewrites from next.config.js (if no route matched) ───────
|
|
1675
1731
|
if (!match && __configRewrites.fallback && __configRewrites.fallback.length) {
|
|
1676
|
-
const __fallbackRewritten = __applyConfigRewrites(cleanPathname, __configRewrites.fallback,
|
|
1732
|
+
const __fallbackRewritten = __applyConfigRewrites(cleanPathname, __configRewrites.fallback, __postMwReqCtx);
|
|
1677
1733
|
if (__fallbackRewritten) {
|
|
1678
1734
|
if (__isExternalUrl(__fallbackRewritten)) {
|
|
1679
1735
|
setHeadersContext(null);
|
|
@@ -2135,12 +2191,7 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
2135
2191
|
} else if (revalidateSeconds) {
|
|
2136
2192
|
responseHeaders["Cache-Control"] = "s-maxage=" + revalidateSeconds + ", stale-while-revalidate";
|
|
2137
2193
|
}
|
|
2138
|
-
//
|
|
2139
|
-
if (_middlewareResponseHeaders) {
|
|
2140
|
-
for (const [key, value] of _middlewareResponseHeaders) {
|
|
2141
|
-
responseHeaders[key] = value;
|
|
2142
|
-
}
|
|
2143
|
-
}
|
|
2194
|
+
// Middleware response headers are merged by the handler() wrapper.
|
|
2144
2195
|
// Attach internal timing header so the dev server middleware can log it.
|
|
2145
2196
|
// Format: "handlerStart,compileMs,renderMs"
|
|
2146
2197
|
// handlerStart - absolute performance.now() when _handleRequest began,
|
|
@@ -2156,7 +2207,7 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
2156
2207
|
const compileMs = __compileEnd !== undefined ? Math.round(__compileEnd - __reqStart) : -1;
|
|
2157
2208
|
responseHeaders["x-vinext-timing"] = handlerStart + "," + compileMs + ",-1";
|
|
2158
2209
|
}
|
|
2159
|
-
return new Response(rscStream, { status:
|
|
2210
|
+
return new Response(rscStream, { status: _mwCtx.status || 200, headers: responseHeaders });
|
|
2160
2211
|
}
|
|
2161
2212
|
|
|
2162
2213
|
// Collect font data from RSC environment before passing to SSR
|
|
@@ -2208,12 +2259,7 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
2208
2259
|
if (fontLinkHeader) {
|
|
2209
2260
|
response.headers.set("Link", fontLinkHeader);
|
|
2210
2261
|
}
|
|
2211
|
-
//
|
|
2212
|
-
if (_middlewareResponseHeaders) {
|
|
2213
|
-
for (const [key, value] of _middlewareResponseHeaders) {
|
|
2214
|
-
response.headers.append(key, value);
|
|
2215
|
-
}
|
|
2216
|
-
}
|
|
2262
|
+
// Middleware response headers are merged by the handler() wrapper.
|
|
2217
2263
|
// Attach internal timing header so the dev server middleware can log it.
|
|
2218
2264
|
// Format: "handlerStart,compileMs,renderMs"
|
|
2219
2265
|
// handlerStart - absolute performance.now() when _handleRequest began,
|
|
@@ -2231,9 +2277,9 @@ async function _handleRequest(request, __reqCtx) {
|
|
|
2231
2277
|
response.headers.set("x-vinext-timing", handlerStart + "," + compileMs + "," + renderMs);
|
|
2232
2278
|
}
|
|
2233
2279
|
// Apply custom status code from middleware rewrite
|
|
2234
|
-
if (
|
|
2280
|
+
if (_mwCtx.status) {
|
|
2235
2281
|
return new Response(response.body, {
|
|
2236
|
-
status:
|
|
2282
|
+
status: _mwCtx.status,
|
|
2237
2283
|
headers: response.headers,
|
|
2238
2284
|
});
|
|
2239
2285
|
}
|