From 721d2222a46d6a53d6f352683263e7b1eedee46b Mon Sep 17 00:00:00 2001 From: Matt Mazzola Date: Tue, 5 Mar 2024 08:21:22 -0800 Subject: [PATCH 1/2] Change dev and build commands to use npm scripts to allow remix cli (#8975) Co-authored-by: Matt Brophy --- docs/future/spa-mode.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/future/spa-mode.md b/docs/future/spa-mode.md index c0e96086ddc..f0a888540f6 100644 --- a/docs/future/spa-mode.md +++ b/docs/future/spa-mode.md @@ -58,7 +58,7 @@ export default defineConfig({ In SPA Mode, you develop the same way you would for a traditional Remix SSR app, and you actually use a running Remix dev server in order to enable HMR/HDR: ```sh -remix vite:dev +npx remix vite:dev ``` ### Production @@ -66,7 +66,7 @@ remix vite:dev When you build your app in SPA Mode, Remix will call the server handler for the `/` route and save the rendered HTML in an `index.html` file alongside your client side assets (by default `build/client/index.html`). ```sh -remix vite:build +npx remix vite:build ``` #### Preview From 77b1e55568147a6173a6be796fe676e38b12632a Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 5 Mar 2024 14:47:32 -0500 Subject: [PATCH 2/2] Bump router (#8984) --- .changeset/tasty-stingrays-work.md | 5 ++++ packages/remix-dev/package.json | 2 +- packages/remix-react/package.json | 6 ++--- packages/remix-server-runtime/package.json | 2 +- packages/remix-testing/package.json | 4 +-- yarn.lock | 30 +++++++++++----------- 6 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 .changeset/tasty-stingrays-work.md diff --git a/.changeset/tasty-stingrays-work.md b/.changeset/tasty-stingrays-work.md new file mode 100644 index 00000000000..2a5c2e42de8 --- /dev/null +++ b/.changeset/tasty-stingrays-work.md @@ -0,0 +1,5 @@ +--- +"@remix-run/react": patch +--- + +[REMOVE] Bump router diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index 2814b16b969..4e17c0050c3 100644 --- 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.8.0", - "@remix-run/router": "1.15.2", + "@remix-run/router": "1.15.3-pre.0", "@remix-run/server-runtime": "2.8.0", "@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 index e28ec808845..7f7caa628dc 100644 --- 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": "1.15.2", + "@remix-run/router": "1.15.3-pre.0", "@remix-run/server-runtime": "2.8.0", - "react-router": "6.22.2", - "react-router-dom": "6.22.2" + "react-router": "6.22.3-pre.0", + "react-router-dom": "6.22.3-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 index 16b5060d375..b8351f05825 100644 --- 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": "1.15.2", + "@remix-run/router": "1.15.3-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 index f6abacb39b3..8bf383a34cb 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -18,8 +18,8 @@ "dependencies": { "@remix-run/node": "2.8.0", "@remix-run/react": "2.8.0", - "@remix-run/router": "1.15.2", - "react-router-dom": "6.22.2" + "@remix-run/router": "1.15.3-pre.0", + "react-router-dom": "6.22.3-pre.0" }, "devDependencies": { "@types/node": "^18.17.1", diff --git a/yarn.lock b/yarn.lock index ac40c81c5d2..26fd1f9c2c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2482,10 +2482,10 @@ "@changesets/types" "^5.0.0" dotenv "^8.1.0" -"@remix-run/router@1.15.2": - version "1.15.2" - resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.15.2.tgz#35726510d332ba5349c6398d13259d5da184553d" - integrity sha512-+Rnav+CaoTE5QJc4Jcwh5toUpnVLKYbpU6Ys0zqbakqbaLQHeglLVHPfxOiQqdNmUy5C2lXz5dwC6tQNX2JW2Q== +"@remix-run/router@1.15.3-pre.0": + version "1.15.3-pre.0" + resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.15.3-pre.0.tgz#a77015ddaafcf0f0df538874f77abdbfcf86cc59" + integrity sha512-JUQb6sztqJpRbsdKpx3D4+6eaGmHU4Yb/QeKrES/ZbLuijlZMOmZ+gV0ohX5vrRDnJHJmcQPq3Tpk0GGPNM9gg== "@remix-run/web-blob@^3.1.0": version "3.1.0" @@ -11300,20 +11300,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@6.22.2: - version "6.22.2" - resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.2.tgz#8233968a8a576f3006e5549c80f3527d2598fc9c" - integrity sha512-WgqxD2qySEIBPZ3w0sHH+PUAiamDeszls9tzqMPBDA1YYVucTBXLU7+gtRfcSnhe92A3glPnvSxK2dhNoAVOIQ== +react-router-dom@6.22.3-pre.0: + version "6.22.3-pre.0" + resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.3-pre.0.tgz#aaa552f3263bb48a1fbb4a7002decc956f20a4b5" + integrity sha512-MElqnf6gB5wA2MiZLEINbFjEo7zSPzkCu/wYRdC7AAs0JJnc8OQ55BjAZ+1Fmix3hqmv6cYg0A2ijNXt/Qdh/w== dependencies: - "@remix-run/router" "1.15.2" - react-router "6.22.2" + "@remix-run/router" "1.15.3-pre.0" + react-router "6.22.3-pre.0" -react-router@6.22.2: - version "6.22.2" - resolved "https://registry.npmjs.org/react-router/-/react-router-6.22.2.tgz#27e77e4c635a5697693b922d131d773451c98a5b" - integrity sha512-YD3Dzprzpcq+tBMHBS822tCjnWD3iIZbTeSXMY9LPSG541EfoBGyZ3bS25KEnaZjLcmQpw2AVLkFyfgXY8uvcw== +react-router@6.22.3-pre.0: + version "6.22.3-pre.0" + resolved "https://registry.npmjs.org/react-router/-/react-router-6.22.3-pre.0.tgz#3f98e2c9d8ea69d492f26c9117d61ed6b4541ab0" + integrity sha512-8LOHYElMZlqS85xZFMOKGdhsyiBmrb7ecwo71k8ld6nXDYXcAh7oQ0i+Szk8z1C+DoSuDwC5FRjwnPtSO1Cmqw== dependencies: - "@remix-run/router" "1.15.2" + "@remix-run/router" "1.15.3-pre.0" react@^18.2.0: version "18.2.0"