vite-plugin-react-server 1.0.2 → 1.1.0

package/scripts/check-react-version.mjs

@@ -1,58 +1,70 @@
 #!/usr/bin/env node
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import React from 'react'
+import fs from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import React from "react";
+import packageJSON from "../package.json" with { type: "json" };
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+// Hardcoded template version from our last successful patch
+const TEMPLATE_VERSION = "0.0.0-experimental-0ca8420f-20250504";
+const [templateVersionNumber, templateVersionSuffix] = TEMPLATE_VERSION.split("-");
 
-const TEMPLATE_VERSION = '0.0.0-experimental-eda36a1c-20250228'
-const STUB_VERSION = '0.0.1'
+// Get installed version
+const installedVersion = React.version;
+const [installedVersionNumber, installedVersionSuffix] = installedVersion.split("-");
 
+// Get peer dependency versions
+const peerReactVersion = packageJSON.peerDependencies.react.replace("^", "");
+const peerReactESMVersion = packageJSON.peerDependencies["react-server-dom-esm"].replace("^", "");
+
+console.log('Template version:', TEMPLATE_VERSION);
+console.log('Installed version:', installedVersion);
+console.log('Peer version:', peerReactVersion);
+console.log('ESM version (for final patch):', peerReactESMVersion);
+
+// Define patches to process
+const patches = [
+  {
+    // The template patch file uses our experimental version
+    template: path.resolve(
+      __dirname,
+      `react-server-dom-esm+${TEMPLATE_VERSION}.patch`
+    ),
+    // But the final patch file uses the ESM version
+    output: `react-server-dom-esm+${peerReactESMVersion}.patch`,
+  },
+];
+
+// Create patches dir
+const userPatchesDir = path.resolve(process.cwd(), "patches");
+
+/**
+ * The script checks if the installed React version is 19.2.0.
+ * If it is, it will replace the version number in react-server-dom-esm+0.0.1.patch
+ * with the current React version, such as 0.0.0.experimental-e5dd82a7-20250401
+ *
+ * @returns Promise<void>
+ */
 async function main() {
-    // Read installed React version
-    const patchVersion = React.version
-    const PATCH_RECONCILER_VERSION = patchVersion.replace('19.1.0', '0.0.0')
-    if(TEMPLATE_VERSION === PATCH_RECONCILER_VERSION) {
-        console.log('React version is already patched')
-        return;
-    } 
-    
-    // Define patches to process
-    const patches = [
-      {
-        template: path.resolve(__dirname, `react-server-dom-esm+${TEMPLATE_VERSION}.patch`),
-        output: `react-server-dom-esm+${STUB_VERSION}.patch`
-      },
-      {
-        template: path.resolve(__dirname, `react+${TEMPLATE_VERSION}.patch`),
-        output: `react+${PATCH_RECONCILER_VERSION}.patch`
-      },
-      {
-        template: path.resolve(__dirname, `react-dom+${TEMPLATE_VERSION}.patch`),
-        output: `react-dom+${PATCH_RECONCILER_VERSION}.patch`
-      }
-    ]
-
-    // Create patches dir
-    const userPatchesDir = path.resolve(process.cwd(), 'patches')
-    await fs.mkdir(userPatchesDir, { recursive: true })
-
-    // Process each patch
-    for (const {template, output} of patches) {
-      let patchContent = await fs.readFile(template, 'utf-8')
-      // Write patched file
-      const outputPath = path.resolve(userPatchesDir, output)
-      await fs.writeFile(outputPath, patchContent)
-      console.log(`Wrote patch file to ${outputPath}`)
-    }
+  if (templateVersionSuffix === installedVersionSuffix) {
+    console.log("React version is already patched", TEMPLATE_VERSION, installedVersion);
+    return;
+  }
+  await fs.mkdir(userPatchesDir, { recursive: true });
 
+  // Process each patch
+  for (const { template, output } of patches) {
+    let patchContent = await fs.readFile(template, "utf-8");
+    // Write patched file
+    const outputPath = path.resolve(userPatchesDir, output);
+    await fs.writeFile(outputPath, patchContent);
+    console.log(`Wrote patch file to ${outputPath}`);
+  }
 }
 
-const PATCH = ``
-
 try {
-main()   
+  await main();
 } catch (error) {
-  console.error('error applying patch', error)
-}
+  console.error("error applying patch", error);
+}

package/scripts/react+0.0.0-experimental-0ca8420f-20250504.patch

@@ -0,0 +1,57 @@
+diff --git a/node_modules/react/cjs/react.development.js b/node_modules/react/cjs/react.development.js
+index 234f4b0..7c48c87 100644
+--- a/node_modules/react/cjs/react.development.js
++++ b/node_modules/react/cjs/react.development.js
+@@ -1326,7 +1326,7 @@
+     exports.useTransition = function () {
+       return resolveDispatcher().useTransition();
+     };
+-    exports.version = "19.2.0-experimental-c129c242-20250505";
++    exports.version = "19.2.0-experimental-0ca8420f-20250504";
+     "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
+       "function" ===
+         typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
+diff --git a/node_modules/react/cjs/react.production.js b/node_modules/react/cjs/react.production.js
+index e98c79b..c22b875 100644
+--- a/node_modules/react/cjs/react.production.js
++++ b/node_modules/react/cjs/react.production.js
+@@ -603,4 +603,4 @@ exports.useSyncExternalStore = function (
+ exports.useTransition = function () {
+   return ReactSharedInternals.H.useTransition();
+ };
+-exports.version = "19.2.0-experimental-c129c242-20250505";
++exports.version = "19.2.0-experimental-0ca8420f-20250504";
+diff --git a/node_modules/react/cjs/react.react-server.development.js b/node_modules/react/cjs/react.react-server.development.js
+index c1a91c9..fa37015 100644
+--- a/node_modules/react/cjs/react.react-server.development.js
++++ b/node_modules/react/cjs/react.react-server.development.js
+@@ -992,5 +992,5 @@
+     exports.useMemo = function (create, deps) {
+       return resolveDispatcher().useMemo(create, deps);
+     };
+-    exports.version = "19.2.0-experimental-c129c242-20250505";
++    exports.version = "19.2.0-experimental-0ca8420f-20250504";
+   })();
+diff --git a/node_modules/react/cjs/react.react-server.production.js b/node_modules/react/cjs/react.react-server.production.js
+index ae987bf..2dac15e 100644
+--- a/node_modules/react/cjs/react.react-server.production.js
++++ b/node_modules/react/cjs/react.react-server.production.js
+@@ -569,4 +569,4 @@ exports.useId = function () {
+ exports.useMemo = function (create, deps) {
+   return ReactSharedInternals.H.useMemo(create, deps);
+ };
+-exports.version = "19.2.0-experimental-c129c242-20250505";
++exports.version = "19.2.0-experimental-0ca8420f-20250504";
+diff --git a/node_modules/react/package.json b/node_modules/react/package.json
+index d9ce355..ab201cc 100644
+--- a/node_modules/react/package.json
++++ b/node_modules/react/package.json
+@@ -4,7 +4,7 @@
+   "keywords": [
+     "react"
+   ],
+-  "version": "0.0.0-experimental-c129c242-20250505",
++  "version": "0.0.0-experimental-0ca8420f-20250504",
+   "homepage": "https://react.dev/",
+   "bugs": "https://github.com/facebook/react/issues",
+   "license": "MIT",