Skip to content

Commit

Permalink
bump dependencies; use react-router 6.15.0-pre.0 instead of patching
Browse files Browse the repository at this point in the history
  • Loading branch information
robbtraister committed Aug 11, 2023
1 parent df0e58a commit b2defd3
Show file tree
Hide file tree
Showing 5 changed files with 878 additions and 1,039 deletions.
6 changes: 3 additions & 3 deletions app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {
} from "@remix-run/react";

export const meta = () => [
{charset: "utf-8"},
{title: "New Remix App"},
{viewport: "width=device-width,initial-scale=1"}
{ charset: "utf-8" },
{ title: "New Remix App" },
{ name: "viewport", content: "width=device-width,initial-scale=1" }
];

export default function App() {
Expand Down
24 changes: 14 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"private": true,
"sideEffects": false,
"resolutions": {
"react-router": "6.15.0-pre.0",
"react-router-dom": "6.15.0-pre.0"
},
"scripts": {
"build": "remix build",
"dev": "remix build && run-p \"dev:*\"",
Expand All @@ -11,27 +15,27 @@
"typecheck": "tsc"
},
"dependencies": {
"@remix-run/express": "^1.18.1",
"@remix-run/node": "^1.18.1",
"@remix-run/react": "^1.18.1",
"@remix-run/express": "^1.19.3",
"@remix-run/node": "^1.19.3",
"@remix-run/react": "^1.19.3",
"compression": "^1.7.4",
"cross-env": "^7.0.3",
"express": "^4.18.2",
"isbot": "^3.6.12",
"isbot": "^3.6.13",
"morgan": "^1.10.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@remix-run/dev": "^1.18.1",
"@remix-run/eslint-config": "^1.18.1",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@remix-run/dev": "^1.19.3",
"@remix-run/eslint-config": "^1.19.3",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"dotenv": "^16.3.1",
"eslint": "^8.44.0",
"eslint": "^8.47.0",
"nodemon": "^3.0.1",
"npm-run-all": "^4.1.5",
"patch-package": "^7.0.1",
"patch-package": "^8.0.0",
"postinstall-postinstall": "^2.1.0",
"typescript": "^5.1.6"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/@remix-run/react/dist/esm/routes.js b/node_modules/@remix-run/react/dist/esm/routes.js
index 366a0fe..15b32dd 100644
index c06ab4f..d5d805c 100644
--- a/node_modules/@remix-run/react/dist/esm/routes.js
+++ b/node_modules/@remix-run/react/dist/esm/routes.js
@@ -150,6 +150,10 @@ function getRedirect(response) {
Expand All @@ -14,7 +14,7 @@ index 366a0fe..15b32dd 100644
status,
headers
diff --git a/node_modules/@remix-run/react/dist/routes.js b/node_modules/@remix-run/react/dist/routes.js
index 938cbf4..9c0817f 100644
index e2a97f6..15f4821 100644
--- a/node_modules/@remix-run/react/dist/routes.js
+++ b/node_modules/@remix-run/react/dist/routes.js
@@ -171,6 +171,10 @@ function getRedirect(response) {
Expand Down
235 changes: 0 additions & 235 deletions patches/@remix-run+router+1.7.1.patch

This file was deleted.

0 comments on commit b2defd3

Please sign in to comment.