@react-router/dev 0.0.0-experimental-2e661fbb4 → 0.0.0-experimental-54614613e

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # `@react-router/dev`
 
+## 7.4.1
+
+### Patch Changes
+
+- Fix path in prerender error messages ([#13257](https://github.com/remix-run/react-router/pull/13257))
+- Fix typegen for virtual modules when `moduleDetection` is set to `force` ([#13267](https://github.com/remix-run/react-router/pull/13267))
+- When both `future.unstable_middleware` and `future.unstable_splitRouteModules` are enabled, split `unstable_clientMiddleware` route exports into separate chunks when possible ([#13210](https://github.com/remix-run/react-router/pull/13210))
+- Improve performance of `future.unstable_middleware` by ensuring that route modules are only blocking during the middleware phase when the `unstable_clientMiddleware` has been defined ([#13210](https://github.com/remix-run/react-router/pull/13210))
+- Updated dependencies:
+  - `react-router@7.4.1`
+  - `@react-router/node@7.4.1`
+  - `@react-router/serve@7.4.1`
+
 ## 7.4.0
 
 ### Minor Changes
@@ -254,7 +267,7 @@
   +import { cloudflareDevProxy } from "@react-router/dev/vite/cloudflare";
   ```
 
-- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
 

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-2e661fbb4
+ * @react-router/dev v0.0.0-experimental-54614613e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -419,6 +419,7 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
@@ -1308,11 +1309,12 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, virtual2, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, fs4, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, virtual2, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
     import_node_crypto = require("crypto");
+    fs4 = __toESM(require("fs"));
     path7 = __toESM(require("path"));
     url = __toESM(require("url"));
     fse = __toESM(require("fs-extra"));

package/dist/config.d.ts

@@ -46,6 +46,7 @@ interface FutureConfig {
      * Automatically split route modules into multiple chunks when possible.
      */
     unstable_splitRouteModules: boolean | "enforce";
+    unstable_subResourceIntegrity: boolean;
     /**
      * Use Vite Environment API (experimental)
      */

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2e661fbb4
+ * @react-router/dev v0.0.0-experimental-54614613e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2e661fbb4
+ * @react-router/dev v0.0.0-experimental-54614613e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2e661fbb4
+ * @react-router/dev v0.0.0-experimental-54614613e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -512,6 +512,7 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-2e661fbb4
+ * @react-router/dev v0.0.0-experimental-54614613e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -46,6 +46,7 @@ module.exports = __toCommonJS(vite_exports);
 
 // vite/plugin.ts
 var import_node_crypto = require("crypto");
+var fs3 = __toESM(require("fs"));
 var path6 = __toESM(require("path"));
 var url = __toESM(require("url"));
 var fse = __toESM(require("fs-extra"));
@@ -475,6 +476,7 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
@@ -2397,6 +2399,34 @@ var reactRouterVitePlugin = () => {
     );
     return /* @__PURE__ */ new Set([...cssUrlPaths, ...chunkAssetPaths]);
   };
+  let generateSriManifest = async (ctx2) => {
+    let clientBuildDirectory = getClientBuildDirectory(ctx2.reactRouterConfig);
+    let entries = fs3.readdirSync(clientBuildDirectory, {
+      withFileTypes: true,
+      recursive: true
+    });
+    let sriManifest = {};
+    for (const entry of entries) {
+      if (entry.isFile() && entry.name.endsWith(".js")) {
+        let contents;
+        try {
+          contents = await fse.readFile(
+            path6.join(entry.path, entry.name),
+            "utf-8"
+          );
+        } catch (e) {
+          logger.error(`Failed to read file for SRI generation: ${entry.name}`);
+          throw e;
+        }
+        let hash = (0, import_node_crypto.createHash)("sha384").update(contents).digest().toString("base64");
+        let filepath = getVite().normalizePath(
+          path6.relative(clientBuildDirectory, path6.join(entry.path, entry.name))
+        );
+        sriManifest[`${ctx2.publicPath}${filepath}`] = `sha384-${hash}`;
+      }
+    }
+    return sriManifest;
+  };
   let generateReactRouterManifestsForBuild = async ({
     routeIds
   }) => {
@@ -2501,7 +2531,8 @@ var reactRouterVitePlugin = () => {
     let nonFingerprintedValues = { url: url2, version };
     let reactRouterBrowserManifest = {
       ...fingerprintedValues,
-      ...nonFingerprintedValues
+      ...nonFingerprintedValues,
+      sri: void 0
     };
     await writeFileSafe(
       path6.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath),
@@ -2509,9 +2540,14 @@ var reactRouterVitePlugin = () => {
         reactRouterBrowserManifest
       )};`
     );
+    let sri = void 0;
+    if (ctx.reactRouterConfig.future.unstable_subResourceIntegrity) {
+      sri = await generateSriManifest(ctx);
+    }
     let reactRouterServerManifest = {
       ...reactRouterBrowserManifest,
-      routes: serverRoutes
+      routes: serverRoutes,
+      sri
     };
     return {
       reactRouterBrowserManifest,
@@ -2581,6 +2617,7 @@ var reactRouterVitePlugin = () => {
         imports: []
       };
     }
+    let sri = void 0;
     let reactRouterManifestForDev = {
       version: String(Math.random()),
       url: combineURLs(ctx.publicPath, virtual2.browserManifest.url),
@@ -2594,6 +2631,7 @@ var reactRouterVitePlugin = () => {
         ),
         imports: []
       },
+      sri,
       routes
     };
     currentReactRouterManifestForDev = reactRouterManifestForDev;
@@ -2862,23 +2900,7 @@ var reactRouterVitePlugin = () => {
               ...plugin2,
               configureServer: void 0,
               configurePreviewServer: void 0
-            })),
-            {
-              name: "react-router:override-optimize-deps",
-              config(userConfig) {
-                if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && userConfig.environments) {
-                  for (const environmentName of Object.keys(
-                    userConfig.environments
-                  )) {
-                    userConfig.environments[environmentName].optimizeDeps = {
-                      noDiscovery: true
-                    };
-                  }
-                } else {
-                  userConfig.optimizeDeps = { noDiscovery: true };
-                }
-              }
-            }
+            }))
           ]
         });
         await viteChildCompiler.pluginContainer.buildStart({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-2e661fbb4",
+  "version": "0.0.0-experimental-54614613e",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-2e661fbb4"
+    "@react-router/node": "0.0.0-experimental-54614613e"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -109,16 +109,16 @@
     "typescript": "^5.1.6",
     "vite": "^6.1.0",
     "wireit": "0.14.9",
-    "wrangler": "^3.109.2",
-    "@react-router/serve": "0.0.0-experimental-2e661fbb4",
-    "react-router": "^0.0.0-experimental-2e661fbb4"
+    "wrangler": "^4.2.0",
+    "react-router": "^0.0.0-experimental-54614613e",
+    "@react-router/serve": "0.0.0-experimental-54614613e"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
-    "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-2e661fbb4",
-    "react-router": "^0.0.0-experimental-2e661fbb4"
+    "wrangler": "^3.28.2 || ^4.0.0",
+    "react-router": "^0.0.0-experimental-54614613e",
+    "@react-router/serve": "^0.0.0-experimental-54614613e"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {