diff --git a/integration/flat-routes-test.ts b/integration/flat-routes-test.ts
index 0b4b6b6aab6..9254ca16ee5 100644
--- a/integration/flat-routes-test.ts
+++ b/integration/flat-routes-test.ts
@@ -5,7 +5,6 @@ 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;
@@ -148,52 +147,6 @@ test.describe("flat routes", () => {
}
});
-test.describe("warns when v1 routesConvention is used", () => {
- let buildStdio = new PassThrough();
- let buildOutput: string;
-
- let originalConsoleLog = console.log;
- let originalConsoleWarn = console.warn;
- let originalConsoleError = console.error;
-
- test.beforeAll(async () => {
- console.log = () => {};
- console.warn = () => {};
- console.error = () => {};
- await createFixtureProject({
- buildStdio,
- future: { v2_routeConvention: false },
- files: {
- "routes/index.tsx": js`
- export default function () {
- return
routes/index
;
- }
- `,
- },
- });
-
- let chunks: Buffer[] = [];
- buildOutput = await new Promise((resolve, reject) => {
- buildStdio.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
- buildStdio.on("error", (err) => reject(err));
- buildStdio.on("end", () =>
- resolve(Buffer.concat(chunks).toString("utf8"))
- );
- });
- });
-
- test.afterAll(() => {
- console.log = originalConsoleLog;
- 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 () => {
let buildStdio = new PassThrough();
let buildOutput: string;
diff --git a/integration/tsconfig.json b/integration/tsconfig.json
index d2215944147..b8fd6c97ac7 100644
--- a/integration/tsconfig.json
+++ b/integration/tsconfig.json
@@ -17,7 +17,6 @@
"rootDir": "."
},
"references": [
- { "path": "../packages/remix-dev" },
{ "path": "../packages/remix-express" },
{ "path": "../packages/remix-react" },
{ "path": "../packages/remix-server-runtime" }
diff --git a/packages/remix-dev/__tests__/create-test.ts b/packages/remix-dev/__tests__/create-test.ts
index 4508ac91907..4a0fbed9768 100644
--- a/packages/remix-dev/__tests__/create-test.ts
+++ b/packages/remix-dev/__tests__/create-test.ts
@@ -8,7 +8,6 @@ import stripAnsi from "strip-ansi";
import { run } from "../cli/run";
import { server } from "./msw";
-import { flatRoutesWarning } from "../config";
beforeAll(() => server.listen({ onUnhandledRequest: "error" }));
afterAll(() => server.close());
@@ -348,9 +347,7 @@ describe("the create command", () => {
"--no-typescript",
]);
expect(output.trim()).toBe(
- flatRoutesWarning +
- "\n\n" +
- getOptOutOfInstallMessage() +
+ getOptOutOfInstallMessage() +
"\n\n" +
getSuccessMessage(path.join("", "template-to-js"))
);
diff --git a/packages/remix-dev/config.ts b/packages/remix-dev/config.ts
index 8686777438a..4c6f161eb86 100644
--- a/packages/remix-dev/config.ts
+++ b/packages/remix-dev/config.ts
@@ -560,14 +560,9 @@ export async function readConfig(
root: { path: "", id: "root", file: rootRouteFile },
};
- let routesConvention: typeof flatRoutes;
-
- if (appConfig.future?.v2_routeConvention) {
- routesConvention = flatRoutes;
- } else {
- warnOnce(flatRoutesWarning, "v2_routeConvention");
- routesConvention = defineConventionalRoutes;
- }
+ let routesConvention = appConfig.future?.v2_routeConvention
+ ? flatRoutes
+ : defineConventionalRoutes;
if (fse.existsSync(path.resolve(appDirectory, "routes"))) {
let conventionalRoutes = routesConvention(
@@ -731,6 +726,4 @@ let listFormat = new Intl.ListFormat("en", {
type: "conjunction",
});
-export let serverBuildTargetWarning = `⚠️ DEPRECATED: The "serverBuildTarget" config option is deprecated. Use a combination of "publicPath", "serverBuildPath", "serverConditions", "serverDependenciesToBundle", "serverMainFields", "serverMinify", "serverModuleFormat" and/or "serverPlatform" instead.`;
-
-export let flatRoutesWarning = `⚠️ DEPRECATED: The old nested folders route convention has been deprecated in favor of "flat routes". Please enable the new routing convention via the \`future.v2_routeConvention\` flag in your \`remix.config.js\` file. For more information, please see https://remix.run/docs/en/main/file-conventions/route-files-v2.`;
+export let serverBuildTargetWarning = `The "serverBuildTarget" config option is deprecated. Use a combination of "publicPath", "serverBuildPath", "serverConditions", "serverDependenciesToBundle", "serverMainFields", "serverMinify", "serverModuleFormat" and/or "serverPlatform" instead.`;