From e69cbc259ad54cfdc50590cb653c6d022658017f Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 16 Nov 2023 09:54:45 -0500 Subject: [PATCH] Bump router --- .changeset/sweet-peas-count.md | 5 ++++ packages/remix-react/package.json | 4 ++-- packages/remix-server-runtime/package.json | 2 +- packages/remix-testing/package.json | 4 ++-- scripts/bump-router-versions.sh | 7 +++--- yarn.lock | 27 +++++++++++++--------- 6 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 .changeset/sweet-peas-count.md diff --git a/.changeset/sweet-peas-count.md b/.changeset/sweet-peas-count.md new file mode 100644 index 00000000000..633f4ba2eae --- /dev/null +++ b/.changeset/sweet-peas-count.md @@ -0,0 +1,5 @@ +--- +"@remix-run/react": patch +--- + +[REMOVE} Bump router diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index fd9c05c5b30..4056bc451e3 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -16,9 +16,9 @@ "typings": "dist/index.d.ts", "module": "dist/esm/index.js", "dependencies": { - "@remix-run/router": "1.12.0-pre.0", + "@remix-run/router": "1.12.0", "@remix-run/server-runtime": "2.3.0-pre.1", - "react-router-dom": "6.19.0-pre.0" + "react-router-dom": "6.19.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 8c2386c20ab..96fe82539ab 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.12.0-pre.0", + "@remix-run/router": "1.12.0", "@types/cookie": "^0.5.3", "@web3-storage/multipart-parser": "^1.0.0", "cookie": "^0.5.0", diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index 79beb957789..680eaad66c1 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -18,8 +18,8 @@ "dependencies": { "@remix-run/node": "2.3.0-pre.1", "@remix-run/react": "2.3.0-pre.1", - "@remix-run/router": "1.12.0-pre.0", - "react-router-dom": "6.19.0-pre.0" + "@remix-run/router": "1.12.0", + "react-router-dom": "6.19.0" }, "devDependencies": { "@types/node": "^18.17.1", diff --git a/scripts/bump-router-versions.sh b/scripts/bump-router-versions.sh index 5b88d35bccc..2ee9cbe5b68 100755 --- a/scripts/bump-router-versions.sh +++ b/scripts/bump-router-versions.sh @@ -31,10 +31,6 @@ cd packages/remix-server-runtime yarn add -E @remix-run/router@${ROUTER_VERSION} cd ../.. -# cd packages/remix-express -# yarn add -E @remix-run/router@${ROUTER_VERSION} -# cd ../.. - cd packages/remix-react yarn add -E @remix-run/router@${ROUTER_VERSION} react-router-dom@${RR_VERSION} cd ../.. @@ -43,4 +39,7 @@ cd packages/remix-testing yarn add -E @remix-run/router@${ROUTER_VERSION} react-router-dom@${RR_VERSION} cd ../.. +# Because deplicates... +npx yarn-deduplicate && rm -rf ./node_modules && yarn + set +x \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 79e0d85149b..e189edd89ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2319,6 +2319,11 @@ "@changesets/types" "^5.0.0" dotenv "^8.1.0" +"@remix-run/router@1.12.0": + version "1.12.0" + resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0.tgz#e89b64b6fa97a8a5b740a4c38c2904b80f1f229a" + integrity sha512-2hXv036Bux90e1GXTWSMfNzfDDK8LA8JYEWfyHxzvwdp6GyoWEovKc9cotb3KCKmkdwsIBuFGX7ScTWyiHv7Eg== + "@remix-run/router@1.12.0-pre.0": version "1.12.0-pre.0" resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.12.0-pre.0.tgz#a7a3ed1941016f574147a97d64d3c687bf343113" @@ -11028,20 +11033,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.19.0-pre.0: - version "6.19.0-pre.0" - resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.19.0-pre.0.tgz#99d561cf50babea4c8c65317950884bb1db76395" - integrity sha512-elYzIXUmv92//Stn0IK8EYQixv1zeuUWw/HZM9LTQ4aGdNeBTqpTEq/K66KJbmfklzgVpg29Nr515onohZA1dA== +react-router-dom@6.19.0: + version "6.19.0" + resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.19.0.tgz#ee807e36ae7dd954db7a3f770e38b7cc026c66a8" + integrity sha512-N6dWlcgL2w0U5HZUUqU2wlmOrSb3ighJmtQ438SWbhB1yuLTXQ8yyTBMK3BSvVjp7gBtKurT554nCtMOgxCZmQ== dependencies: - "@remix-run/router" "1.12.0-pre.0" - react-router "6.19.0-pre.0" + "@remix-run/router" "1.12.0" + react-router "6.19.0" -react-router@6.19.0-pre.0: - version "6.19.0-pre.0" - resolved "https://registry.npmjs.org/react-router/-/react-router-6.19.0-pre.0.tgz#bebd659375430700b894e6007311bd1ff4bd84c5" - integrity sha512-qyPRUTh6jnZHu9t0UtdLdcVeKCWVmJbIZo0YgZb4ETxygqe/43WAPHsJ8TjA6/b6A+SeYhDZqeVu/U/lpBdUsA== +react-router@6.19.0: + version "6.19.0" + resolved "https://registry.npmjs.org/react-router/-/react-router-6.19.0.tgz#6d5062fa33495859daca98d86292ab03b037a9ca" + integrity sha512-0W63PKCZ7+OuQd7Tm+RbkI8kCLmn4GPjDbX61tWljPxWgqTKlEpeQUwPkT1DRjYhF8KSihK0hQpmhU4uxVMcdw== dependencies: - "@remix-run/router" "1.12.0-pre.0" + "@remix-run/router" "1.12.0" react@^18.2.0: version "18.2.0"