@expo/cli 0.19.6 → 0.19.8

package/build/bin/cli

@@ -120,7 +120,7 @@ const args = (0, _arg().default)({
 });
 if (args["--version"]) {
     // Version is added in the build script.
-    console.log("0.19.6");
+    console.log("0.19.8");
     process.exit(0);
 }
 if (args["--non-interactive"]) {

package/build/src/start/server/metro/MetroBundlerDevServer.js

@@ -523,13 +523,13 @@ class MetroBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
     }
     async singlePageReactServerComponentExportAsync(options, files, extraOptions = {}) {
         // NOTE(EvanBacon): This will not support any code elimination since it's a static pass.
-        const { reactClientReferences: clientBoundaries , reactServerReferences: serverActionReferencesInServer , cssModules ,  } = await this.rscRenderer.getExpoRouterClientReferencesAsync({
+        let { reactClientReferences: clientBoundaries , reactServerReferences: serverActionReferencesInServer , cssModules ,  } = await this.rscRenderer.getExpoRouterClientReferencesAsync({
             platform: options.platform
         }, files);
         // TODO: The output keys should be in production format or use a lookup manifest.
         debug("Evaluated client boundaries:", clientBoundaries);
         // Run metro bundler and create the JS bundles/source maps.
-        const bundle = await this.legacySinglePageExportBundleAsync({
+        let bundle = await this.legacySinglePageExportBundleAsync({
             ...options,
             clientBoundaries
         }, extraOptions);
@@ -544,13 +544,30 @@ class MetroBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
             throw new Error("Static server action references were not returned from the Metro client bundle");
         }
         debug("React server action boundaries from client:", reactServerReferences);
-        await this.rscRenderer.exportServerActionsAsync({
+        // When we export the server actions that were imported from the client, we may need to re-bundle the client with the new client boundaries.
+        const { clientBoundaries: nestedClientBoundaries  } = await this.rscRenderer.exportServerActionsAsync({
             platform: options.platform,
             entryPoints: [
                 ...serverActionReferencesInServer,
                 ...reactServerReferences
             ]
         }, files);
+        const hasUniqueClientBoundaries = nestedClientBoundaries.some((boundary)=>!clientBoundaries.includes(boundary));
+        if (hasUniqueClientBoundaries) {
+            debug("Re-bundling client with nested client boundaries:", nestedClientBoundaries);
+            clientBoundaries = [
+                ...new Set(clientBoundaries.concat(nestedClientBoundaries))
+            ];
+            // Re-bundle the client with the new client boundaries that only exist in server actions that were imported from the client.
+            // Run metro bundler and create the JS bundles/source maps.
+            bundle = await this.legacySinglePageExportBundleAsync({
+                ...options,
+                clientBoundaries: [
+                    ...clientBoundaries,
+                    ...nestedClientBoundaries
+                ]
+            }, extraOptions);
+        }
         // Inject the global CSS that was imported during the server render.
         bundle.artifacts.push(...cssModules);
         const serverRoot = (0, _paths().getMetroServerRoot)(this.projectRoot);
@@ -651,7 +668,7 @@ class MetroBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
     }
     rscRenderer = null;
     async startImplementationAsync(options) {
-        var ref, ref1, ref2, ref3;
+        var ref, ref1, ref2, ref3, ref4, ref5, ref6;
         options.port = await this.resolvePortAsync(options);
         this.urlCreator = this.getUrlCreator(options);
         const config = (0, _config().getConfig)(this.projectRoot, {
@@ -659,17 +676,18 @@ class MetroBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
         });
         const { exp  } = config;
         // NOTE: This will change in the future when it's less experimental, we enable React 19, and turn on more RSC flags by default.
-        const isReactServerComponentsEnabled = !!((ref = exp.experiments) == null ? void 0 : ref.reactServerComponents);
+        const isReactServerComponentsEnabled = !!((ref = exp.experiments) == null ? void 0 : ref.reactServerComponents) || !!((ref1 = exp.experiments) == null ? void 0 : ref1.reactServerActions);
+        const isReactServerActionsOnlyEnabled = !((ref2 = exp.experiments) == null ? void 0 : ref2.reactServerComponents) && !!((ref3 = exp.experiments) == null ? void 0 : ref3.reactServerActions);
         this.isReactServerComponentsEnabled = isReactServerComponentsEnabled;
         const useServerRendering = [
             "static",
             "server"
-        ].includes(((ref1 = exp.web) == null ? void 0 : ref1.output) ?? "");
-        const hasApiRoutes = isReactServerComponentsEnabled || ((ref2 = exp.web) == null ? void 0 : ref2.output) === "server";
+        ].includes(((ref4 = exp.web) == null ? void 0 : ref4.output) ?? "");
+        const hasApiRoutes = isReactServerComponentsEnabled || ((ref5 = exp.web) == null ? void 0 : ref5.output) === "server";
         const baseUrl = (0, _metroOptions.getBaseUrlFromExpoConfig)(exp);
         const asyncRoutes = (0, _metroOptions.getAsyncRoutesFromExpoConfig)(exp, options.mode ?? "development", "web");
         const routerRoot = (0, _router.getRouterDirectoryModuleIdWithManifest)(this.projectRoot, exp);
-        const reactCompiler = !!((ref3 = exp.experiments) == null ? void 0 : ref3.reactCompiler);
+        const reactCompiler = !!((ref6 = exp.experiments) == null ? void 0 : ref6.reactCompiler);
         const appDir = _path().default.join(this.projectRoot, routerRoot);
         const mode = options.mode ?? "development";
         if (isReactServerComponentsEnabled && useServerRendering) {
@@ -775,7 +793,8 @@ class MetroBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
                     instanceMetroOptions: this.instanceMetroOptions,
                     rscPath: "/_flight",
                     ssrLoadModule: this.ssrLoadModule.bind(this),
-                    ssrLoadModuleArtifacts: this.metroImportAsArtifactsAsync.bind(this)
+                    ssrLoadModuleArtifacts: this.metroImportAsArtifactsAsync.bind(this),
+                    useClientRouter: isReactServerActionsOnlyEnabled
                 });
                 this.rscRenderer = rscMiddleware;
                 middleware.use(rscMiddleware.middleware);
@@ -787,12 +806,12 @@ class MetroBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
                     // This MUST run last since it's the fallback.
                     middleware.use(new _historyFallbackMiddleware.HistoryFallbackMiddleware(manifestMiddleware.getHandler().internal).getHandler());
                 } else {
-                    var ref4;
+                    var ref7;
                     middleware.use((0, _createServerRouteMiddleware.createRouteHandlerMiddleware)(this.projectRoot, {
                         appDir,
                         routerRoot,
                         config,
-                        ...(ref4 = config.exp.extra) == null ? void 0 : ref4.router,
+                        ...(ref7 = config.exp.extra) == null ? void 0 : ref7.router,
                         bundleApiRoute: (functionFilePath)=>this.ssrImportApiRoute(functionFilePath, {
                                 platform: "web"
                             }),
@@ -810,7 +829,8 @@ class MetroBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
                     instanceMetroOptions: this.instanceMetroOptions,
                     rscPath: "/_flight",
                     ssrLoadModule: this.ssrLoadModule.bind(this),
-                    ssrLoadModuleArtifacts: this.metroImportAsArtifactsAsync.bind(this)
+                    ssrLoadModuleArtifacts: this.metroImportAsArtifactsAsync.bind(this),
+                    useClientRouter: isReactServerActionsOnlyEnabled
                 });
                 this.rscRenderer = rscMiddleware1;
             }