From a7cffe5733c8b7d0f29bd2d8606876c537d87101 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 5 Aug 2024 08:46:52 -0700 Subject: [PATCH 1/9] Revert 9695 brophdawg11/fix initial hydration url check (#9831) Co-authored-by: Matt Brophy Co-authored-by: Remix Run Bot --- .../remix-react/__tests__/components-test.tsx | 2 +- packages/remix-react/browser.tsx | 54 +++++++++---------- packages/remix-server-runtime/server.ts | 4 +- .../remix-server-runtime/serverHandoff.ts | 2 +- 4 files changed, 28 insertions(+), 34 deletions(-) diff --git a/packages/remix-react/__tests__/components-test.tsx b/packages/remix-react/__tests__/components-test.tsx index 0f3c353ba3d..f0a30a3a1b1 100644 --- a/packages/remix-react/__tests__/components-test.tsx +++ b/packages/remix-react/__tests__/components-test.tsx @@ -293,7 +293,7 @@ describe("", () => { describe("", () => { it("handles empty default export objects from the compiler", () => { window.__remixContext = { - ssrMatches: ["root", "empty"], + url: "/", state: { loaderData: {}, }, diff --git a/packages/remix-react/browser.tsx b/packages/remix-react/browser.tsx index f0394dbe2ac..c0014b1c1e1 100644 --- a/packages/remix-react/browser.tsx +++ b/packages/remix-react/browser.tsx @@ -25,7 +25,7 @@ import { initFogOfWar, useFogOFWarDiscovery } from "./fog-of-war"; /* eslint-disable prefer-let/prefer-let */ declare global { var __remixContext: { - ssrMatches: string[]; + url: string; basename?: string; state: HydrationState; criticalCss?: string; @@ -194,6 +194,29 @@ if (import.meta && import.meta.hot) { */ export function RemixBrowser(_props: RemixBrowserProps): ReactElement { if (!router) { + // Hard reload if the path we tried to load is not the current path. + // This is usually the result of 2 rapid back/forward clicks from an + // external site into a Remix app, where we initially start the load for + // one URL and while the JS chunks are loading a second forward click moves + // us to a new URL. Avoid comparing search params because of CDNs which + // can be configured to ignore certain params and only pathname is relevant + // towards determining the route matches. + let initialPathname = window.__remixContext.url; + let hydratedPathname = window.location.pathname; + if ( + initialPathname !== hydratedPathname && + !window.__remixContext.isSpaMode + ) { + let errorMsg = + `Initial URL (${initialPathname}) does not match URL at time of hydration ` + + `(${hydratedPathname}), reloading page...`; + console.error(errorMsg); + window.location.reload(); + // Get out of here so the reload can happen - don't create the router + // since it'll then kick off unnecessary route.lazy() loads + return <>; + } + // When single fetch is enabled, we need to suspend until the initial state // snapshot is decoded into window.__remixContext.state if (window.__remixContext.future.unstable_singleFetch) { @@ -247,35 +270,6 @@ export function RemixBrowser(_props: RemixBrowserProps): ReactElement { window.location, window.__remixContext.basename ); - - // Hard reload if the matches we rendered on the server aren't the matches - // we matched in the client, otherwise we'll try to hydrate without the - // right modules and throw a hydration error, which can put React into an - // infinite hydration loop when hydrating the full `` document. - // This is usually the result of 2 rapid back/forward clicks from an - // external site into a Remix app, where we initially start the load for - // one URL and while the JS chunks are loading a second forward click moves - // us to a new URL. - let ssrMatches = window.__remixContext.ssrMatches; - let hasDifferentSSRMatches = - (initialMatches || []).length !== ssrMatches.length || - !(initialMatches || []).every((m, i) => ssrMatches[i] === m.route.id); - - if (hasDifferentSSRMatches && !window.__remixContext.isSpaMode) { - let ssr = ssrMatches.join(","); - let client = (initialMatches || []).map((m) => m.route.id).join(","); - let errorMsg = - `SSR Matches (${ssr}) do not match client matches (${client}) at ` + - `time of hydration , reloading page...`; - console.error(errorMsg); - - window.location.reload(); - - // Get out of here so the reload can happen - don't create the router - // since it'll then kick off unnecessary route.lazy() loads - return <>; - } - if (initialMatches) { for (let match of initialMatches) { let routeId = match.route.id; diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts index 865bae76063..35c2ebfef58 100644 --- a/packages/remix-server-runtime/server.ts +++ b/packages/remix-server-runtime/server.ts @@ -481,7 +481,7 @@ async function handleDocumentRequest( staticHandlerContext: context, criticalCss, serverHandoffString: createServerHandoffString({ - ssrMatches: context.matches.map((m) => m.route.id), + url: context.location.pathname, basename: build.basename, criticalCss, future: build.future, @@ -558,7 +558,7 @@ async function handleDocumentRequest( ...entryContext, staticHandlerContext: context, serverHandoffString: createServerHandoffString({ - ssrMatches: context.matches.map((m) => m.route.id), + url: context.location.pathname, basename: build.basename, future: build.future, isSpaMode: build.isSpaMode, diff --git a/packages/remix-server-runtime/serverHandoff.ts b/packages/remix-server-runtime/serverHandoff.ts index 124cb5e0711..7328388ac3d 100644 --- a/packages/remix-server-runtime/serverHandoff.ts +++ b/packages/remix-server-runtime/serverHandoff.ts @@ -20,7 +20,7 @@ export function createServerHandoffString(serverHandoff: { // we'd end up including duplicate info state?: ValidateShape; criticalCss?: string; - ssrMatches: string[]; + url: string; basename: string | undefined; future: FutureConfig; isSpaMode: boolean; From d06f11c1526800c4fcec479fbe71d60f93835c21 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 5 Aug 2024 08:53:22 -0700 Subject: [PATCH 2/9] revert changelog --- packages/remix-deno/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md index ec7fc16fa7d..5e34c802791 100644 --- a/packages/remix-deno/CHANGELOG.md +++ b/packages/remix-deno/CHANGELOG.md @@ -574,4 +574,4 @@ from return type of its related server function. ([#1254](https://github.com/remix-run/remix/pull/1254)) - Updated dependencies - - `@remix-run/server-runtime@1.6.5` + - `@remix-run/server-runtime@1.6.5` \ No newline at end of file From 6dd2757977d9029501b399f02c83d1010df692d1 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 5 Aug 2024 08:56:14 -0700 Subject: [PATCH 3/9] changeset --- .changeset/nervous-knives-exercise.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/nervous-knives-exercise.md diff --git a/.changeset/nervous-knives-exercise.md b/.changeset/nervous-knives-exercise.md new file mode 100644 index 00000000000..169fdcfc235 --- /dev/null +++ b/.changeset/nervous-knives-exercise.md @@ -0,0 +1,6 @@ +--- +"@remix-run/react": patch +"@remix-run/server-runtime": patch +--- + +Revert #9695, stop infinite reload. From c3ade483f40e8d1f70968b37a428a7628331d776 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 5 Aug 2024 08:58:29 -0700 Subject: [PATCH 4/9] enter pre-release --- .changeset/pre.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 00000000000..e9ba319d79d --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,29 @@ +{ + "mode": "pre", + "tag": "pre", + "initialVersions": { + "integration": "0.0.0", + "integration-cf-template": "0.0.0", + "integration-deno-template": "0.0.0", + "integration-node-template": "0.0.0", + "integration-vite-cloudflare-template": "0.0.0", + "integration-vite-template": "0.0.0", + "create-remix": "2.11.0", + "remix": "2.11.0", + "@remix-run/architect": "2.11.0", + "@remix-run/cloudflare": "2.11.0", + "@remix-run/cloudflare-pages": "2.11.0", + "@remix-run/cloudflare-workers": "2.11.0", + "@remix-run/css-bundle": "2.11.0", + "@remix-run/deno": "2.11.0", + "@remix-run/dev": "2.11.0", + "@remix-run/eslint-config": "2.11.0", + "@remix-run/express": "2.11.0", + "@remix-run/node": "2.11.0", + "@remix-run/react": "2.11.0", + "@remix-run/serve": "2.11.0", + "@remix-run/server-runtime": "2.11.0", + "@remix-run/testing": "2.11.0" + }, + "changesets": [] +} From 7482bc1701c698e978bfaf3a5e00d773f63657c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 09:03:16 -0700 Subject: [PATCH 5/9] chore: Update version for release (pre) (#9832) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 4 +++- .../helpers/vite-cloudflare-template/package.json | 6 +++--- packages/create-remix/CHANGELOG.md | 2 ++ packages/create-remix/package.json | 2 +- packages/remix-architect/CHANGELOG.md | 7 +++++++ packages/remix-architect/package.json | 2 +- packages/remix-cloudflare-pages/CHANGELOG.md | 7 +++++++ packages/remix-cloudflare-pages/package.json | 2 +- packages/remix-cloudflare-workers/CHANGELOG.md | 7 +++++++ packages/remix-cloudflare-workers/package.json | 2 +- packages/remix-cloudflare/CHANGELOG.md | 7 +++++++ packages/remix-cloudflare/package.json | 2 +- packages/remix-css-bundle/CHANGELOG.md | 2 ++ packages/remix-css-bundle/package.json | 2 +- packages/remix-deno/CHANGELOG.md | 9 ++++++++- packages/remix-deno/package.json | 2 +- packages/remix-dev/CHANGELOG.md | 10 ++++++++++ packages/remix-dev/package.json | 6 +++--- packages/remix-eslint-config/CHANGELOG.md | 2 ++ packages/remix-eslint-config/package.json | 2 +- packages/remix-express/CHANGELOG.md | 7 +++++++ packages/remix-express/package.json | 2 +- packages/remix-node/CHANGELOG.md | 7 +++++++ packages/remix-node/package.json | 2 +- packages/remix-react/CHANGELOG.md | 8 ++++++++ packages/remix-react/package.json | 2 +- packages/remix-serve/CHANGELOG.md | 8 ++++++++ packages/remix-serve/package.json | 2 +- packages/remix-server-runtime/CHANGELOG.md | 6 ++++++ packages/remix-server-runtime/package.json | 2 +- packages/remix-testing/CHANGELOG.md | 8 ++++++++ packages/remix-testing/package.json | 2 +- packages/remix/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 34 files changed, 124 insertions(+), 27 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index e9ba319d79d..8337de690a8 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -25,5 +25,7 @@ "@remix-run/server-runtime": "2.11.0", "@remix-run/testing": "2.11.0" }, - "changesets": [] + "changesets": [ + "nervous-knives-exercise" + ] } diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json index b8139569e00..330e86d5d1c 100644 --- a/integration/helpers/vite-cloudflare-template/package.json +++ b/integration/helpers/vite-cloudflare-template/package.json @@ -11,9 +11,9 @@ "typecheck": "tsc" }, "dependencies": { - "@remix-run/cloudflare": "2.11.0", - "@remix-run/cloudflare-pages": "2.11.0", - "@remix-run/react": "2.11.0", + "@remix-run/cloudflare": "2.11.1-pre.0", + "@remix-run/cloudflare-pages": "2.11.1-pre.0", + "@remix-run/react": "2.11.1-pre.0", "isbot": "^4.1.0", "miniflare": "^3.20231030.4", "react": "^18.2.0", diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md index 5152023c08b..8393208eb44 100644 --- a/packages/create-remix/CHANGELOG.md +++ b/packages/create-remix/CHANGELOG.md @@ -1,5 +1,7 @@ # `create-remix` +## 2.11.1-pre.0 + ## 2.11.0 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.11.0. diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json index bb23cb856e8..f7b7b7e302c 100644 --- a/packages/create-remix/package.json +++ b/packages/create-remix/package.json @@ -1,6 +1,6 @@ { "name": "create-remix", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Create a new Remix app", "homepage": "https://remix.run", "bugs": { diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md index 713b48e5839..685cc0c30a4 100644 --- a/packages/remix-architect/CHANGELOG.md +++ b/packages/remix-architect/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/architect` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.1-pre.0` + ## 2.11.0 ### Patch Changes diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json index 1a6f9613bb9..f135f7f4017 100644 --- a/packages/remix-architect/package.json +++ b/packages/remix-architect/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/architect", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Architect server request handler for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md index 02c03f650e9..b05a935d75d 100644 --- a/packages/remix-cloudflare-pages/CHANGELOG.md +++ b/packages/remix-cloudflare-pages/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/cloudflare-pages` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/cloudflare@2.11.1-pre.0` + ## 2.11.0 ### Patch Changes diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json index ab62b83db6e..5740d17d1bb 100644 --- a/packages/remix-cloudflare-pages/package.json +++ b/packages/remix-cloudflare-pages/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/cloudflare-pages", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Cloudflare Pages request handler for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md index 308c903ee8f..4fa72939479 100644 --- a/packages/remix-cloudflare-workers/CHANGELOG.md +++ b/packages/remix-cloudflare-workers/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/cloudflare-workers` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/cloudflare@2.11.1-pre.0` + ## 2.11.0 ### Patch Changes diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json index 8b80e50931e..64790657297 100644 --- a/packages/remix-cloudflare-workers/package.json +++ b/packages/remix-cloudflare-workers/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/cloudflare-workers", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Cloudflare worker request handler for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md index 0ffb761cf47..4c6b507f766 100644 --- a/packages/remix-cloudflare/CHANGELOG.md +++ b/packages/remix-cloudflare/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/cloudflare` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.1-pre.0` + ## 2.11.0 ### Minor Changes diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json index 795bc1a1f20..47f8680620f 100644 --- a/packages/remix-cloudflare/package.json +++ b/packages/remix-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/cloudflare", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Cloudflare platform abstractions for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md index 750b0f6cd21..f4cef724858 100644 --- a/packages/remix-css-bundle/CHANGELOG.md +++ b/packages/remix-css-bundle/CHANGELOG.md @@ -1,5 +1,7 @@ # @remix-run/css-bundle +## 2.11.1-pre.0 + ## 2.11.0 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.11.0. diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json index 2e1e015aeb6..a7f6796178e 100644 --- a/packages/remix-css-bundle/package.json +++ b/packages/remix-css-bundle/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/css-bundle", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "CSS bundle href when using CSS bundling features in Remix", "homepage": "https://remix.run", "bugs": { diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md index 5e34c802791..285a646c8d5 100644 --- a/packages/remix-deno/CHANGELOG.md +++ b/packages/remix-deno/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/deno` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.1-pre.0` + ## 2.11.0 ### Minor Changes @@ -574,4 +581,4 @@ from return type of its related server function. ([#1254](https://github.com/remix-run/remix/pull/1254)) - Updated dependencies - - `@remix-run/server-runtime@1.6.5` \ No newline at end of file + - `@remix-run/server-runtime@1.6.5` diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json index 3deec6e9e28..3633784ef36 100644 --- a/packages/remix-deno/package.json +++ b/packages/remix-deno/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/deno", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Deno platform abstractions for Remix", "homepage": "https://remix.run", "main": "./index.ts", diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md index 3cbba82a67b..dbb6df84b37 100644 --- a/packages/remix-dev/CHANGELOG.md +++ b/packages/remix-dev/CHANGELOG.md @@ -1,5 +1,15 @@ # `@remix-run/dev` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/react@2.11.1-pre.0` + - `@remix-run/server-runtime@2.11.1-pre.0` + - `@remix-run/node@2.11.1-pre.0` + - `@remix-run/serve@2.11.1-pre.0` + ## 2.11.0 ### Minor Changes diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index 6aa137844db..01fac40d87f 100644 --- a/packages/remix-dev/package.json +++ b/packages/remix-dev/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/dev", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Dev tools and CLI for Remix", "homepage": "https://remix.run", "bugs": { @@ -106,8 +106,8 @@ "wrangler": "^3.28.2" }, "peerDependencies": { - "@remix-run/react": "^2.11.0", - "@remix-run/serve": "^2.11.0", + "@remix-run/react": "^2.11.1-pre.0", + "@remix-run/serve": "^2.11.1-pre.0", "typescript": "^5.1.0", "vite": "^5.1.0", "wrangler": "^3.28.2" diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md index 101f52287e4..ffb869ed6c3 100644 --- a/packages/remix-eslint-config/CHANGELOG.md +++ b/packages/remix-eslint-config/CHANGELOG.md @@ -1,5 +1,7 @@ # `@remix-run/eslint-config` +## 2.11.1-pre.0 + ## 2.11.0 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.11.0. diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json index 4aa08433050..51d0b8cb60a 100644 --- a/packages/remix-eslint-config/package.json +++ b/packages/remix-eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/eslint-config", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "ESLint configuration for Remix projects", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md index e50d468c268..df850381e10 100644 --- a/packages/remix-express/CHANGELOG.md +++ b/packages/remix-express/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/express` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.1-pre.0` + ## 2.11.0 ### Patch Changes diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json index 1e6ab65af16..88159e88781 100644 --- a/packages/remix-express/package.json +++ b/packages/remix-express/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/express", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Express server request handler for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md index 4c033a6d58d..d84551b287f 100644 --- a/packages/remix-node/CHANGELOG.md +++ b/packages/remix-node/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/node` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.1-pre.0` + ## 2.11.0 ### Minor Changes diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json index 974291ce3d5..7bea2a0eecc 100644 --- a/packages/remix-node/package.json +++ b/packages/remix-node/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/node", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Node.js platform abstractions for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md index a06c685aa4a..1d1ca9c9c4c 100644 --- a/packages/remix-react/CHANGELOG.md +++ b/packages/remix-react/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/react` +## 2.11.1-pre.0 + +### Patch Changes + +- Revert #9695, stop infinite reload. ([`6dd275797`](https://github.com/remix-run/remix/commit/6dd2757977d9029501b399f02c83d1010df692d1)) +- Updated dependencies: + - `@remix-run/server-runtime@2.11.1-pre.0` + ## 2.11.0 ### Minor Changes diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index bb85e8d6c4e..7d834a46627 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/react", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "React DOM bindings for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md index c2830d6e712..a243363255a 100644 --- a/packages/remix-serve/CHANGELOG.md +++ b/packages/remix-serve/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/serve` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.1-pre.0` + - `@remix-run/express@2.11.1-pre.0` + ## 2.11.0 ### Patch Changes diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json index b3a97134bed..a6d70753c81 100644 --- a/packages/remix-serve/package.json +++ b/packages/remix-serve/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/serve", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Production application server for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md index 283ecfaf74a..20c2e308987 100644 --- a/packages/remix-server-runtime/CHANGELOG.md +++ b/packages/remix-server-runtime/CHANGELOG.md @@ -1,5 +1,11 @@ # `@remix-run/server-runtime` +## 2.11.1-pre.0 + +### Patch Changes + +- Revert #9695, stop infinite reload. ([`6dd275797`](https://github.com/remix-run/remix/commit/6dd2757977d9029501b399f02c83d1010df692d1)) + ## 2.11.0 ### Minor Changes diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index 858bf8f7cc3..aa7a422c3b4 100644 --- a/packages/remix-server-runtime/package.json +++ b/packages/remix-server-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/server-runtime", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Server runtime for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md index 7d957c34c61..501907275a8 100644 --- a/packages/remix-testing/CHANGELOG.md +++ b/packages/remix-testing/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/testing` +## 2.11.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/react@2.11.1-pre.0` + - `@remix-run/node@2.11.1-pre.0` + ## 2.11.0 ### Minor Changes diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index c319c468beb..07e7b956b26 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/testing", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "Testing utilities for Remix apps", "homepage": "https://remix.run", "bugs": { diff --git a/packages/remix/package.json b/packages/remix/package.json index 98299b21d80..bada4b32971 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -1,6 +1,6 @@ { "name": "remix", - "version": "2.11.0", + "version": "2.11.1-pre.0", "description": "A framework for building better websites", "homepage": "https://remix.run", "bugs": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a71b8096b4..40d8abdab81 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -548,13 +548,13 @@ importers: integration/helpers/vite-cloudflare-template: dependencies: '@remix-run/cloudflare': - specifier: 2.11.0 + specifier: 2.11.1-pre.0 version: link:../../../packages/remix-cloudflare '@remix-run/cloudflare-pages': - specifier: 2.11.0 + specifier: 2.11.1-pre.0 version: link:../../../packages/remix-cloudflare-pages '@remix-run/react': - specifier: 2.11.0 + specifier: 2.11.1-pre.0 version: link:../../../packages/remix-react isbot: specifier: ^4.1.0 @@ -868,7 +868,7 @@ importers: specifier: workspace:* version: link:../remix-node '@remix-run/react': - specifier: ^2.11.0 + specifier: ^2.11.1-pre.0 version: link:../remix-react '@remix-run/router': specifier: 1.19.0 From 4a5d7e3f49c1d05fdc4647ea403934ea70f579f1 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 5 Aug 2024 09:29:12 -0700 Subject: [PATCH 6/9] exit pre-release mode --- .changeset/pre.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 8337de690a8..693c5aaf392 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -1,5 +1,5 @@ { - "mode": "pre", + "mode": "exit", "tag": "pre", "initialVersions": { "integration": "0.0.0", From eed4e0bba8f2c043abf08d38e90808724538b74b Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 5 Aug 2024 09:38:18 -0700 Subject: [PATCH 7/9] update changelog --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 108a8504fd6..5923bf9ab42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -202,6 +202,34 @@ Date: YYYY-MM-DD --> +## v2.11.1 + +Date: 2024-08-05 + +### Patch Changes + +- Revert #9695, stop infinite reload. ([`6dd275797`](https://github.com/remix-run/remix/commit/6dd2757977d9029501b399f02c83d1010df692d1)) + +### Changes by Package + +- [`create-remix`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/create-remix/CHANGELOG.md#2111) +- [`@remix-run/architect`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-architect/CHANGELOG.md#2111) +- [`@remix-run/cloudflare`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-cloudflare/CHANGELOG.md#2111) +- [`@remix-run/cloudflare-pages`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-cloudflare-pages/CHANGELOG.md#2111) +- [`@remix-run/cloudflare-workers`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-cloudflare-workers/CHANGELOG.md#2111) +- [`@remix-run/css-bundle`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-css-bundle/CHANGELOG.md#2111) +- [`@remix-run/deno`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-deno/CHANGELOG.md#2111) +- [`@remix-run/dev`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-dev/CHANGELOG.md#2111) +- [`@remix-run/eslint-config`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-eslint-config/CHANGELOG.md#2111) +- [`@remix-run/express`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-express/CHANGELOG.md#2111) +- [`@remix-run/node`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-node/CHANGELOG.md#2111) +- [`@remix-run/react`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-react/CHANGELOG.md#2111) +- [`@remix-run/serve`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-serve/CHANGELOG.md#2111) +- [`@remix-run/server-runtime`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-server-runtime/CHANGELOG.md#2111) +- [`@remix-run/testing`](https://github.com/remix-run/remix/blob/remix%402.X.Y/packages/remix-testing/CHANGELOG.md#2111) + +**Full Changelog**: [`v2.11.0...v2.11.1`](https://github.com/remix-run/remix/compare/remix@2.11.0...remix@2.11.1) + ## v2.11.0 Date: 2024-08-01 From 43c8d47e72e2967c5deb855a67f2c13f09e05f29 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 5 Aug 2024 10:20:31 -0700 Subject: [PATCH 8/9] update CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5923bf9ab42..4cc46216ea5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ We manage release notes in this file instead of the paginated Github Releases Pa Table of Contents - [Remix Releases](#remix-releases) + - [v2.11.1](#v2110) + - [Patch Changes](#patch-changes) + - [Changes by Package](#changes-by-package) - [v2.11.0](#v2110) - [What's Changed](#whats-changed) - [Renamed `unstable_fogOfWar` future flag to `unstable_lazyRouteDiscovery` (unstable)](#renamed-unstable_fogofwar-future-flag-to-unstable_lazyroutediscovery-unstable) From 73fdcdc166043efcb991daba4f59ea08ce5d51f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:19:57 -0700 Subject: [PATCH 9/9] chore: Update version for release (#9833) Co-authored-by: github-actions[bot] --- .changeset/nervous-knives-exercise.md | 6 ---- .changeset/pre.json | 31 ------------------- .../vite-cloudflare-template/package.json | 6 ++-- packages/create-remix/CHANGELOG.md | 2 +- packages/create-remix/package.json | 2 +- packages/remix-architect/CHANGELOG.md | 4 +-- packages/remix-architect/package.json | 2 +- packages/remix-cloudflare-pages/CHANGELOG.md | 4 +-- packages/remix-cloudflare-pages/package.json | 2 +- .../remix-cloudflare-workers/CHANGELOG.md | 4 +-- .../remix-cloudflare-workers/package.json | 2 +- packages/remix-cloudflare/CHANGELOG.md | 4 +-- packages/remix-cloudflare/package.json | 2 +- packages/remix-css-bundle/CHANGELOG.md | 2 +- packages/remix-css-bundle/package.json | 2 +- packages/remix-deno/CHANGELOG.md | 4 +-- packages/remix-deno/package.json | 2 +- packages/remix-dev/CHANGELOG.md | 8 ++--- packages/remix-dev/package.json | 6 ++-- packages/remix-eslint-config/CHANGELOG.md | 2 +- packages/remix-eslint-config/package.json | 2 +- packages/remix-express/CHANGELOG.md | 4 +-- packages/remix-express/package.json | 2 +- packages/remix-node/CHANGELOG.md | 4 +-- packages/remix-node/package.json | 2 +- packages/remix-react/CHANGELOG.md | 6 ++-- packages/remix-react/package.json | 2 +- packages/remix-serve/CHANGELOG.md | 6 ++-- packages/remix-serve/package.json | 2 +- packages/remix-server-runtime/CHANGELOG.md | 4 +-- packages/remix-server-runtime/package.json | 2 +- packages/remix-testing/CHANGELOG.md | 6 ++-- packages/remix-testing/package.json | 2 +- packages/remix/package.json | 2 +- pnpm-lock.yaml | 8 ++--- 35 files changed, 56 insertions(+), 95 deletions(-) delete mode 100644 .changeset/nervous-knives-exercise.md delete mode 100644 .changeset/pre.json diff --git a/.changeset/nervous-knives-exercise.md b/.changeset/nervous-knives-exercise.md deleted file mode 100644 index 169fdcfc235..00000000000 --- a/.changeset/nervous-knives-exercise.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@remix-run/react": patch -"@remix-run/server-runtime": patch ---- - -Revert #9695, stop infinite reload. diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 693c5aaf392..00000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "mode": "exit", - "tag": "pre", - "initialVersions": { - "integration": "0.0.0", - "integration-cf-template": "0.0.0", - "integration-deno-template": "0.0.0", - "integration-node-template": "0.0.0", - "integration-vite-cloudflare-template": "0.0.0", - "integration-vite-template": "0.0.0", - "create-remix": "2.11.0", - "remix": "2.11.0", - "@remix-run/architect": "2.11.0", - "@remix-run/cloudflare": "2.11.0", - "@remix-run/cloudflare-pages": "2.11.0", - "@remix-run/cloudflare-workers": "2.11.0", - "@remix-run/css-bundle": "2.11.0", - "@remix-run/deno": "2.11.0", - "@remix-run/dev": "2.11.0", - "@remix-run/eslint-config": "2.11.0", - "@remix-run/express": "2.11.0", - "@remix-run/node": "2.11.0", - "@remix-run/react": "2.11.0", - "@remix-run/serve": "2.11.0", - "@remix-run/server-runtime": "2.11.0", - "@remix-run/testing": "2.11.0" - }, - "changesets": [ - "nervous-knives-exercise" - ] -} diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json index 330e86d5d1c..44304604d3c 100644 --- a/integration/helpers/vite-cloudflare-template/package.json +++ b/integration/helpers/vite-cloudflare-template/package.json @@ -11,9 +11,9 @@ "typecheck": "tsc" }, "dependencies": { - "@remix-run/cloudflare": "2.11.1-pre.0", - "@remix-run/cloudflare-pages": "2.11.1-pre.0", - "@remix-run/react": "2.11.1-pre.0", + "@remix-run/cloudflare": "2.11.1", + "@remix-run/cloudflare-pages": "2.11.1", + "@remix-run/react": "2.11.1", "isbot": "^4.1.0", "miniflare": "^3.20231030.4", "react": "^18.2.0", diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md index 8393208eb44..c579d487dd1 100644 --- a/packages/create-remix/CHANGELOG.md +++ b/packages/create-remix/CHANGELOG.md @@ -1,6 +1,6 @@ # `create-remix` -## 2.11.1-pre.0 +## 2.11.1 ## 2.11.0 diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json index f7b7b7e302c..db76346097d 100644 --- a/packages/create-remix/package.json +++ b/packages/create-remix/package.json @@ -1,6 +1,6 @@ { "name": "create-remix", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Create a new Remix app", "homepage": "https://remix.run", "bugs": { diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md index 685cc0c30a4..21a88bce46e 100644 --- a/packages/remix-architect/CHANGELOG.md +++ b/packages/remix-architect/CHANGELOG.md @@ -1,11 +1,11 @@ # `@remix-run/architect` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/node@2.11.1-pre.0` + - `@remix-run/node@2.11.1` ## 2.11.0 diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json index f135f7f4017..5811d0ba9ae 100644 --- a/packages/remix-architect/package.json +++ b/packages/remix-architect/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/architect", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Architect server request handler for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md index b05a935d75d..4d7b4e078cb 100644 --- a/packages/remix-cloudflare-pages/CHANGELOG.md +++ b/packages/remix-cloudflare-pages/CHANGELOG.md @@ -1,11 +1,11 @@ # `@remix-run/cloudflare-pages` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/cloudflare@2.11.1-pre.0` + - `@remix-run/cloudflare@2.11.1` ## 2.11.0 diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json index 5740d17d1bb..b37f29619bf 100644 --- a/packages/remix-cloudflare-pages/package.json +++ b/packages/remix-cloudflare-pages/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/cloudflare-pages", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Cloudflare Pages request handler for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md index 4fa72939479..8dd94103721 100644 --- a/packages/remix-cloudflare-workers/CHANGELOG.md +++ b/packages/remix-cloudflare-workers/CHANGELOG.md @@ -1,11 +1,11 @@ # `@remix-run/cloudflare-workers` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/cloudflare@2.11.1-pre.0` + - `@remix-run/cloudflare@2.11.1` ## 2.11.0 diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json index 64790657297..87a4da77120 100644 --- a/packages/remix-cloudflare-workers/package.json +++ b/packages/remix-cloudflare-workers/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/cloudflare-workers", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Cloudflare worker request handler for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md index 4c6b507f766..0607a4f0a1f 100644 --- a/packages/remix-cloudflare/CHANGELOG.md +++ b/packages/remix-cloudflare/CHANGELOG.md @@ -1,11 +1,11 @@ # `@remix-run/cloudflare` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/server-runtime@2.11.1-pre.0` + - `@remix-run/server-runtime@2.11.1` ## 2.11.0 diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json index 47f8680620f..f7b0a0c5c9b 100644 --- a/packages/remix-cloudflare/package.json +++ b/packages/remix-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/cloudflare", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Cloudflare platform abstractions for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md index f4cef724858..75c08e4ac8e 100644 --- a/packages/remix-css-bundle/CHANGELOG.md +++ b/packages/remix-css-bundle/CHANGELOG.md @@ -1,6 +1,6 @@ # @remix-run/css-bundle -## 2.11.1-pre.0 +## 2.11.1 ## 2.11.0 diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json index a7f6796178e..b7b7f7ced2e 100644 --- a/packages/remix-css-bundle/package.json +++ b/packages/remix-css-bundle/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/css-bundle", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "CSS bundle href when using CSS bundling features in Remix", "homepage": "https://remix.run", "bugs": { diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md index 285a646c8d5..9243091aedf 100644 --- a/packages/remix-deno/CHANGELOG.md +++ b/packages/remix-deno/CHANGELOG.md @@ -1,11 +1,11 @@ # `@remix-run/deno` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/server-runtime@2.11.1-pre.0` + - `@remix-run/server-runtime@2.11.1` ## 2.11.0 diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json index 3633784ef36..8dbdec487f9 100644 --- a/packages/remix-deno/package.json +++ b/packages/remix-deno/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/deno", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Deno platform abstractions for Remix", "homepage": "https://remix.run", "main": "./index.ts", diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md index dbb6df84b37..d27d540858e 100644 --- a/packages/remix-dev/CHANGELOG.md +++ b/packages/remix-dev/CHANGELOG.md @@ -1,14 +1,12 @@ # `@remix-run/dev` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/react@2.11.1-pre.0` - - `@remix-run/server-runtime@2.11.1-pre.0` - - `@remix-run/node@2.11.1-pre.0` - - `@remix-run/serve@2.11.1-pre.0` + - `@remix-run/server-runtime@2.11.1` + - `@remix-run/node@2.11.1` ## 2.11.0 diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index 01fac40d87f..bef865675f2 100644 --- a/packages/remix-dev/package.json +++ b/packages/remix-dev/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/dev", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Dev tools and CLI for Remix", "homepage": "https://remix.run", "bugs": { @@ -106,8 +106,8 @@ "wrangler": "^3.28.2" }, "peerDependencies": { - "@remix-run/react": "^2.11.1-pre.0", - "@remix-run/serve": "^2.11.1-pre.0", + "@remix-run/react": "^2.11.1", + "@remix-run/serve": "^2.11.1", "typescript": "^5.1.0", "vite": "^5.1.0", "wrangler": "^3.28.2" diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md index ffb869ed6c3..99ad89b2a00 100644 --- a/packages/remix-eslint-config/CHANGELOG.md +++ b/packages/remix-eslint-config/CHANGELOG.md @@ -1,6 +1,6 @@ # `@remix-run/eslint-config` -## 2.11.1-pre.0 +## 2.11.1 ## 2.11.0 diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json index 51d0b8cb60a..19839dbb0a6 100644 --- a/packages/remix-eslint-config/package.json +++ b/packages/remix-eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/eslint-config", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "ESLint configuration for Remix projects", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md index df850381e10..01fc7fda682 100644 --- a/packages/remix-express/CHANGELOG.md +++ b/packages/remix-express/CHANGELOG.md @@ -1,11 +1,11 @@ # `@remix-run/express` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/node@2.11.1-pre.0` + - `@remix-run/node@2.11.1` ## 2.11.0 diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json index 88159e88781..364502917b3 100644 --- a/packages/remix-express/package.json +++ b/packages/remix-express/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/express", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Express server request handler for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md index d84551b287f..2d62b311c64 100644 --- a/packages/remix-node/CHANGELOG.md +++ b/packages/remix-node/CHANGELOG.md @@ -1,11 +1,11 @@ # `@remix-run/node` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/server-runtime@2.11.1-pre.0` + - `@remix-run/server-runtime@2.11.1` ## 2.11.0 diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json index 7bea2a0eecc..765e0170926 100644 --- a/packages/remix-node/package.json +++ b/packages/remix-node/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/node", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Node.js platform abstractions for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md index 1d1ca9c9c4c..8557f4fd419 100644 --- a/packages/remix-react/CHANGELOG.md +++ b/packages/remix-react/CHANGELOG.md @@ -1,12 +1,12 @@ # `@remix-run/react` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes -- Revert #9695, stop infinite reload. ([`6dd275797`](https://github.com/remix-run/remix/commit/6dd2757977d9029501b399f02c83d1010df692d1)) +- Revert #9695, stop infinite reload. ([#9833](https://github.com/remix-run/remix/pull/9833)) - Updated dependencies: - - `@remix-run/server-runtime@2.11.1-pre.0` + - `@remix-run/server-runtime@2.11.1` ## 2.11.0 diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index 7d834a46627..3c976c5ccb0 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/react", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "React DOM bindings for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md index a243363255a..dee2f3f5c81 100644 --- a/packages/remix-serve/CHANGELOG.md +++ b/packages/remix-serve/CHANGELOG.md @@ -1,12 +1,12 @@ # `@remix-run/serve` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/node@2.11.1-pre.0` - - `@remix-run/express@2.11.1-pre.0` + - `@remix-run/node@2.11.1` + - `@remix-run/express@2.11.1` ## 2.11.0 diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json index a6d70753c81..c22f7d82107 100644 --- a/packages/remix-serve/package.json +++ b/packages/remix-serve/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/serve", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Production application server for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md index 20c2e308987..4f9cb6da0c2 100644 --- a/packages/remix-server-runtime/CHANGELOG.md +++ b/packages/remix-server-runtime/CHANGELOG.md @@ -1,10 +1,10 @@ # `@remix-run/server-runtime` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes -- Revert #9695, stop infinite reload. ([`6dd275797`](https://github.com/remix-run/remix/commit/6dd2757977d9029501b399f02c83d1010df692d1)) +- Revert #9695, stop infinite reload. ([#9833](https://github.com/remix-run/remix/pull/9833)) ## 2.11.0 diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index aa7a422c3b4..a6708eb6ebe 100644 --- a/packages/remix-server-runtime/package.json +++ b/packages/remix-server-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/server-runtime", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Server runtime for Remix", "bugs": { "url": "https://github.com/remix-run/remix/issues" diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md index 501907275a8..a54a13e9b93 100644 --- a/packages/remix-testing/CHANGELOG.md +++ b/packages/remix-testing/CHANGELOG.md @@ -1,12 +1,12 @@ # `@remix-run/testing` -## 2.11.1-pre.0 +## 2.11.1 ### Patch Changes - Updated dependencies: - - `@remix-run/react@2.11.1-pre.0` - - `@remix-run/node@2.11.1-pre.0` + - `@remix-run/react@2.11.1` + - `@remix-run/node@2.11.1` ## 2.11.0 diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index 07e7b956b26..4e5ff7e107c 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/testing", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "Testing utilities for Remix apps", "homepage": "https://remix.run", "bugs": { diff --git a/packages/remix/package.json b/packages/remix/package.json index bada4b32971..1991733efcd 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -1,6 +1,6 @@ { "name": "remix", - "version": "2.11.1-pre.0", + "version": "2.11.1", "description": "A framework for building better websites", "homepage": "https://remix.run", "bugs": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 40d8abdab81..c9d4ffc6a5b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -548,13 +548,13 @@ importers: integration/helpers/vite-cloudflare-template: dependencies: '@remix-run/cloudflare': - specifier: 2.11.1-pre.0 + specifier: 2.11.1 version: link:../../../packages/remix-cloudflare '@remix-run/cloudflare-pages': - specifier: 2.11.1-pre.0 + specifier: 2.11.1 version: link:../../../packages/remix-cloudflare-pages '@remix-run/react': - specifier: 2.11.1-pre.0 + specifier: 2.11.1 version: link:../../../packages/remix-react isbot: specifier: ^4.1.0 @@ -868,7 +868,7 @@ importers: specifier: workspace:* version: link:../remix-node '@remix-run/react': - specifier: ^2.11.1-pre.0 + specifier: ^2.11.1 version: link:../remix-react '@remix-run/router': specifier: 1.19.0