@reckona/mreact-router 0.0.157 → 0.0.158

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-router",
-  "version": "0.0.157",
+  "version": "0.0.158",
   "description": "File-system app router, SSR, actions, and deployment adapters for mreact.",
   "keywords": [
     "jsx",
@@ -105,20 +105,20 @@
   },
   "dependencies": {
     "typescript": "^6.0.3",
-    "@reckona/mreact-compat": "0.0.157",
-    "@reckona/mreact-devtools": "0.0.157",
-    "@reckona/mreact-query": "0.0.157",
-    "@reckona/mreact-reactive-core": "0.0.157",
-    "@reckona/mreact-compiler": "0.0.157",
-    "@reckona/mreact": "0.0.157",
-    "@reckona/mreact-reactive-dom": "0.0.157",
-    "@reckona/mreact-server": "0.0.157",
-    "@reckona/mreact-shared": "0.0.157"
+    "@reckona/mreact": "0.0.158",
+    "@reckona/mreact-compiler": "0.0.158",
+    "@reckona/mreact-compat": "0.0.158",
+    "@reckona/mreact-query": "0.0.158",
+    "@reckona/mreact-devtools": "0.0.158",
+    "@reckona/mreact-reactive-core": "0.0.158",
+    "@reckona/mreact-reactive-dom": "0.0.158",
+    "@reckona/mreact-server": "0.0.158",
+    "@reckona/mreact-shared": "0.0.158"
   },
   "peerDependencies": {
     "vite": ">=8 <9"
   },
   "optionalDependencies": {
-    "@reckona/mreact-router-native": "0.0.157"
+    "@reckona/mreact-router-native": "0.0.158"
   }
 }

package/src/build.ts

@@ -448,7 +448,7 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
         );
 
   const clientRouteInferenceCache = createClientRouteInferenceCache();
