test: remove flatRoutesWarning and v2_routeConvention future flag

Signed-off-by: Logan McAnsh <logan@mcan.sh>
remix-run · Mar 22, 2023 · 9bbc4ea · 9bbc4ea
1 parent c02f9a2
commit 9bbc4ea
Show file tree

Hide file tree

Showing 56 changed files with 37 additions and 153 deletions.
diff --git a/integration/abort-signal-test.ts b/integration/abort-signal-test.ts
@@ -9,7 +9,6 @@ let appFixture: AppFixture;
 
 test.beforeAll(async () => {
   fixture = await createFixture({
-    future: { v2_routeConvention: true },
     files: {
       "app/routes/_index.jsx": js`
         import { json } from "@remix-run/node";

diff --git a/integration/action-test.ts b/integration/action-test.ts
@@ -17,9 +17,6 @@ test.describe("actions", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: {
-        v2_routeConvention: true,
-      },
       files: {
         "app/routes/urlencoded.jsx": js`
           import { Form, useActionData } from "@remix-run/react";

diff --git a/integration/bug-report-test.ts b/integration/bug-report-test.ts
@@ -42,7 +42,6 @@ let appFixture: AppFixture;
 
 test.beforeAll(async () => {
   fixture = await createFixture({
-    future: { v2_routeConvention: true },
     ////////////////////////////////////////////////////////////////////////////
     // 💿 Next, add files to this object, just like files in a real app,
     // `createFixture` will make an app and run your tests against it.

diff --git a/integration/catch-boundary-data-test.ts b/integration/catch-boundary-data-test.ts
@@ -26,9 +26,6 @@ let LAYOUT_DATA = "root data";
 
 test.beforeAll(async () => {
   fixture = await createFixture({
-    future: {
-      v2_routeConvention: true,
-    },
     files: {
       "app/root.jsx": js`
           import { json } from "@remix-run/node";

diff --git a/integration/catch-boundary-test.ts b/integration/catch-boundary-test.ts
@@ -24,9 +24,6 @@ test.describe("CatchBoundary", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: {
-        v2_routeConvention: true,
-      },
       files: {
         "app/root.jsx": js`
             import { json } from "@remix-run/node";

diff --git a/integration/cf-compiler-test.ts b/integration/cf-compiler-test.ts
@@ -9,7 +9,6 @@ test.describe("cloudflare compiler", () => {
 
   test.beforeAll(async () => {
     projectDir = await createFixtureProject({
-      future: { v2_routeConvention: true },
       setup: "cloudflare",
       template: "cf-template",
       files: {

diff --git a/integration/compiler-test.ts b/integration/compiler-test.ts
@@ -25,9 +25,7 @@ test.describe("compiler", () => {
         "remix.config.js": js`
           let { getDependenciesToBundle } = require("@remix-run/dev");
           module.exports = {
-            future: {
-              v2_routeConvention: true,
-            },
+
             serverDependenciesToBundle: [
               "esm-only-pkg",
               "esm-only-single-export",
@@ -329,7 +327,6 @@ test.describe("compiler", () => {
 
       await expect(() =>
         createFixtureProject({
-          future: { v2_routeConvention: true },
           buildStdio,
           files: {
             "app/routes/_index.jsx": js`

diff --git a/integration/css-modules-test.ts b/integration/css-modules-test.ts
@@ -20,7 +20,6 @@ test.describe("CSS Modules", () => {
   test.beforeAll(async () => {
     fixture = await createFixture({
       future: {
-        v2_routeConvention: true,
         // Enable all CSS future flags to
         // ensure features don't clash
         unstable_cssSideEffectImports: true,

diff --git a/integration/css-side-effect-imports-test.ts b/integration/css-side-effect-imports-test.ts
@@ -29,7 +29,6 @@ test.describe("CSS side-effect imports", () => {
               unstable_postcss: true,
               unstable_tailwind: true,
               unstable_vanillaExtract: true,
-              v2_routeConvention: true,
             },
           };
         `,

diff --git a/integration/custom-entry-server-test.ts b/integration/custom-entry-server-test.ts
@@ -9,7 +9,6 @@ let appFixture: AppFixture;
 
 test.beforeAll(async () => {
   fixture = await createFixture({
-    future: { v2_routeConvention: true },
     files: {
       "app/entry.server.jsx": js`
         import * as React from "react";

diff --git a/integration/defer-loader-test.ts b/integration/defer-loader-test.ts
@@ -9,7 +9,6 @@ let appFixture: AppFixture;
 
 test.beforeAll(async () => {
   fixture = await createFixture({
-    future: { v2_routeConvention: true },
     files: {
       "app/routes/_index.jsx": js`
         import { useLoaderData, Link } from "@remix-run/react";

diff --git a/integration/defer-test.ts b/integration/defer-test.ts
@@ -33,9 +33,7 @@ test.describe("non-aborted", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: {
-        v2_routeConvention: true,
-      },
+      future: {},
       files: {
         "app/components/counter.tsx": js`
           import { useState } from "react";
@@ -939,7 +937,6 @@ test.describe("aborted", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: { v2_routeConvention: true },
       ////////////////////////////////////////////////////////////////////////////
       // 💿 Next, add files to this object, just like files in a real app,
       // `createFixture` will make an app and run your tests against it.

diff --git a/integration/deno-compiler-test.ts b/integration/deno-compiler-test.ts
@@ -34,7 +34,6 @@ const searchFiles = async (pattern: string | RegExp, files: string[]) => {
 
 test.beforeAll(async () => {
   projectDir = await createFixtureProject({
-    future: { v2_routeConvention: true },
     template: "deno-template",
     files: {
       "package.json": json({

diff --git a/integration/deterministic-build-output-test.ts b/integration/deterministic-build-output-test.ts
@@ -30,7 +30,6 @@ test("builds deterministically under different paths", async () => {
       unstable_cssSideEffectImports: true,
       unstable_postcss: true,
       unstable_vanillaExtract: true,
-      v2_routeConvention: true,
     },
     files: {
       "app/routes/_index.mdx": "# hello world",
@@ -120,7 +119,6 @@ test("builds Vanilla Extract files deterministically under different paths with
   let init: FixtureInit = {
     future: {
       unstable_vanillaExtract: { cache: true },
-      v2_routeConvention: true,
     },
     files: {
       "app/routes/foo.tsx": js`

diff --git a/integration/error-boundary-test.ts b/integration/error-boundary-test.ts
@@ -41,9 +41,6 @@ test.describe("ErrorBoundary", () => {
     _consoleError = console.error;
     console.error = () => {};
     fixture = await createFixture({
-      future: {
-        v2_routeConvention: true,
-      },
       files: {
         "app/root.jsx": js`
           import { Links, Meta, Outlet, Scripts } from "@remix-run/react";
@@ -494,9 +491,6 @@ test.describe("ErrorBoundary", () => {
 
     test.beforeAll(async () => {
       fixture = await createFixture({
-        future: {
-          v2_routeConvention: true,
-        },
         files: {
           "app/root.jsx": js`
             import { Links, Meta, Outlet, Scripts } from "@remix-run/react";
@@ -662,9 +656,6 @@ test.describe("loaderData in ErrorBoundary", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: {
-        v2_routeConvention: true,
-      },
       files: {
         "app/root.jsx": js`
           import { Links, Meta, Outlet, Scripts } from "@remix-run/react";
@@ -1012,9 +1003,6 @@ test.describe("Default ErrorBoundary", () => {
   test.describe("When the root route does not have a boundary", () => {
     test.beforeAll(async () => {
       fixture = await createFixture({
-        future: {
-          v2_routeConvention: true,
-        },
         files: getFiles({ includeRootErrorBoundary: false }),
       });
       appFixture = await createAppFixture(fixture, ServerMode.Development);
@@ -1083,9 +1071,6 @@ test.describe("Default ErrorBoundary", () => {
   test.describe("When the root route has a boundary", () => {
     test.beforeAll(async () => {
       fixture = await createFixture({
-        future: {
-          v2_routeConvention: true,
-        },
         files: getFiles({ includeRootErrorBoundary: true }),
       });
       appFixture = await createAppFixture(fixture, ServerMode.Development);
@@ -1149,9 +1134,6 @@ test.describe("Default ErrorBoundary", () => {
   test.describe("When the root route has a boundary but it also throws 😦", () => {
     test.beforeAll(async () => {
       fixture = await createFixture({
-        future: {
-          v2_routeConvention: true,
-        },
         files: getFiles({
           includeRootErrorBoundary: true,
           rootErrorBoundaryThrows: true,

diff --git a/integration/error-boundary-v2-test.ts b/integration/error-boundary-v2-test.ts
@@ -13,9 +13,6 @@ test.describe("V2 Singular ErrorBoundary (future.v2_errorBoundary)", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: {
-        v2_routeConvention: true,
-      },
       files: {
         "app/root.jsx": js`
           import { Links, Meta, Outlet, Scripts } from "@remix-run/react";

diff --git a/integration/error-data-request-test.ts b/integration/error-data-request-test.ts
@@ -16,7 +16,6 @@ test.describe("ErrorBoundary", () => {
     };
 
     fixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/root.jsx": js`
           import { Links, Meta, Outlet, Scripts } from "@remix-run/react";

diff --git a/integration/esm-only-warning-test.ts b/integration/esm-only-warning-test.ts
@@ -10,7 +10,6 @@ test.beforeAll(async () => {
 
   await createFixtureProject({
     buildStdio,
-    future: { v2_routeConvention: true },
     files: {
       "package.json": json({
         name: "remix-integration-9v4bpv66vd",

diff --git a/integration/fetcher-layout-test.ts b/integration/fetcher-layout-test.ts
@@ -9,7 +9,6 @@ let appFixture: AppFixture;
 
 test.beforeAll(async () => {
   fixture = await createFixture({
-    future: { v2_routeConvention: true },
     files: {
       "app/routes/layout-action.jsx": js`
         import { json } from "@remix-run/node";

diff --git a/integration/fetcher-state-test.ts b/integration/fetcher-state-test.ts
@@ -19,7 +19,6 @@ test.describe("fetcher states", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/root.jsx": js`
           import { useMemo, useRef } from "react";

diff --git a/integration/fetcher-test.ts b/integration/fetcher-test.ts
@@ -17,7 +17,6 @@ test.describe("useFetcher", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/routes/resource-route-action-only.ts": js`
           import { json } from "@remix-run/node";

diff --git a/integration/flat-routes-test.ts b/integration/flat-routes-test.ts
@@ -5,15 +5,13 @@ import { PlaywrightFixture } from "./helpers/playwright-fixture";
 import type { Fixture, AppFixture } from "./helpers/create-fixture";
 import { createFixtureProject } from "./helpers/create-fixture";
 import { createAppFixture, createFixture, js } from "./helpers/create-fixture";
-import { flatRoutesWarning } from "../packages/remix-dev/config";
 
 let fixture: Fixture;
 let appFixture: AppFixture;
 
 test.describe("flat routes", () => {
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/root.jsx": js`
           import { Links, Meta, Outlet, Scripts } from "@remix-run/react";
@@ -162,7 +160,7 @@ test.describe("warns when v1 routesConvention is used", () => {
     console.error = () => {};
     await createFixtureProject({
       buildStdio,
-      future: { v2_routeConvention: false },
+
       files: {
         "routes/index.tsx": js`
           export default function () {
@@ -187,11 +185,6 @@ test.describe("warns when v1 routesConvention is used", () => {
     console.warn = originalConsoleWarn;
     console.error = originalConsoleError;
   });
-
-  test("warns about conflicting routes", () => {
-    console.log(buildOutput);
-    expect(buildOutput).toContain(flatRoutesWarning);
-  });
 });
 
 test.describe("emits warnings for route conflicts", async () => {
@@ -208,7 +201,6 @@ test.describe("emits warnings for route conflicts", async () => {
     console.error = () => {};
     await createFixtureProject({
       buildStdio,
-      future: { v2_routeConvention: true },
       files: {
         "routes/_dashboard._index.tsx": js`
           export default function () {

diff --git a/integration/form-data-test.ts b/integration/form-data-test.ts
@@ -7,7 +7,6 @@ let fixture: Fixture;
 
 test.beforeAll(async () => {
   fixture = await createFixture({
-    future: { v2_routeConvention: true },
     files: {
       "app/routes/_index.jsx": js`
         import { json } from "@remix-run/node";

diff --git a/integration/form-test.ts b/integration/form-test.ts
@@ -49,7 +49,6 @@ test.describe("Forms", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/routes/get-submission.jsx": js`
           import { useLoaderData, Form } from "@remix-run/react";

diff --git a/integration/headers-test.ts b/integration/headers-test.ts
@@ -13,7 +13,6 @@ test.describe("headers export", () => {
 
   test.beforeAll(async () => {
     appFixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/root.jsx": js`
           import { json } from "@remix-run/node";
@@ -100,7 +99,6 @@ test.describe("headers export", () => {
     let HEADER_VALUE = "SUCCESS";
 
     let fixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/root.jsx": js`
           import { Links, Meta, Outlet, Scripts } from "@remix-run/react";

diff --git a/integration/hmr-test.ts b/integration/hmr-test.ts
@@ -14,7 +14,6 @@ let fixture = (options: { port: number; appServerPort: number }) => ({
       appServerPort: options.appServerPort,
     },
     unstable_tailwind: true,
-    v2_routeConvention: true,
   },
   files: {
     "package.json": json({

diff --git a/integration/hook-useSubmit-test.ts b/integration/hook-useSubmit-test.ts
@@ -10,7 +10,6 @@ test.describe("`useSubmit()` returned function", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/routes/_index.jsx": js`
         import { useLoaderData, useSubmit } from "@remix-run/react";

diff --git a/integration/js-routes-test.ts b/integration/js-routes-test.ts
@@ -10,9 +10,6 @@ test.describe(".js route files", () => {
   test.beforeAll(async () => {
     appFixture = await createAppFixture(
       await createFixture({
-        future: {
-          v2_routeConvention: true,
-        },
         files: {
           "app/routes/js.js": js`
             export default () => <div data-testid="route-js">Rendered with .js ext</div>;

diff --git a/integration/layout-route-test.ts b/integration/layout-route-test.ts
@@ -10,9 +10,6 @@ test.describe("pathless layout routes", () => {
   test.beforeAll(async () => {
     appFixture = await createAppFixture(
       await createFixture({
-        future: {
-          v2_routeConvention: true,
-        },
         files: {
           "app/routes/_layout.jsx": js`
             import { Outlet } from "@remix-run/react";

diff --git a/integration/link-test.ts b/integration/link-test.ts
@@ -32,9 +32,6 @@ test.describe("route module link export", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: {
-        v2_routeConvention: true,
-      },
       files: {
         "app/favicon.ico": js``,
 

diff --git a/integration/loader-test.ts b/integration/loader-test.ts
@@ -12,7 +12,6 @@ test.describe("loader", () => {
 
   test.beforeAll(async () => {
     fixture = await createFixture({
-      future: { v2_routeConvention: true },
       files: {
         "app/root.jsx": js`
         import { json } from "@remix-run/node";
@@ -76,9 +75,6 @@ test.describe("loader in an app", () => {
   test.beforeAll(async () => {
     appFixture = await createAppFixture(
       await createFixture({
-        future: {
-          v2_routeConvention: true,
-        },
         files: {
           "app/root.jsx": js`
             import { Outlet } from '@remix-run/react'