remix-run · ryanflorence · Jun 21, 2024 · Jun 21, 2024
diff --git a/.github/workflows/integration-pr-windows-macos.yml b/.github/workflows/integration-pr-windows-macos.yml
@@ -1,11 +1,11 @@
 name: PR (Full)
 
-# PRs touching remix-dev will also run on Windows and OSX
+# PRs touching react-router-dev will also run on Windows and OSX
 
 on:
   pull_request:
     paths:
-      - "packages/remix-dev/**"
+      - "packages/react-router-dev/**"
       - "!**/*.md"
 
 concurrency:

diff --git a/README.md b/README.md
@@ -21,10 +21,10 @@ There are many different ways to contribute to React Router's development. If yo
 
 This repository is a monorepo containing the following packages:
 
-- [`@react-router/dev`](/packages/remix-dev)
-- [`@react-router/express`](/packages/remix-express)
-- [`@react-router/node`](/packages/remix-node)
-- [`@react-router/serve`](/packages/remix-serve)
+- [`@react-router/dev`](/packages/react-router-dev)
+- [`@react-router/express`](/packages/react-router-express)
+- [`@react-router/node`](/packages/react-router-node)
+- [`@react-router/serve`](/packages/react-router-serve)
 - [`react-router`](/packages/react-router)
 - [`react-router-dom`](/packages/react-router-dom)
 

