@reckona/mreact-router 0.0.86 → 0.0.87

package/src/client.ts

@@ -938,14 +938,7 @@ function isStyleModuleSpecifier(source: string): boolean {
   return styleModuleExtensions.has(extname(pathname));
 }
 
-const styleModuleExtensions = new Set([
-  ".css",
-  ".less",
-  ".sass",
-  ".scss",
-  ".styl",
-  ".stylus",
-]);
+const styleModuleExtensions = new Set([".css", ".less", ".sass", ".scss", ".styl", ".stylus"]);
 
 function renderedImportedExportNames(
   reference: ClientRouteStaticImportReference,
@@ -1272,13 +1265,10 @@ function hasViteTransformHook(plugin: Plugin): boolean {
   return viteTransformHookHandler(plugin) !== undefined;
 }
 
-function viteTransformHookHandler(plugin: Plugin):
-  | ((
-      this: unknown,
-      code: string,
-      id: string,
-      options?: { ssr?: boolean | undefined },
-    ) => unknown)
+function viteTransformHookHandler(
+  plugin: Plugin,
+):
+  | ((this: unknown, code: string, id: string, options?: { ssr?: boolean | undefined }) => unknown)
   | undefined {
   const transform = plugin.transform as unknown;
 
@@ -1580,8 +1570,7 @@ export async function buildClientRouteEntrySource(
     routeSourceAnalysis,
     options.filename,
   );
-  const routeHasEventBindings =
-    (compiled.metadata.eventHydrationManifest?.events.length ?? 0) > 0;
+  const routeHasEventBindings = (compiled.metadata.eventHydrationManifest?.events.length ?? 0) > 0;
   const routeRequiresFullHydration =
     routeExplicitlyRequiresHydration ||
     routeUsesCells ||
@@ -1695,8 +1684,9 @@ __mreactGlobal.__mreactRouteCell = (nativeCell, initial) => {
 `
     : "";
   const routeCellHydrationIndent = routeUsesCells ? "      " : "  ";
-  const routeCleanupHydrationStart = routeUsesCleanupScope && !routeUsesCells
-    ? `  __mreactDisposeRoute(__mreactRouteId);
+  const routeCleanupHydrationStart =
+    routeUsesCleanupScope && !routeUsesCells
+      ? `  __mreactDisposeRoute(__mreactRouteId);
   const __mreactRouteEffectDisposers = new Set();
   __mreactRouteDisposers.set(__mreactRouteId, () => {
     for (const __mreactDispose of Array.from(__mreactRouteEffectDisposers)) {
@@ -1705,7 +1695,7 @@ __mreactGlobal.__mreactRouteCell = (nativeCell, initial) => {
     __mreactRouteEffectDisposers.clear();
   });
 `
-    : "";
+      : "";
   const routeCellDropFunction = routeUsesCells
     ? `
 function __mreactDropMismatchedRouteState(previousState, nextState) {
@@ -3235,6 +3225,15 @@ function workspaceRuntimePlugin(options: { routeFiles: readonly string[] }) {
     "@reckona/mreact-compat",
   ];
   const runtimePaths = new Map([
+    ["react", reactCompatPath],
+    ["react-dom", reactCompatPath],
+    ["react-dom/client", reactCompatPath],
+    ["react-dom/server", reactCompatPath],
+    [
+      "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-reactive-core/internal",
       packageFile("reactive-core", "@reckona/mreact-reactive-core", "internal"),
@@ -3264,10 +3263,7 @@ function workspaceRuntimePlugin(options: { routeFiles: readonly string[] }) {
       "@reckona/mreact-compat/scheduler",
       packageFile("react-compat", "@reckona/mreact-compat", "scheduler"),
     ],
-    [
-      "@reckona/mreact-reactive-dom",
-      reactiveDomPath,
-    ],
+    ["@reckona/mreact-reactive-dom", reactiveDomPath],
   ]);
 
   return {
@@ -3295,7 +3291,7 @@ function workspaceRuntimePlugin(options: { routeFiles: readonly string[] }) {
       buildApi.onResolve(
         {
           filter:
-            /^@reckona\/mreact-(?:compat|reactive-core|reactive-dom)(?:\/(?:event-priority|flight|internal|jsx-dev-runtime|jsx-runtime|scheduler))?$/,
+            /^(?:react(?:\/jsx-(?:dev-)?runtime)?|react-dom(?:\/(?:client|server))?|@reckona\/mreact-(?:compat|reactive-core|reactive-dom)(?:\/(?:event-priority|flight|internal|jsx-dev-runtime|jsx-runtime|scheduler))?)$/,
         },
         (args) => {
           const path = runtimePaths.get(args.path);
@@ -3381,9 +3377,7 @@ function importerInRuntimePackage(
   const normalizedImporter = importer.split(/[\\/]+/).join("/");
   return (
     directories.some((directory) => importer.startsWith(`${directory}${sep}`)) ||
-    packageNames.some((packageName) =>
-      normalizedImporter.includes(`/node_modules/${packageName}/`),
-    )
+    packageNames.some((packageName) => normalizedImporter.includes(`/node_modules/${packageName}/`))
   );
 }
 
@@ -3421,10 +3415,7 @@ function detectRouteCellStateHint(code: string): boolean {
 }
 
 function detectRouteReactiveEffectHint(code: string): boolean {
-  return (
-    /from\s+["']@reckona\/mreact-reactive-core["']/.test(code) &&
-    /\beffect\s*\(/.test(code)
-  );
+  return /from\s+["']@reckona\/mreact-reactive-core["']/.test(code) && /\beffect\s*\(/.test(code);
 }
 
 async function inferClientReferenceManifestForBundle(options: {

package/src/module-runner.ts

@@ -69,6 +69,7 @@ export function routerModuleRunnerRuntimeCacheStats(): RouterRuntimeCacheStat[]
 export async function importAppRouterSourceModule<T>(options: {
   cacheKey?: string | undefined;
   code: string;
+  externalizeAppSourceModuleDirs?: readonly string[] | undefined;
   label: string;
   resolveDir?: string | undefined;
   serverSourceTransform?: ServerSourceTransformOptions | undefined;
@@ -107,6 +108,7 @@ export async function importAppRouterSourceModule<T>(options: {
 
 async function importAppRouterSourceModuleWithoutCache<T>(options: {
   code: string;
+  externalizeAppSourceModuleDirs?: readonly string[] | undefined;
   label: string;
   resolveDir?: string | undefined;
   serverSourceTransform?: ServerSourceTransformOptions | undefined;
@@ -116,7 +118,10 @@ async function importAppRouterSourceModuleWithoutCache<T>(options: {
   const code =
     options.resolveDir === undefined ? options.code : await bundleAppRouterSourceModule(options);
   const executableCode = withNodeRequireShimForEsmBundle({
-    code,
+    code: withFileImportMetaUrl(
+      code,
+      options.sourcefile ?? join(options.resolveDir ?? process.cwd(), "module.js"),
+    ),
     requireBaseDir:
       options.resolveDir ??
       (options.sourcefile === undefined ? undefined : dirname(options.sourcefile)),
@@ -174,6 +179,7 @@ export async function importAppRouterBuiltFileModule<T>(options: {
 
 export async function bundleAppRouterSourceModule(options: {
   code: string;
+  externalizeAppSourceModuleDirs?: readonly string[] | undefined;
   label: string;
   resolveDir?: string | undefined;
   serverSourceTransform?: ServerSourceTransformOptions | undefined;
@@ -182,6 +188,7 @@ export async function bundleAppRouterSourceModule(options: {
 }): Promise<string> {
   const output = await bundleRouterModule({
     code: options.code,
+    externalizeAppSourceModuleDirs: options.externalizeAppSourceModuleDirs,
     filename: options.sourcefile ?? join(options.resolveDir ?? process.cwd(), "module.js"),
     platform: "node",
     vitePlugins: options.vitePlugins,
@@ -419,6 +426,34 @@ function workspacePackageResolutionPlugin() {
       specifier,
     });
   const entries = new Map<string, { entry: string; monorepoDir: string; packageName: string }>([
+    [
+      "react",
+      { entry: "index", monorepoDir: "react-compat", packageName: "@reckona/mreact-compat" },
+    ],
+    [
+      "react-dom",
+      { entry: "index", monorepoDir: "react-compat", packageName: "@reckona/mreact-compat" },
+    ],
+    [
+      "react-dom/client",
+      { entry: "index", monorepoDir: "react-compat", packageName: "@reckona/mreact-compat" },
+    ],
+    [
+      "react-dom/server",
+      { entry: "index", monorepoDir: "react-compat", packageName: "@reckona/mreact-compat" },
+    ],
+    [
+      "react/jsx-dev-runtime",
+      {
+        entry: "jsx-dev-runtime",
+        monorepoDir: "react-compat",
+        packageName: "@reckona/mreact-compat",
+      },
+    ],
+    [
+      "react/jsx-runtime",
+      { entry: "jsx-runtime", monorepoDir: "react-compat", packageName: "@reckona/mreact-compat" },
+    ],
     ["@reckona/mreact", { entry: "index", monorepoDir: "react", packageName: "@reckona/mreact" }],
     [
       "@reckona/mreact/jsx-dev-runtime",
@@ -503,7 +538,7 @@ function workspacePackageResolutionPlugin() {
       buildApi.onResolve(
         {
           filter:
-            /^@reckona\/(?:mreact(?:\/(?:jsx-dev-runtime|jsx-runtime))?|mreact-(?:auth|query|reactive-core|server|router|compat)(?:\/(?:event-priority|flight|internal|jsx-dev-runtime|jsx-runtime|scheduler|app-router-globals|link|native-escape|navigation-state|session|stream-list|internal\/native-escape|internal\/session))?)$/,
+            /^(?:react(?:\/jsx-(?:dev-)?runtime)?|react-dom(?:\/(?:client|server))?|@reckona\/(?:mreact(?:\/(?:jsx-dev-runtime|jsx-runtime))?|mreact-(?:auth|query|reactive-core|server|router|compat)(?:\/(?:event-priority|flight|internal|jsx-dev-runtime|jsx-runtime|scheduler|app-router-globals|link|native-escape|navigation-state|session|stream-list|internal\/native-escape|internal\/session))?))$/,
         },
         (args) => {
           const routerPath = routerEntries.get(args.path);

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;
@@ -853,6 +849,7 @@ async function renderAppRequestInternal(options: RenderAppRequestOptions): Promi
       return await dispatchServerRoute({
         env: options.env,
         file: matched.route.file,
+        importPolicy: options.importPolicy,
         params: matched.params,
         request: options.request,
         route: matched.route,
@@ -914,12 +911,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 +1593,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: {
@@ -1858,6 +1858,7 @@ function errorDebugContext(
 async function dispatchServerRoute(options: {
   env?: unknown;
   file: string;
+  importPolicy?: AppRouterImportPolicy | undefined;
   params: RouteParams;
   request: Request;
   route: AppRoute;
@@ -1992,17 +1993,15 @@ 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 });
@@ -2010,23 +2009,27 @@ async function dispatchMetadataRoute(options: {
 
 async function loadServerRouteModule(options: {
   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,6 +2060,7 @@ async function loadServerRouteModule(options: {
   const loaded = importAppRouterSourceModule<Record<string, unknown>>({
     cacheKey,
     code: moduleCode,
+    externalizeAppSourceModuleDirs: externalSourceDirs,
     label: `server-route:${options.file}`,
     ...(moduleCode === code ? { resolveDir: dirname(options.file) } : {}),
     sourcefile: options.file,
@@ -2076,6 +2080,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 +3894,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 +3945,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"),
@@ -158,9 +164,7 @@ export function createAppRouterVitePlugin(
           vitePlugins: server.config.plugins,
         };
 
-        server.middlewares.use(
-          createAppRouterViteMiddleware(middlewareOptions),
-        );
+        server.middlewares.use(createAppRouterViteMiddleware(middlewareOptions));
       };
     },
     handleHotUpdate(context) {
@@ -207,11 +211,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 +261,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 +336,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 +598,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 +655,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 {