From a19bbebbe36abd34efbd8f003e0f3bb55e0f1fdc Mon Sep 17 00:00:00 2001
From: Josh Story <story@hey.com>
Date: Thu, 6 Jul 2023 10:50:59 -0700
Subject: [PATCH] =?UTF-8?q?When=20selecting=20a=20package=20variant=20from?=
 =?UTF-8?q?=20an=20export=20map=20we=20should=20favor=20n=E2=80=A6=20(#270?=
 =?UTF-8?q?30)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When selecting a package variant from an export map we should favor node
over edge-light

edge-light represents a runtime with some minimal set of web apis
generally found across edge runtimes. However some environments might be
both edge-light compatible and node compatible and (node is adding many
web APIs) and when both conditions exist we want to favor the node
implementations. A followup to this change will add the web streams APIs
to Flight and Fizz so the node version exports the same interfaces for
web streams that edge does in addition to the node specific
implementations.
---
 packages/react-dom/package.json                | 6 ++++--
 packages/react-server-dom-webpack/package.json | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index d5f051694b..7d95df5734 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -50,11 +50,12 @@
     "./client": "./client.js",
     "./server": {
       "workerd": "./server.edge.js",
-      "edge-light": "./server.edge.js",
       "bun": "./server.bun.js",
       "deno": "./server.browser.js",
       "worker": "./server.browser.js",
       "browser": "./server.browser.js",
+      "node": "./server.node.js",
+      "edge-light": "./server.edge.js",
       "default": "./server.node.js"
     },
     "./server.browser": "./server.browser.js",
@@ -63,10 +64,11 @@
     "./server.node": "./server.node.js",
     "./static": {
       "workerd": "./static.edge.js",
-      "edge-light": "./static.edge.js",
       "deno": "./static.browser.js",
       "worker": "./static.browser.js",
       "browser": "./static.browser.js",
+      "node": "./static.node.js",
+      "edge-light": "./static.edge.js",
       "default": "./static.node.js"
     },
     "./static.browser": "./static.browser.js",
diff --git a/packages/react-server-dom-webpack/package.json b/packages/react-server-dom-webpack/package.json
index 4075fdec42..53f8fb4c0d 100644
--- a/packages/react-server-dom-webpack/package.json
+++ b/packages/react-server-dom-webpack/package.json
@@ -33,13 +33,13 @@
     "./plugin": "./plugin.js",
     "./client": {
       "workerd": "./client.edge.js",
-      "edge-light": "./client.edge.js",
       "deno": "./client.edge.js",
       "worker": "./client.edge.js",
       "node": {
         "webpack": "./client.node.js",
         "default": "./client.node.unbundled.js"
       },
+      "edge-light": "./client.edge.js",
       "browser": "./client.browser.js",
       "default": "./client.browser.js"
     },
@@ -50,12 +50,12 @@
     "./server": {
       "react-server": {
         "workerd": "./server.edge.js",
-        "edge-light": "./server.edge.js",
         "deno": "./server.browser.js",
         "node": {
           "webpack": "./server.node.js",
           "default": "./server.node.unbundled.js"
         },
+        "edge-light": "./server.edge.js",
         "browser": "./server.browser.js"
       },
       "default": "./server.js"