@netlify/vite-plugin-react-router 3.0.0 → 3.1.0-next.1

package/dist/index.js

@@ -113,7 +113,7 @@ var import_tinyglobby = require("tinyglobby");
 
 // package.json
 var name = "@netlify/vite-plugin-react-router";
-var version = "3.0.0";
+var version = "3.1.0-next.1";
 
 // src/lib/rollup.ts
 var import_node_path = require("path");
@@ -149,6 +149,26 @@ var FUNCTION_HANDLER_MODULE_ID = "virtual:netlify-server";
 var RESOLVED_FUNCTION_HANDLER_MODULE_ID = `\0${FUNCTION_HANDLER_MODULE_ID}`;
 var SERVER_ENTRY_MODULE_ID = "virtual:netlify-server-entry";
 var toPosixPath = (path) => path.split(import_node_path2.sep).join(import_posix.sep);
+var ALLOWED_USER_EDGE_FUNCTION_HANDLER_FILENAMES = [
+  "server.ts",
+  "server.mts",
+  "server.cts",
+  "server.mjs",
+  "server.cjs",
+  "server.js"
+];
+var findUserEdgeFunctionHandlerFile = async (root) => {
+  for (const filename of ALLOWED_USER_EDGE_FUNCTION_HANDLER_FILENAMES) {
+    try {
+      await (0, import_promises.access)((0, import_node_path2.join)(root, filename));
+      return filename;
+    } catch {
+    }
+  }
+  throw new Error(
+    "Your Hydrogen site must include a `server.ts` (or js/mjs/cjs/mts/cts) file at the root to deploy to Netlify. See https://github.com/netlify/hydrogen-template."
+  );
+};
 var FUNCTION_HANDLER = (
   /* js */
   `
@@ -207,6 +227,7 @@ function netlifyPlugin(options = {}) {
   let resolvedConfig;
   let isProductionSsrBuild = false;
   let currentCommand;
+  let isHydrogenSite = false;
   return {
     name: "vite-plugin-netlify-react-router",
     config(_config, { command, isSsrBuild }) {
@@ -222,7 +243,9 @@ function netlifyPlugin(options = {}) {
             rollupOptions: {
               input: mergedInput,
               output: {
-                entryFileNames: "[name].js"
+                // NOTE: must use function syntax here to work around Shopify CLI reading
+                // the config value literally (i.e. trying to stat `[name].js` as a filename).
+                entryFileNames: () => "[name].js"
               }
             }
           },
@@ -243,6 +266,11 @@ function netlifyPlugin(options = {}) {
       }
     },
     async resolveId(source, importer, options2) {
+      if (isHydrogenSite && edge) {
+        if (source === FUNCTION_HANDLER_MODULE_ID || source === SERVER_ENTRY_MODULE_ID) {
+          return;
+        }
+      }
       if (source === FUNCTION_HANDLER_MODULE_ID) {
         return RESOLVED_FUNCTION_HANDLER_MODULE_ID;
       }
@@ -263,8 +291,18 @@ function netlifyPlugin(options = {}) {
         return edge ? EDGE_FUNCTION_HANDLER : FUNCTION_HANDLER;
       }
     },
-    async configResolved(config) {
-      resolvedConfig = config;
+    configResolved: {
+      order: "pre",
+      async handler(config) {
+        resolvedConfig = config;
+        isHydrogenSite = config.plugins.some((plugin) => plugin.name === "hydrogen:main");
+        if (isHydrogenSite && edge && isProductionSsrBuild) {
+          const userServerFile = await findUserEdgeFunctionHandlerFile(config.root);
+          if (config.build?.rollupOptions?.input && typeof config.build.rollupOptions.input === "object" && !Array.isArray(config.build.rollupOptions.input)) {
+            config.build.rollupOptions.input[FUNCTION_HANDLER_CHUNK] = userServerFile;
+          }
+        }
+      }
     },
     // See https://rollupjs.org/plugin-development/#writebundle.
     async writeBundle() {

package/dist/index.mjs

@@ -5,14 +5,14 @@ import {
 import "./chunk-J5PMA2AP.mjs";
 
 // src/plugin.ts
-import { mkdir, writeFile } from "node:fs/promises";
+import { access, mkdir, writeFile } from "node:fs/promises";
 import { dirname, join, relative, resolve, sep } from "node:path";
 import { sep as posixSep } from "node:path/posix";
 import { glob } from "tinyglobby";
 
 // package.json
 var name = "@netlify/vite-plugin-react-router";
-var version = "3.0.0";
+var version = "3.1.0-next.1";
 
 // src/lib/rollup.ts
 import { basename, extname } from "node:path";
@@ -48,6 +48,26 @@ var FUNCTION_HANDLER_MODULE_ID = "virtual:netlify-server";
 var RESOLVED_FUNCTION_HANDLER_MODULE_ID = `\0${FUNCTION_HANDLER_MODULE_ID}`;
 var SERVER_ENTRY_MODULE_ID = "virtual:netlify-server-entry";
 var toPosixPath = (path) => path.split(sep).join(posixSep);
+var ALLOWED_USER_EDGE_FUNCTION_HANDLER_FILENAMES = [
+  "server.ts",
+  "server.mts",
+  "server.cts",
+  "server.mjs",
+  "server.cjs",
+  "server.js"
+];
+var findUserEdgeFunctionHandlerFile = async (root) => {
+  for (const filename of ALLOWED_USER_EDGE_FUNCTION_HANDLER_FILENAMES) {
+    try {
+      await access(join(root, filename));
+      return filename;
+    } catch {
+    }
+  }
+  throw new Error(
+    "Your Hydrogen site must include a `server.ts` (or js/mjs/cjs/mts/cts) file at the root to deploy to Netlify. See https://github.com/netlify/hydrogen-template."
+  );
+};
 var FUNCTION_HANDLER = (
   /* js */
   `
@@ -106,6 +126,7 @@ function netlifyPlugin(options = {}) {
   let resolvedConfig;
   let isProductionSsrBuild = false;
   let currentCommand;
+  let isHydrogenSite = false;
   return {
     name: "vite-plugin-netlify-react-router",
     config(_config, { command, isSsrBuild }) {
@@ -121,7 +142,9 @@ function netlifyPlugin(options = {}) {
             rollupOptions: {
               input: mergedInput,
               output: {
-                entryFileNames: "[name].js"
+                // NOTE: must use function syntax here to work around Shopify CLI reading
+                // the config value literally (i.e. trying to stat `[name].js` as a filename).
+                entryFileNames: () => "[name].js"
               }
             }
           },
@@ -142,6 +165,11 @@ function netlifyPlugin(options = {}) {
       }
     },
     async resolveId(source, importer, options2) {
+      if (isHydrogenSite && edge) {
+        if (source === FUNCTION_HANDLER_MODULE_ID || source === SERVER_ENTRY_MODULE_ID) {
+          return;
+        }
+      }
       if (source === FUNCTION_HANDLER_MODULE_ID) {
         return RESOLVED_FUNCTION_HANDLER_MODULE_ID;
       }
@@ -162,8 +190,18 @@ function netlifyPlugin(options = {}) {
         return edge ? EDGE_FUNCTION_HANDLER : FUNCTION_HANDLER;
       }
     },
-    async configResolved(config) {
-      resolvedConfig = config;
+    configResolved: {
+      order: "pre",
+      async handler(config) {
+        resolvedConfig = config;
+        isHydrogenSite = config.plugins.some((plugin) => plugin.name === "hydrogen:main");
+        if (isHydrogenSite && edge && isProductionSsrBuild) {
+          const userServerFile = await findUserEdgeFunctionHandlerFile(config.root);
+          if (config.build?.rollupOptions?.input && typeof config.build.rollupOptions.input === "object" && !Array.isArray(config.build.rollupOptions.input)) {
+            config.build.rollupOptions.input[FUNCTION_HANDLER_CHUNK] = userServerFile;
+          }
+        }
+      }
     },
     // See https://rollupjs.org/plugin-development/#writebundle.
     async writeBundle() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/vite-plugin-react-router",
-  "version": "3.0.0",
+  "version": "3.1.0-next.1",
   "description": "React Router 7+ Vite plugin for Netlify",
   "type": "commonjs",
   "main": "./dist/index.js",
@@ -52,8 +52,8 @@
   },
   "homepage": "https://github.com/netlify/remix-compute#readme",
   "dependencies": {
-    "@netlify/edge-functions": "^3.0.3",
-    "@netlify/functions": "^5.1.2",
+    "@netlify/edge-functions": "^3.0.4",
+    "@netlify/functions": "^5.1.3",
     "isbot": "^5.1.25",
     "tinyglobby": "^0.2.10"
   },