Skip to content

Commit

Permalink
rename remix folders to react-router-*
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanflorence committed Jun 21, 2024
1 parent 3c5c242 commit faaa678
Show file tree
Hide file tree
Showing 109 changed files with 230 additions and 237 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration-pr-windows-macos.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions jest/jest.config.shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/react-router/lib/server-runtime/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading

0 comments on commit faaa678

Please sign in to comment.