Add future.v3_relativeSplatPath flag (#8216)

remix-run · Dec 5, 2023 · d76f3eb · d76f3eb
1 parent 2860de2
commit d76f3eb
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 7 deletions.
diff --git a/integration/form-test.ts b/integration/form-test.ts
@@ -921,7 +921,7 @@ test.describe("Forms", () => {
           await app.goto("/projects/blarg");
           let html = await app.getHtml();
           let el = getElement(html, `#${SPLAT_ROUTE_NO_ACTION}`);
-          expect(el.attr("action")).toMatch("/projects/blarg");
+          expect(el.attr("action")).toMatch("/projects");
         });
 
         test("no action resolves to URL including search params", async ({
@@ -931,7 +931,7 @@ test.describe("Forms", () => {
           await app.goto("/projects/blarg?foo=bar");
           let html = await app.getHtml();
           let el = getElement(html, `#${SPLAT_ROUTE_NO_ACTION}`);
-          expect(el.attr("action")).toMatch("/projects/blarg?foo=bar");
+          expect(el.attr("action")).toMatch("/projects?foo=bar");
         });
 
         test("absolute action resolves relative to the root route", async ({

diff --git a/packages/remix-dev/__tests__/readConfig-test.ts b/packages/remix-dev/__tests__/readConfig-test.ts
@@ -37,6 +37,7 @@ describe("readConfig", () => {
         "entryServerFilePath": Any<String>,
         "future": {
           "v3_fetcherPersist": false,
+          "v3_relativeSplatPath": false,
         },
         "mdx": undefined,
         "postcss": true,

diff --git a/packages/remix-dev/config.ts b/packages/remix-dev/config.ts
@@ -35,6 +35,7 @@ type Dev = {
 
 interface FutureConfig {
   v3_fetcherPersist: boolean;
+  v3_relativeSplatPath: boolean;
 }
 
 type NodeBuiltinsPolyfillOptions = Pick<
@@ -581,6 +582,7 @@ export async function resolveConfig(
   // typings this won't be necessary anymore.
   let future: FutureConfig = {
     v3_fetcherPersist: appConfig.future?.v3_fetcherPersist === true,
+    v3_relativeSplatPath: appConfig.future?.v3_relativeSplatPath === true,
   };
 
   if (appConfig.future) {

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -29,7 +29,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "2.3.1",
-    "@remix-run/router": "0.0.0-experimental-35fa15e5",
+    "@remix-run/router": "1.14.0-pre.0",
     "@remix-run/server-runtime": "2.3.1",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",

diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
@@ -349,6 +349,7 @@ export const remixVitePlugin: RemixVitePlugin = (options = {}) => {
         relativeAssetsBuildDirectory,
         future: {
           v3_fetcherPersist: options.future?.v3_fetcherPersist === true,
+          v3_relativeSplatPath: options.future?.v3_relativeSplatPath === true,
         },
       };
     };

diff --git a/packages/remix-server-runtime/entry.ts b/packages/remix-server-runtime/entry.ts
@@ -16,6 +16,7 @@ export interface EntryContext {
 
 export interface FutureConfig {
   v3_fetcherPersist: boolean;
+  v3_relativeSplatPath: boolean;
 }
 
 export interface AssetsManifest {

diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
@@ -16,7 +16,7 @@
   "typings": "dist/index.d.ts",
   "module": "dist/esm/index.js",
   "dependencies": {
-    "@remix-run/router": "0.0.0-experimental-35fa15e5",
+    "@remix-run/router": "1.14.0-pre.0",
     "@types/cookie": "^0.5.3",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.5.0",

diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
@@ -44,7 +44,11 @@ function derive(build: ServerBuild, mode?: string) {
   let routes = createRoutes(build.routes);
   let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
   let serverMode = isServerMode(mode) ? mode : ServerMode.Production;
-  let staticHandler = createStaticHandler(dataRoutes);
+  let staticHandler = createStaticHandler(dataRoutes, {
+    future: {
+      v7_relativeSplatPath: build.future?.v3_relativeSplatPath,
+    },
+  });
 
   let errorHandler =
     build.entry.module.handleError ||

diff --git a/packages/remix-testing/create-remix-stub.tsx b/packages/remix-testing/create-remix-stub.tsx
@@ -105,6 +105,7 @@ export function createRemixStub(
       remixContextRef.current = {
         future: {
           v3_fetcherPersist: future?.v3_fetcherPersist === true,
+          v3_relativeSplatPath: future?.v3_relativeSplatPath === true,
         },
         manifest: {
           routes: {},

diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
@@ -18,8 +18,8 @@
   "dependencies": {
     "@remix-run/node": "2.3.1",
     "@remix-run/react": "2.3.1",
-    "@remix-run/router": "0.0.0-experimental-35fa15e5",
-    "react-router-dom": "0.0.0-experimental-35fa15e5"
+    "@remix-run/router": "1.14.0-pre.0",
+    "react-router-dom": "6.21.0-pre.0"
   },
   "devDependencies": {
     "@types/node": "^18.17.1",