Remove trailing slash data request flag (#15100)

Author: brophdawg11

integration/error-data-request-test.ts

@@ -108,15 +108,15 @@ test.describe("ErrorBoundary", () => {
 
   test("returns a 200 empty response on a data fetch to a path with no loaders", async () => {
     let { status, headers, data } =
-      await fixture.requestSingleFetchData("/_root.data");
+      await fixture.requestSingleFetchData("/_.data");
     expect(status).toBe(200);
     expect(headers.has("X-Remix-Response")).toBe(true);
     expect(data).toEqual({});
   });
 
   test("returns a 405 on a data fetch POST to a path with no action", async () => {
     let { status, headers, data } = await fixture.requestSingleFetchData(
-      "/_root.data?index",
+      "/_.data?index",
       {
         method: "POST",
       },
@@ -127,11 +127,11 @@ test.describe("ErrorBoundary", () => {
       error: new ErrorResponseImpl(
         405,
         "Method Not Allowed",
-        'Error: You made a POST request to "/_root.data" but did not provide an `action` for route "routes/_index", so there is no way to handle the request.',
+        'Error: You made a POST request to "/_.data" but did not provide an `action` for route "routes/_index", so there is no way to handle the request.',
       ),
     });
     assertLoggedErrorInstance(
-      'You made a POST request to "/_root.data" but did not provide an `action` for route "routes/_index", so there is no way to handle the request.',
+      'You made a POST request to "/_.data" but did not provide an `action` for route "routes/_index", so there is no way to handle the request.',
     );
   });
 

integration/error-sanitization-test.ts

@@ -230,7 +230,7 @@ test.describe("Error Sanitization", () => {
     });
 
     test("returns data without errors", async () => {
-      let { data } = await fixture.requestSingleFetchData("/_root.data");
+      let { data } = await fixture.requestSingleFetchData("/_.data");
       expect(data).toEqual({
         "routes/_index": {
           data: "LOADER",
@@ -239,7 +239,7 @@ test.describe("Error Sanitization", () => {
     });
 
     test("sanitizes loader errors in data requests", async () => {
-      let { data } = await fixture.requestSingleFetchData("/_root.data?loader");
+      let { data } = await fixture.requestSingleFetchData("/_.data?loader");
       expect(data).toEqual({
         "routes/_index": {
           error: new Error("Unexpected Server Error"),
@@ -388,7 +388,7 @@ test.describe("Error Sanitization", () => {
     });
 
     test("returns data without errors", async () => {
-      let { data } = await fixture.requestSingleFetchData("/_root.data");
+      let { data } = await fixture.requestSingleFetchData("/_.data");
       expect(data).toEqual({
         "routes/_index": {
           data: "LOADER",
@@ -397,7 +397,7 @@ test.describe("Error Sanitization", () => {
     });
 
     test("does not sanitize loader errors in data requests", async () => {
-      let { data } = await fixture.requestSingleFetchData("/_root.data?loader");
+      let { data } = await fixture.requestSingleFetchData("/_.data?loader");
       expect(data).toEqual({
         "routes/_index": {
           error: new Error("Loader Error"),
@@ -634,7 +634,7 @@ test.describe("Error Sanitization", () => {
     });
 
     test("returns data without errors", async () => {
-      let { data } = await fixture.requestSingleFetchData("/_root.data");
+      let { data } = await fixture.requestSingleFetchData("/_.data");
       expect(data).toEqual({
         "routes/_index": {
           data: "LOADER",
@@ -643,15 +643,15 @@ test.describe("Error Sanitization", () => {
     });
 
     test("sanitizes loader errors in data requests", async () => {
-      let { data } = await fixture.requestSingleFetchData("/_root.data?loader");
+      let { data } = await fixture.requestSingleFetchData("/_.data?loader");
       expect(data).toEqual({
         "routes/_index": {
           error: new Error("Unexpected Server Error"),
         },
       });
       expect(errorLogs[0][0]).toEqual("App Specific Error Logging:");
       expect(errorLogs[1][0]).toEqual(
-        "  Request: GET test://test/_root.data?loader",
+        "  Request: GET test://test/_.data?loader",
       );
       expect(errorLogs[2][0]).toEqual("  Error: Loader Error");
       expect(errorLogs[3][0]).toMatch(" at ");

integration/http-test.ts

@@ -59,7 +59,7 @@ test.describe("HTTP behavior", () => {
     expect(await response.text()).toBe("RESOURCE");
 
     let singleFetchResponse =
-      await appFixture.requestSingleFetchData("/_root.data");
+      await appFixture.requestSingleFetchData("/_.data");
     expect(response.status).toBe(202);
     expect(singleFetchResponse.data).toEqual({
       "routes/_index": { data: "INDEX" },
@@ -78,7 +78,7 @@ test.describe("HTTP behavior", () => {
     expect(response.body).toBe(null);
 
     let singleFetchResponse = await appFixture.requestSingleFetchData(
-      "/_root.data",
+      "/_.data",
       { method: "HEAD" },
     );
     expect(response.status).toBe(202);

integration/loader-test.ts

@@ -52,7 +52,7 @@ test.describe("loader", () => {
   });
 
   test("returns responses for single fetch routes", async () => {
-    let { data } = await fixture.requestSingleFetchData("/_root.data");
+    let { data } = await fixture.requestSingleFetchData("/_.data");
     expect(data).toEqual({
       root: { data: ROOT_DATA },
       "routes/_index": { data: INDEX_DATA },

integration/multiple-cookies-test.ts

@@ -67,9 +67,7 @@ test.describe("pathless layout routes", () => {
     let app = new PlaywrightFixture(appFixture, page);
     await app.goto("/");
     // do this after the first request so that it doesnt appear in our next assertions
-    let responses = app.collectResponses(
-      (url) => url.pathname === "/_root.data",
-    );
+    let responses = app.collectResponses((url) => url.pathname === "/_.data");
     await page.click("button[type=submit]");
     await page.waitForSelector(`[data-testid="action-success"]`);
     let setCookies = await responses[0].headerValues("set-cookie");

integration/passthrough-requests-test.ts

@@ -120,29 +120,29 @@ test.describe("pass through requests", () => {
     // Client-side navigation with query params
     await app.clickLink("/?a=1");
     expect(await page.locator("[data-loader-url]").textContent()).toBe(
-      "/_root.data?a=1",
+      "/_.data?a=1",
     );
     expect(await page.locator("[data-loader-path]").textContent()).toBe(
       "/?a=1",
     );
-    expect(requests).toEqual(["/_root.data?a=1"]);
+    expect(requests).toEqual(["/_.data?a=1"]);
     requests = [];
 
     // Client-side form submission with query params
     await app.clickElement('button[type="submit"]');
     expect(await page.locator("[data-action-url]").textContent()).toBe(
-      "/_root.data?index&a=1",
+      "/_.data?index&a=1",
     );
     expect(await page.locator("[data-action-path]").textContent()).toBe(
       "/?a=1",
     );
     expect(await page.locator("[data-loader-url]").textContent()).toBe(
-      "/_root.data?a=1",
+      "/_.data?a=1",
     );
     expect(await page.locator("[data-loader-path]").textContent()).toBe(
       "/?a=1",
     );
-    expect(requests).toEqual(["/_root.data?index&a=1", "/_root.data?a=1"]);
+    expect(requests).toEqual(["/_.data?index&a=1", "/_.data?a=1"]);
     requests = [];
 
     // Navigate to new page

integration/request-test.ts

@@ -120,7 +120,7 @@ test("loader request on CSR GET requests", async ({ page }) => {
   loaderData = JSON.parse(await page.locator("#loader-data").innerHTML());
   expect(loaderData.method).toEqual("GET");
   expect(loaderData.url).toMatch(
-    /^http:\/\/localhost:\d+\/_root\.data\?type=csr$/,
+    /^http:\/\/localhost:\d+\/_.data\?type=csr$/,
   );
   expect(loaderData.headers.cookie).toEqual("cookie=nomnom");
   expect(loaderData.body).toEqual(null);
@@ -168,14 +168,14 @@ test("action + loader requests on CSR POST requests", async ({ page }) => {
   let actionData = JSON.parse(await page.locator("#action-data").innerHTML());
   expect(actionData.method).toEqual("POST");
   expect(actionData.url).toMatch(
-    /^http:\/\/localhost:\d+\/_root\.data\?index$/,
+    /^http:\/\/localhost:\d+\/_.data\?index$/,
   );
   expect(actionData.headers.cookie).toEqual("cookie=nomnom");
   expect(actionData.body).toEqual({ type: "csr" });
 
   loaderData = JSON.parse(await page.locator("#loader-data").innerHTML());
   expect(loaderData.method).toEqual("GET");
-  expect(loaderData.url).toMatch(/^http:\/\/localhost:\d+\/_root\.data$/);
+  expect(loaderData.url).toMatch(/^http:\/\/localhost:\d+\/_.data$/);
   expect(loaderData.headers.cookie).toEqual("cookie=nomnom");
   expect(loaderData.body).toEqual(null);
 });

integration/single-fetch-test.ts

@@ -205,7 +205,7 @@ test.describe("single-fetch", () => {
     let fixture = await createFixture({
       files,
     });
-    let res = await fixture.requestSingleFetchData("/_root.data");
+    let res = await fixture.requestSingleFetchData("/_.data");
     expect(res.data).toEqual({
       root: {
         data: {
@@ -1141,7 +1141,7 @@ test.describe("single-fetch", () => {
     expect(await page.locator("#data").innerText()).toBe(
       '[["root",{"count":3}],["routes/_index",null]]',
     );
-    expect(urls).toEqual(["/_root.data"]);
+    expect(urls).toEqual(["/_.data"]);
     urls.splice(0, urls.length);
 
     await app.clickLink("/page?optout");
@@ -1960,7 +1960,7 @@ test.describe("single-fetch", () => {
     await app.clickLink("/base/");
     await expect(page.getByText("Index")).toBeVisible();
 
-    expect(requests).toEqual(["/base/data.data", "/base/_root.data"]);
+    expect(requests).toEqual(["/base/data.data", "/base/_.data"]);
   });
 
   test("processes redirects when a basename is present", async ({ page }) => {
@@ -2497,8 +2497,8 @@ test.describe("single-fetch", () => {
 
     expect(await page.innerText("[data-submit]")).toEqual("no content!");
     expect(requests).toEqual([
-      ["POST", 204, "/_root.data?index"],
-      ["GET", 200, "/_root.data"],
+      ["POST", 204, "/_.data?index"],
+      ["GET", 200, "/_.data"],
     ]);
   });
 
@@ -2538,7 +2538,7 @@ test.describe("single-fetch", () => {
     expect(await documentRes.text()).toBe("");
 
     // Data requests
-    let dataRes = await fixture.requestSingleFetchData("/_root.data");
+    let dataRes = await fixture.requestSingleFetchData("/_.data");
     expect(dataRes.data).toEqual({
       root: {
         data: {
@@ -2551,7 +2551,7 @@ test.describe("single-fetch", () => {
         },
       },
     });
-    dataRes = await fixture.requestSingleFetchData("/_root.data", {
+    dataRes = await fixture.requestSingleFetchData("/_.data", {
       headers: {
         "If-None-Match": "1234",
       },
@@ -4566,7 +4566,7 @@ test.describe("single-fetch", () => {
     expect(await app.getHtml("h1")).toMatch("It worked!");
   });
 
-  test("always uses /{path}.data without future.v8_trailingSlashAwareDataRequests flag", async ({
+  test("uses {path}.data or {path}/_.data depending on trailing slash", async ({
     page,
   }) => {
     let fixture = await createFixture({
@@ -4644,105 +4644,6 @@ test.describe("single-fetch", () => {
     expect(await page.locator("#pathname").innerText()).toEqual("/about/");
     expect(await page.locator("#trailing-slash").innerText()).toEqual("true");
 
-    // Client-side navigation with trailing slash
-    await app.goto("/");
-    await app.clickLink("/about/");
-    await page.waitForSelector("#pathname");
-    expect(await page.locator("#pathname").innerText()).toEqual("/about");
-    expect(await page.locator("#trailing-slash").innerText()).toEqual("false");
-    expect(requests).toEqual(["/about.data"]);
-    requests = [];
-
-    // Client-side navigation back to /
-    await app.clickLink("/");
-    await page.waitForSelector("h1:has-text('Home')");
-    expect(requests).toEqual(["/_root.data"]);
-    requests = [];
-  });
-
-  test("uses {path}.data or {path}/_.data depending on trailing slash with future.v8_trailingSlashAwareDataRequests flag", async ({
-    page,
-  }) => {
-    let fixture = await createFixture({
-      files: {
-        ...files,
-        "react-router.config.ts": reactRouterConfig({
-          future: {
-            v8_trailingSlashAwareDataRequests: true,
-          },
-        }),
-        "app/routes/_index.tsx": js`
-          import { Link } from "react-router";
-
-          export default function Index() {
-            return (
-              <div>
-                <h1>Home</h1>
-                <Link to="/about/">Go to About (with trailing slash)</Link>
-                <Link to="/about">Go to About (without trailing slash)</Link>
-              </div>
-            );
-          }
-        `,
-        "app/routes/about.tsx": js`
-          import { Link, useLoaderData } from "react-router";
-
-          export function loader({ request }) {
-            let pathname = new URL(request.url).pathname
-              .replace(/_\.data$/, "")
-              .replace(/\.data$/, "");
-            return {
-              pathname,
-              hasTrailingSlash: pathname.endsWith("/"),
-            };
-          }
-
-          export default function About() {
-            let { pathname, hasTrailingSlash } = useLoaderData();
-            return (
-              <div>
-                <h1>About</h1>
-                <p id="pathname">{pathname}</p>
-                <p id="trailing-slash">{String(hasTrailingSlash)}</p>
-                <Link to="/">Go back home</Link>
-              </div>
-            );
-          }
-        `,
-      },
-    });
-    let appFixture = await createAppFixture(fixture);
-    let app = new PlaywrightFixture(appFixture, page);
-
-    let requests: string[] = [];
-    page.on("request", (req) => {
-      let url = new URL(req.url());
-      if (url.pathname.endsWith(".data")) {
-        requests.push(url.pathname + url.search);
-      }
-    });
-
-    // Document load without trailing slash
-    await app.goto("/about");
-    await page.waitForSelector("#pathname");
-    expect(await page.locator("#pathname").innerText()).toEqual("/about");
-    expect(await page.locator("#trailing-slash").innerText()).toEqual("false");
-
-    // Client-side navigation without trailing slash
-    await app.goto("/");
-    await app.clickLink("/about");
-    await page.waitForSelector("#pathname");
-    expect(await page.locator("#pathname").innerText()).toEqual("/about");
-    expect(await page.locator("#trailing-slash").innerText()).toEqual("false");
-    expect(requests).toEqual(["/about.data"]);
-    requests = [];
-
-    // Document load with trailing slash
-    await app.goto("/about/");
-    await page.waitForSelector("#pathname");
-    expect(await page.locator("#pathname").innerText()).toEqual("/about/");
-    expect(await page.locator("#trailing-slash").innerText()).toEqual("true");
-
     // Client-side navigation with trailing slash
     await app.goto("/");
     await app.clickLink("/about/");