Skip to content

Commit

Permalink
Migrate to route-config package
Browse files Browse the repository at this point in the history
  • Loading branch information
markdalgleish committed Oct 16, 2024
1 parent 9e146e8 commit 8388823
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 22 deletions.
8 changes: 4 additions & 4 deletions integration/vite-fs-routes-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test.describe("fs-routes", () => {
});
`,
"app/routes.ts": js`
import { type RouteConfig } from "@remix-run/dev/routes";
import { type RouteConfig } from "@remix-run/route-config";
import { flatRoutes } from "@remix-run/fs-routes";
export const routes: RouteConfig = flatRoutes({
Expand Down Expand Up @@ -230,7 +230,7 @@ test.describe("emits warnings for route conflicts", async () => {
});
`,
"app/routes.ts": js`
import { type RouteConfig } from "@remix-run/dev/routes";
import { type RouteConfig } from "@remix-run/route-config";
import { flatRoutes } from "@remix-run/fs-routes";
export const routes: RouteConfig = flatRoutes({
Expand Down Expand Up @@ -302,7 +302,7 @@ test.describe("", () => {
});
`,
"app/routes.ts": js`
import { type RouteConfig } from "@remix-run/dev/routes";
import { type RouteConfig } from "@remix-run/route-config";
import { flatRoutes } from "@remix-run/fs-routes";
export const routes: RouteConfig = flatRoutes({
Expand Down Expand Up @@ -349,7 +349,7 @@ test.describe("pathless routes and route collisions", () => {
});
`,
"app/routes.ts": js`
import { type RouteConfig } from "@remix-run/dev/routes";
import { type RouteConfig } from "@remix-run/route-config";
import { flatRoutes } from "@remix-run/fs-routes";
export const routes: RouteConfig = flatRoutes({
Expand Down
11 changes: 0 additions & 11 deletions packages/remix-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,6 @@
"license": "MIT",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"exports": {
".": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
},
"./routes": {
"types": "./dist/routes.d.ts",
"default": "./dist/routes.js"
},
"./*": "./*"
},
"bin": {
"remix": "dist/cli.js"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { route } from "@remix-run/dev/routes";
import { route } from "@remix-run/route-config";

import { routeManifestToRouteConfig } from "../manifest";

Expand Down
5 changes: 4 additions & 1 deletion packages/remix-fs-routes/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import fs from "node:fs";
import path from "node:path";
import { type RouteConfigEntry, getAppDirectory } from "@remix-run/dev/routes";
import {
type RouteConfigEntry,
getAppDirectory,
} from "@remix-run/route-config";

import { routeManifestToRouteConfig } from "./manifest";
import { flatRoutes as flatRoutesImpl } from "./flatRoutes";
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-fs-routes/manifest.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RouteConfigEntry } from "@remix-run/dev/routes";
import type { RouteConfigEntry } from "@remix-run/route-config";

export interface RouteManifestEntry {
path?: string;
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-fs-routes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"minimatch": "^9.0.0"
},
"devDependencies": {
"@remix-run/dev": "workspace:*",
"@remix-run/route-config": "workspace:*",
"typescript": "^5.1.6"
},
"peerDependencies": {
"@remix-run/dev": "workspace:^",
"@remix-run/route-config": "workspace:*",
"typescript": "^5.1.0"
},
"peerDependenciesMeta": {
Expand Down
4 changes: 2 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8388823

Please sign in to comment.