vinext 1.3.0 → 1.4.0

package/dist/entries/pages-entry-helpers.js

@@ -1,2 +1 @@
-import { findFileWithExts } from "../routing/file-matcher.js";
-export { findFileWithExts };
+export { findFileWithExts } from "../routing/file-matcher.js";

package/dist/entries/pages-server-entry.d.ts

@@ -17,4 +17,5 @@ export declare function generatePagesRequestEntry(pagesDir: string, nextConfig:
  */
 export declare function generatePagesResponseEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, prerenderSecret?: string): Promise<string>;
 export declare function generateServerEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, publicFiles?: string[], options?: GeneratePagesServerEntryOptions): Promise<string>;
-//#endregion
+//#endregion
+export {};

package/dist/entries/pages-server-entry.js

@@ -29,11 +29,34 @@ const _isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url
 const _revalidationRequestPath = resolveEntryPath("../server/revalidation-request.js", import.meta.url);
 const _instrumentationRuntimePath = resolveEntryPath("../server/instrumentation-runtime.js", import.meta.url);
 const _isolateSharedPromisePath = resolveEntryPath("../server/isolate-shared-promise.js", import.meta.url);
-async function getPagesDataKind(filePath) {
+const GET_INITIAL_PROPS_NAME = /\bgetInitialProps\b/;
+/**
+* Whether a module's source names getInitialProps. Next.js serves a page
+* without data functions as one static file only when neither it nor a
+* custom _app defines getInitialProps, which it checks on the loaded modules:
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/build/utils.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts
+* The source is all the request stage has. A getInitialProps an imported
+* wrapper attaches is only seen once the page renders.
+*/
+async function namesGetInitialProps(filePath) {
+	if (filePath === null) return false;
+	return GET_INITIAL_PROPS_NAME.test(await readFile(filePath, "utf8"));
+}
+async function getPagesRouteData(filePath, appRunsInitialProps) {
 	const source = await readFile(filePath, "utf8");
-	if (hasExportedName(source, "getStaticProps")) return "static";
-	if (hasExportedName(source, "getServerSideProps")) return "server";
-	return "none";
+	if (hasExportedName(source, "getStaticProps")) return {
+		dataKind: "static",
+		runsInitialProps: false
+	};
+	if (hasExportedName(source, "getServerSideProps")) return {
+		dataKind: "server",
+		runsInitialProps: false
+	};
+	return {
+		dataKind: "none",
+		runsInitialProps: appRunsInitialProps || GET_INITIAL_PROPS_NAME.test(source)
+	};
 }
 /**
 * Generate the request-only Pages Worker entry used by a multi-stage output.
@@ -43,9 +66,10 @@ async function generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, midd
 	const pageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const hasRequestAwareDocument = findFileWithExts(pagesDir, "_document", fileMatcher) !== null;
+	const appRunsInitialProps = await namesGetInitialProps(findFileWithExts(pagesDir, "_app", fileMatcher));
 	const pageRouteEntries = await Promise.all(pageRoutes.map(async (route) => {
-		const dataKind = await getPagesDataKind(route.filePath);
-		return `  { pattern: ${JSON.stringify(route.pattern)}, patternParts: ${JSON.stringify(route.patternParts)}, isDynamic: ${route.isDynamic}, params: ${JSON.stringify(route.params)}, dataKind: ${JSON.stringify(dataKind)} }`;
+		const { dataKind, runsInitialProps } = await getPagesRouteData(route.filePath, appRunsInitialProps);
+		return `  { pattern: ${JSON.stringify(route.pattern)}, patternParts: ${JSON.stringify(route.patternParts)}, isDynamic: ${route.isDynamic}, params: ${JSON.stringify(route.params)}, dataKind: ${JSON.stringify(dataKind)}, runsInitialProps: ${runsInitialProps} }`;
 	}));
 	const apiRouteEntries = apiRoutes.map((route) => `  { pattern: ${JSON.stringify(route.pattern)}, patternParts: ${JSON.stringify(route.patternParts)}, isDynamic: ${route.isDynamic}, params: ${JSON.stringify(route.params)} }`);
 	const i18nConfigJson = nextConfig?.i18n ? JSON.stringify({
@@ -210,9 +234,10 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 	const pageImportInitializers = pageRoutes.map((r, i) => `page_${i} = await import(${JSON.stringify(r.filePath)});`);
 	const apiImports = apiRoutes.map((r, i) => instrumentationPath ? `let api_${i};` : `import * as api_${i} from ${JSON.stringify(r.filePath)};`);
 	const apiImportInitializers = apiRoutes.map((r, i) => `api_${i} = await import(${JSON.stringify(r.filePath)});`);
+	const appRunsInitialProps = await namesGetInitialProps(findFileWithExts(pagesDir, "_app", fileMatcher));
 	const pageRouteEntries = await Promise.all(pageRoutes.map(async (r, i) => {
-		const dataKind = await getPagesDataKind(r.filePath);
-		return `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: ${instrumentationPath ? "null" : `page_${i}`}, filePath: ${JSON.stringify(r.filePath)}, dataKind: ${JSON.stringify(dataKind)} }`;
+		const { dataKind, runsInitialProps } = await getPagesRouteData(r.filePath, appRunsInitialProps);
+		return `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: ${instrumentationPath ? "null" : `page_${i}`}, filePath: ${JSON.stringify(r.filePath)}, dataKind: ${JSON.stringify(dataKind)}, runsInitialProps: ${runsInitialProps} }`;
 	}));
 	const apiRouteEntries = apiRoutes.map((r, i) => `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: ${instrumentationPath ? "null" : `api_${i}`} }`);
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
@@ -318,7 +343,7 @@ export async function runMiddleware(request, ctx) {
 	return `
 import ${JSON.stringify(_serverGlobalsPath)};
 import React from "react";
-import { renderToReadableStream } from "react-dom/server.edge";
+import { renderToReadableStream } from "react-dom/server";
 import { resetSSRHead, getSSRHeadHTML, setDocumentInitialHead } from "next/head";
 import { flushPreloads } from "next/dynamic";
 import Router, { setSSRContext, wrapWithRouterContext, getPagesNavigationIsReadyFromSerializedState } from "next/router";

package/dist/entries/runtime-entry-module.d.ts

@@ -21,4 +21,5 @@ export declare function resolveEntryPath(rel: string, base: string): string;
  */
 export declare function resolveRuntimeEntryModule(name: string): string;
 export declare function resolveClientRuntimeModule(name: string): string;
+export declare function resolveShimRuntimeModule(name: string): string;
 //#endregion

package/dist/entries/runtime-entry-module.js

@@ -30,6 +30,9 @@ function resolveRuntimeEntryModule(name) {
 function resolveClientRuntimeModule(name) {
 	return resolveRuntimeModulePath("client", name);
 }
+function resolveShimRuntimeModule(name) {
+	return resolveRuntimeModulePath("shims", name);
+}
 function resolveRuntimeModulePath(directory, name) {
 	for (const ext of [
 		".ts",
@@ -43,4 +46,4 @@ function resolveRuntimeModulePath(directory, name) {
 	return resolveEntryPath(`../${directory}/${name}.js`, import.meta.url);
 }
 //#endregion
-export { resolveClientRuntimeModule, resolveEntryPath, resolveRuntimeEntryModule };
+export { resolveClientRuntimeModule, resolveEntryPath, resolveRuntimeEntryModule, resolveShimRuntimeModule };

package/dist/image/image-adapters-virtual.d.ts

@@ -57,4 +57,5 @@ export declare const VIRTUAL_IMAGE_ADAPTERS = "virtual:vinext-image-adapters";
  * given config. Always exports `registerConfiguredImageOptimizer(env)`.
  */
 export declare function generateImageAdaptersModule(images?: VinextImageConfig): string;
-//#endregion
+//#endregion
+export {};