diff --git a/jest/jest.config.shared.js b/jest/jest.config.shared.js
@@ -9,10 +9,10 @@ const ignorePatterns = [
 /** @type {import('jest').Config} */
 module.exports = {
   moduleNameMapper: {
-    "@react-router/dev$": "<rootDir>/../remix-dev/index.ts",
-    "@react-router/express$": "<rootDir>/../remix-express/index.ts",
-    "@react-router/node$": "<rootDir>/../remix-node/index.ts",
-    "@react-router/serve$": "<rootDir>/../remix-serve/index.ts",
+    "@react-router/dev$": "<rootDir>/../react-router-dev/index.ts",
+    "@react-router/express$": "<rootDir>/../react-router-express/index.ts",
+    "@react-router/node$": "<rootDir>/../react-router-node/index.ts",
+    "@react-router/serve$": "<rootDir>/../react-router-serve/index.ts",
     "^react-router$": "<rootDir>/../react-router/index.ts",
     "^@web3-storage/multipart-parser$": require.resolve(
       "@web3-storage/multipart-parser"

diff --git a/packages/remix-dev/.gitignore → packages/react-router-dev/.gitignore b/packages/remix-dev/.gitignore → packages/react-router-dev/.gitignore
diff --git a/packages/remix-dev/CHANGELOG.md → packages/react-router-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md → packages/react-router-dev/CHANGELOG.md
diff --git a/packages/remix-dev/README.md → packages/react-router-dev/README.md b/packages/remix-dev/README.md → packages/react-router-dev/README.md
diff --git a/packages/remix-dev/__tests__/cli-test.ts → ...es/react-router-dev/__tests__/cli-test.ts b/packages/remix-dev/__tests__/cli-test.ts → ...es/react-router-dev/__tests__/cli-test.ts
diff --git a/.../remix-dev/__tests__/defineRoutes-test.ts → ...router-dev/__tests__/defineRoutes-test.ts b/.../remix-dev/__tests__/defineRoutes-test.ts → ...router-dev/__tests__/defineRoutes-test.ts
diff --git a/...ix-dev/__tests__/fixtures/node/.gitignore → ...er-dev/__tests__/fixtures/node/.gitignore b/...ix-dev/__tests__/fixtures/node/.gitignore → ...er-dev/__tests__/fixtures/node/.gitignore
diff --git a/...mix-dev/__tests__/fixtures/node/README.md → ...ter-dev/__tests__/fixtures/node/README.md b/...mix-dev/__tests__/fixtures/node/README.md → ...ter-dev/__tests__/fixtures/node/README.md
diff --git a/...-dev/__tests__/fixtures/node/app/root.tsx → ...-dev/__tests__/fixtures/node/app/root.tsx b/...-dev/__tests__/fixtures/node/app/root.tsx → ...-dev/__tests__/fixtures/node/app/root.tsx
diff --git a/...sts__/fixtures/node/app/routes/_index.tsx → ...sts__/fixtures/node/app/routes/_index.tsx b/...sts__/fixtures/node/app/routes/_index.tsx → ...sts__/fixtures/node/app/routes/_index.tsx
diff --git a/...-dev/__tests__/fixtures/node/package.json → ...-dev/__tests__/fixtures/node/package.json b/...-dev/__tests__/fixtures/node/package.json → ...-dev/__tests__/fixtures/node/package.json
diff --git a/..._tests__/fixtures/node/public/favicon.ico → ..._tests__/fixtures/node/public/favicon.ico b/..._tests__/fixtures/node/public/favicon.ico → ..._tests__/fixtures/node/public/favicon.ico
diff --git a/...ev/__tests__/fixtures/node/remix.env.d.ts → ...ev/__tests__/fixtures/node/remix.env.d.ts b/...ev/__tests__/fixtures/node/remix.env.d.ts → ...ev/__tests__/fixtures/node/remix.env.d.ts
diff --git a/...dev/__tests__/fixtures/node/tsconfig.json → ...dev/__tests__/fixtures/node/tsconfig.json b/...dev/__tests__/fixtures/node/tsconfig.json → ...dev/__tests__/fixtures/node/tsconfig.json
diff --git a/...s/remix-dev/__tests__/flat-routes-test.ts → ...-router-dev/__tests__/flat-routes-test.ts b/...s/remix-dev/__tests__/flat-routes-test.ts → ...-router-dev/__tests__/flat-routes-test.ts
diff --git a/packages/remix-dev/__tests__/reveal-test.ts → ...react-router-dev/__tests__/reveal-test.ts b/packages/remix-dev/__tests__/reveal-test.ts → ...react-router-dev/__tests__/reveal-test.ts
diff --git a/...ages/remix-dev/__tests__/setupAfterEnv.ts → ...act-router-dev/__tests__/setupAfterEnv.ts b/...ages/remix-dev/__tests__/setupAfterEnv.ts → ...act-router-dev/__tests__/setupAfterEnv.ts
diff --git a/...remix-dev/__tests__/utils/captureError.ts → ...outer-dev/__tests__/utils/captureError.ts b/...remix-dev/__tests__/utils/captureError.ts → ...outer-dev/__tests__/utils/captureError.ts
diff --git a/packages/remix-dev/__tests__/utils/cli.ts → ...s/react-router-dev/__tests__/utils/cli.ts b/packages/remix-dev/__tests__/utils/cli.ts → ...s/react-router-dev/__tests__/utils/cli.ts
@@ -58,7 +58,7 @@ export const run = async (args: string[], options: execa.Options = {}) => {
   // // To get speed ups in dev, make sure you build before running tests or are running `pnpm watch`
   let sourceDir = path.resolve(__dirname, "../..");
   let sourceTS = path.resolve(sourceDir, "cli.ts");
-  // // when the most recent change happened _anywhere_ within `packages/remix-dev/`
+  // // when the most recent change happened _anywhere_ within `packages/react-router-dev/`
 
   let sourceModified = await mtimeDir(sourceDir);
 

diff --git a/packages/remix-dev/__tests__/utils/eol.ts → ...s/react-router-dev/__tests__/utils/eol.ts b/packages/remix-dev/__tests__/utils/eol.ts → ...s/react-router-dev/__tests__/utils/eol.ts
diff --git a/packages/remix-dev/__tests__/utils/git.ts → ...s/react-router-dev/__tests__/utils/git.ts b/packages/remix-dev/__tests__/utils/git.ts → ...s/react-router-dev/__tests__/utils/git.ts
diff --git a/...ages/remix-dev/__tests__/utils/withApp.ts → ...act-router-dev/__tests__/utils/withApp.ts b/...ages/remix-dev/__tests__/utils/withApp.ts → ...act-router-dev/__tests__/utils/withApp.ts
diff --git a/packages/remix-dev/assets-manifest.d.ts → ...ges/react-router-dev/assets-manifest.d.ts b/packages/remix-dev/assets-manifest.d.ts → ...ges/react-router-dev/assets-manifest.d.ts
diff --git a/packages/remix-dev/cli.ts → packages/react-router-dev/cli.ts b/packages/remix-dev/cli.ts → packages/react-router-dev/cli.ts
diff --git a/packages/remix-dev/cli/commands.ts → packages/react-router-dev/cli/commands.ts b/packages/remix-dev/cli/commands.ts → packages/react-router-dev/cli/commands.ts
diff --git a/...ges/remix-dev/cli/detectPackageManager.ts → ...ct-router-dev/cli/detectPackageManager.ts b/...ges/remix-dev/cli/detectPackageManager.ts → ...ct-router-dev/cli/detectPackageManager.ts
diff --git a/packages/remix-dev/cli/index.ts → packages/react-router-dev/cli/index.ts b/packages/remix-dev/cli/index.ts → packages/react-router-dev/cli/index.ts
diff --git a/packages/remix-dev/cli/run.ts → packages/react-router-dev/cli/run.ts b/packages/remix-dev/cli/run.ts → packages/react-router-dev/cli/run.ts
diff --git a/packages/remix-dev/cli/useJavascript.ts → ...ges/react-router-dev/cli/useJavascript.ts b/packages/remix-dev/cli/useJavascript.ts → ...ges/react-router-dev/cli/useJavascript.ts
diff --git a/packages/remix-dev/colors.ts → packages/react-router-dev/colors.ts b/packages/remix-dev/colors.ts → packages/react-router-dev/colors.ts
diff --git a/packages/remix-dev/config.ts → packages/react-router-dev/config.ts b/packages/remix-dev/config.ts → packages/react-router-dev/config.ts
diff --git a/...emix-dev/config/defaults/entry.client.tsx → ...uter-dev/config/defaults/entry.client.tsx b/...emix-dev/config/defaults/entry.client.tsx → ...uter-dev/config/defaults/entry.client.tsx
diff --git a/...dev/config/defaults/entry.server.node.tsx → ...dev/config/defaults/entry.server.node.tsx b/...dev/config/defaults/entry.server.node.tsx → ...dev/config/defaults/entry.server.node.tsx
diff --git a/packages/remix-dev/config/findConfig.ts → ...ges/react-router-dev/config/findConfig.ts b/packages/remix-dev/config/findConfig.ts → ...ges/react-router-dev/config/findConfig.ts
diff --git a/packages/remix-dev/config/flatRoutes.ts → ...ges/react-router-dev/config/flatRoutes.ts b/packages/remix-dev/config/flatRoutes.ts → ...ges/react-router-dev/config/flatRoutes.ts
diff --git a/packages/remix-dev/config/format.ts → packages/react-router-dev/config/format.ts b/packages/remix-dev/config/format.ts → packages/react-router-dev/config/format.ts
diff --git a/packages/remix-dev/config/routes.ts → packages/react-router-dev/config/routes.ts b/packages/remix-dev/config/routes.ts → packages/react-router-dev/config/routes.ts
diff --git a/packages/remix-dev/config/serverModes.ts → ...es/react-router-dev/config/serverModes.ts b/packages/remix-dev/config/serverModes.ts → ...es/react-router-dev/config/serverModes.ts
diff --git a/packages/remix-dev/index.ts → packages/react-router-dev/index.ts b/packages/remix-dev/index.ts → packages/react-router-dev/index.ts
diff --git a/packages/remix-dev/invariant.ts → packages/react-router-dev/invariant.ts b/packages/remix-dev/invariant.ts → packages/react-router-dev/invariant.ts
diff --git a/packages/remix-dev/jest.config.js → packages/react-router-dev/jest.config.js b/packages/remix-dev/jest.config.js → packages/react-router-dev/jest.config.js
diff --git a/packages/remix-dev/manifest.ts → packages/react-router-dev/manifest.ts b/packages/remix-dev/manifest.ts → packages/react-router-dev/manifest.ts
diff --git a/packages/remix-dev/package.json → packages/react-router-dev/package.json b/packages/remix-dev/package.json → packages/react-router-dev/package.json
@@ -9,7 +9,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/remix-run/react-router",
-    "directory": "packages/remix-dev"
+    "directory": "packages/react-router-dev"
   },
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/remix-dev/rollup.config.js → packages/react-router-dev/rollup.config.js b/packages/remix-dev/rollup.config.js → packages/react-router-dev/rollup.config.js
@@ -18,7 +18,7 @@ module.exports = function rollup() {
   const { SOURCE_DIR, OUTPUT_DIR } = getBuildDirectories(
     name,
     // We don't live in a folder matching our package name
-    "remix-dev"
+    "react-router-dev"
   );
 
   return [

diff --git a/packages/remix-dev/tsconfig.json → packages/react-router-dev/tsconfig.json b/packages/remix-dev/tsconfig.json → packages/react-router-dev/tsconfig.json
diff --git a/packages/remix-dev/typedoc.json → packages/react-router-dev/typedoc.json b/packages/remix-dev/typedoc.json → packages/react-router-dev/typedoc.json
diff --git a/packages/remix-dev/vite/babel.ts → packages/react-router-dev/vite/babel.ts b/packages/remix-dev/vite/babel.ts → packages/react-router-dev/vite/babel.ts
diff --git a/packages/remix-dev/vite/build.ts → packages/react-router-dev/vite/build.ts b/packages/remix-dev/vite/build.ts → packages/react-router-dev/vite/build.ts
diff --git a/packages/remix-dev/vite/dev.ts → packages/react-router-dev/vite/dev.ts b/packages/remix-dev/vite/dev.ts → packages/react-router-dev/vite/dev.ts
diff --git a/...es/remix-dev/vite/import-vite-esm-sync.ts → ...t-router-dev/vite/import-vite-esm-sync.ts b/...es/remix-dev/vite/import-vite-esm-sync.ts → ...t-router-dev/vite/import-vite-esm-sync.ts
diff --git a/packages/remix-dev/vite/index.ts → packages/react-router-dev/vite/index.ts b/packages/remix-dev/vite/index.ts → packages/react-router-dev/vite/index.ts
diff --git a/packages/remix-dev/vite/node-adapter.ts → ...ges/react-router-dev/vite/node-adapter.ts b/packages/remix-dev/vite/node-adapter.ts → ...ges/react-router-dev/vite/node-adapter.ts
@@ -30,7 +30,7 @@ function fromNodeHeaders(nodeHeaders: IncomingHttpHeaders): Headers {
   return headers;
 }
 
-// Based on `createRemixRequest` in packages/remix-express/server.ts
+// Based on `createRemixRequest` in packages/react-router-express/server.ts
 export function fromNodeRequest(
   nodeReq: Vite.Connect.IncomingMessage
 ): Request {

diff --git a/packages/remix-dev/vite/plugin.ts → packages/react-router-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts → packages/react-router-dev/vite/plugin.ts
diff --git a/packages/remix-dev/vite/profiler.ts → packages/react-router-dev/vite/profiler.ts b/packages/remix-dev/vite/profiler.ts → packages/react-router-dev/vite/profiler.ts
diff --git a/...ges/remix-dev/vite/remove-exports-test.ts → ...ct-router-dev/vite/remove-exports-test.ts b/...ges/remix-dev/vite/remove-exports-test.ts → ...ct-router-dev/vite/remove-exports-test.ts
diff --git a/packages/remix-dev/vite/remove-exports.ts → ...s/react-router-dev/vite/remove-exports.ts b/packages/remix-dev/vite/remove-exports.ts → ...s/react-router-dev/vite/remove-exports.ts
diff --git a/packages/remix-dev/vite/resolve-file-url.ts → ...react-router-dev/vite/resolve-file-url.ts b/packages/remix-dev/vite/resolve-file-url.ts → ...react-router-dev/vite/resolve-file-url.ts
diff --git a/...s/remix-dev/vite/static/refresh-utils.cjs → ...-router-dev/vite/static/refresh-utils.cjs b/...s/remix-dev/vite/static/refresh-utils.cjs → ...-router-dev/vite/static/refresh-utils.cjs
diff --git a/packages/remix-dev/vite/styles.ts → packages/react-router-dev/vite/styles.ts b/packages/remix-dev/vite/styles.ts → packages/react-router-dev/vite/styles.ts
diff --git a/packages/remix-dev/vite/vmod.ts → packages/react-router-dev/vite/vmod.ts b/packages/remix-dev/vite/vmod.ts → packages/react-router-dev/vite/vmod.ts
diff --git a/packages/remix-express/CHANGELOG.md → packages/react-router-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md → packages/react-router-express/CHANGELOG.md
diff --git a/packages/remix-express/README.md → packages/react-router-express/README.md b/packages/remix-express/README.md → packages/react-router-express/README.md
diff --git a/...es/remix-express/__tests__/server-test.ts → ...t-router-express/__tests__/server-test.ts b/...es/remix-express/__tests__/server-test.ts → ...t-router-express/__tests__/server-test.ts
diff --git a/packages/remix-express/__tests__/setup.ts → ...s/react-router-express/__tests__/setup.ts b/packages/remix-express/__tests__/setup.ts → ...s/react-router-express/__tests__/setup.ts
diff --git a/packages/remix-express/index.ts → packages/react-router-express/index.ts b/packages/remix-express/index.ts → packages/react-router-express/index.ts
diff --git a/packages/remix-express/jest.config.js → packages/react-router-express/jest.config.js b/packages/remix-express/jest.config.js → packages/react-router-express/jest.config.js
diff --git a/packages/remix-express/package.json → packages/react-router-express/package.json b/packages/remix-express/package.json → packages/react-router-express/package.json
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/remix-run/react-router",
-    "directory": "packages/remix-express"
+    "directory": "packages/react-router-express"
   },
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/remix-express/rollup.config.js → ...ges/react-router-express/rollup.config.js b/packages/remix-express/rollup.config.js → ...ges/react-router-express/rollup.config.js
@@ -18,7 +18,7 @@ module.exports = function rollup() {
   const { SOURCE_DIR, OUTPUT_DIR } = getBuildDirectories(
     name,
     // We don't live in a folder matching our package name
-    "remix-express"
+    "react-router-express"
   );
 
   return [

diff --git a/packages/remix-express/server.ts → packages/react-router-express/server.ts b/packages/remix-express/server.ts → packages/react-router-express/server.ts
diff --git a/packages/remix-express/tsconfig.json → packages/react-router-express/tsconfig.json b/packages/remix-express/tsconfig.json → packages/react-router-express/tsconfig.json
diff --git a/packages/remix-express/typedoc.json → packages/react-router-express/typedoc.json b/packages/remix-express/typedoc.json → packages/react-router-express/typedoc.json
diff --git a/packages/remix-node/.gitignore → packages/react-router-node/.gitignore b/packages/remix-node/.gitignore → packages/react-router-node/.gitignore
diff --git a/packages/remix-node/CHANGELOG.md → packages/react-router-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md → packages/react-router-node/CHANGELOG.md
diff --git a/packages/remix-node/README.md → packages/react-router-node/README.md b/packages/remix-node/README.md → packages/react-router-node/README.md
diff --git a/...ages/remix-node/__tests__/assets/test.txt → ...act-router-node/__tests__/assets/test.txt b/...ages/remix-node/__tests__/assets/test.txt → ...act-router-node/__tests__/assets/test.txt
diff --git a/...-node/__tests__/fileUploadHandler-test.ts → ...-node/__tests__/fileUploadHandler-test.ts b/...-node/__tests__/fileUploadHandler-test.ts → ...-node/__tests__/fileUploadHandler-test.ts
diff --git a/...ges/remix-node/__tests__/sessions-test.ts → ...ct-router-node/__tests__/sessions-test.ts b/...ges/remix-node/__tests__/sessions-test.ts → ...ct-router-node/__tests__/sessions-test.ts
diff --git a/packages/remix-node/__tests__/setup.ts → ...ages/react-router-node/__tests__/setup.ts b/packages/remix-node/__tests__/setup.ts → ...ages/react-router-node/__tests__/setup.ts
diff --git a/packages/remix-node/__tests__/utils.ts → ...ages/react-router-node/__tests__/utils.ts b/packages/remix-node/__tests__/utils.ts → ...ages/react-router-node/__tests__/utils.ts
diff --git a/packages/remix-node/crypto.ts → packages/react-router-node/crypto.ts b/packages/remix-node/crypto.ts → packages/react-router-node/crypto.ts
diff --git a/packages/remix-node/globals.ts → packages/react-router-node/globals.ts b/packages/remix-node/globals.ts → packages/react-router-node/globals.ts
diff --git a/packages/remix-node/implementations.ts → ...ages/react-router-node/implementations.ts b/packages/remix-node/implementations.ts → ...ages/react-router-node/implementations.ts
diff --git a/packages/remix-node/index.ts → packages/react-router-node/index.ts b/packages/remix-node/index.ts → packages/react-router-node/index.ts
diff --git a/packages/remix-node/install.d.ts → packages/react-router-node/install.d.ts b/packages/remix-node/install.d.ts → packages/react-router-node/install.d.ts
diff --git a/packages/remix-node/install.js → packages/react-router-node/install.js b/packages/remix-node/install.js → packages/react-router-node/install.js
diff --git a/packages/remix-node/jest.config.js → packages/react-router-node/jest.config.js b/packages/remix-node/jest.config.js → packages/react-router-node/jest.config.js
diff --git a/packages/remix-node/package.json → packages/react-router-node/package.json b/packages/remix-node/package.json → packages/react-router-node/package.json
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/remix-run/react-router",
-    "directory": "packages/remix-node"
+    "directory": "packages/react-router-node"
   },
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/remix-node/rollup.config.js → packages/react-router-node/rollup.config.js b/packages/remix-node/rollup.config.js → packages/react-router-node/rollup.config.js
@@ -18,7 +18,7 @@ module.exports = function rollup() {
   const { SOURCE_DIR, OUTPUT_DIR } = getBuildDirectories(
     name,
     // We don't live in a folder matching our package name
-    "remix-node"
+    "react-router-node"
   );
 
   return [

diff --git a/packages/remix-node/sessions/fileStorage.ts → ...react-router-node/sessions/fileStorage.ts b/packages/remix-node/sessions/fileStorage.ts → ...react-router-node/sessions/fileStorage.ts
diff --git a/packages/remix-node/stream.ts → packages/react-router-node/stream.ts b/packages/remix-node/stream.ts → packages/react-router-node/stream.ts
diff --git a/packages/remix-node/tsconfig.json → packages/react-router-node/tsconfig.json b/packages/remix-node/tsconfig.json → packages/react-router-node/tsconfig.json
diff --git a/packages/remix-node/typedoc.json → packages/react-router-node/typedoc.json b/packages/remix-node/typedoc.json → packages/react-router-node/typedoc.json
diff --git a/...es/remix-node/upload/fileUploadHandler.ts → ...t-router-node/upload/fileUploadHandler.ts b/...es/remix-node/upload/fileUploadHandler.ts → ...t-router-node/upload/fileUploadHandler.ts
diff --git a/packages/remix-serve/CHANGELOG.md → packages/react-router-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md → packages/react-router-serve/CHANGELOG.md
diff --git a/packages/remix-serve/README.md → packages/react-router-serve/README.md b/packages/remix-serve/README.md → packages/react-router-serve/README.md
diff --git a/packages/remix-serve/cli.ts → packages/react-router-serve/cli.ts b/packages/remix-serve/cli.ts → packages/react-router-serve/cli.ts
diff --git a/packages/remix-serve/package.json → packages/react-router-serve/package.json b/packages/remix-serve/package.json → packages/react-router-serve/package.json
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/remix-run/react-router",
-    "directory": "packages/remix-serve"
+    "directory": "packages/react-router-serve"
   },
   "license": "MIT",
   "bin": {

diff --git a/packages/remix-serve/rollup.config.js → packages/react-router-serve/rollup.config.js b/packages/remix-serve/rollup.config.js → packages/react-router-serve/rollup.config.js
@@ -17,7 +17,7 @@ module.exports = function rollup() {
   const { SOURCE_DIR, OUTPUT_DIR } = getBuildDirectories(
     name,
     // We don't live in a folder matching our package name
-    "remix-serve"
+    "react-router-serve"
   );
 
   return [

diff --git a/packages/remix-serve/tsconfig.json → packages/react-router-serve/tsconfig.json b/packages/remix-serve/tsconfig.json → packages/react-router-serve/tsconfig.json
diff --git a/packages/remix-serve/typedoc.json → packages/react-router-serve/typedoc.json b/packages/remix-serve/typedoc.json → packages/react-router-serve/typedoc.json
diff --git a/packages/react-router/lib/server-runtime/routes.ts b/packages/react-router/lib/server-runtime/routes.ts
@@ -14,7 +14,7 @@ export interface RouteManifest<Route> {
 
 export type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
 
-// NOTE: make sure to change the Route in remix-react/remix-dev if you change this
+// NOTE: make sure to change the Route in remix-react/react-router-dev if you change this
 export interface Route {
   index?: boolean;
   caseSensitive?: boolean;
@@ -23,7 +23,7 @@ export interface Route {
   path?: string;
 }
 
-// NOTE: make sure to change the EntryRoute in remix-react/remix-dev if you change this
+// NOTE: make sure to change the EntryRoute in react-router/react-router-dev if you change this
 export interface EntryRoute extends Route {
   hasAction: boolean;
   hasLoader: boolean;