@reckona/mreact-router 0.0.86 → 0.0.88

package/src/render.ts

@@ -1,11 +1,8 @@
 import { randomUUID } from "node:crypto";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { access, readFile, stat } from "node:fs/promises";
-import { dirname, join, relative, sep } from "node:path";
-import {
-  formatDiagnostic,
-  transform,
-} from "@reckona/mreact-compiler";
+import { dirname, join, relative, resolve, sep } from "node:path";
+import { formatDiagnostic, transform } from "@reckona/mreact-compiler";
 import type {
   ClientReferenceMetadata,
   ServerOutputMode,
@@ -178,10 +175,9 @@ export interface RenderAppRequestOptions {
   serverModuleCacheVersion?: string | undefined;
   serverSourceFiles?: ReadonlyMap<string, string> | undefined;
   serverActions?: AppRouterServerActionOptions | undefined;
-  serverActionReferencesByFile?: ReadonlyMap<
-    string,
-    readonly PreparedFormActionReference[]
-  > | undefined;
+  serverActionReferencesByFile?:
+    | ReadonlyMap<string, readonly PreparedFormActionReference[]>
+    | undefined;
   skipMiddleware?: boolean | undefined;
   preload?: AppRouterRenderPreload | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -240,10 +236,13 @@ export async function preloadBuiltRequestModules(options: {
 
     if (route.kind === "server") {
       await loadServerRouteModule({
+        appDir: options.appDir,
         file: route.file,
+        importPolicy: options.importPolicy,
         serverModules: options.serverModules,
         serverModuleCacheVersion: options.serverModuleCacheVersion,
         serverSourceFiles: options.serverSourceFiles,
+        vitePlugins: options.vitePlugins,
       });
       continue;
     }
@@ -838,7 +837,9 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
 
     if (matched.route.kind === "metadata") {
       return await dispatchMetadataRoute({
+        appDir: options.appDir,
         file: matched.route.file,
+        importPolicy: options.importPolicy,
         params: matched.params,
         request: options.request,
         route: matched.route,
@@ -851,8 +852,10 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
 
     if (matched.route.kind === "server") {
       return await dispatchServerRoute({
+        appDir: options.appDir,
         env: options.env,
         file: matched.route.file,
+        importPolicy: options.importPolicy,
         params: matched.params,
         request: options.request,
         route: matched.route,
@@ -914,12 +917,13 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
         : cachePolicy.revalidateSeconds !== 0;
     const reloadRouteCache = isNavigationRouteCacheReloadRequest(options.request);
     phaseStartedAt = renderTimingPhaseStartedAt(timing);
-    const cachedResponse = !mayUseRouteCache || reloadRouteCache
-      ? undefined
-      : await cachedRouteResponse({
-          cache: options.routeCache,
-          key: cacheKey,
-        });
+    const cachedResponse =
+      !mayUseRouteCache || reloadRouteCache
+        ? undefined
+        : await cachedRouteResponse({
+            cache: options.routeCache,
+            key: cacheKey,
+          });
     finishRenderTimingPhase(timing, phaseStartedAt, "routeCacheMs");
 
     if (cachedResponse !== undefined) {
@@ -1595,7 +1599,9 @@ function isNavigationRequest(request: Request): boolean {
 }
 
 function isNavigationRouteCacheReloadRequest(request: Request): boolean {
-  return isNavigationRequest(request) && request.headers.get("x-mreact-navigation-cache") === "reload";
+  return (
+    isNavigationRequest(request) && request.headers.get("x-mreact-navigation-cache") === "reload"
+  );
 }
 
 async function nearestBoundaryFileForPage(options: {
@@ -1856,8 +1862,10 @@ function errorDebugContext(
 }
 
 async function dispatchServerRoute(options: {
+  appDir: string;
   env?: unknown;
   file: string;
+  importPolicy?: AppRouterImportPolicy | undefined;
   params: RouteParams;
   request: Request;
   route: AppRoute;
@@ -1943,7 +1951,9 @@ function jsonConventionResponse(body: ManifestDescriptor): Response {
 }
 
 async function dispatchMetadataRoute(options: {
+  appDir: string;
   file: string;
+  importPolicy?: AppRouterImportPolicy | undefined;
   params: RouteParams;
   request: Request;
   route: Extract<AppRoute, { kind: "metadata" }>;
@@ -1992,41 +2002,44 @@ async function dispatchMetadataRoute(options: {
       value instanceof Uint8Array
         ? value
         : new TextEncoder().encode(typeof value === "string" ? value : String(value));
-    return bytesResponse(
-      body,
-      {
-        headers: {
-          "cache-control": "public, max-age=3600",
-          "content-type": typeof value === "string" && value.trimStart().startsWith("<svg")
+    return bytesResponse(body, {
+      headers: {
+        "cache-control": "public, max-age=3600",
+        "content-type":
+          typeof value === "string" && value.trimStart().startsWith("<svg")
             ? "image/svg+xml"
             : "application/octet-stream",
-        },
       },
-    );
+    });
   }
 
   return new Response("Invalid metadata route convention", { status: 500 });
 }
 
 async function loadServerRouteModule(options: {
+  appDir: string;
   file: string;
+  importPolicy?: AppRouterImportPolicy | undefined;
   serverModules?: ReadonlyMap<string, BuiltServerModuleArtifact> | undefined;
   serverModuleCacheVersion?: string | undefined;
   serverSourceFiles?: ReadonlyMap<string, string> | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<Record<string, unknown>> {
+  const code = await readServerSourceFile(
+    options.file,
+    options.serverModuleCacheVersion,
+    options.serverSourceFiles,
+  );
+  const externalSourceDirs = devExternalSourceDirs(options.file, options.importPolicy);
+
   if (
     options.serverModuleCacheVersion === undefined &&
-    (options.vitePlugins === undefined || options.vitePlugins.length === 0)
+    (options.vitePlugins === undefined || options.vitePlugins.length === 0) &&
+    (externalSourceDirs === undefined || !hasRelativeSourceImport(code))
   ) {
     return await importAppRouterFileModule<Record<string, unknown>>(options.file);
   }
 
-  const code = await readServerSourceFile(
-    options.file,
-    options.serverModuleCacheVersion,
-    options.serverSourceFiles,
-  );
   const artifactCode = options.serverModules?.get(options.file)?.request;
   const codeHash = memoizedHashText(code);
   if (
@@ -2057,7 +2070,15 @@ async function loadServerRouteModule(options: {
   const loaded = importAppRouterSourceModule<Record<string, unknown>>({
     cacheKey,
     code: moduleCode,
+    externalizeAppSourceModuleDirs: externalSourceDirs,
     label: `server-route:${options.file}`,
+    plugins: [
+      createAppRouterImportPolicyPlugin({
+        appDir: options.appDir,
+        importPolicy: options.importPolicy,
+        label: "Route handler",
+      }),
+    ],
     ...(moduleCode === code ? { resolveDir: dirname(options.file) } : {}),
     sourcefile: options.file,
     vitePlugins: options.vitePlugins,
@@ -2076,6 +2097,25 @@ async function loadServerRouteModule(options: {
   return loaded;
 }
 
+function hasRelativeSourceImport(code: string): boolean {
+  return (
+    /\b(?:import|export)\s+(?:[^"'()]*?\s+from\s+)?["']\.{1,2}\//u.test(code) ||
+    /\bimport\s*\(\s*["']\.{1,2}\//u.test(code)
+  );
+}
+
+function devExternalSourceDirs(
+  baseDir: string,
+  importPolicy: AppRouterImportPolicy | undefined,
+): readonly string[] | undefined {
+  if (importPolicy?.allowedSourceDirs === undefined) {
+    return undefined;
+  }
+
+  const projectRoot = resolve(importPolicy.projectRoot ?? baseDir);
+  return importPolicy.allowedSourceDirs.map((directory) => resolve(projectRoot, directory));
+}
+
 async function runMiddleware(options: {
   appDir: string;
   importPolicy?: AppRouterImportPolicy | undefined;
@@ -3871,12 +3911,14 @@ async function loadRouteLoaderModule(options: {
 export async function bundleRouteLoaderModuleCode(options: {
   appDir: string;
   code: string;
+  externalizeAppSourceModuleDirs?: readonly string[] | undefined;
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<string> {
   const output = await bundleRouterModule({
     code: stripRouteLoaderOnlyExports(options.code),
+    externalizeAppSourceModuleDirs: options.externalizeAppSourceModuleDirs,
     filename: options.filename,
     platform: "node",
     vitePlugins: options.vitePlugins,
@@ -3920,6 +3962,10 @@ async function loadBundledRouteLoaderModule(options: {
     (await bundleRouteLoaderModuleCode({
       appDir: options.appDir,
       code: options.code,
+      externalizeAppSourceModuleDirs:
+        options.serverModuleCacheVersion === undefined
+          ? devExternalSourceDirs(options.appDir, options.importPolicy)
+          : undefined,
       filename: options.filename,
       importPolicy: options.importPolicy,
       vitePlugins: options.vitePlugins,

package/src/vite.ts

@@ -6,7 +6,13 @@ import {
   createCompilerModuleContext,
   transformCompilerModuleContext,
 } from "@reckona/mreact-compiler/internal";
-import { normalizePath, type Connect, type Plugin, type PluginOption, type ViteDevServer } from "vite";
+import {
+  normalizePath,
+  type Connect,
+  type Plugin,
+  type PluginOption,
+  type ViteDevServer,
+} from "vite";
 import type { AppRouterServerActionOptions } from "./actions.js";
 import type { AppRouterCache } from "./cache.js";
 import {
@@ -69,11 +75,11 @@ type MreactRouterPlugin = Plugin & {
   [mreactRouterConfigKey]: ResolvedAppRouterProject;
 };
 
-export function createAppRouterVitePlugin(
-  options: AppRouterVitePluginOptions,
-): Plugin {
+export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions): Plugin {
   const project = resolveAppRouterProjectOptions(options);
-  const normalizedSourceDirs = project.allowedSourceDirs.map((directory) => normalizePath(directory));
+  const normalizedSourceDirs = project.allowedSourceDirs.map((directory) =>
+    normalizePath(directory),
+  );
   const packageFile = (monorepoDir: string, packageName: string, entry: string): string =>
     workspacePackageFile({
       currentFileUrl: import.meta.url,
@@ -94,18 +100,21 @@ export function createAppRouterVitePlugin(
     "@reckona/mreact-compat",
   ];
   const runtimePaths = new Map([
+    ["react", reactCompatPath],
+    ["react-dom", reactCompatPath],
+    ["react-dom/client", reactCompatPath],
+    ["react-dom/server", reactCompatPath],
     [
-      "@reckona/mreact-reactive-core/internal",
-      packageFile("reactive-core", "@reckona/mreact-reactive-core", "internal"),
-    ],
-    [
-      "@reckona/mreact-reactive-dom",
-      reactiveDomPath,
+      "react/jsx-dev-runtime",
+      packageFile("react-compat", "@reckona/mreact-compat", "jsx-dev-runtime"),
     ],
+    ["react/jsx-runtime", packageFile("react-compat", "@reckona/mreact-compat", "jsx-runtime")],
     [
-      "@reckona/mreact-compat",
-      reactCompatPath,
+      "@reckona/mreact-reactive-core/internal",
+      packageFile("reactive-core", "@reckona/mreact-reactive-core", "internal"),
     ],
+    ["@reckona/mreact-reactive-dom", reactiveDomPath],
+    ["@reckona/mreact-compat", reactCompatPath],
     [
       "@reckona/mreact-compat/event-priority",
       packageFile("react-compat", "@reckona/mreact-compat", "event-priority"),
@@ -130,10 +139,7 @@ export function createAppRouterVitePlugin(
       "@reckona/mreact-compat/scheduler",
       packageFile("react-compat", "@reckona/mreact-compat", "scheduler"),
     ],
-    [
-      "@reckona/mreact-router/link",
-      packageFile("router", "@reckona/mreact-router", "link"),
-    ],
+    ["@reckona/mreact-router/link", packageFile("router", "@reckona/mreact-router", "link")],
     [
       "@reckona/mreact-router/navigation-state",
       packageFile("router", "@reckona/mreact-router", "navigation-state"),
@@ -148,6 +154,20 @@ export function createAppRouterVitePlugin(
     [mreactRouterConfigKey]: project,
     enforce: "pre",
     name: "mreact-router",
+    config() {
+      return {
+        optimizeDeps: {
+          exclude: [
+            "react",
+            "react-dom",
+            "react-dom/client",
+            "react-dom/server",
+            "react/jsx-dev-runtime",
+            "react/jsx-runtime",
+          ],
+        },
+      };
+    },
     configureServer(server) {
       server.middlewares.use(createDevCssProxyMiddleware());
 
@@ -158,9 +178,7 @@ export function createAppRouterVitePlugin(
           vitePlugins: server.config.plugins,
         };
 
-        server.middlewares.use(
-          createAppRouterViteMiddleware(middlewareOptions),
-        );
+        server.middlewares.use(createAppRouterViteMiddleware(middlewareOptions));
       };
     },
     handleHotUpdate(context) {
@@ -207,11 +225,9 @@ export function currentDevtoolsEmitter() { return undefined; }`;
       }
 
       if (id.startsWith(virtualClientPrefix)) {
-        return renderAppRouterClientAsset(
-          project.routesDir,
-          id.slice(virtualClientPrefix.length),
-          { dev: true },
-        ).then(async (response) => {
+        return renderAppRouterClientAsset(project.routesDir, id.slice(virtualClientPrefix.length), {
+          dev: true,
+        }).then(async (response) => {
           if (!response.ok) {
             const message = await response.text();
             throw new Error(message || `MReact client route asset was not found: ${id}`);
@@ -259,9 +275,7 @@ export function currentDevtoolsEmitter() { return undefined; }`;
 
       if (output.diagnostics.length > 0) {
         throw new Error(
-          output.diagnostics
-            .map((diagnostic) => formatDiagnostic(filename, diagnostic))
-            .join("\n"),
+          output.diagnostics.map((diagnostic) => formatDiagnostic(filename, diagnostic)).join("\n"),
         );
       }
 
@@ -336,11 +350,7 @@ export function mreactRouterConfigFromPlugins(
   plugins: readonly unknown[],
 ): ResolvedAppRouterProject | undefined {
   for (const plugin of plugins.flat(Infinity)) {
-    if (
-      plugin !== null &&
-      typeof plugin === "object" &&
-      mreactRouterConfigKey in plugin
-    ) {
+    if (plugin !== null && typeof plugin === "object" && mreactRouterConfigKey in plugin) {
       return (plugin as MreactRouterPlugin)[mreactRouterConfigKey];
     }
   }
@@ -602,9 +612,7 @@ function importerInRuntimePackage(
   const normalizedImporter = normalizePath(importer);
   return (
     directories.some((directory) => normalizedImporter.startsWith(`${directory}/`)) ||
-    packageNames.some((packageName) =>
-      normalizedImporter.includes(`/node_modules/${packageName}/`),
-    )
+    packageNames.some((packageName) => normalizedImporter.includes(`/node_modules/${packageName}/`))
   );
 }
 
@@ -661,7 +669,9 @@ async function devNavigationScripts(appDir: string): Promise<ReadonlyMap<string,
     }),
   );
 
-  return new Map(entries.filter((entry): entry is readonly [string, string] => entry !== undefined));
+  return new Map(
+    entries.filter((entry): entry is readonly [string, string] => entry !== undefined),
+  );
 }
 
 function createDevCssProxyMiddleware(): Connect.NextHandleFunction {