From 267ee2a0a1edc18e523109ac84f0595b524b7daf Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 20 Dec 2024 15:50:33 -0500 Subject: [PATCH 1/2] Bump router --- packages/remix-react/package.json | 4 ++-- packages/remix-testing/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index 29deb69afa8..adad747f90d 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -21,8 +21,8 @@ "dependencies": { "@remix-run/router": "1.21.0", "@remix-run/server-runtime": "workspace:*", - "react-router": "6.28.1-pre.0", - "react-router-dom": "6.28.1-pre.0", + "react-router": "6.28.1", + "react-router-dom": "6.28.1", "turbo-stream": "2.4.0" }, "devDependencies": { diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index 4908fbef300..6420a1a956d 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -22,7 +22,7 @@ "@remix-run/node": "workspace:*", "@remix-run/react": "workspace:*", "@remix-run/router": "1.21.0", - "react-router-dom": "6.28.1-pre.0" + "react-router-dom": "6.28.1" }, "devDependencies": { "@remix-run/server-runtime": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e81c88c0ed2..225c0235a8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1253,11 +1253,11 @@ importers: specifier: workspace:* version: link:../remix-server-runtime react-router: - specifier: 6.28.1-pre.0 - version: 6.28.1-pre.0(react@18.2.0) + specifier: 6.28.1 + version: 6.28.1(react@18.2.0) react-router-dom: - specifier: 6.28.1-pre.0 - version: 6.28.1-pre.0(react-dom@18.2.0)(react@18.2.0) + specifier: 6.28.1 + version: 6.28.1(react-dom@18.2.0)(react@18.2.0) turbo-stream: specifier: 2.4.0 version: 2.4.0 @@ -1404,8 +1404,8 @@ importers: specifier: 1.21.0 version: 1.21.0 react-router-dom: - specifier: 6.28.1-pre.0 - version: 6.28.1-pre.0(react-dom@18.2.0)(react@18.2.0) + specifier: 6.28.1 + version: 6.28.1(react-dom@18.2.0)(react@18.2.0) devDependencies: '@remix-run/server-runtime': specifier: workspace:* @@ -12840,8 +12840,8 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-router-dom@6.28.1-pre.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-GdGG7PBIlWY0YsH1EsJik526Ph6DNv6WEADqY+6Tq1vZRDv6jijVc6TTsTlOMqzvfIsA3fW/y96KgkjOk0IV3A==} + /react-router-dom@6.28.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-YraE27C/RdjcZwl5UCqF/ffXnZDxpJdk9Q6jw38SZHjXs7NNdpViq2l2c7fO7+4uWaEfcwfGCv3RSg4e1By/fQ==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' @@ -12850,11 +12850,11 @@ packages: '@remix-run/router': 1.21.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.28.1-pre.0(react@18.2.0) + react-router: 6.28.1(react@18.2.0) dev: false - /react-router@6.28.1-pre.0(react@18.2.0): - resolution: {integrity: sha512-Z91mG6e7KDdmTMs0J5QcYpcOv138en8nPhNTNcC2mTAkMblce2C0rP/csExqL8xPbiCznfwglibno4au/JYFAA==} + /react-router@6.28.1(react@18.2.0): + resolution: {integrity: sha512-2omQTA3rkMljmrvvo6WtewGdVh45SpL9hGiCI9uUrwGGfNFDIvGK4gYJsKlJoNVi6AQZcopSCballL+QGOm7fA==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' From fc65dafc3367c8e0442ed850625748b523ef3e75 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 20 Dec 2024 15:50:55 -0500 Subject: [PATCH 2/2] Allow future flag warning supression with explicit false setting --- .changeset/curly-comics-bake.md | 5 +++++ packages/remix-dev/config.ts | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .changeset/curly-comics-bake.md diff --git a/.changeset/curly-comics-bake.md b/.changeset/curly-comics-bake.md new file mode 100644 index 00000000000..cf88e8a977a --- /dev/null +++ b/.changeset/curly-comics-bake.md @@ -0,0 +1,5 @@ +--- +"@remix-run/dev": patch +--- + +Allow supression of future flag warnings by setting them to `false` diff --git a/packages/remix-dev/config.ts b/packages/remix-dev/config.ts index 4dd453ea5f7..fad59a58a95 100644 --- a/packages/remix-dev/config.ts +++ b/packages/remix-dev/config.ts @@ -882,14 +882,14 @@ function logFutureFlagWarning(args: { flag: string; message: string }) { } export function logFutureFlagWarnings(future: FutureConfig) { - if (!future.v3_fetcherPersist) { + if (future.v3_fetcherPersist === undefined) { logFutureFlagWarning({ flag: "v3_fetcherPersist", message: "Fetcher persistence behavior is changing in React Router v7", }); } - if (!future.v3_lazyRouteDiscovery) { + if (future.v3_lazyRouteDiscovery === undefined) { logFutureFlagWarning({ flag: "v3_lazyRouteDiscovery", message: @@ -897,7 +897,7 @@ export function logFutureFlagWarnings(future: FutureConfig) { }); } - if (!future.v3_relativeSplatPath) { + if (future.v3_relativeSplatPath === undefined) { logFutureFlagWarning({ flag: "v3_relativeSplatPath", message: @@ -905,14 +905,14 @@ export function logFutureFlagWarnings(future: FutureConfig) { }); } - if (!future.v3_singleFetch) { + if (future.v3_singleFetch === undefined) { logFutureFlagWarning({ flag: "v3_singleFetch", message: "Data fetching is changing to a single fetch in React Router v7", }); } - if (!future.v3_throwAbortReason) { + if (future.v3_throwAbortReason === undefined) { logFutureFlagWarning({ flag: "v3_throwAbortReason", message: