Merge branch 'dev' into markdalgleish/adapter-config

remix-run · Jan 31, 2024 · 08ebfc2 · 08ebfc2
2 parents 9fafb11 + 7ddaa9c
commit 08ebfc2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -29,7 +29,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "2.5.1",
-    "@remix-run/router": "0.0.0-experimental-add6f8aa",
+    "@remix-run/router": "1.15.0-pre.0",
     "@remix-run/server-runtime": "2.5.1",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",

diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
@@ -16,10 +16,10 @@
   "typings": "dist/index.d.ts",
   "module": "dist/esm/index.js",
   "dependencies": {
-    "@remix-run/router": "0.0.0-experimental-add6f8aa",
+    "@remix-run/router": "1.15.0-pre.0",
     "@remix-run/server-runtime": "2.5.1",
-    "react-router": "0.0.0-experimental-add6f8aa",
-    "react-router-dom": "0.0.0-experimental-add6f8aa"
+    "react-router": "6.22.0-pre.0",
+    "react-router-dom": "6.22.0-pre.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.17.0",

diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
@@ -16,7 +16,7 @@
   "typings": "dist/index.d.ts",
   "module": "dist/esm/index.js",
   "dependencies": {
-    "@remix-run/router": "0.0.0-experimental-add6f8aa",
+    "@remix-run/router": "1.15.0-pre.0",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",

diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
@@ -18,8 +18,8 @@
   "dependencies": {
     "@remix-run/node": "2.5.1",
     "@remix-run/react": "2.5.1",
-    "@remix-run/router": "0.0.0-experimental-add6f8aa",
-    "react-router-dom": "0.0.0-experimental-add6f8aa"
+    "@remix-run/router": "1.15.0-pre.0",
+    "react-router-dom": "6.22.0-pre.0"
   },
   "devDependencies": {
     "@types/node": "^18.17.1",

diff --git a/yarn.lock b/yarn.lock
@@ -2489,10 +2489,10 @@
     "@changesets/types" "^5.0.0"
     dotenv "^8.1.0"
 
-"@remix-run/router@0.0.0-experimental-add6f8aa":
-  version "0.0.0-experimental-add6f8aa"
-  resolved "https://registry.npmjs.org/@remix-run/router/-/router-0.0.0-experimental-add6f8aa.tgz#58232edf157a762ac8d9d50c3d1d43e434791ab6"
-  integrity sha512-jVZ8xXRUXu6MoRMVsAZMmlf1ek7kFLgiY/5ZHaBY6VEBLc1J1nNLAtD1LzSJYE7sB1nBoF3ysNWpZ+QfAb3KXA==
+"@remix-run/router@1.15.0-pre.0":
+  version "1.15.0-pre.0"
+  resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.15.0-pre.0.tgz#9450042984609bf98833fd63a5f3847c02fd2c62"
+  integrity sha512-029lVlbVKEZkhaW7sMqztGzvlt+o4tVKwKiMLelhc7gGDfzmsbG1vH5B9CBk6mWVfeGWqqqzP221Dv9/1U4/DQ==
 
 "@remix-run/web-blob@^3.1.0":
   version "3.1.0"
@@ -11307,20 +11307,20 @@ react-refresh@^0.14.0:
   resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz"
   integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
 
-react-router-dom@0.0.0-experimental-add6f8aa:
-  version "0.0.0-experimental-add6f8aa"
-  resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-0.0.0-experimental-add6f8aa.tgz#89d6fb5f8f9bf6c739584866e592f1345dcaa555"
-  integrity sha512-n9uf5z6OHTIiRzs6nQde4reA61dB4YWZQSJI4ouIW0ZUvcnE6nA6zoR9qF7Y/CFR7lJJ/DtTyj5xNY8I04pL6w==
+react-router-dom@6.22.0-pre.0:
+  version "6.22.0-pre.0"
+  resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.0-pre.0.tgz#721e32bae66798c7f94c7fe181697fe8dbfbc224"
+  integrity sha512-ibpM7O7QiA7GXNANfnjjmboPyc1hdAcbQlu2zQuForkXKZR+L1UTvU7zgc1c7FhidZ5K6QDNfiH/iXYgKAxefw==
   dependencies:
-    "@remix-run/router" "0.0.0-experimental-add6f8aa"
-    react-router "0.0.0-experimental-add6f8aa"
+    "@remix-run/router" "1.15.0-pre.0"
+    react-router "6.22.0-pre.0"
 
-react-router@0.0.0-experimental-add6f8aa:
-  version "0.0.0-experimental-add6f8aa"
-  resolved "https://registry.npmjs.org/react-router/-/react-router-0.0.0-experimental-add6f8aa.tgz#06ed3e248c39cbdd52aef6be9a82fe5ee4067219"
-  integrity sha512-CusUxuUcU3QKX4Di33Tl6DDyQMd02gfNTIBx8fSYKWFoyWeJ/Pf4nF7HkBbQPkBPiTUBgE7MWHynp4JhRzXaYw==
+react-router@6.22.0-pre.0:
+  version "6.22.0-pre.0"
+  resolved "https://registry.npmjs.org/react-router/-/react-router-6.22.0-pre.0.tgz#04a067f2e7f095c1b1c0f5e0d4037f2b64adfc1e"
+  integrity sha512-Hcylu3lT72IN9ceq93qRrBWmDGSHbsbychYIafgUQHk3uoGLwcJoQ0qQFmGgQ8/M+Tt+nXyBkfVRCjGxUYHUVg==
   dependencies:
-    "@remix-run/router" "0.0.0-experimental-add6f8aa"
+    "@remix-run/router" "1.15.0-pre.0"
 
 react@^18.2.0:
   version "18.2.0"