From 90f62d6262cf478a9493560014e12b5f25463b6a Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 27 Apr 2023 16:11:42 -0400 Subject: [PATCH 1/2] Bump to latest router prerelease --- .changeset/bump-router-pre-2.md | 6 ++++++ packages/remix-react/package.json | 2 +- packages/remix-testing/package.json | 2 +- yarn.lock | 18 +++++++++--------- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 .changeset/bump-router-pre-2.md diff --git a/.changeset/bump-router-pre-2.md b/.changeset/bump-router-pre-2.md new file mode 100644 index 00000000000..36e4bc8f346 --- /dev/null +++ b/.changeset/bump-router-pre-2.md @@ -0,0 +1,6 @@ +--- +"@remix-run/react": patch +"@remix-run/testing": patch +--- + +Bump to React Router `6.11.0-pre.2` diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index 5937d0e1b08..1624f1ada4e 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -17,7 +17,7 @@ "module": "dist/esm/index.js", "dependencies": { "@remix-run/router": "1.6.0-pre.0", - "react-router-dom": "6.11.0-pre.1" + "react-router-dom": "6.11.0-pre.2" }, "devDependencies": { "@remix-run/server-runtime": "1.16.0-pre.3", diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index b038e44541f..506411a20e0 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -19,7 +19,7 @@ "@remix-run/node": "1.16.0-pre.3", "@remix-run/react": "1.16.0-pre.3", "@remix-run/router": "1.6.0-pre.0", - "react-router-dom": "6.11.0-pre.1" + "react-router-dom": "6.11.0-pre.2" }, "devDependencies": { "@types/node": "^18.11.9", diff --git a/yarn.lock b/yarn.lock index bd161bd08a2..ff7a46c29c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11236,18 +11236,18 @@ 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.11.0-pre.1: - version "6.11.0-pre.1" - resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.11.0-pre.1.tgz#66e076c2777108b2bac1729e33bde9161a8e83f5" - integrity sha512-EEdmUk06pGPrjU87mFxKlQQMc5a/RIMA2gEwnmdAyIHdo/FAWGb917yOEDIh4pnv/wH0eSX0Wgsnuua9/k6X+g== +react-router-dom@6.11.0-pre.2: + version "6.11.0-pre.2" + resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.11.0-pre.2.tgz#31eb25fb1ccc22795e2a4938a1bafdc8f0fb8121" + integrity sha512-FWmPehDeRjX/KmNpYq6DB4Tc76s/NHWgKkEe/SbqSX0AYivHg+rwfcUxj3eUgJohjHQTQ+eImWC16PNjALgaRA== dependencies: "@remix-run/router" "1.6.0-pre.0" - react-router "6.11.0-pre.1" + react-router "6.11.0-pre.2" -react-router@6.11.0-pre.1: - version "6.11.0-pre.1" - resolved "https://registry.npmjs.org/react-router/-/react-router-6.11.0-pre.1.tgz#cbeade3bec425aab45e0a49060c7735ba98a8bbb" - integrity sha512-CBOpqUysQxG598u9I0ngzoXXxMXYDEkBW6sSL9O1xyFJg3dYa0ytaVlKap9QAKOYsYTiMlkMiAGFKbyp81ErHA== +react-router@6.11.0-pre.2: + version "6.11.0-pre.2" + resolved "https://registry.npmjs.org/react-router/-/react-router-6.11.0-pre.2.tgz#5880e73c09485c5fcb3f1e2ee6aa4d460a842a4c" + integrity sha512-4xCL6I6D0DSDwaX35Gc0dVpIKE9zQCrGakWQXW8mBFK1EnxG8nUgwW6T/HN43d72bd9AmFJDXVc+fqPN7ayq4g== dependencies: "@remix-run/router" "1.6.0-pre.0" From 6c6f2c7f29d22c2370021c662dfdd63a54c08c76 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 27 Apr 2023 16:24:09 -0400 Subject: [PATCH 2/2] Fix lint issues --- docs/tutorials/jokes.md | 2 +- packages/remix-dev/CHANGELOG.md | 20 ++++++++++---------- packages/remix-server-runtime/CHANGELOG.md | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/tutorials/jokes.md b/docs/tutorials/jokes.md index eba6a7f3ef5..c4e4bae5f71 100644 --- a/docs/tutorials/jokes.md +++ b/docs/tutorials/jokes.md @@ -6427,7 +6427,7 @@ function validatePassword(password: string) { } function validateUrl(url: string) { - let urls = ["/jokes", "/", "https://remix.run"]; + const urls = ["/jokes", "/", "https://remix.run"]; if (urls.includes(url)) { return url; } diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md index 505d9ea9152..93865f2371e 100644 --- a/packages/remix-dev/CHANGELOG.md +++ b/packages/remix-dev/CHANGELOG.md @@ -136,11 +136,11 @@ Enable `unstable_dev` in `remix.config.js`: ```js - { + module.exports = { future: { - "unstable_dev": true - } - } + unstable_dev: true, + }, + }; ``` ## Remix App Server @@ -182,12 +182,12 @@ import { devReady } from "@remix-run/node"; // Path to Remix's server build directory ('build/' by default) - let BUILD_DIR = path.join(process.cwd(), "build"); + const BUILD_DIR = path.join(process.cwd(), "build"); // app.listen(3000, () => { - let build = require(BUILD_DIR); + const build = require(BUILD_DIR); console.log("Ready: http://localhost:" + port); // in development, call `devReady` _after_ your server is up and running @@ -211,7 +211,7 @@ - You want to handle server updates yourself (e.g. via require cache purging) ```js - { + module.exports = { future: { unstable_dev: { // Command to run your app server @@ -227,9 +227,9 @@ // Whether the app server should be restarted when app is rebuilt // See `Advanced > restart` for more restart: false, // default: `true` - } - } - } + }, + }, + }; ``` You can also configure via flags. For example: diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md index 05ba183bb9e..d9b0d29e0b2 100644 --- a/packages/remix-server-runtime/CHANGELOG.md +++ b/packages/remix-server-runtime/CHANGELOG.md @@ -124,11 +124,11 @@ Enable `unstable_dev` in `remix.config.js`: ```js - { + module.exports = { future: { - "unstable_dev": true - } - } + unstable_dev: true, + }, + }; ``` ## Remix App Server @@ -170,12 +170,12 @@ import { devReady } from "@remix-run/node"; // Path to Remix's server build directory ('build/' by default) - let BUILD_DIR = path.join(process.cwd(), "build"); + const BUILD_DIR = path.join(process.cwd(), "build"); // app.listen(3000, () => { - let build = require(BUILD_DIR); + const build = require(BUILD_DIR); console.log("Ready: http://localhost:" + port); // in development, call `devReady` _after_ your server is up and running @@ -199,7 +199,7 @@ - You want to handle server updates yourself (e.g. via require cache purging) ```js - { + module.exports = { future: { unstable_dev: { // Command to run your app server @@ -215,9 +215,9 @@ // Whether the app server should be restarted when app is rebuilt // See `Advanced > restart` for more restart: false, // default: `true` - } - } - } + }, + }, + }; ``` You can also configure via flags. For example: