@reckona/mreact-router 0.0.95 → 0.0.97

package/src/build.ts

@@ -1132,7 +1132,7 @@ async function buildServerModuleArtifacts(options: {
       loaderArtifactFiles.add(file);
     }
 
-    if (hasMetadataExport(source)) {
+    if (isServerComponentFile(file) && hasMetadataExport(source)) {
       metadataArtifactFiles.add(file);
     }
   }
@@ -1150,7 +1150,7 @@ async function buildServerModuleArtifacts(options: {
       if (loaderArtifactFiles.has(file)) {
         const code = await bundleRouteLoaderModuleCode({
           appDir: options.project.routesDir,
-          code: stripRouteLoaderOnlyExports(source),
+          code: stripRouteLoaderOnlyExports(source, absoluteFile),
           filename: absoluteFile,
           importPolicy: requestModuleImportPolicy,
           vitePlugins: options.vitePlugins,
@@ -1164,7 +1164,7 @@ async function buildServerModuleArtifacts(options: {
       if (metadataArtifactFiles.has(file)) {
         const code = await bundleRouteMetadataModuleCode({
           appDir: options.project.routesDir,
-          code: stripRouteMetadataOnlyExports(source),
+          code: stripRouteMetadataOnlyExports(source, absoluteFile),
           filename: absoluteFile,
           importPolicy: requestModuleImportPolicy,
           vitePlugins: options.vitePlugins,
@@ -1208,13 +1208,13 @@ async function buildServerModuleArtifacts(options: {
       streamRoute || (route === undefined && closureUsesAwait)
         ? (["stream", "string"] as const)
         : (["string"] as const);
-    const code = route === undefined ? source : stripRouteBuildExports(source);
+    const code = route === undefined ? source : stripRouteBuildExports(source, absoluteFile);
     const clientInference = await inferClientRouteModule({
       ...(route === undefined ? {} : { appDir: options.project.routesDir }),
       cache: options.clientRouteInferenceCache,
       code:
         route === undefined
-          ? stripRouteClientOnlyExports(source)
+          ? stripRouteClientOnlyExports(source, absoluteFile)
           : stripRouteClientSource({ code: source, filename: route.file }),
       filename: join(options.projectRoot, file),
       ...(route === undefined ? {} : { routePath: route.path }),
@@ -1413,7 +1413,7 @@ async function buildRequestModuleArtifactCode(options: {
 
   return await bundleRouteLoaderModuleCode({
     appDir: options.appDir,
-    code: stripRouteRequestOnlyExports(options.source),
+    code: stripRouteRequestOnlyExports(options.source, options.filename),
     filename: options.filename,
     importPolicy: options.importPolicy,
     vitePlugins: options.vitePlugins,
@@ -2271,7 +2271,7 @@ async function bundleCloudflareModule(options: {
     code: options.entry,
     filename: options.filename,
     minify: true,
-    platform: "browser",
+    platform: "node",
     preserveExports: true,
     plugins: options.plugins,
     target: "es2022",
@@ -2371,7 +2371,9 @@ function cloudflareServerSourceTransformPlugin(options: {
         }
 
         const source = await readFile(args.path, "utf8");
-        const serverSource = isServerComponentFile(args.path) ? stripRouteBuildExports(source) : source;
+        const serverSource = isServerComponentFile(args.path)
+          ? stripRouteBuildExports(source, args.path)
+          : source;
         const sourceHash = hashText(serverSource);
         const routeFile = relative(options.projectRoot, args.path).replaceAll(sep, "/");
         const artifact = options.serverModules[routeFile]?.[options.serverOutput];
@@ -2663,6 +2665,7 @@ async function writeClientRouteBundles(options: {
         code: source,
         filename: route.file,
         references,
+        vitePlugins: options.vitePlugins,
       });
 
       for (const diagnostic of references.diagnostics) {
@@ -3158,7 +3161,7 @@ async function validateProductionRoutes(options: {
     const source = await readFile(route.file, "utf8");
     const filename = relative(options.projectRoot, route.file);
     const output = transform({
-      code: stripRouteBuildExports(source),
+      code: stripRouteBuildExports(source, route.file),
       dev: false,
       filename: route.file,
       serverEscape: nativeEscapeTransform,

package/src/bundle-pipeline.ts

@@ -370,6 +370,24 @@ function mreactJsxRuntimeAliasPlugin(): VitePlugin {
         packageName: "@reckona/mreact-compat",
       }),
     ],
+    [
+      "@reckona/mreact/jsx-dev-runtime",
+      workspacePackageFile({
+        currentFileUrl: import.meta.url,
+        entry: "jsx-dev-runtime",
+        monorepoDir: "react",
+        packageName: "@reckona/mreact",
+      }),
+    ],
+    [
+      "@reckona/mreact/jsx-runtime",
+      workspacePackageFile({
+        currentFileUrl: import.meta.url,
+        entry: "jsx-runtime",
+        monorepoDir: "react",
+        packageName: "@reckona/mreact",
+      }),
+    ],
     [
       "@reckona/mreact-compat/hooks",
       workspacePackageFile({

package/src/client.ts

@@ -520,11 +520,17 @@ export async function resolveNavigationRuntime(options: {
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<boolean> {
   const cache = options.cache ?? createClientRouteInferenceCache();
+  const sourceTransform = clientRouteSourceTransformForVitePlugins(options.vitePlugins);
+  const code = await transformClientRouteSource({
+    code: options.code,
+    filename: options.filename,
+    sourceTransform,
+  });
   // Read the override from the cached module context so the dev server does not
   // re-parse every page route on each request.
   const moduleContext = await compilerModuleContextForSource({
     cache,
-    code: options.code,
+    code,
     filename: options.filename,
   });
   const override = readTopLevelBooleanExportFromContext(moduleContext, "navigationRuntime");
@@ -2081,6 +2087,10 @@ export async function __mreactPrefetch(url) {
     return false;
   }
 
+  if (!__mreactIsSameOriginNavigationUrl(href)) {
+    return false;
+  }
+
   const script = __mreactRouteScriptForNavigationUrl(href);
 
   if (script === undefined) {
@@ -2666,6 +2676,18 @@ function __mreactNormalizeNavigationUrl(url) {
   }
 }
 
+function __mreactIsSameOriginNavigationUrl(url) {
+  if (typeof location === "undefined") {
+    return true;
+  }
+
+  try {
+    return new URL(url, location.href).origin === location.origin;
+  } catch {
+    return false;
+  }
+}
+
 function __mreactNormalizeAssetUrl(url) {
   if (typeof location === "undefined") {
     return typeof url === "string" ? url : undefined;

package/src/render.ts

@@ -2525,7 +2525,7 @@ async function analyzeRouteSourceUncached(options: {
   serverSourceFiles?: ReadonlyMap<string, string> | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<RouteSourceAnalysis> {
-  const routeCode = stripRouteModuleExports(options.code);
+  const routeCode = stripRouteModuleExports(options.code, options.filename);
   const clientInference = await inferClientRouteModule({
     appDir: options.appDir,
     cache: options.clientRouteInferenceCache,
@@ -3464,7 +3464,7 @@ async function renderShellPrefixSuffix(
       ? { client: false, clientBoundaryImports: [], diagnostics: [] }
       : await inferClientRouteModule({
           cache: clientRouteInferenceCache,
-          code: stripRouteClientOnlyExports(code),
+          code: stripRouteClientOnlyExports(code, shell.file),
           filename: shell.file,
           vitePlugins,
         });
@@ -3967,7 +3967,7 @@ export async function bundleRouteLoaderModuleCode(options: {
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<string> {
   const output = await bundleRouterModule({
-    code: stripRouteLoaderOnlyExports(options.code),
+    code: stripRouteLoaderOnlyExports(options.code, options.filename),
     externalizeAppSourceModuleDirs: options.externalizeAppSourceModuleDirs,
     filename: options.filename,
     platform: "node",
@@ -4111,7 +4111,7 @@ async function bundleRouteMetadataModuleCode(options: {
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<string> {
   const output = await bundleRouterModule({
-    code: stripRouteMetadataOnlyExports(options.code),
+    code: stripRouteMetadataOnlyExports(options.code, options.filename),
     filename: options.filename,
     platform: "node",
     vitePlugins: options.vitePlugins,

package/src/route-source.ts

@@ -37,21 +37,26 @@ const routeRequestExportNames = new Set<string>([
 const routeLoaderOnlyExportNames = new Set<string>(["loader"]);
 const routeMetadataOnlyExportNames = new Set<string>(["generateMetadata", "metadata"]);
 
-export function stripRouteModuleExports(code: string): string {
+export function stripRouteModuleExports(code: string, filename?: string | undefined): string {
   return demoteRouteHelperExports(stripTopLevelExportDeclarations({
     code,
+    filename,
     names: routeModuleExportNames,
-  }));
+  }), routeRenderExportNames, filename);
 }
 
-export function stripRouteClientOnlyExports(code: string): string {
+export function stripRouteClientOnlyExports(code: string, filename?: string | undefined): string {
   return stripUnusedStaticValueImports({
     code: demoteRouteHelperExports(
       stripTopLevelExportDeclarations({
         code,
+        filename,
         names: routeClientOnlyExportNames,
       }),
+      routeRenderExportNames,
+      filename,
     ),
+    filename,
   });
 }
 
@@ -60,7 +65,7 @@ export function stripRouteClientSource(input: {
   filename?: string | undefined;
 }): string {
   return stripRouteClientFormActionExpressions({
-    code: stripRouteClientOnlyExports(input.code),
+    code: stripRouteClientOnlyExports(input.code, input.filename),
     filename: input.filename,
   });
 }
@@ -79,43 +84,50 @@ export function stripRouteClientFormActionExpressions(input: {
   return code;
 }
 
-export function stripRouteBuildExports(code: string): string {
-  return stripRouteClientOnlyExports(code);
+export function stripRouteBuildExports(code: string, filename?: string | undefined): string {
+  return stripRouteClientOnlyExports(code, filename);
 }
 
-export function stripRouteRequestOnlyExports(code: string): string {
+export function stripRouteRequestOnlyExports(code: string, filename?: string | undefined): string {
   return demoteRouteHelperExports(
     stripTopLevelExportDeclarations({
       code,
+      filename,
       names: routeRequestRenderExportNames,
     }),
     routeRequestExportNames,
+    filename,
   );
 }
 
-export function stripRouteLoaderOnlyExports(code: string): string {
+export function stripRouteLoaderOnlyExports(code: string, filename?: string | undefined): string {
   return demoteRouteHelperExports(
     stripTopLevelExportDeclarations({
       code,
+      filename,
       names: ["auth", "default", "generateMetadata", "generateStaticParams", "metadata", "middleware", "prerender", "revalidate", "slots", "stream"],
     }),
     routeLoaderOnlyExportNames,
+    filename,
   );
 }
 
-export function stripRouteMetadataOnlyExports(code: string): string {
+export function stripRouteMetadataOnlyExports(code: string, filename?: string | undefined): string {
   return demoteRouteHelperExports(
     stripTopLevelExportDeclarations({
       code,
+      filename,
       names: ["auth", "default", "generateStaticParams", "loader", "middleware", "prerender", "revalidate", "slots", "stream"],
     }),
     routeMetadataOnlyExportNames,
+    filename,
   );
 }
 
-export function stripRouteConfigExports(code: string): string {
+export function stripRouteConfigExports(code: string, filename?: string | undefined): string {
   return stripTopLevelExportDeclarations({
     code,
+    filename,
     names: ["auth", "prerender", "revalidate", "stream"],
   });
 }
@@ -209,13 +221,14 @@ export function hasLoaderExport(code: string): boolean {
 function demoteRouteHelperExports(
   code: string,
   preservedExportNames: ReadonlySet<string> = routeRenderExportNames,
+  filename?: string | undefined,
 ): string {
-  const helperNames = collectTopLevelValueExportNames({ code })
+  const helperNames = collectTopLevelValueExportNames({ code, filename })
     .filter((name) => !preservedExportNames.has(name) && startsLowercase(name));
 
   return helperNames.length === 0
     ? code
-    : demoteTopLevelExportDeclarations({ code, names: helperNames });
+    : demoteTopLevelExportDeclarations({ code, filename, names: helperNames });
 }
 
 function startsLowercase(value: string): boolean {

package/src/vite.ts

@@ -176,7 +176,7 @@ export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions):
     enforce: "pre",
     name: "mreact-router",
     config(userConfig) {
-      userVitePlugins = userConfig.plugins;
+      userVitePlugins = routeTransformUserVitePlugins(userConfig.plugins);
 
       return {
         optimizeDeps: {
@@ -197,7 +197,7 @@ export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions):
       return () => {
         const middlewareOptions: AppRouterViteRuntimeMiddlewareOptions = {
           ...options,
-          navigationScanVitePlugins: userVitePlugins,
+          navigationScanVitePlugins: userVitePlugins ?? [],
           viteDevServer: server,
           vitePlugins: server.config.plugins,
         };
@@ -370,6 +370,40 @@ function isCompatSourcePath(filename: string): boolean {
 
 export const mreactRouter = createAppRouterVitePlugin;
 
+function routeTransformUserVitePlugins(
+  pluginOptions: readonly PluginOption[] | undefined,
+): PluginOption[] {
+  const plugins: PluginOption[] = [];
+  const visit = (option: PluginOption | null | false | undefined): void => {
+    if (option === false || option === null || option === undefined) {
+      return;
+    }
+
+    if (Array.isArray(option)) {
+      for (const child of option) {
+        visit(child);
+      }
+      return;
+    }
+
+    if (typeof option === "object" && "then" in option) {
+      return;
+    }
+
+    if (typeof option === "object" && mreactRouterConfigKey in option) {
+      return;
+    }
+
+    plugins.push(option);
+  };
+
+  for (const option of pluginOptions ?? []) {
+    visit(option);
+  }
+
+  return plugins;
+}
+
 export function mreactRouterConfigFromPlugins(
   plugins: readonly unknown[],
 ): ResolvedAppRouterProject | undefined {
@@ -450,6 +484,7 @@ async function handleAppRouterViteRequest(
     }
 
     const request = nodeRequestToWebRequest(incoming, origin);
+    const routeTransformPlugins = options.navigationScanVitePlugins ?? options.vitePlugins;
 
     await sendResponse(
       outgoing,
@@ -464,11 +499,12 @@ async function handleAppRouterViteRequest(
         navigationScripts: await devNavigationScripts(
           project.routesDir,
           options.clientRouteInferenceCache,
-          options.navigationScanVitePlugins,
+          routeTransformPlugins,
         ),
         request,
         routeCache: options.routeCache,
         serverActions: options.serverActions,
+        vitePlugins: routeTransformPlugins,
       }),
     );
   } catch (error) {
@@ -501,7 +537,7 @@ export async function renderAppRouterClientAsset(
   }
 
   const code = await readFile(route.file, "utf8");
-  const clientSource = stripRouteClientOnlyExports(code);
+  const clientSource = stripRouteClientOnlyExports(code, route.file);
   let references: Awaited<ReturnType<typeof collectClientRouteReferences>>;
 
   try {
@@ -565,7 +601,7 @@ async function renderAppRouterClientRouteDevModule(
   }
 
   const code = await readFile(route.file, "utf8");
-  const clientSource = stripRouteClientOnlyExports(code);
+  const clientSource = stripRouteClientOnlyExports(code, route.file);
   const references = await collectClientRouteReferences({
     appDir,
     code: clientSource,