Improve inference for targets in serve mode

Author: devongovett

packages/core/core/src/Environment.js

@@ -48,6 +48,7 @@ export function createEnvironment({
     switch (context) {
       case 'node':
       case 'electron-main':
+      case 'react-server':
         engines = {
           node: DEFAULT_ENGINES.node,
         };
@@ -56,6 +57,7 @@ export function createEnvironment({
       case 'web-worker':
       case 'service-worker':
       case 'electron-renderer':
+      case 'react-client':
         engines = {
           browsers: DEFAULT_ENGINES.browsers,
         };
@@ -70,6 +72,7 @@ export function createEnvironment({
       case 'node':
       case 'electron-main':
       case 'electron-renderer':
+      case 'react-server':
         includeNodeModules = false;
         break;
       case 'browser':
@@ -86,6 +89,7 @@ export function createEnvironment({
       case 'node':
       case 'electron-main':
       case 'electron-renderer':
+      case 'react-server':
         outputFormat = 'commonjs';
         break;
       default:

packages/core/core/src/requests/TargetRequest.js

@@ -48,6 +48,7 @@ import {
 import {optionsProxy, toInternalSourceLocation} from '../utils';
 import {fromProjectPath, toProjectPath, joinProjectPath} from '../projectPath';
 import {requestTypes} from '../RequestTracker';
+import {BROWSER_ENVS} from '../public/Environment';
 
 type RunOpts<TResult> = {|
   input: Entry,
@@ -78,7 +79,7 @@ const COMMON_TARGETS = {
 };
 
 const DEFAULT_ENGINES = {
-  node: 'current',
+  node: process.versions.node,
   browsers: [
     'last 1 Chrome version',
     'last 1 Safari version',
@@ -345,26 +346,41 @@ export class TargetResolver {
         );
       }
     } else {
+      targets = Array.from(packageTargets.values())
+        .filter(Boolean)
+        .filter(descriptor => {
+          return (
+            descriptor &&
+            !skipTarget(descriptor.name, exclusiveTarget, descriptor.source)
+          );
+        });
+
       // Explicit targets were not provided. Either use a modern target for server
       // mode, or simply use the package.json targets.
       if (this.options.serveOptions) {
         // In serve mode, we only support a single browser target. Since the user
         // hasn't specified a target, use one targeting modern browsers for development
+        let distDir = toProjectPath(
+          this.options.projectRoot,
+          this.options.serveOptions.distDir,
+        );
+        let context = targets[0]?.env.context ?? 'browser';
+        let engines = BROWSER_ENVS.has(context)
+          ? {browsers: DEFAULT_ENGINES.browsers}
+          : {node: DEFAULT_ENGINES.node};
         targets = [
           {
             name: 'default',
-            distDir: toProjectPath(
-              this.options.projectRoot,
-              this.options.serveOptions.distDir,
-            ),
+            distDir,
             publicUrl: this.options.defaultTargetOptions.publicUrl ?? '/',
             env: createEnvironment({
-              context: 'browser',
-              engines: {
-                browsers: DEFAULT_ENGINES.browsers,
-              },
+              context,
+              engines,
+              includeNodeModules: targets[0]?.env.includeNodeModules,
               shouldOptimize: this.options.defaultTargetOptions.shouldOptimize,
-              outputFormat: this.options.defaultTargetOptions.outputFormat,
+              outputFormat:
+                targets[0]?.env.outputFormat ??
+                this.options.defaultTargetOptions.outputFormat,
               shouldScopeHoist:
                 this.options.defaultTargetOptions.shouldScopeHoist,
               sourceMap: this.options.defaultTargetOptions.sourceMaps
@@ -373,15 +389,6 @@ export class TargetResolver {
             }),
           },
         ];
-      } else {
-        targets = Array.from(packageTargets.values())
-          .filter(Boolean)
-          .filter(descriptor => {
-            return (
-              descriptor &&
-              !skipTarget(descriptor.name, exclusiveTarget, descriptor.source)
-            );
-          });
       }
     }
 

packages/examples/react-server-components/package.json

@@ -3,19 +3,15 @@
   "version": "1.0.0",
   "private": true,
   "server": "dist/server.js",
+  "source": "src/server.tsx",
   "targets": {
     "server": {
-      "source": "src/server.tsx",
       "context": "react-server",
-      "outputFormat": "commonjs",
       "includeNodeModules": {
         "express": false
       }
     }
   },
-  "engines": {
-    "node": ">= 18"
-  },
   "dependencies": {
     "express": "^4.18.2",
     "react": "^19",

yarn.lock

@@ -12332,8 +12332,10 @@ react-resizable-panels@^0.0.61:
   resolved "https://registry.yarnpkg.com/react-resizable-panels/-/react-resizable-panels-0.0.61.tgz#2260ec8ca591431d367d172bced49733cc3308aa"
   integrity sha512-Vk2a4LEHWkI6hGPnPmXxa/2twLYMAMMUTyA2PtR1ijvH2Nkg/AhGqrPsIi/eI85uVWtYCFNZKEsbR3uGuJl/yg==
 
-"react-server-dom-parcel@file:../react/build/node_modules/react-server-dom-parcel":
-  version "19.0.0"
+react-server-dom-parcel@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/react-server-dom-parcel/-/react-server-dom-parcel-0.0.1.tgz#2653c2b39a857fbd17770d27d6f08bd139803f09"
+  integrity sha512-f93wv8gycm4ltcQRqpSlgYyT6cJxmjJdRmXw3deQoXowDlP44W4RRzwHQ70u1xseCpHFIORmuHVXk7+Fk8RFtQ==
 
 react-universal-interface@^0.6.2:
   version "0.6.2"