@netlify/vite-plugin-react-router 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.1.3](https://github.com/netlify/remix-compute/compare/vite-plugin-react-router-v2.1.2...vite-plugin-react-router-v2.1.3) (2026-01-19)
+
+
+### Bug Fixes
+
+* **vite-plugin-react-router:** fix prerendering by not clobbering SSR bundle entries ([#620](https://github.com/netlify/remix-compute/issues/620)) ([54851a9](https://github.com/netlify/remix-compute/commit/54851a92c4361c9987dc1cb34186bf73ddb1a38e))
+
+## [2.1.2](https://github.com/netlify/remix-compute/compare/vite-plugin-react-router-v2.1.1...vite-plugin-react-router-v2.1.2) (2025-11-08)
+
+
+### Bug Fixes
+
+* **vite-plugin-react-router:** fix custom `build.assetsDir` edge case ([#578](https://github.com/netlify/remix-compute/issues/578)) ([7316d95](https://github.com/netlify/remix-compute/commit/7316d95ea087e19dffe9414749c891642096c4cd))
+
 ## [2.1.1](https://github.com/netlify/remix-compute/compare/vite-plugin-react-router-v2.1.0...vite-plugin-react-router-v2.1.1) (2025-11-06)
 
 

package/dist/index.js

@@ -107,12 +107,38 @@ function createRequestHandler({
 
 // src/plugin.ts
 var import_promises = require("fs/promises");
-var import_node_path = require("path");
+var import_node_path2 = require("path");
 var import_posix = require("path/posix");
+var import_tinyglobby = require("tinyglobby");
 
 // package.json
 var name = "@netlify/vite-plugin-react-router";
-var version = "2.1.1";
+var version = "2.1.3";
+
+// src/lib/rollup.ts
+var import_node_path = require("path");
+var getAliasName = (id) => {
+  const base = (0, import_node_path.basename)(id);
+  return base.slice(0, Math.max(0, base.length - (0, import_node_path.extname)(id).length));
+};
+var normalizeRollupInput = (input) => {
+  if (input == null) {
+    return {};
+  }
+  if (typeof input === "string") {
+    return { [getAliasName(input)]: input };
+  }
+  if (Array.isArray(input)) {
+    return Object.fromEntries(input.map((entry) => [getAliasName(entry), entry]));
+  }
+  return input;
+};
+var mergeRollupInput = (existing, newEntries) => {
+  return {
+    ...normalizeRollupInput(existing),
+    ...newEntries
+  };
+};
 
 // src/plugin.ts
 var NETLIFY_FUNCTIONS_DIR = ".netlify/v1/functions";
@@ -122,7 +148,7 @@ var FUNCTION_HANDLER_CHUNK = "server";
 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_path.sep).join(import_posix.sep);
+var toPosixPath = (path) => path.split(import_node_path2.sep).join(import_posix.sep);
 var FUNCTION_HANDLER = (
   /* js */
   `
@@ -183,36 +209,37 @@ function netlifyPlugin(options = {}) {
   let currentCommand;
   return {
     name: "vite-plugin-netlify-react-router",
-    config(config, { command, isSsrBuild }) {
+    config(_config, { command, isSsrBuild }) {
       currentCommand = command;
       isProductionSsrBuild = isSsrBuild === true && command === "build";
       if (isProductionSsrBuild) {
-        config.build ??= {};
-        config.build.rollupOptions ??= {};
-        config.build.rollupOptions.input = {
+        const functionHandlerInput = {
           [FUNCTION_HANDLER_CHUNK]: FUNCTION_HANDLER_MODULE_ID
         };
-        config.build.rollupOptions.output ??= {};
-        if (Array.isArray(config.build.rollupOptions.output)) {
-          console.warn(
-            "Expected Vite config `build.rollupOptions.output` to be an object, but it is an array - overwriting it, but this may cause issues with your custom configuration"
-          );
-          config.build.rollupOptions.output = {};
-        }
-        config.build.rollupOptions.output.entryFileNames = "[name].js";
-        if (edge) {
-          config.ssr = {
-            ...config.ssr,
-            target: "webworker",
-            // Bundle everything except Node.js built-ins (which are supported but must use the `node:` prefix):
-            // https://docs.netlify.com/build/edge-functions/api/#runtime-environment
-            noExternal: /^(?!node:).*$/,
-            resolve: {
-              ...config.resolve,
-              conditions: ["worker", "deno", "browser"]
+        const mergedInput = mergeRollupInput(_config.build?.rollupOptions?.input, functionHandlerInput);
+        const configChanges = {
+          build: {
+            rollupOptions: {
+              input: mergedInput,
+              output: {
+                entryFileNames: "[name].js"
+              }
             }
-          };
-        }
+          },
+          // Additional config needed for Edge Functions if enabled
+          ...edge ? {
+            ssr: {
+              target: "webworker",
+              // Bundle everything except Node.js built-ins (which are supported but must use the `node:` prefix):
+              // https://docs.netlify.com/build/edge-functions/api/#runtime-environment
+              noExternal: /^(?!node:).*$/,
+              resolve: {
+                conditions: ["worker", "deno", "browser"]
+              }
+            }
+          } : {}
+        };
+        return configChanges;
       }
     },
     async resolveId(source, importer, options2) {
@@ -225,7 +252,7 @@ function netlifyPlugin(options = {}) {
           if (!reactRouterDev) {
             throw new Error("The @react-router/dev package is required for local development. Please install it.");
           }
-          return (0, import_node_path.resolve)((0, import_node_path.dirname)(reactRouterDev.id), "config/defaults/entry.server.node.tsx");
+          return (0, import_node_path2.resolve)((0, import_node_path2.dirname)(reactRouterDev.id), "config/defaults/entry.server.node.tsx");
         }
         return this.resolve("@netlify/vite-plugin-react-router/entry.server.edge", importer, options2);
       }
@@ -242,29 +269,31 @@ function netlifyPlugin(options = {}) {
     // See https://rollupjs.org/plugin-development/#writebundle.
     async writeBundle() {
       if (isProductionSsrBuild) {
-        const handlerPath = (0, import_node_path.join)(resolvedConfig.build.outDir, `${FUNCTION_HANDLER_CHUNK}.js`);
+        const handlerPath = (0, import_node_path2.join)(resolvedConfig.build.outDir, `${FUNCTION_HANDLER_CHUNK}.js`);
         if (edge) {
-          const clientDir = (0, import_node_path.join)(resolvedConfig.build.outDir, "..", "client");
-          const entries = await (0, import_promises.readdir)(clientDir, { withFileTypes: true });
-          const excludedPath = [
-            "/.netlify/*",
-            ...entries.map((entry) => entry.isDirectory() ? `/${entry.name}/*` : `/${entry.name}`),
-            ...additionalExcludedPaths
-          ];
-          const edgeFunctionsDir = (0, import_node_path.join)(resolvedConfig.root, NETLIFY_EDGE_FUNCTIONS_DIR);
+          const clientDir = (0, import_node_path2.join)(resolvedConfig.build.outDir, "..", "client");
+          const clientFiles = await (0, import_tinyglobby.glob)("**/*", {
+            cwd: clientDir,
+            // We can't exclude entire directories because there could be `foo/bar.baz` in the
+            // client dir and a `/foo` route handled by the server function.
+            onlyFiles: true,
+            dot: true
+          });
+          const excludedPath = ["/.netlify/*", ...clientFiles.map((file) => `/${file}`), ...additionalExcludedPaths];
+          const edgeFunctionsDir = (0, import_node_path2.join)(resolvedConfig.root, NETLIFY_EDGE_FUNCTIONS_DIR);
           await (0, import_promises.mkdir)(edgeFunctionsDir, { recursive: true });
-          const relativeHandlerPath = toPosixPath((0, import_node_path.relative)(edgeFunctionsDir, handlerPath));
+          const relativeHandlerPath = toPosixPath((0, import_node_path2.relative)(edgeFunctionsDir, handlerPath));
           await (0, import_promises.writeFile)(
-            (0, import_node_path.join)(edgeFunctionsDir, FUNCTION_FILENAME),
+            (0, import_node_path2.join)(edgeFunctionsDir, FUNCTION_FILENAME),
             generateEdgeFunction(relativeHandlerPath, excludedPath)
           );
         } else {
-          const functionsDir = (0, import_node_path.join)(resolvedConfig.root, NETLIFY_FUNCTIONS_DIR);
+          const functionsDir = (0, import_node_path2.join)(resolvedConfig.root, NETLIFY_FUNCTIONS_DIR);
           await (0, import_promises.mkdir)(functionsDir, { recursive: true });
-          const relativeHandlerPath = toPosixPath((0, import_node_path.relative)(functionsDir, handlerPath));
+          const relativeHandlerPath = toPosixPath((0, import_node_path2.relative)(functionsDir, handlerPath));
           const excludedPath = ["/.netlify/*", ...additionalExcludedPaths];
           await (0, import_promises.writeFile)(
-            (0, import_node_path.join)(functionsDir, FUNCTION_FILENAME),
+            (0, import_node_path2.join)(functionsDir, FUNCTION_FILENAME),
             generateNetlifyFunction(relativeHandlerPath, excludedPath)
           );
         }

package/dist/index.mjs

@@ -5,13 +5,39 @@ import {
 import "./chunk-J5PMA2AP.mjs";
 
 // src/plugin.ts
-import { mkdir, writeFile, readdir } from "node:fs/promises";
+import { 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 = "2.1.1";
+var version = "2.1.3";
+
+// src/lib/rollup.ts
+import { basename, extname } from "node:path";
+var getAliasName = (id) => {
+  const base = basename(id);
+  return base.slice(0, Math.max(0, base.length - extname(id).length));
+};
+var normalizeRollupInput = (input) => {
+  if (input == null) {
+    return {};
+  }
+  if (typeof input === "string") {
+    return { [getAliasName(input)]: input };
+  }
+  if (Array.isArray(input)) {
+    return Object.fromEntries(input.map((entry) => [getAliasName(entry), entry]));
+  }
+  return input;
+};
+var mergeRollupInput = (existing, newEntries) => {
+  return {
+    ...normalizeRollupInput(existing),
+    ...newEntries
+  };
+};
 
 // src/plugin.ts
 var NETLIFY_FUNCTIONS_DIR = ".netlify/v1/functions";
@@ -82,36 +108,37 @@ function netlifyPlugin(options = {}) {
   let currentCommand;
   return {
     name: "vite-plugin-netlify-react-router",
-    config(config, { command, isSsrBuild }) {
+    config(_config, { command, isSsrBuild }) {
       currentCommand = command;
       isProductionSsrBuild = isSsrBuild === true && command === "build";
       if (isProductionSsrBuild) {
-        config.build ??= {};
-        config.build.rollupOptions ??= {};
-        config.build.rollupOptions.input = {
+        const functionHandlerInput = {
           [FUNCTION_HANDLER_CHUNK]: FUNCTION_HANDLER_MODULE_ID
         };
-        config.build.rollupOptions.output ??= {};
-        if (Array.isArray(config.build.rollupOptions.output)) {
-          console.warn(
-            "Expected Vite config `build.rollupOptions.output` to be an object, but it is an array - overwriting it, but this may cause issues with your custom configuration"
-          );
-          config.build.rollupOptions.output = {};
-        }
-        config.build.rollupOptions.output.entryFileNames = "[name].js";
-        if (edge) {
-          config.ssr = {
-            ...config.ssr,
-            target: "webworker",
-            // Bundle everything except Node.js built-ins (which are supported but must use the `node:` prefix):
-            // https://docs.netlify.com/build/edge-functions/api/#runtime-environment
-            noExternal: /^(?!node:).*$/,
-            resolve: {
-              ...config.resolve,
-              conditions: ["worker", "deno", "browser"]
+        const mergedInput = mergeRollupInput(_config.build?.rollupOptions?.input, functionHandlerInput);
+        const configChanges = {
+          build: {
+            rollupOptions: {
+              input: mergedInput,
+              output: {
+                entryFileNames: "[name].js"
+              }
             }
-          };
-        }
+          },
+          // Additional config needed for Edge Functions if enabled
+          ...edge ? {
+            ssr: {
+              target: "webworker",
+              // Bundle everything except Node.js built-ins (which are supported but must use the `node:` prefix):
+              // https://docs.netlify.com/build/edge-functions/api/#runtime-environment
+              noExternal: /^(?!node:).*$/,
+              resolve: {
+                conditions: ["worker", "deno", "browser"]
+              }
+            }
+          } : {}
+        };
+        return configChanges;
       }
     },
     async resolveId(source, importer, options2) {
@@ -144,12 +171,14 @@ function netlifyPlugin(options = {}) {
         const handlerPath = join(resolvedConfig.build.outDir, `${FUNCTION_HANDLER_CHUNK}.js`);
         if (edge) {
           const clientDir = join(resolvedConfig.build.outDir, "..", "client");
-          const entries = await readdir(clientDir, { withFileTypes: true });
-          const excludedPath = [
-            "/.netlify/*",
-            ...entries.map((entry) => entry.isDirectory() ? `/${entry.name}/*` : `/${entry.name}`),
-            ...additionalExcludedPaths
-          ];
+          const clientFiles = await glob("**/*", {
+            cwd: clientDir,
+            // We can't exclude entire directories because there could be `foo/bar.baz` in the
+            // client dir and a `/foo` route handled by the server function.
+            onlyFiles: true,
+            dot: true
+          });
+          const excludedPath = ["/.netlify/*", ...clientFiles.map((file) => `/${file}`), ...additionalExcludedPaths];
           const edgeFunctionsDir = join(resolvedConfig.root, NETLIFY_EDGE_FUNCTIONS_DIR);
           await mkdir(edgeFunctionsDir, { recursive: true });
           const relativeHandlerPath = toPosixPath(relative(edgeFunctionsDir, handlerPath));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/vite-plugin-react-router",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "React Router 7+ Vite plugin for Netlify",
   "type": "commonjs",
   "main": "./dist/index.js",
@@ -52,9 +52,10 @@
   },
   "homepage": "https://github.com/netlify/remix-compute#readme",
   "dependencies": {
-    "@netlify/edge-functions": "^3.0.2",
-    "@netlify/functions": "^5.1.0",
-    "isbot": "^5.1.25"
+    "@netlify/edge-functions": "^3.0.3",
+    "@netlify/functions": "^5.1.2",
+    "isbot": "^5.1.25",
+    "tinyglobby": "^0.2.10"
   },
   "devDependencies": {
     "@types/react": "^18.0.27",