-  const [serverActionManifest, serverModules, generatedImportPolicy] = await Promise.all([
+  const [serverActionManifest, generatedImportPolicy] = await Promise.all([
     shouldTrackBuildPhases === false
       ? collectBuildServerActionManifest({
           files,
@@ -464,8 +464,32 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
             routesDir: project.routesDir,
           }),
         ),
+    shouldTrackBuildPhases === false
+      ? buildGeneratedImportPolicy({
+          files,
+          projectRoot: project.projectRoot,
+          routes,
+          routesDir: project.routesDir,
+        })
+      : timeBuildPhase(timingSink, progressSink, "importPolicy", () =>
+          buildGeneratedImportPolicy({
+            files,
+            projectRoot: project.projectRoot,
+            routes,
+            routesDir: project.routesDir,
+          }),
+        ),
+  ]);
+  const actionRenderBundleExcludedFiles = new Set(
+    [...serverActionManifest.routeReferences.entries()]
+      .filter(([, references]) => references.length > 0)
+      .map(([file]) => file),
+  );
+  const serverModules = await (
     shouldTrackBuildPhases === false
       ? buildServerModuleArtifacts({
+          actionRenderBundleExcludedFiles,
+          bundleRequestRuntimePackages: shouldBuildAwsLambda,
           bundleCache: new Map(),
           clientRouteInferenceCache: serverClientRouteInferenceCache,
           define: viteDefine,
@@ -480,6 +504,8 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
         })
       : timeBuildPhase(timingSink, progressSink, "serverModules", () =>
           buildServerModuleArtifacts({
+            actionRenderBundleExcludedFiles,
+            bundleRequestRuntimePackages: shouldBuildAwsLambda,
             bundleCache: new Map(),
             clientRouteInferenceCache: serverClientRouteInferenceCache,
             define: viteDefine,
@@ -492,23 +518,8 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
             serverTransformCache,
             vitePlugins,
           }),
-        ),
-    shouldTrackBuildPhases === false
-      ? buildGeneratedImportPolicy({
-          files,
-          projectRoot: project.projectRoot,
-          routes,
-          routesDir: project.routesDir,
-        })
-      : timeBuildPhase(timingSink, progressSink, "importPolicy", () =>
-          buildGeneratedImportPolicy({
-            files,
-            projectRoot: project.projectRoot,
-            routes,
-            routesDir: project.routesDir,
-          }),
-        ),
-  ]);
+        )
+  );
   const serverRoutes = routes.map((route) => ({
     ...route,
     file: relative(project.projectRoot, route.file),
@@ -1993,6 +2004,8 @@ function routePathFromParams(route: AppRoute, params: StaticParams): string {
 }
 
 async function buildServerModuleArtifacts(options: {
+  actionRenderBundleExcludedFiles?: ReadonlySet<string> | undefined;
+  bundleRequestRuntimePackages: boolean;
   bundleCache: Map<string, Promise<RouterBundleOutput>>;
   cacheDir?: string | undefined;
   clientRouteInferenceCache: ClientRouteInferenceCache;
@@ -2091,6 +2104,7 @@ async function buildServerModuleArtifacts(options: {
           bundleCache: options.bundleCache,
           cacheDir: options.cacheDir,
           entries: requestBatchEntries,
+          externalizeAllowedPackages: !options.bundleRequestRuntimePackages,
           importPolicy: requestModuleImportPolicy,
           define: options.define,
           vitePlugins: options.vitePlugins,
@@ -2119,6 +2133,7 @@ async function buildServerModuleArtifacts(options: {
               cacheDir: options.cacheDir,
               code: stripRouteLoaderOnlyExports(source, absoluteFile),
               filename: absoluteFile,
+              externalizeAllowedPackages: !options.bundleRequestRuntimePackages,
               importPolicy: requestModuleImportPolicy,
               define: options.define,
               vitePlugins: options.vitePlugins,
@@ -2138,6 +2153,7 @@ async function buildServerModuleArtifacts(options: {
               cacheDir: options.cacheDir,
               code: stripRouteMetadataOnlyExports(source, absoluteFile),
               filename: absoluteFile,
+              externalizeAllowedPackages: !options.bundleRequestRuntimePackages,
               importPolicy: requestModuleImportPolicy,
               label: "Metadata",
               define: options.define,
@@ -2161,6 +2177,7 @@ async function buildServerModuleArtifacts(options: {
                 bundleCache: options.bundleCache,
                 cacheDir: options.cacheDir,
                 filename: absoluteFile,
+                externalizeAllowedPackages: !options.bundleRequestRuntimePackages,
                 importPolicy: requestModuleImportPolicy,
                 define: options.define,
                 routeKind: route?.kind,
@@ -2273,23 +2290,26 @@ async function buildServerModuleArtifacts(options: {
             return undefined;
           }
 
+          const shouldWriteRenderBundle =
+            options.prebundleServerComponents &&
+            options.actionRenderBundleExcludedFiles?.has(file) !== true;
+          const bundleCode = shouldWriteRenderBundle
+            ? await buildServerComponentBundleArtifactCode({
+                clientRouteInferenceCache: options.clientRouteInferenceCache,
+                code: output.code,
+                externalizeCompatVendor,
+                filename: absoluteFile,
+                define: options.define,
+                root: options.projectRoot,
+                serverOutput,
+                vitePlugins: options.vitePlugins,
+              })
+            : undefined;
+
           return [
             serverOutput,
             {
-              ...(options.prebundleServerComponents
-                ? {
-                    bundleCode: await buildServerComponentBundleArtifactCode({
-                      clientRouteInferenceCache: options.clientRouteInferenceCache,
-                      code: output.code,
-                      externalizeCompatVendor,
-                      filename: absoluteFile,
-                      define: options.define,
-                      root: options.projectRoot,
-                      serverOutput,
-                      vitePlugins: options.vitePlugins,
-                    }),
-                  }
-                : {}),
+              ...(bundleCode === undefined ? {} : { bundleCode }),
               code: output.code,
               metadata: output.metadata,
               sourceHash: hashText(code),
@@ -2476,6 +2496,7 @@ async function buildRequestModuleArtifactCode(options: {
   bundleCache: Map<string, Promise<RouterBundleOutput>>;
   cacheDir?: string | undefined;
   define?: UserConfig["define"] | undefined;
+  externalizeAllowedPackages: boolean;
   filename: string;
   importPolicy: AppRouterImportPolicy;
   routeKind?: AppRoute["kind"] | undefined;
@@ -2488,6 +2509,7 @@ async function buildRequestModuleArtifactCode(options: {
       code: options.source,
       define: options.define,
       file: options.filename,
+      externalizeAllowedPackages: options.externalizeAllowedPackages,
       importPolicy: options.importPolicy,
       vitePlugins: options.vitePlugins,
     });
@@ -2512,6 +2534,7 @@ async function buildRequestModuleArtifactCode(options: {
     cacheDir: options.cacheDir,
     code: stripRouteRequestOnlyExports(options.source, options.filename),
     define: options.define,
+    externalizeAllowedPackages: options.externalizeAllowedPackages,
     filename: options.filename,
     importPolicy: options.importPolicy,
     vitePlugins: options.vitePlugins,
@@ -2524,6 +2547,7 @@ async function bundleRouteLoaderModuleCode(options: {
   cacheDir?: string | undefined;
   code: string;
   define?: UserConfig["define"] | undefined;
+  externalizeAllowedPackages?: boolean | undefined;
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -2540,6 +2564,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
   cacheDir?: string | undefined;
   define?: UserConfig["define"] | undefined;
   entries: readonly RouteRequestModuleBatchEntry[];
+  externalizeAllowedPackages?: boolean | undefined;
   importPolicy?: AppRouterImportPolicy | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<Map<string, string>> {
@@ -2562,6 +2587,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
           cacheDir: options.cacheDir,
           code: entry.code,
           define: options.define,
+          externalizeAllowedPackages: options.externalizeAllowedPackages,
           filename: entry.filename,
           importPolicy: options.importPolicy,
           label: entry.label,
@@ -2594,6 +2620,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
         appDir: options.appDir,
         importPolicy: options.importPolicy,
         label: "Request artifact",
+        externalizeAllowedPackages: options.externalizeAllowedPackages,
       }),
     ],
     root:
@@ -2613,6 +2640,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
             cacheDir: options.cacheDir,
             code: entry.code,
             define: options.define,
+            externalizeAllowedPackages: options.externalizeAllowedPackages,
             filename: entry.filename,
             importPolicy: options.importPolicy,
             label: entry.label,
@@ -2643,6 +2671,7 @@ export async function __bundleRouteRequestModuleBatchForTests(options: {
   cacheDir?: string | undefined;
   define?: UserConfig["define"] | undefined;
   entries: readonly RouteRequestModuleBatchEntry[];
+  externalizeAllowedPackages?: boolean | undefined;
   importPolicy?: AppRouterImportPolicy | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
 }): Promise<Record<string, string>> {
@@ -2652,6 +2681,7 @@ export async function __bundleRouteRequestModuleBatchForTests(options: {
       cacheDir: options.cacheDir,
       define: options.define,
       entries: options.entries,
+      externalizeAllowedPackages: options.externalizeAllowedPackages,
       importPolicy: options.importPolicy,
       vitePlugins: options.vitePlugins,
     }),
@@ -2664,6 +2694,7 @@ async function bundleRouteRequestModuleCode(options: {
   cacheDir?: string | undefined;
   code: string;
   define?: UserConfig["define"] | undefined;
+  externalizeAllowedPackages?: boolean | undefined;
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   label: "Loader" | "Metadata";
@@ -2683,6 +2714,7 @@ async function bundleRouteRequestModuleCode(options: {
       fileImportMetaUrlPlugin(),
       createAppRouterImportPolicyPlugin({
         appDir: options.appDir,
+        externalizeAllowedPackages: options.externalizeAllowedPackages,
         importPolicy: options.importPolicy,
         label: options.label,
       }),
@@ -2701,6 +2733,7 @@ function routeRequestBundleCacheKey(options: {
   appDir: string;
   code: string;
   define?: UserConfig["define"] | undefined;
+  externalizeAllowedPackages?: boolean | undefined;
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   label: "Loader" | "Metadata";
@@ -2723,6 +2756,7 @@ function routeRequestBundleCacheKey(options: {
                 ? undefined
                 : resolve(options.importPolicy.projectRoot),
           },
+    externalizeAllowedPackages: options.externalizeAllowedPackages,
     label: options.label,
     platform: "node",
     target: "es2022",

package/src/import-policy.ts

@@ -21,6 +21,7 @@ export interface AppRouterImportPolicy {
 export interface AppRouterImportPolicyPluginOptions {
   allowedSourceDirs?: readonly string[] | undefined;
   appDir: string;
+  externalizeAllowedPackages?: boolean | undefined;
   importPolicy?: AppRouterImportPolicy | undefined;
   label: string;
   projectRoot?: string | undefined;
@@ -110,10 +111,12 @@ export function createAppRouterImportPolicyPlugin(options: AppRouterImportPolicy
           return undefined;
         }
 
-        return {
-          external: true,
-          path: pathToFileURL(resolvedPackage).href,
-        };
+        return options.externalizeAllowedPackages === false
+          ? undefined
+          : {
+              external: true,
+              path: pathToFileURL(resolvedPackage).href,
+            };
       });
     },
   };

package/src/render.ts

@@ -2525,6 +2525,7 @@ export async function bundleMiddlewareModuleCode(options: {
   appDir: string;
   code: string;
   define?: UserConfig["define"] | undefined;
+  externalizeAllowedPackages?: boolean | undefined;
   file: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -2539,6 +2540,7 @@ export async function bundleMiddlewareModuleCode(options: {
       fileImportMetaUrlPlugin(),
       createAppRouterImportPolicyPlugin({
         appDir: options.appDir,
+        externalizeAllowedPackages: options.externalizeAllowedPackages,
         importPolicy: options.importPolicy,
         label: "Middleware",
       }),