@reckona/mreact-router 0.0.51 → 0.0.53

package/dist/build.js

@@ -28,6 +28,7 @@ export async function buildApp(options) {
     const shouldBuildCloudflare = buildTargets.includes("cloudflare");
     const shouldBuildAwsLambda = buildTargets.includes("aws-lambda");
     const routes = await scanAppRoutes({ appDir: project.routesDir });
+    const vitePlugins = options.viteConfig?.plugins;
     const files = await collectBuildFiles(project.projectRoot, project.allowedSourceDirs, project.routesDir);
     const serverDir = join(options.outDir, "server");
     const clientDir = join(options.outDir, "client");
@@ -42,7 +43,7 @@ export async function buildApp(options) {
     await mkdir(join(clientDir, ".vite"), { recursive: true });
     await mkdir(join(clientDir, "assets", "routes"), { recursive: true });
     await copyPublicAssets(project.publicDir, join(clientDir, "public"));
-    const appConventionPublicAssets = await copyAppFileConventionAssets(project.routesDir, join(clientDir, "public"));
+    const appConventionPublicAssets = await copyAppFileConventionAssets(project.routesDir, clientDir);
     await copyPublicAssets(project.publicDir, clientDir);
     const publicAssets = [
         ...new Set([...(await collectPublicAssetPaths(project.publicDir)), ...appConventionPublicAssets]),
@@ -60,6 +61,7 @@ export async function buildApp(options) {
         project,
         projectRoot: project.projectRoot,
         routes,
+        vitePlugins,
     });
     const generatedImportPolicy = buildGeneratedImportPolicy({
         files,
@@ -80,6 +82,7 @@ export async function buildApp(options) {
         route,
         sourceMapDir: join(options.outDir, "source-maps", "client"),
         sourceMaps: project.clientSourceMaps,
+        vitePlugins,
     })));
     const navigationRuntimeScript = clientRoutes.some((route) => route.navigation === true && !route.client)
         ? await writeNavigationRuntimeBundle(clientDir)
@@ -93,7 +96,9 @@ export async function buildApp(options) {
         appDir: project.routesDir,
         assetBaseUrl: project.assetBaseUrl,
         clientRoutes: clientManifestRoutes,
+        project,
         routes,
+        serverModules,
     });
     let cloudflareRouteModules;
     if (shouldBuildCloudflare) {
@@ -105,6 +110,7 @@ export async function buildApp(options) {
             routesDir: project.routesDir,
             routes,
             serverModules,
+            vitePlugins,
         });
     }
     const serverManifest = {
@@ -438,6 +444,15 @@ function isNodeError(error) {
 async function prerenderStaticRoutes(options) {
     const clientScripts = new Map(options.clientRoutes.flatMap((route) => route.client && route.script !== undefined ? [[route.path, route.script]] : []));
     const prerendered = {};
+    const importPolicy = {
+        allowedPackages: await readDeclaredProjectPackages(options.project.projectRoot),
+        allowedSourceDirs: options.project.allowedSourceDirs,
+        projectRoot: options.project.projectRoot,
+    };
+    const serverModuleMap = new Map(Object.entries(options.serverModules).map(([file, artifact]) => [
+        join(options.project.projectRoot, file),
+        artifact,
+    ]));
     for (const route of options.routes) {
         if (route.kind !== "page") {
             continue;
@@ -451,7 +466,9 @@ async function prerenderStaticRoutes(options) {
                 appDir: options.appDir,
                 assetBaseUrl: options.assetBaseUrl,
                 clientScripts,
+                importPolicy,
                 request: new Request(`http://mreact.local${pathname}`),
+                serverModules: serverModuleMap,
             });
             const headers = {};
             response.headers.forEach((value, key) => {
@@ -542,6 +559,7 @@ async function buildServerModuleArtifacts(options) {
                     code: stripRouteLoaderOnlyExports(source),
                     filename: absoluteFile,
                     importPolicy: requestModuleImportPolicy,
+                    vitePlugins: options.vitePlugins,
                 });
                 artifact.loader = {
                     code,
@@ -554,6 +572,7 @@ async function buildServerModuleArtifacts(options) {
                     code: stripRouteMetadataOnlyExports(source),
                     filename: absoluteFile,
                     importPolicy: requestModuleImportPolicy,
+                    vitePlugins: options.vitePlugins,
                 });
                 artifact.routeMetadata = {
                     code,
@@ -568,6 +587,7 @@ async function buildServerModuleArtifacts(options) {
                         importPolicy: requestModuleImportPolicy,
                         routeKind: route?.kind,
                         source,
+                        vitePlugins: options.vitePlugins,
                     }),
                     sourceHash: hashText(source),
                 };
@@ -639,6 +659,7 @@ async function buildServerModuleArtifacts(options) {
                             code: output.code,
                             filename: absoluteFile,
                             serverOutput,
+                            vitePlugins: options.vitePlugins,
                         }),
                     }
                     : {}),
@@ -662,6 +683,7 @@ async function buildServerComponentBundleArtifactCode(options) {
             serverOutput: options.serverOutput,
         },
         sourcefile: options.filename,
+        vitePlugins: options.vitePlugins,
     });
 }
 function builtRouteSourceAnalysisSummary(options) {
@@ -728,6 +750,7 @@ async function buildRequestModuleArtifactCode(options) {
         code: stripRouteRequestOnlyExports(options.source),
         filename: options.filename,
         importPolicy: options.importPolicy,
+        vitePlugins: options.vitePlugins,
     });
 }
 async function bundleRouteLoaderModuleCode(options) {
@@ -747,6 +770,7 @@ async function bundleRouteRequestModuleCode(options) {
         code: options.code,
         filename: options.filename,
         platform: "node",
+        vitePlugins: options.vitePlugins,
         plugins: [
             createAppRouterImportPolicyPlugin({
                 appDir: options.appDir,
@@ -794,18 +818,24 @@ async function writeCloudflareRouteModules(options) {
         const routeId = routeIdForPath(route.path);
         const routeModuleFile = `routes/${routeId}.mjs`;
         let routeModuleExports;
-        if (route.kind === "server") {
+        if (route.kind === "server" || route.kind === "metadata") {
             try {
                 const routeOutput = await buildCloudflareServerRouteModule({
                     filename: route.file,
+                    vitePlugins: options.vitePlugins,
                 });
                 const serverRouteFile = `routes/${routeId}.${hashText(routeOutput).slice(0, 8)}.server.mjs`;
                 await writeFile(join(options.cloudflareDir, serverRouteFile), routeOutput);
                 const serverRouteImport = `./${serverRouteFile.split("/").pop() ?? serverRouteFile}`;
-                routeModuleExports = [`export * from ${JSON.stringify(serverRouteImport)};`];
+                routeModuleExports = [
+                    `export * from ${JSON.stringify(serverRouteImport)};`,
+                    ...(route.kind === "metadata"
+                        ? [`export { default } from ${JSON.stringify(serverRouteImport)};`]
+                        : []),
+                ];
             }
             catch (error) {
-                throw new Error(`Failed to build Cloudflare server route module for ${routeFile}: ${errorMessage(error)}`);
+                throw new Error(`Failed to build Cloudflare ${route.kind} route module for ${routeFile}: ${errorMessage(error)}`);
             }
             await writeFile(join(options.cloudflareDir, routeModuleFile), `${routeModuleExports.join("\n")}\n`);
             registryEntries.push(`${JSON.stringify(routeFile)}: () => import(${JSON.stringify(`./${routeModuleFile}`)})`);
@@ -827,12 +857,14 @@ async function writeCloudflareRouteModules(options) {
                     projectRoot: options.projectRoot,
                     routesDir: options.routesDir,
                     serverModules: options.serverModules,
+                    vitePlugins: options.vitePlugins,
                 })
                 : await buildCloudflareStringRouteComponentModule({
                     filename: route.file,
                     projectRoot: options.projectRoot,
                     routesDir: options.routesDir,
                     serverModules: options.serverModules,
+                    vitePlugins: options.vitePlugins,
                 });
             const componentFile = `routes/${routeId}.${hashText(componentOutput).slice(0, 8)}.component.mjs`;
             await writeFile(join(options.cloudflareDir, componentFile), componentOutput);
@@ -849,6 +881,7 @@ async function writeCloudflareRouteModules(options) {
                 const loaderOutput = await buildCloudflareRouteLoaderModule({
                     filename: route.file,
                     projectRoot: options.projectRoot,
+                    vitePlugins: options.vitePlugins,
                 });
                 const loaderFile = `routes/${routeId}.${hashText(loaderOutput).slice(0, 8)}.loader.mjs`;
                 await writeFile(join(options.cloudflareDir, loaderFile), loaderOutput);
@@ -873,7 +906,10 @@ async function writeCloudflareRouteModules(options) {
     return { registryFile: "route-modules.mjs" };
 }
 async function buildCloudflareServerComponentModule(options) {
-    const metadataModule = await buildCloudflareRouteMetadataExportModule(options.filename);
+    const metadataModule = await buildCloudflareRouteMetadataExportModule({
+        filename: options.filename,
+        vitePlugins: options.vitePlugins,
+    });
     const entry = `import * as routeModule from ${JSON.stringify(options.filename)};
 ${metadataModule === undefined ? "const metadataModule = {};" : 'import * as metadataModule from "mreact:metadata";'}
 
@@ -898,6 +934,7 @@ export const slots = routeModule.slots;`;
             cloudflareWorkspaceRuntimePlugin(),
         ],
         resolveDir: dirname(options.filename),
+        vitePlugins: options.vitePlugins,
     });
 }
 async function buildCloudflareStringRouteComponentModule(options) {
@@ -908,6 +945,7 @@ async function buildCloudflareStringRouteComponentModule(options) {
             projectRoot: options.projectRoot,
             serverModules: options.serverModules,
             serverOutput: "string",
+            vitePlugins: options.vitePlugins,
         });
     }
     const pageModule = await buildCloudflareComponentExportModule({
@@ -915,12 +953,14 @@ async function buildCloudflareStringRouteComponentModule(options) {
         projectRoot: options.projectRoot,
         serverModules: options.serverModules,
         serverOutput: "string",
+        vitePlugins: options.vitePlugins,
     });
     const shellModules = await Promise.all(shellFiles.map((shell) => buildCloudflareComponentExportModule({
         filename: shell.file,
         projectRoot: options.projectRoot,
         serverModules: options.serverModules,
         serverOutput: "string",
+        vitePlugins: options.vitePlugins,
     })));
     const shellImports = shellFiles.map((_, index) => `import * as shell${index} from "mreact:shell-${index}";`);
     const shellDefinitions = shellFiles.map((shell, index) => `{ component: selectComponent(shell${index}, ${JSON.stringify(shell.file)}), id: ${JSON.stringify(shell.id)}, kind: ${JSON.stringify(shell.kind)}, module: shell${index} }`);
@@ -982,6 +1022,7 @@ ${cloudflareShellRuntimeSource()}`;
         ]),
         plugins: [cloudflareWorkspaceRuntimePlugin()],
         resolveDir: dirname(options.filename),
+        vitePlugins: options.vitePlugins,
     });
 }
 async function buildCloudflareStreamRouteComponentModule(options) {
@@ -990,6 +1031,7 @@ async function buildCloudflareStreamRouteComponentModule(options) {
         projectRoot: options.projectRoot,
         serverModules: options.serverModules,
         serverOutput: "stream",
+        vitePlugins: options.vitePlugins,
     });
     const shellFiles = await cloudflareShellFilesForPage(options.routesDir, options.filename);
     const shellModules = await Promise.all(shellFiles.map((shell) => buildCloudflareComponentExportModule({
@@ -997,6 +1039,7 @@ async function buildCloudflareStreamRouteComponentModule(options) {
         projectRoot: options.projectRoot,
         serverModules: options.serverModules,
         serverOutput: "string",
+        vitePlugins: options.vitePlugins,
     })));
     const shellImports = shellFiles.map((_, index) => `import * as shell${index} from "mreact:shell-${index}";`);
     const shellDefinitions = shellFiles.map((shell, index) => `{ component: selectComponent(shell${index}, ${JSON.stringify(shell.file)}), id: ${JSON.stringify(shell.id)}, kind: ${JSON.stringify(shell.kind)}, module: shell${index} }`);
@@ -1074,6 +1117,7 @@ ${cloudflareShellRuntimeSource()}`;
         ]),
         plugins: [cloudflareWorkspaceRuntimePlugin()],
         resolveDir: dirname(options.filename),
+        vitePlugins: options.vitePlugins,
     });
 }
 function cloudflareShellRuntimeSource() {
@@ -1241,9 +1285,9 @@ function routeMetadataHeadTags(metadata) {
 
 function openGraphImages(openGraph) {
   if (openGraph?.images !== undefined && openGraph.images.length > 0) {
-    return openGraph.images.map(metadataString);
+    return openGraph.images.map(metadataImageUrl);
   }
-  return openGraph?.image === undefined ? [] : [metadataString(openGraph.image)];
+  return openGraph?.image === undefined ? [] : [metadataImageUrl(openGraph.image)];
 }
 
 function headDescriptorTags(descriptors, nonce) {
@@ -1289,6 +1333,13 @@ function metadataString(value) {
   throw new Error("Invalid metadata field: expected string, number, or boolean.");
 }
 
+function metadataImageUrl(value) {
+  if (typeof value === "object" && value !== null && "url" in value) {
+    return metadataString(value.url);
+  }
+  return metadataString(value);
+}
+
 function cloudflareRouteHeadTags(manifest, routePath) {
   const route = manifest.routes.find((route) => route.path === routePath);
   const css = route?.css ?? [];
@@ -1317,7 +1368,10 @@ function escapeHtml(value) {
 }`;
 }
 async function buildCloudflareComponentExportModule(options) {
-    const metadataModule = await buildCloudflareRouteMetadataExportModule(options.filename);
+    const metadataModule = await buildCloudflareRouteMetadataExportModule({
+        filename: options.filename,
+        vitePlugins: options.vitePlugins,
+    });
     const entry = `import * as routeModule from ${JSON.stringify(options.filename)};
 ${metadataModule === undefined ? "const metadataModule = {};" : 'import * as metadataModule from "mreact:metadata";'}
 
@@ -1342,6 +1396,7 @@ export const slots = routeModule.slots;`;
             cloudflareWorkspaceRuntimePlugin(),
         ],
         resolveDir: dirname(options.filename),
+        vitePlugins: options.vitePlugins,
     });
 }
 async function buildCloudflareRouteLoaderModule(options) {
@@ -1351,21 +1406,23 @@ async function buildCloudflareRouteLoaderModule(options) {
         filename: `${options.filename}.mreact-cloudflare-loader.js`,
         plugins: [cloudflareWorkspaceRuntimePlugin()],
         resolveDir: dirname(options.filename),
+        vitePlugins: options.vitePlugins,
     });
 }
-async function buildCloudflareRouteMetadataExportModule(filename) {
-    const source = await readFile(filename, "utf8");
+async function buildCloudflareRouteMetadataExportModule(options) {
+    const source = await readFile(options.filename, "utf8");
     if (!hasMetadataExport(source)) {
         return undefined;
     }
-    const entry = `import * as routeMetadataModule from ${JSON.stringify(filename)};
+    const entry = `import * as routeMetadataModule from ${JSON.stringify(options.filename)};
 export const generateMetadata = routeMetadataModule.generateMetadata;
 export const metadata = routeMetadataModule.metadata;`;
     return bundleCloudflareModule({
         entry,
-        filename: `${filename}.mreact-cloudflare-metadata.js`,
+        filename: `${options.filename}.mreact-cloudflare-metadata.js`,
         plugins: [cloudflareWorkspaceRuntimePlugin()],
-        resolveDir: dirname(filename),
+        resolveDir: dirname(options.filename),
+        vitePlugins: options.vitePlugins,
     });
 }
 async function buildCloudflareServerRouteModule(options) {
@@ -1386,6 +1443,7 @@ export default defaultHandler;`;
         filename: `${options.filename}.mreact-cloudflare-server-route.js`,
         plugins: [cloudflareWorkspaceRuntimePlugin()],
         resolveDir: dirname(options.filename),
+        vitePlugins: options.vitePlugins,
     });
 }
 async function bundleCloudflareModule(options) {
@@ -1397,6 +1455,7 @@ async function bundleCloudflareModule(options) {
         preserveExports: true,
         plugins: options.plugins,
         target: "es2022",
+        vitePlugins: options.vitePlugins,
     });
     const code = output.code;
     if (code === undefined) {
@@ -1432,6 +1491,7 @@ async function bundleCloudflareVirtualModule(options) {
             ...options.plugins,
         ],
         resolveDir: options.resolveDir,
+        vitePlugins: options.vitePlugins,
     });
 }
 async function cloudflareShellFilesForPage(routesDir, pageFile) {
@@ -1527,6 +1587,7 @@ function cloudflareWorkspaceRuntimePlugin() {
     });
     const routerCachePath = packageFile("router", "@reckona/mreact-router", "cache");
     const routerCookiesPath = packageFile("router", "@reckona/mreact-router", "cookies");
+    const routerCsrfPath = packageFile("router", "@reckona/mreact-router", "csrf");
     const routerDeferredPath = packageFile("router", "@reckona/mreact-router", "deferred");
     const routerI18nPath = packageFile("router", "@reckona/mreact-router", "i18n");
     const routerLinkPath = packageFile("router", "@reckona/mreact-router", "link");
@@ -1593,6 +1654,7 @@ export function escapeHtmlBatch(values) {
             buildApi.onLoad({ filter: /^index$/, namespace: "mreact-cloudflare-router-index" }, () => ({
                 contents: `export { cacheControl, revalidatePath } from ${JSON.stringify(routerCachePath)};
 export { deleteCookie, parseCookieHeader, serializeCookie, setCookie } from ${JSON.stringify(routerCookiesPath)};
+export { createFormCsrfToken, formCsrfCookie, formCsrfFieldName, serverActionCookie, validateFormCsrf } from ${JSON.stringify(routerCsrfPath)};
 export { defer, isDeferredLoaderData } from ${JSON.stringify(routerDeferredPath)};
 export { defineMessages, detectLocale } from ${JSON.stringify(routerI18nPath)};
 export { Link, linkProps } from ${JSON.stringify(routerLinkPath)};
@@ -1610,7 +1672,8 @@ export { cookies, headers, html, json, next, notFound, redirect, redirectExterna
     };
 }
 function cloudflareRouteRequiresGeneratedModule(route, prerenderedRoutes) {
-    return (route.kind === "server" ||
+    return (route.kind === "metadata" ||
+        route.kind === "server" ||
         (route.kind === "page" &&
             (route.segments.some((segment) => segment.kind !== "static") ||
                 prerenderedRoutes[route.path] === undefined)));
@@ -1645,6 +1708,7 @@ async function writeClientRouteBundle(options) {
         pageFile: route.file,
         projectRoot: options.projectRoot,
         routeId: routeIdForPath(route.path),
+        vitePlugins: options.vitePlugins,
     });
     const source = await readFile(route.file, "utf8");
     const clientSource = stripRouteClientOnlyExports(source);
@@ -1735,6 +1799,7 @@ async function writeRouteCssAssets(options) {
         filename: options.pageFile,
         minify: true,
         platform: "browser",
+        vitePlugins: options.vitePlugins,
     });
     const cssAssets = (output.assets ?? []).filter((asset) => asset.fileName.endsWith(".css"));
     const written = [];