From 907bcdbe930d4ff197e6cd2c6506c01bebd7b9b6 Mon Sep 17 00:00:00 2001 From: Remix Run Bot Date: Thu, 1 Aug 2024 20:48:05 +0000 Subject: [PATCH 01/17] chore: format --- packages/remix-deno/CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md index 0f64f871425..ec7fc16fa7d 100644 --- a/packages/remix-deno/CHANGELOG.md +++ b/packages/remix-deno/CHANGELOG.md @@ -4,8 +4,13 @@ ### Minor Changes -- Single Fetch: Add a new `unstable_data()` API as a replacement for `json`/`defer` when custom `status`/`headers` are needed ([#9769](https://github.com/remix-run/remix/pull/9769)) -- Add a new `replace(url, init?)` alternative to `redirect(url, init?)` that performs a `history.replaceState` instead of a `history.pushState` on client-side navigation redirects ([#9764](https://github.com/remix-run/remix/pull/9764)) +- Single Fetch: Add a new `unstable_data()` API as a replacement for + `json`/`defer` when custom `status`/`headers` are needed + ([#9769](https://github.com/remix-run/remix/pull/9769)) +- Add a new `replace(url, init?)` alternative to `redirect(url, init?)` that + performs a `history.replaceState` instead of a `history.pushState` on + client-side navigation redirects + ([#9764](https://github.com/remix-run/remix/pull/9764)) ### Patch Changes From 05bb290b3cc87034bb661d0b303d3679d57632dd Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 9 Aug 2024 15:09:20 -0400 Subject: [PATCH 02/17] Fix single fetch redirects whena basename is present (#9848) --- .changeset/rich-teachers-warn.md | 5 ++ integration/single-fetch-test.ts | 65 +++++++++++++++++++ packages/remix-server-runtime/server.ts | 6 +- packages/remix-server-runtime/single-fetch.ts | 30 +++++++-- 4 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 .changeset/rich-teachers-warn.md diff --git a/.changeset/rich-teachers-warn.md b/.changeset/rich-teachers-warn.md new file mode 100644 index 00000000000..c07df3aa7c8 --- /dev/null +++ b/.changeset/rich-teachers-warn.md @@ -0,0 +1,5 @@ +--- +"@remix-run/server-runtime": patch +--- + +Single Fetch: Fix redirects when a `basename` is presernt diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts index e383ff812ab..aad153c0d41 100644 --- a/integration/single-fetch-test.ts +++ b/integration/single-fetch-test.ts @@ -1463,6 +1463,71 @@ test.describe("single-fetch", () => { expect(await app.getHtml("#target")).toContain("Target"); }); + test("processes redirects when a basename is present", async ({ page }) => { + let fixture = await createFixture({ + compiler: "vite", + files: { + ...files, + "vite.config.ts": js` + import { defineConfig } from "vite"; + import { vitePlugin as remix } from "@remix-run/dev"; + export default defineConfig({ + plugins: [ + remix({ + basename: '/base', + future: { + unstable_singleFetch: true, + } + }), + ], + }); + `, + "app/routes/data.tsx": js` + import { redirect } from '@remix-run/node'; + export function loader() { + throw redirect('/target'); + } + export default function Component() { + return null + } + `, + "app/routes/target.tsx": js` + export default function Component() { + return

Target

+ } + `, + }, + }); + + console.error = () => {}; + + let res = await fixture.requestDocument("/base/data"); + expect(res.status).toBe(302); + expect(res.headers.get("Location")).toBe("/base/target"); + expect(await res.text()).toBe(""); + + let { status, data } = await fixture.requestSingleFetchData( + "/base/data.data" + ); + expect(data).toEqual({ + [SingleFetchRedirectSymbol]: { + status: 302, + redirect: "/target", + reload: false, + replace: false, + revalidate: false, + }, + }); + expect(status).toBe(202); + + let appFixture = await createAppFixture(fixture); + let app = new PlaywrightFixture(appFixture, page); + await app.goto("/base/"); + await app.clickLink("/base/data"); + await page.waitForSelector("#target"); + expect(await app.getHtml("#target")).toContain("Target"); + }); + test("processes thrown loader errors", async ({ page }) => { let fixture = await createFixture({ config: { diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts index 35c2ebfef58..6b9a724283d 100644 --- a/packages/remix-server-runtime/server.ts +++ b/packages/remix-server-runtime/server.ts @@ -214,7 +214,11 @@ export const createRequestHandler: CreateRequestHandlerFunction = ( if (isRedirectResponse(response)) { let result: SingleFetchResult | SingleFetchResults = - getSingleFetchRedirect(response.status, response.headers); + getSingleFetchRedirect( + response.status, + response.headers, + _build.basename + ); if (request.method === "GET") { result = { diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts index e9298122a7b..b1c888f033a 100644 --- a/packages/remix-server-runtime/single-fetch.ts +++ b/packages/remix-server-runtime/single-fetch.ts @@ -8,6 +8,7 @@ import { isRouteErrorResponse, unstable_data as routerData, UNSAFE_ErrorResponseImpl as ErrorResponseImpl, + stripBasename, } from "@remix-run/router"; import { encode } from "turbo-stream"; @@ -111,7 +112,11 @@ export async function singleFetchAction( // let non-Response return values through if (isResponse(result)) { return { - result: getSingleFetchRedirect(result.status, result.headers), + result: getSingleFetchRedirect( + result.status, + result.headers, + build.basename + ), headers: result.headers, status: SINGLE_FETCH_REDIRECT_STATUS, }; @@ -122,7 +127,11 @@ export async function singleFetchAction( if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return { - result: getSingleFetchRedirect(context.statusCode, headers), + result: getSingleFetchRedirect( + context.statusCode, + headers, + build.basename + ), headers, status: SINGLE_FETCH_REDIRECT_STATUS, }; @@ -192,7 +201,8 @@ export async function singleFetchLoaders( result: { [SingleFetchRedirectSymbol]: getSingleFetchRedirect( result.status, - result.headers + result.headers, + build.basename ), }, headers: result.headers, @@ -208,7 +218,8 @@ export async function singleFetchLoaders( result: { [SingleFetchRedirectSymbol]: getSingleFetchRedirect( context.statusCode, - headers + headers, + build.basename ), }, headers, @@ -264,10 +275,17 @@ export async function singleFetchLoaders( export function getSingleFetchRedirect( status: number, - headers: Headers + headers: Headers, + basename: string | undefined ): SingleFetchRedirectResult { + let redirect = headers.get("Location")!; + + if (basename) { + redirect = stripBasename(redirect, basename) || redirect; + } + return { - redirect: headers.get("Location")!, + redirect, status, revalidate: // Technically X-Remix-Revalidate isn't needed here - that was an implementation From 50c4e9f3bf28b6e96e5916a9b879ae0f04f2bbf4 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 13 Aug 2024 15:38:39 -0700 Subject: [PATCH 03/17] fix: update turbo-stream to v2.3.0 (#9856) --- .changeset/sweet-roses-shake.md | 8 ++++++++ packages/remix-react/package.json | 2 +- packages/remix-server-runtime/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 .changeset/sweet-roses-shake.md diff --git a/.changeset/sweet-roses-shake.md b/.changeset/sweet-roses-shake.md new file mode 100644 index 00000000000..4808cc2965e --- /dev/null +++ b/.changeset/sweet-roses-shake.md @@ -0,0 +1,8 @@ +--- +"@remix-run/react": patch +"@remix-run/server-runtime": patch +--- + +fix: update turbo-stream to v2.3.0 +fix: stabilize object key order for unstable_singleFetch +fix: unstable_singleFetch can now have payloads as large as you have memory diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index 3c976c5ccb0..c502a8f928c 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -23,7 +23,7 @@ "@remix-run/server-runtime": "workspace:*", "react-router": "6.26.0", "react-router-dom": "6.26.0", - "turbo-stream": "2.2.0" + "turbo-stream": "2.3.0" }, "devDependencies": { "@remix-run/node": "workspace:*", diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index a6708eb6ebe..ebe4313bc27 100644 --- a/packages/remix-server-runtime/package.json +++ b/packages/remix-server-runtime/package.json @@ -25,7 +25,7 @@ "cookie": "^0.6.0", "set-cookie-parser": "^2.4.8", "source-map": "^0.7.3", - "turbo-stream": "2.2.0" + "turbo-stream": "2.3.0" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c9d4ffc6a5b..278822b9086 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1229,8 +1229,8 @@ importers: specifier: 6.26.0 version: 6.26.0(react-dom@18.2.0)(react@18.2.0) turbo-stream: - specifier: 2.2.0 - version: 2.2.0 + specifier: 2.3.0 + version: 2.3.0 devDependencies: '@remix-run/node': specifier: workspace:* @@ -1321,8 +1321,8 @@ importers: specifier: ^0.7.3 version: 0.7.3 turbo-stream: - specifier: 2.2.0 - version: 2.2.0 + specifier: 2.3.0 + version: 2.3.0 devDependencies: '@types/set-cookie-parser': specifier: ^2.4.1 @@ -14317,8 +14317,8 @@ packages: safe-buffer: 5.2.1 dev: false - /turbo-stream@2.2.0: - resolution: {integrity: sha512-FKFg7A0To1VU4CH9YmSMON5QphK0BXjSoiC7D9yMh+mEEbXLUP9qJ4hEt1qcjKtzncs1OpcnjZO8NgrlVbZH+g==} + /turbo-stream@2.3.0: + resolution: {integrity: sha512-PhEr9mdexoVv+rJkQ3c8TjrN3DUghX37GNJkSMksoPR4KrXIPnM2MnqRt07sViIqX9IdlhrgtTSyjoVOASq6cg==} dev: false /tweetnacl@0.14.5: From 604545245db895e0cd9cf19157ee772392d39f7d Mon Sep 17 00:00:00 2001 From: Remix Run Bot Date: Tue, 13 Aug 2024 22:40:06 +0000 Subject: [PATCH 04/17] chore: format --- .changeset/sweet-roses-shake.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/sweet-roses-shake.md b/.changeset/sweet-roses-shake.md index 4808cc2965e..67a5d1313bf 100644 --- a/.changeset/sweet-roses-shake.md +++ b/.changeset/sweet-roses-shake.md @@ -5,4 +5,4 @@ fix: update turbo-stream to v2.3.0 fix: stabilize object key order for unstable_singleFetch -fix: unstable_singleFetch can now have payloads as large as you have memory +fix: unstable_singleFetch can now have payloads as large as you have memory From 8460c77a22ae6da54f81193ba41d6d1c50308b9f Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 Aug 2024 12:05:47 -0400 Subject: [PATCH 05/17] Handle fog of war edge cases with server-known higher-scoring routes (#9860) --- .changeset/shy-ducks-repeat.md | 8 + integration/fog-of-war-test.ts | 470 +++++++++++++++++++++ integration/package.json | 2 +- packages/remix-dev/package.json | 2 +- packages/remix-react/browser.tsx | 23 +- packages/remix-react/fog-of-war.ts | 131 +++--- packages/remix-react/package.json | 6 +- packages/remix-server-runtime/package.json | 2 +- packages/remix-server-runtime/server.ts | 11 +- packages/remix-testing/package.json | 4 +- pnpm-lock.yaml | 50 +-- 11 files changed, 572 insertions(+), 137 deletions(-) create mode 100644 .changeset/shy-ducks-repeat.md diff --git a/.changeset/shy-ducks-repeat.md b/.changeset/shy-ducks-repeat.md new file mode 100644 index 00000000000..f8db29a9e9d --- /dev/null +++ b/.changeset/shy-ducks-repeat.md @@ -0,0 +1,8 @@ +--- +"@remix-run/react": patch +"@remix-run/server-runtime": patch +--- + +- Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously disscovered routes (see https://github.com/remix-run/react-router/pull/11883) + - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field +- Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) \ No newline at end of file diff --git a/integration/fog-of-war-test.ts b/integration/fog-of-war-test.ts index 70f209b238a..4a3c4b77908 100644 --- a/integration/fog-of-war-test.ts +++ b/integration/fog-of-war-test.ts @@ -818,6 +818,7 @@ test.describe("Fog of War", () => { "routes/parent._a._b", "routes/parent._a._b._index", ]); + expect(manifestRequests).toEqual([]); // Without pre-loading the index, we'd "match" `/parent` to just the // parent route client side and never fetch the children pathless/index routes @@ -841,6 +842,475 @@ test.describe("Fog of War", () => { ]); }); + test("detects higher-ranking static routes on the server when a slug match is already known by the client", async ({ + page, + }) => { + let fixture = await createFixture({ + config: { + future: { + unstable_lazyRouteDiscovery: true, + }, + }, + files: { + "app/root.tsx": js` + import { Link, Outlet, Scripts } from "@remix-run/react"; + + export default function Root() { + return ( + + + + + + + + + ); + } + `, + + "app/routes/_index.tsx": js` + export default function Index() { + return

Index

+ } + `, + "app/routes/$slug.tsx": js` + import { Link } from "@remix-run/react"; + export default function Component() { + return ( + <> +

Slug

; + Go to /static + + ); + } + `, + "app/routes/static.tsx": js` + export default function Component() { + return

Static

; + } + `, + }, + }); + let appFixture = await createAppFixture(fixture); + let app = new PlaywrightFixture(appFixture, page); + + let manifestRequests: string[] = []; + page.on("request", (req) => { + if (req.url().includes("/__manifest")) { + manifestRequests.push(req.url()); + } + }); + + await app.goto("/", true); + expect(await app.getHtml("#index")).toMatch("Index"); + expect( + await page.evaluate(() => + Object.keys((window as any).__remixManifest.routes) + ) + ).toEqual(["root", "routes/_index", "routes/$slug"]); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fsomething/), + ]); + manifestRequests = []; + + await app.clickLink("/something"); + await page.waitForSelector("#slug"); + expect(await app.getHtml("#slug")).toMatch("Slug"); + expect(manifestRequests).toEqual([]); + + // This will require a new fetch for the /static route + await app.clickLink("/static"); + await page.waitForSelector("#static"); + expect(await app.getHtml("#static")).toMatch("Static"); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fstatic/), + ]); + expect( + await page.evaluate(() => + Object.keys((window as any).__remixManifest.routes) + ) + ).toEqual(["root", "routes/_index", "routes/$slug", "routes/static"]); + }); + + test("detects higher-ranking static routes on the server when a splat match is already known by the client", async ({ + page, + }) => { + let fixture = await createFixture({ + config: { + future: { + unstable_lazyRouteDiscovery: true, + }, + }, + files: { + "app/root.tsx": js` + import { Link, Outlet, Scripts } from "@remix-run/react"; + + export default function Root() { + return ( + + + + + + + + + ); + } + `, + + "app/routes/_index.tsx": js` + export default function Index() { + return

Index

+ } + `, + "app/routes/$.tsx": js` + import { Link } from "@remix-run/react"; + export default function Component() { + return ( + <> +

Splat

; + Go to /static + + ); + } + `, + "app/routes/static.tsx": js` + export default function Component() { + return

Static

; + } + `, + }, + }); + let appFixture = await createAppFixture(fixture); + let app = new PlaywrightFixture(appFixture, page); + + let manifestRequests: string[] = []; + page.on("request", (req) => { + if (req.url().includes("/__manifest")) { + manifestRequests.push(req.url()); + } + }); + + await app.goto("/", true); + expect(await app.getHtml("#index")).toMatch("Index"); + expect( + await page.evaluate(() => + Object.keys((window as any).__remixManifest.routes) + ) + ).toEqual(["root", "routes/_index", "routes/$"]); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fsomething/), + ]); + manifestRequests = []; + + await app.clickLink("/something"); + await page.waitForSelector("#splat"); + expect(await app.getHtml("#splat")).toMatch("Splat"); + expect(manifestRequests).toEqual([]); + + // This will require a new fetch for the /static route + await app.clickLink("/static"); + await page.waitForSelector("#static"); + expect(await app.getHtml("#static")).toMatch("Static"); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fstatic/), + ]); + expect( + await page.evaluate(() => + Object.keys((window as any).__remixManifest.routes) + ) + ).toEqual(["root", "routes/_index", "routes/$", "routes/static"]); + }); + + test("does not re-request for previously discovered slug routes", async ({ + page, + }) => { + let fixture = await createFixture({ + config: { + future: { + unstable_lazyRouteDiscovery: true, + }, + }, + files: { + "app/root.tsx": js` + import { Link, Outlet, Scripts } from "@remix-run/react"; + + export default function Root() { + return ( + + + + + + + + + ); + } + `, + + "app/routes/_index.tsx": js` + export default function Index() { + return

Index

; + } + `, + "app/routes/$slug.tsx": js` + import { Link, useParams } from "@remix-run/react"; + export default function Component() { + let params = useParams(); + return

Slug: {params.slug}

; + } + `, + }, + }); + let appFixture = await createAppFixture(fixture); + let app = new PlaywrightFixture(appFixture, page); + + let manifestRequests: string[] = []; + page.on("request", (req) => { + if (req.url().includes("/__manifest")) { + manifestRequests.push(req.url()); + } + }); + + await app.goto("/", true); + expect(await app.getHtml("#index")).toMatch("Index"); + expect( + await page.evaluate(() => + Object.keys((window as any).__remixManifest.routes) + ) + ).toEqual(["root", "routes/_index"]); + expect(manifestRequests.length).toBe(0); + + // Click /a which will discover via a manifest request + await app.clickLink("/a"); + await page.waitForSelector("#slug"); + expect(await app.getHtml("#slug")).toMatch("Slug: a"); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fa/), + ]); + manifestRequests = []; + + // Go back home + await app.clickLink("/"); + await page.waitForSelector("#index"); + expect(manifestRequests).toEqual([]); + + // Click /a again which will not re-discover + await app.clickLink("/a"); + await page.waitForSelector("#slug"); + expect(await app.getHtml("#slug")).toMatch("Slug: a"); + expect(manifestRequests).toEqual([]); + manifestRequests = []; + + // Click /b which will need to discover + await app.clickLink("/b"); + await page.waitForSelector("#slug"); + expect(await app.getHtml("#slug")).toMatch("Slug: b"); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fb/), + ]); + }); + + test("does not re-request for previously discovered splat routes", async ({ + page, + }) => { + let fixture = await createFixture({ + config: { + future: { + unstable_lazyRouteDiscovery: true, + }, + }, + files: { + "app/root.tsx": js` + import { Link, Outlet, Scripts } from "@remix-run/react"; + + export default function Root() { + return ( + + + + + + + + + ); + } + `, + + "app/routes/_index.tsx": js` + export default function Index() { + return

Index

; + } + `, + "app/routes/$.tsx": js` + import { Link, useParams } from "@remix-run/react"; + export default function Component() { + let params = useParams(); + return

Splat: {params["*"]}

; + } + `, + }, + }); + let appFixture = await createAppFixture(fixture); + let app = new PlaywrightFixture(appFixture, page); + + let manifestRequests: string[] = []; + page.on("request", (req) => { + if (req.url().includes("/__manifest")) { + manifestRequests.push(req.url()); + } + }); + + await app.goto("/", true); + expect(await app.getHtml("#index")).toMatch("Index"); + expect( + await page.evaluate(() => + Object.keys((window as any).__remixManifest.routes) + ) + ).toEqual(["root", "routes/_index"]); + expect(manifestRequests.length).toBe(0); + + // Click /a which will discover via a manifest request + await app.clickLink("/a"); + await page.waitForSelector("#splat"); + expect(await app.getHtml("#splat")).toMatch("Splat: a"); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fa/), + ]); + manifestRequests = []; + + // Go back home + await app.clickLink("/"); + await page.waitForSelector("#index"); + expect(manifestRequests).toEqual([]); + + // Click /a again which will not re-discover + await app.clickLink("/a"); + await page.waitForSelector("#splat"); + expect(await app.getHtml("#splat")).toMatch("Splat: a"); + expect(manifestRequests).toEqual([]); + manifestRequests = []; + + // Click /b which will need to discover + await app.clickLink("/b/c"); + await page.waitForSelector("#splat"); + expect(await app.getHtml("#splat")).toMatch("Splat: b/c"); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fb%2Fc/), + ]); + }); + + test("does not re-request for previously navigated 404 routes", async ({ + page, + }) => { + let fixture = await createFixture({ + config: { + future: { + unstable_lazyRouteDiscovery: true, + }, + }, + files: { + "app/root.tsx": js` + import { Link, Outlet, Scripts } from "@remix-run/react"; + + export function Layout({ children }) { + return ( + + + + + {children} + + + + ); + } + export default function Root() { + return ; + } + + export function ErrorBoundary() { + return

Error

; + } + `, + + "app/routes/_index.tsx": js` + export default function Index() { + return

Index

; + } + `, + "app/routes/$slug.tsx": js` + import { Link, useParams } from "@remix-run/react"; + export default function Component() { + let params = useParams(); + return

Slug: {params.slug}

; + } + `, + }, + }); + let appFixture = await createAppFixture(fixture); + let app = new PlaywrightFixture(appFixture, page); + + let manifestRequests: string[] = []; + page.on("request", (req) => { + if (req.url().includes("/__manifest")) { + manifestRequests.push(req.url()); + } + }); + + await app.goto("/", true); + expect(await app.getHtml("#index")).toMatch("Index"); + expect( + await page.evaluate(() => + Object.keys((window as any).__remixManifest.routes) + ) + ).toEqual(["root", "routes/_index"]); + expect(manifestRequests.length).toBe(0); + + // Click a 404 link which will try to discover via a manifest request + await app.clickLink("/not/a/path"); + await page.waitForSelector("#error"); + expect(manifestRequests).toEqual([ + expect.stringMatching( + /\/__manifest\?version=[a-z0-9]{8}&p=%2Fnot%2Fa%2Fpath/ + ), + ]); + manifestRequests = []; + + // Go to a valid slug route + await app.clickLink("/something"); + await page.waitForSelector("#slug"); + expect(manifestRequests).toEqual([ + expect.stringMatching(/\/__manifest\?version=[a-z0-9]{8}&p=%2Fsomething/), + ]); + manifestRequests = []; + + // Click the same 404 link again which will not re-discover + await app.clickLink("/not/a/path"); + await page.waitForSelector("#error"); + expect(manifestRequests).toEqual([]); + }); + test("skips prefetching if the URL gets too large", async ({ page }) => { let fixture = await createFixture({ config: { diff --git a/integration/package.json b/integration/package.json index cbdae1b26a2..5b6aac81978 100644 --- a/integration/package.json +++ b/integration/package.json @@ -14,7 +14,7 @@ "@remix-run/dev": "workspace:*", "@remix-run/express": "workspace:*", "@remix-run/node": "workspace:*", - "@remix-run/router": "1.19.0", + "@remix-run/router": "0.0.0-experimental-5a6545bf7", "@remix-run/server-runtime": "workspace:*", "@types/express": "^4.17.9", "@vanilla-extract/css": "^1.10.0", diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index bef865675f2..abbcaf0a1e9 100644 --- a/packages/remix-dev/package.json +++ b/packages/remix-dev/package.json @@ -32,7 +32,7 @@ "@mdx-js/mdx": "^2.3.0", "@npmcli/package-json": "^4.0.1", "@remix-run/node": "workspace:*", - "@remix-run/router": "1.19.0", + "@remix-run/router": "0.0.0-experimental-5a6545bf7", "@remix-run/server-runtime": "workspace:*", "@types/mdx": "^2.0.5", "@vanilla-extract/integration": "^6.2.0", diff --git a/packages/remix-react/browser.tsx b/packages/remix-react/browser.tsx index c0014b1c1e1..b7b65cb6bf9 100644 --- a/packages/remix-react/browser.tsx +++ b/packages/remix-react/browser.tsx @@ -20,7 +20,10 @@ import { getSingleFetchDataStrategy, } from "./single-fetch"; import invariant from "./invariant"; -import { initFogOfWar, useFogOFWarDiscovery } from "./fog-of-war"; +import { + getPatchRoutesOnNavigationFunction, + useFogOFWarDiscovery, +} from "./fog-of-war"; /* eslint-disable prefer-let/prefer-let */ declare global { @@ -305,14 +308,6 @@ export function RemixBrowser(_props: RemixBrowserProps): ReactElement { } } - let { enabled: isFogOfWarEnabled, patchRoutesOnMiss } = initFogOfWar( - window.__remixManifest, - window.__remixRouteModules, - window.__remixContext.future, - window.__remixContext.isSpaMode, - window.__remixContext.basename - ); - // We don't use createBrowserRouter here because we need fine-grained control // over initialization to support synchronous `clientLoader` flows. router = createRouter({ @@ -337,9 +332,13 @@ export function RemixBrowser(_props: RemixBrowserProps): ReactElement { window.__remixRouteModules ) : undefined, - ...(isFogOfWarEnabled - ? { unstable_patchRoutesOnMiss: patchRoutesOnMiss } - : {}), + unstable_patchRoutesOnNavigation: getPatchRoutesOnNavigationFunction( + window.__remixManifest, + window.__remixRouteModules, + window.__remixContext.future, + window.__remixContext.isSpaMode, + window.__remixContext.basename + ), }); // We can call initialize() immediately if the router doesn't have any diff --git a/packages/remix-react/fog-of-war.ts b/packages/remix-react/fog-of-war.ts index d2fd22ecdbb..033d4624a09 100644 --- a/packages/remix-react/fog-of-war.ts +++ b/packages/remix-react/fog-of-war.ts @@ -1,7 +1,7 @@ import type { Router } from "@remix-run/router"; import { matchRoutes } from "@remix-run/router"; import * as React from "react"; -import type { unstable_PatchRoutesOnMissFunction } from "react-router"; +import type { unstable_PatchRoutesOnNavigationFunction } from "react-router"; import type { AssetsManifest, FutureConfig } from "./entry"; import type { RouteModules } from "./routeModules"; @@ -13,23 +13,18 @@ declare global { } } -type FogOfWarInfo = { - // Currently rendered links that may need prefetching - nextPaths: Set; - // Paths we know the client can already match, so no need to perform client-side - // matching or prefetching for them. Just an optimization to avoid re-matching - // on a larger and larger route tree over time - knownGoodPaths: Set; - // Routes the server was unable to match - don't ask for them again - known404Paths: Set; -}; +// Currently rendered links that may need prefetching +const nextPaths = new Set(); + +// FIFO queue of previously discovered routes to prevent re-calling on +// subsequent navigations to the same path +const discoveredPathsMaxSize = 1000; +const discoveredPaths = new Set(); // 7.5k to come in under the ~8k limit for most browsers // https://stackoverflow.com/a/417184 const URL_LIMIT = 7680; -let fogOfWar: FogOfWarInfo | null = null; - export function isFogOfWarEnabled(future: FutureConfig, isSpaMode: boolean) { return future.unstable_lazyRouteDiscovery === true && !isSpaMode; } @@ -69,46 +64,29 @@ export function getPartialManifest(manifest: AssetsManifest, router: Router) { }; } -export function initFogOfWar( +export function getPatchRoutesOnNavigationFunction( manifest: AssetsManifest, routeModules: RouteModules, future: FutureConfig, isSpaMode: boolean, basename: string | undefined -): { - enabled: boolean; - patchRoutesOnMiss?: unstable_PatchRoutesOnMissFunction; -} { +): unstable_PatchRoutesOnNavigationFunction | undefined { if (!isFogOfWarEnabled(future, isSpaMode)) { - return { enabled: false }; + return undefined; } - - fogOfWar = { - nextPaths: new Set(), - knownGoodPaths: new Set(), - known404Paths: new Set(), - }; - - return { - enabled: true, - patchRoutesOnMiss: async ({ path, patch }) => { - if ( - fogOfWar!.known404Paths.has(path) || - fogOfWar!.knownGoodPaths.has(path) - ) { - return; - } - await fetchAndApplyManifestPatches( - [path], - fogOfWar!, - manifest, - routeModules, - future, - isSpaMode, - basename, - patch - ); - }, + return async ({ path, patch }) => { + if (discoveredPaths.has(path)) { + return; + } + await fetchAndApplyManifestPatches( + [path], + manifest, + routeModules, + future, + isSpaMode, + basename, + patch + ); }; } @@ -138,16 +116,21 @@ export function useFogOFWarDiscovery( return; } let url = new URL(path, window.location.origin); - let { knownGoodPaths, known404Paths, nextPaths } = fogOfWar!; - if (knownGoodPaths.has(url.pathname) || known404Paths.has(url.pathname)) { - return; + if (!discoveredPaths.has(url.pathname)) { + nextPaths.add(url.pathname); } - nextPaths.add(url.pathname); } // Fetch patches for all currently rendered links async function fetchPatches() { - let lazyPaths = getFogOfWarPaths(fogOfWar!, router); + let lazyPaths = Array.from(nextPaths.keys()).filter((path) => { + if (discoveredPaths.has(path)) { + nextPaths.delete(path); + return false; + } + return true; + }); + if (lazyPaths.length === 0) { return; } @@ -155,7 +138,6 @@ export function useFogOFWarDiscovery( try { await fetchAndApplyManifestPatches( lazyPaths, - fogOfWar!, manifest, routeModules, future, @@ -218,26 +200,8 @@ export function useFogOFWarDiscovery( }, [future, isSpaMode, manifest, routeModules, router]); } -function getFogOfWarPaths(fogOfWar: FogOfWarInfo, router: Router) { - let { knownGoodPaths, known404Paths, nextPaths } = fogOfWar; - return Array.from(nextPaths.keys()).filter((path) => { - if (knownGoodPaths.has(path)) { - nextPaths.delete(path); - return false; - } - - if (known404Paths.has(path)) { - nextPaths.delete(path); - return false; - } - - return true; - }); -} - export async function fetchAndApplyManifestPatches( paths: string[], - _fogOfWar: FogOfWarInfo, manifest: AssetsManifest, routeModules: RouteModules, future: FutureConfig, @@ -245,7 +209,6 @@ export async function fetchAndApplyManifestPatches( basename: string | undefined, patchRoutes: Router["patchRoutes"] ): Promise { - let { nextPaths, knownGoodPaths, known404Paths } = _fogOfWar; let manifestPath = `${basename ?? "/"}/__manifest`.replace(/\/+/g, "/"); let url = new URL(manifestPath, window.location.origin); url.searchParams.set("version", manifest.version); @@ -267,16 +230,11 @@ export async function fetchAndApplyManifestPatches( throw new Error(await res.text()); } - let data = (await res.json()) as { - notFoundPaths: string[]; - patches: AssetsManifest["routes"]; - }; - - // Capture this before we apply the patches to the manifest - let knownRoutes = new Set(Object.keys(manifest.routes)); + let serverPatches = (await res.json()) as AssetsManifest["routes"]; // Patch routes we don't know about yet into the manifest - let patches: AssetsManifest["routes"] = Object.values(data.patches).reduce( + let knownRoutes = new Set(Object.keys(manifest.routes)); + let patches: AssetsManifest["routes"] = Object.values(serverPatches).reduce( (acc, route) => !knownRoutes.has(route.id) ? Object.assign(acc, { [route.id]: route }) @@ -285,11 +243,8 @@ export async function fetchAndApplyManifestPatches( ); Object.assign(manifest.routes, patches); - // Track legit 404s so we don't try to fetch them again - data.notFoundPaths.forEach((p) => known404Paths.add(p)); - - // Track matched paths so we don't have to fetch them again - paths.forEach((p) => knownGoodPaths.add(p)); + // Track discovered paths so we don't have to fetch them again + paths.forEach((p) => addToFifoQueue(p, discoveredPaths)); // Identify all parentIds for which we have new children to add and patch // in their new children @@ -314,6 +269,14 @@ export async function fetchAndApplyManifestPatches( ); } +function addToFifoQueue(path: string, queue: Set) { + if (queue.size >= discoveredPathsMaxSize) { + let first = queue.values().next().value; + queue.delete(first); + } + queue.add(path); +} + // Thanks Josh! // https://www.joshwcomeau.com/snippets/javascript/debounce/ function debounce(callback: (...args: unknown[]) => unknown, wait: number) { diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index c502a8f928c..8ae187a55f7 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -19,10 +19,10 @@ "tsc": "tsc" }, "dependencies": { - "@remix-run/router": "1.19.0", + "@remix-run/router": "0.0.0-experimental-5a6545bf7", "@remix-run/server-runtime": "workspace:*", - "react-router": "6.26.0", - "react-router-dom": "6.26.0", + "react-router": "0.0.0-experimental-5a6545bf7", + "react-router-dom": "0.0.0-experimental-5a6545bf7", "turbo-stream": "2.3.0" }, "devDependencies": { diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index ebe4313bc27..07ceb6156f0 100644 --- a/packages/remix-server-runtime/package.json +++ b/packages/remix-server-runtime/package.json @@ -19,7 +19,7 @@ "tsc": "tsc" }, "dependencies": { - "@remix-run/router": "1.19.0", + "@remix-run/router": "0.0.0-experimental-5a6545bf7", "@types/cookie": "^0.6.0", "@web3-storage/multipart-parser": "^1.0.0", "cookie": "^0.6.0", diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts index 6b9a724283d..a0aadba33bb 100644 --- a/packages/remix-server-runtime/server.ts +++ b/packages/remix-server-runtime/server.ts @@ -290,10 +290,7 @@ async function handleManifestRequest( routes: ServerRoute[], url: URL ) { - let data: { - patches: Record; - notFoundPaths: string[]; - } = { patches: {}, notFoundPaths: [] }; + let patches: Record = {}; if (url.searchParams.has("p")) { for (let path of url.searchParams.getAll("p")) { @@ -301,14 +298,12 @@ async function handleManifestRequest( if (matches) { for (let match of matches) { let routeId = match.route.id; - data.patches[routeId] = build.assets.routes[routeId]; + patches[routeId] = build.assets.routes[routeId]; } - } else { - data.notFoundPaths.push(path); } } - return json(data, { + return json(patches, { headers: { "Cache-Control": "public, max-age=31536000, immutable", }, diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index 4e5ff7e107c..a3df6276c4f 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -21,8 +21,8 @@ "dependencies": { "@remix-run/node": "workspace:*", "@remix-run/react": "workspace:*", - "@remix-run/router": "1.19.0", - "react-router-dom": "6.26.0" + "@remix-run/router": "0.0.0-experimental-5a6545bf7", + "react-router-dom": "0.0.0-experimental-5a6545bf7" }, "devDependencies": { "@remix-run/server-runtime": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 278822b9086..bf410d94482 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -323,8 +323,8 @@ importers: specifier: workspace:* version: link:../packages/remix-node '@remix-run/router': - specifier: 1.19.0 - version: 1.19.0 + specifier: 0.0.0-experimental-5a6545bf7 + version: 0.0.0-experimental-5a6545bf7 '@remix-run/server-runtime': specifier: workspace:* version: link:../packages/remix-server-runtime @@ -871,8 +871,8 @@ importers: specifier: ^2.11.1 version: link:../remix-react '@remix-run/router': - specifier: 1.19.0 - version: 1.19.0 + specifier: 0.0.0-experimental-5a6545bf7 + version: 0.0.0-experimental-5a6545bf7 '@remix-run/server-runtime': specifier: workspace:* version: link:../remix-server-runtime @@ -1217,17 +1217,17 @@ importers: packages/remix-react: dependencies: '@remix-run/router': - specifier: 1.19.0 - version: 1.19.0 + specifier: 0.0.0-experimental-5a6545bf7 + version: 0.0.0-experimental-5a6545bf7 '@remix-run/server-runtime': specifier: workspace:* version: link:../remix-server-runtime react-router: - specifier: 6.26.0 - version: 6.26.0(react@18.2.0) + specifier: 0.0.0-experimental-5a6545bf7 + version: 0.0.0-experimental-5a6545bf7(react@18.2.0) react-router-dom: - specifier: 6.26.0 - version: 6.26.0(react-dom@18.2.0)(react@18.2.0) + specifier: 0.0.0-experimental-5a6545bf7 + version: 0.0.0-experimental-5a6545bf7(react-dom@18.2.0)(react@18.2.0) turbo-stream: specifier: 2.3.0 version: 2.3.0 @@ -1303,8 +1303,8 @@ importers: packages/remix-server-runtime: dependencies: '@remix-run/router': - specifier: 1.19.0 - version: 1.19.0 + specifier: 0.0.0-experimental-5a6545bf7 + version: 0.0.0-experimental-5a6545bf7 '@types/cookie': specifier: ^0.6.0 version: 0.6.0 @@ -1340,11 +1340,11 @@ importers: specifier: workspace:* version: link:../remix-react '@remix-run/router': - specifier: 1.19.0 - version: 1.19.0 + specifier: 0.0.0-experimental-5a6545bf7 + version: 0.0.0-experimental-5a6545bf7 react-router-dom: - specifier: 6.26.0 - version: 6.26.0(react-dom@18.2.0)(react@18.2.0) + specifier: 0.0.0-experimental-5a6545bf7 + version: 0.0.0-experimental-5a6545bf7(react-dom@18.2.0)(react@18.2.0) devDependencies: '@remix-run/server-runtime': specifier: workspace:* @@ -4201,8 +4201,8 @@ packages: - encoding dev: false - /@remix-run/router@1.19.0: - resolution: {integrity: sha512-zDICCLKEwbVYTS6TjYaWtHXxkdoUvD/QXvyVZjGCsWz5vyH7aFeONlPffPdW+Y/t6KT0MgXb2Mfjun9YpWN1dA==} + /@remix-run/router@0.0.0-experimental-5a6545bf7: + resolution: {integrity: sha512-xsFyd1dMF1kRAVwUWas7iYjhBL0z7//dQ8bVoQ3kXfgWgN7A/WX2M74PrYfa1Qe3xfgvw8h1yjbHRBvM7FA8QA==} engines: {node: '>=14.0.0'} dev: false @@ -12786,26 +12786,26 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-router-dom@6.26.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-RRGUIiDtLrkX3uYcFiCIxKFWMcWQGMojpYZfcstc63A1+sSnVgILGIm9gNUA6na3Fm1QuPGSBQH2EMbAZOnMsQ==} + /react-router-dom@0.0.0-experimental-5a6545bf7(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-fidHtQFuYr6KW2KwXfXrRQFY7jqmJba3h9CY+y7KGHNtt7UxG3tJh4hpm6zhfvHMMX9ONWtNkTYIHjazDh2JBg==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 1.19.0 + '@remix-run/router': 0.0.0-experimental-5a6545bf7 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.26.0(react@18.2.0) + react-router: 0.0.0-experimental-5a6545bf7(react@18.2.0) dev: false - /react-router@6.26.0(react@18.2.0): - resolution: {integrity: sha512-wVQq0/iFYd3iZ9H2l3N3k4PL8EEHcb0XlU2Na8nEwmiXgIUElEH6gaJDtUQxJ+JFzmIXaQjfdpcGWaM6IoQGxg==} + /react-router@0.0.0-experimental-5a6545bf7(react@18.2.0): + resolution: {integrity: sha512-88Ft7yZN0q99d+s4RMV6kaXWLjMMHvGZuOIcOXJ+yVgLOQXXiq8xFBD40D4pyaHYtuo7tR+NK9ti8rhhFx1poA==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 1.19.0 + '@remix-run/router': 0.0.0-experimental-5a6545bf7 react: 18.2.0 dev: false From 1737ac7ca60b83b5ab9dafa2a63a3db98940912a Mon Sep 17 00:00:00 2001 From: Remix Run Bot Date: Wed, 14 Aug 2024 16:07:18 +0000 Subject: [PATCH 06/17] chore: format --- .changeset/shy-ducks-repeat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/shy-ducks-repeat.md b/.changeset/shy-ducks-repeat.md index f8db29a9e9d..8620d7d9d2e 100644 --- a/.changeset/shy-ducks-repeat.md +++ b/.changeset/shy-ducks-repeat.md @@ -5,4 +5,4 @@ - Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously disscovered routes (see https://github.com/remix-run/react-router/pull/11883) - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field -- Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) \ No newline at end of file +- Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) From dfc3401f7ce79774ecd708d741dfdca6758b0871 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 Aug 2024 13:59:50 -0400 Subject: [PATCH 07/17] Bump RR dependency (#9861) --- integration/package.json | 2 +- 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 +- pnpm-lock.yaml | 50 +++++++++++----------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/integration/package.json b/integration/package.json index 5b6aac81978..1ea9256ffcd 100644 --- a/integration/package.json +++ b/integration/package.json @@ -14,7 +14,7 @@ "@remix-run/dev": "workspace:*", "@remix-run/express": "workspace:*", "@remix-run/node": "workspace:*", - "@remix-run/router": "0.0.0-experimental-5a6545bf7", + "@remix-run/router": "1.19.1-pre.0", "@remix-run/server-runtime": "workspace:*", "@types/express": "^4.17.9", "@vanilla-extract/css": "^1.10.0", diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index abbcaf0a1e9..0a25a1495ab 100644 --- a/packages/remix-dev/package.json +++ b/packages/remix-dev/package.json @@ -32,7 +32,7 @@ "@mdx-js/mdx": "^2.3.0", "@npmcli/package-json": "^4.0.1", "@remix-run/node": "workspace:*", - "@remix-run/router": "0.0.0-experimental-5a6545bf7", + "@remix-run/router": "1.19.1-pre.0", "@remix-run/server-runtime": "workspace:*", "@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 8ae187a55f7..1f5a2216f05 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -19,10 +19,10 @@ "tsc": "tsc" }, "dependencies": { - "@remix-run/router": "0.0.0-experimental-5a6545bf7", + "@remix-run/router": "1.19.1-pre.0", "@remix-run/server-runtime": "workspace:*", - "react-router": "0.0.0-experimental-5a6545bf7", - "react-router-dom": "0.0.0-experimental-5a6545bf7", + "react-router": "6.26.1-pre.0", + "react-router-dom": "6.26.1-pre.0", "turbo-stream": "2.3.0" }, "devDependencies": { diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index 07ceb6156f0..e9237650fdb 100644 --- a/packages/remix-server-runtime/package.json +++ b/packages/remix-server-runtime/package.json @@ -19,7 +19,7 @@ "tsc": "tsc" }, "dependencies": { - "@remix-run/router": "0.0.0-experimental-5a6545bf7", + "@remix-run/router": "1.19.1-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 a3df6276c4f..13ea400d6ca 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -21,8 +21,8 @@ "dependencies": { "@remix-run/node": "workspace:*", "@remix-run/react": "workspace:*", - "@remix-run/router": "0.0.0-experimental-5a6545bf7", - "react-router-dom": "0.0.0-experimental-5a6545bf7" + "@remix-run/router": "1.19.1-pre.0", + "react-router-dom": "6.26.1-pre.0" }, "devDependencies": { "@remix-run/server-runtime": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bf410d94482..f2d7d8c3583 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -323,8 +323,8 @@ importers: specifier: workspace:* version: link:../packages/remix-node '@remix-run/router': - specifier: 0.0.0-experimental-5a6545bf7 - version: 0.0.0-experimental-5a6545bf7 + specifier: 1.19.1-pre.0 + version: 1.19.1-pre.0 '@remix-run/server-runtime': specifier: workspace:* version: link:../packages/remix-server-runtime @@ -871,8 +871,8 @@ importers: specifier: ^2.11.1 version: link:../remix-react '@remix-run/router': - specifier: 0.0.0-experimental-5a6545bf7 - version: 0.0.0-experimental-5a6545bf7 + specifier: 1.19.1-pre.0 + version: 1.19.1-pre.0 '@remix-run/server-runtime': specifier: workspace:* version: link:../remix-server-runtime @@ -1217,17 +1217,17 @@ importers: packages/remix-react: dependencies: '@remix-run/router': - specifier: 0.0.0-experimental-5a6545bf7 - version: 0.0.0-experimental-5a6545bf7 + specifier: 1.19.1-pre.0 + version: 1.19.1-pre.0 '@remix-run/server-runtime': specifier: workspace:* version: link:../remix-server-runtime react-router: - specifier: 0.0.0-experimental-5a6545bf7 - version: 0.0.0-experimental-5a6545bf7(react@18.2.0) + specifier: 6.26.1-pre.0 + version: 6.26.1-pre.0(react@18.2.0) react-router-dom: - specifier: 0.0.0-experimental-5a6545bf7 - version: 0.0.0-experimental-5a6545bf7(react-dom@18.2.0)(react@18.2.0) + specifier: 6.26.1-pre.0 + version: 6.26.1-pre.0(react-dom@18.2.0)(react@18.2.0) turbo-stream: specifier: 2.3.0 version: 2.3.0 @@ -1303,8 +1303,8 @@ importers: packages/remix-server-runtime: dependencies: '@remix-run/router': - specifier: 0.0.0-experimental-5a6545bf7 - version: 0.0.0-experimental-5a6545bf7 + specifier: 1.19.1-pre.0 + version: 1.19.1-pre.0 '@types/cookie': specifier: ^0.6.0 version: 0.6.0 @@ -1340,11 +1340,11 @@ importers: specifier: workspace:* version: link:../remix-react '@remix-run/router': - specifier: 0.0.0-experimental-5a6545bf7 - version: 0.0.0-experimental-5a6545bf7 + specifier: 1.19.1-pre.0 + version: 1.19.1-pre.0 react-router-dom: - specifier: 0.0.0-experimental-5a6545bf7 - version: 0.0.0-experimental-5a6545bf7(react-dom@18.2.0)(react@18.2.0) + specifier: 6.26.1-pre.0 + version: 6.26.1-pre.0(react-dom@18.2.0)(react@18.2.0) devDependencies: '@remix-run/server-runtime': specifier: workspace:* @@ -4201,8 +4201,8 @@ packages: - encoding dev: false - /@remix-run/router@0.0.0-experimental-5a6545bf7: - resolution: {integrity: sha512-xsFyd1dMF1kRAVwUWas7iYjhBL0z7//dQ8bVoQ3kXfgWgN7A/WX2M74PrYfa1Qe3xfgvw8h1yjbHRBvM7FA8QA==} + /@remix-run/router@1.19.1-pre.0: + resolution: {integrity: sha512-5d0nLNwmjZEcufZl8OAMRadEynNd9h8rGkFgqFY+5wQRL5H6SRuaJpcaWqtSJRwMRLg2MBoHNI23uxWsEsm14g==} engines: {node: '>=14.0.0'} dev: false @@ -12786,26 +12786,26 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-router-dom@0.0.0-experimental-5a6545bf7(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-fidHtQFuYr6KW2KwXfXrRQFY7jqmJba3h9CY+y7KGHNtt7UxG3tJh4hpm6zhfvHMMX9ONWtNkTYIHjazDh2JBg==} + /react-router-dom@6.26.1-pre.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-rr1u+sgemQ6L7q2E0q6syU3w7LABWWlePBJ1s1+B5NKujMUJDAziUEAxD43r0J2dZKsdZQvD2vqmlUbtQBFqPw==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 0.0.0-experimental-5a6545bf7 + '@remix-run/router': 1.19.1-pre.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 0.0.0-experimental-5a6545bf7(react@18.2.0) + react-router: 6.26.1-pre.0(react@18.2.0) dev: false - /react-router@0.0.0-experimental-5a6545bf7(react@18.2.0): - resolution: {integrity: sha512-88Ft7yZN0q99d+s4RMV6kaXWLjMMHvGZuOIcOXJ+yVgLOQXXiq8xFBD40D4pyaHYtuo7tR+NK9ti8rhhFx1poA==} + /react-router@6.26.1-pre.0(react@18.2.0): + resolution: {integrity: sha512-8HL55H0kg/Qapx1nrz+vM3c/kiF7DzR2/EtaWDz5gL07JSyzMvGnp9LyFvpaZNAVYj+2ZNdg6af9QJbNUAFgbQ==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 0.0.0-experimental-5a6545bf7 + '@remix-run/router': 1.19.1-pre.0 react: 18.2.0 dev: false From 4f08c5adec9c4af8af498733e0c4cf56968024a9 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 Aug 2024 14:01:29 -0400 Subject: [PATCH 08/17] Enter prerelease mode --- .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..4c8ded96e25 --- /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.1", + "remix": "2.11.1", + "@remix-run/architect": "2.11.1", + "@remix-run/cloudflare": "2.11.1", + "@remix-run/cloudflare-pages": "2.11.1", + "@remix-run/cloudflare-workers": "2.11.1", + "@remix-run/css-bundle": "2.11.1", + "@remix-run/deno": "2.11.1", + "@remix-run/dev": "2.11.1", + "@remix-run/eslint-config": "2.11.1", + "@remix-run/express": "2.11.1", + "@remix-run/node": "2.11.1", + "@remix-run/react": "2.11.1", + "@remix-run/serve": "2.11.1", + "@remix-run/server-runtime": "2.11.1", + "@remix-run/testing": "2.11.1" + }, + "changesets": [] +} From 6a4e51fb794c89a2b6a703858218338346bc1dd5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 14:12:25 -0400 Subject: [PATCH 09/17] chore: Update version for release (pre) (#9862) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 6 +++++- .../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 | 7 +++++++ 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 | 13 +++++++++++++ packages/remix-react/package.json | 2 +- packages/remix-serve/CHANGELOG.md | 8 ++++++++ packages/remix-serve/package.json | 2 +- packages/remix-server-runtime/CHANGELOG.md | 12 ++++++++++++ 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, 136 insertions(+), 26 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 4c8ded96e25..c4203a8f203 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -25,5 +25,9 @@ "@remix-run/server-runtime": "2.11.1", "@remix-run/testing": "2.11.1" }, - "changesets": [] + "changesets": [ + "rich-teachers-warn", + "shy-ducks-repeat", + "sweet-roses-shake" + ] } diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json index 44304604d3c..98868d7d8f9 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", - "@remix-run/cloudflare-pages": "2.11.1", - "@remix-run/react": "2.11.1", + "@remix-run/cloudflare": "2.11.2-pre.0", + "@remix-run/cloudflare-pages": "2.11.2-pre.0", + "@remix-run/react": "2.11.2-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 c579d487dd1..4bb6994f8f6 100644 --- a/packages/create-remix/CHANGELOG.md +++ b/packages/create-remix/CHANGELOG.md @@ -1,5 +1,7 @@ # `create-remix` +## 2.11.2-pre.0 + ## 2.11.1 ## 2.11.0 diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json index db76346097d..9649734d6e0 100644 --- a/packages/create-remix/package.json +++ b/packages/create-remix/package.json @@ -1,6 +1,6 @@ { "name": "create-remix", - "version": "2.11.1", + "version": "2.11.2-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 21a88bce46e..da3754ca701 100644 --- a/packages/remix-architect/CHANGELOG.md +++ b/packages/remix-architect/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/architect` +## 2.11.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json index 5811d0ba9ae..ed3cc6b5490 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", + "version": "2.11.2-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 4d7b4e078cb..168c5ec8b65 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.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/cloudflare@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json index b37f29619bf..e6eb6b070b1 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", + "version": "2.11.2-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 8dd94103721..5e067899fff 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.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/cloudflare@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json index 87a4da77120..8c6a464ddcd 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", + "version": "2.11.2-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 0607a4f0a1f..a1ec7e24780 100644 --- a/packages/remix-cloudflare/CHANGELOG.md +++ b/packages/remix-cloudflare/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/cloudflare` +## 2.11.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json index f7b0a0c5c9b..060980f325f 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", + "version": "2.11.2-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 75c08e4ac8e..11b7dabfa36 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.2-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 b7b7f7ced2e..4c093de51b7 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", + "version": "2.11.2-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 9243091aedf..8358992e819 100644 --- a/packages/remix-deno/CHANGELOG.md +++ b/packages/remix-deno/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/deno` +## 2.11.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json index 8dbdec487f9..d43a35347a4 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", + "version": "2.11.2-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 d27d540858e..1da91b72f07 100644 --- a/packages/remix-dev/CHANGELOG.md +++ b/packages/remix-dev/CHANGELOG.md @@ -1,5 +1,15 @@ # `@remix-run/dev` +## 2.11.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.0` + - `@remix-run/react@2.11.2-pre.0` + - `@remix-run/node@2.11.2-pre.0` + - `@remix-run/serve@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index 0a25a1495ab..c50dbfe8fb5 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", + "version": "2.11.2-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.1", - "@remix-run/serve": "^2.11.1", + "@remix-run/react": "^2.11.2-pre.0", + "@remix-run/serve": "^2.11.2-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 99ad89b2a00..9ad0437bef9 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.2-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 19839dbb0a6..03727486f23 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", + "version": "2.11.2-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 01fc7fda682..ad9480aaa31 100644 --- a/packages/remix-express/CHANGELOG.md +++ b/packages/remix-express/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/express` +## 2.11.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json index 364502917b3..05bc46c6bd8 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", + "version": "2.11.2-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 2d62b311c64..e14d16a2f62 100644 --- a/packages/remix-node/CHANGELOG.md +++ b/packages/remix-node/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/node` +## 2.11.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json index 765e0170926..0caf33739d8 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", + "version": "2.11.2-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 2c3cd615eb1..97edfa06555 100644 --- a/packages/remix-react/CHANGELOG.md +++ b/packages/remix-react/CHANGELOG.md @@ -1,5 +1,18 @@ # `@remix-run/react` +## 2.11.2-pre.0 + +### Patch Changes + +- - Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously disscovered routes (see https://github.com/remix-run/react-router/pull/11883) ([#9860](https://github.com/remix-run/remix/pull/9860)) + - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field + - Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) +- fix: update turbo-stream to v2.3.0 ([#9856](https://github.com/remix-run/remix/pull/9856)) + fix: stabilize object key order for unstable_singleFetch + fix: unstable_singleFetch can now have payloads as large as you have memory +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index 1f5a2216f05..44ac557fa84 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", + "version": "2.11.2-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 dee2f3f5c81..fc2ae87b7c1 100644 --- a/packages/remix-serve/CHANGELOG.md +++ b/packages/remix-serve/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/serve` +## 2.11.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.2-pre.0` + - `@remix-run/express@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json index c22f7d82107..9661d232f42 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", + "version": "2.11.2-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 2728e98e3f3..fbdb0f1d96d 100644 --- a/packages/remix-server-runtime/CHANGELOG.md +++ b/packages/remix-server-runtime/CHANGELOG.md @@ -1,5 +1,17 @@ # `@remix-run/server-runtime` +## 2.11.2-pre.0 + +### Patch Changes + +- Single Fetch: Fix redirects when a `basename` is presernt ([#9848](https://github.com/remix-run/remix/pull/9848)) +- - Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously disscovered routes (see https://github.com/remix-run/react-router/pull/11883) ([#9860](https://github.com/remix-run/remix/pull/9860)) + - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field + - Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) +- fix: update turbo-stream to v2.3.0 ([#9856](https://github.com/remix-run/remix/pull/9856)) + fix: stabilize object key order for unstable_singleFetch + fix: unstable_singleFetch can now have payloads as large as you have memory + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index e9237650fdb..78bd5d10dad 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", + "version": "2.11.2-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 a54a13e9b93..14678b6ac07 100644 --- a/packages/remix-testing/CHANGELOG.md +++ b/packages/remix-testing/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/testing` +## 2.11.2-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/react@2.11.2-pre.0` + - `@remix-run/node@2.11.2-pre.0` + ## 2.11.1 ### Patch Changes diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index 13ea400d6ca..90909a12f9f 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", + "version": "2.11.2-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 1991733efcd..5f6d7cd9a3e 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -1,6 +1,6 @@ { "name": "remix", - "version": "2.11.1", + "version": "2.11.2-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 f2d7d8c3583..112d0c72f5d 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 + specifier: 2.11.2-pre.0 version: link:../../../packages/remix-cloudflare '@remix-run/cloudflare-pages': - specifier: 2.11.1 + specifier: 2.11.2-pre.0 version: link:../../../packages/remix-cloudflare-pages '@remix-run/react': - specifier: 2.11.1 + specifier: 2.11.2-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.1 + specifier: ^2.11.2-pre.0 version: link:../remix-react '@remix-run/router': specifier: 1.19.1-pre.0 From 6acfe0c37a980245d95053dc7068e13d3e74ef05 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 Aug 2024 14:56:37 -0400 Subject: [PATCH 10/17] Update release notes --- .changeset/rich-teachers-warn.md | 2 +- .changeset/shy-ducks-repeat.md | 2 +- .changeset/sweet-roses-shake.md | 6 ++-- CHANGELOG.md | 42 +++++++++++++++-------- packages/create-remix/CHANGELOG.md | 2 ++ packages/remix-css-bundle/CHANGELOG.md | 2 ++ packages/remix-eslint-config/CHANGELOG.md | 2 ++ 7 files changed, 38 insertions(+), 20 deletions(-) diff --git a/.changeset/rich-teachers-warn.md b/.changeset/rich-teachers-warn.md index c07df3aa7c8..3ecb557abbe 100644 --- a/.changeset/rich-teachers-warn.md +++ b/.changeset/rich-teachers-warn.md @@ -2,4 +2,4 @@ "@remix-run/server-runtime": patch --- -Single Fetch: Fix redirects when a `basename` is presernt +Single Fetch: Fix redirects when a `basename` is present diff --git a/.changeset/shy-ducks-repeat.md b/.changeset/shy-ducks-repeat.md index 8620d7d9d2e..cbec80cfe1a 100644 --- a/.changeset/shy-ducks-repeat.md +++ b/.changeset/shy-ducks-repeat.md @@ -3,6 +3,6 @@ "@remix-run/server-runtime": patch --- -- Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously disscovered routes (see https://github.com/remix-run/react-router/pull/11883) +- Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously discovered routes (see https://github.com/remix-run/react-router/pull/11883) - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field - Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) diff --git a/.changeset/sweet-roses-shake.md b/.changeset/sweet-roses-shake.md index 67a5d1313bf..8ef5b4d54d3 100644 --- a/.changeset/sweet-roses-shake.md +++ b/.changeset/sweet-roses-shake.md @@ -3,6 +3,6 @@ "@remix-run/server-runtime": patch --- -fix: update turbo-stream to v2.3.0 -fix: stabilize object key order for unstable_singleFetch -fix: unstable_singleFetch can now have payloads as large as you have memory +Single Fetch: Update `turbo-stream` to `v2.3.0` + - Stabilize object key order for serialized payloads + - Remove memory limitations payloads sizes diff --git a/CHANGELOG.md b/CHANGELOG.md index e48af2488d4..078dec4f68b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -205,31 +205,43 @@ Date: YYYY-MM-DD --> +## v2.11.2 + +Date: 2024-08-15 + +### Patch Changes + +- `@remix-run/react` - Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously discovered routes (see https://github.com/remix-run/react-router/pull/11883) ([#9860](https://github.com/remix-run/remix/pull/9860)) + - ⚠️ This changes the return signature of the internal `/__manifest` endpoint since we no longer need the `notFoundPaths` field +- `@remix-run/react` - Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) ([#9860](https://github.com/remix-run/remix/pull/9860)) +- `@remix-run/server-runtime` - Single Fetch: Fix redirects when a `basename` is present ([#9848](https://github.com/remix-run/remix/pull/9848) +- `@remix-run/server-runtime` - Single Fetch: Update `turbo-stream` to `v2.3.0` ([#9856](https://github.com/remix-run/remix/pull/9856)) + - Stabilize object key order for serialized payloads + - Remove memory limitations payloads sizes + +### Updated Dependencies + +- [`react-router-dom@6.26.1`](https://github.com/remix-run/react-router/releases/tag/react-router%406.26.1) +- [`@remix-run/router@1.19.1`](https://github.com/remix-run/react-router/blob/main/packages/router/CHANGELOG.md#1191) + +### Changes by Package + +- [`@remix-run/react`](https://github.com/remix-run/remix/blob/remix%402.11.2/packages/remix-react/CHANGELOG.md#2112) +- [`@remix-run/server-runtime`](https://github.com/remix-run/remix/blob/remix%402.11.2/packages/remix-server-runtime/CHANGELOG.md#2112) + +**Full Changelog**: [`v2.11.1...v2.11.2`](https://github.com/remix-run/remix/compare/remix@2.X.Y...remix@2.X.Y) + ## v2.11.1 Date: 2024-08-05 ### Patch Changes -- Revert #9695, stop infinite reload ([`a7cffe57`](https://github.com/remix-run/remix/commit/a7cffe5733c8b7d0f29bd2d8606876c537d87101)) +- `@remix-run/react` - Revert #9695, stop infinite reload ([`a7cffe57`](https://github.com/remix-run/remix/commit/a7cffe5733c8b7d0f29bd2d8606876c537d87101)) ### Changes by Package -- [`create-remix`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/create-remix/CHANGELOG.md#2111) -- [`@remix-run/architect`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-architect/CHANGELOG.md#2111) -- [`@remix-run/cloudflare`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-cloudflare/CHANGELOG.md#2111) -- [`@remix-run/cloudflare-pages`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-cloudflare-pages/CHANGELOG.md#2111) -- [`@remix-run/cloudflare-workers`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-cloudflare-workers/CHANGELOG.md#2111) -- [`@remix-run/css-bundle`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-css-bundle/CHANGELOG.md#2111) -- [`@remix-run/deno`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-deno/CHANGELOG.md#2111) -- [`@remix-run/dev`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-dev/CHANGELOG.md#2111) -- [`@remix-run/eslint-config`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-eslint-config/CHANGELOG.md#2111) -- [`@remix-run/express`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-express/CHANGELOG.md#2111) -- [`@remix-run/node`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-node/CHANGELOG.md#2111) - [`@remix-run/react`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-react/CHANGELOG.md#2111) -- [`@remix-run/serve`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-serve/CHANGELOG.md#2111) -- [`@remix-run/server-runtime`](https://github.com/remix-run/remix/blob/remix%402.11.1/packages/remix-server-runtime/CHANGELOG.md#2111) -- [`@remix-run/testing`](https://github.com/remix-run/remix/blob/remix%402.11.1/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) diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md index 4bb6994f8f6..f6e90728137 100644 --- a/packages/create-remix/CHANGELOG.md +++ b/packages/create-remix/CHANGELOG.md @@ -4,6 +4,8 @@ ## 2.11.1 +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.1. + ## 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/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md index 11b7dabfa36..d721c77a900 100644 --- a/packages/remix-css-bundle/CHANGELOG.md +++ b/packages/remix-css-bundle/CHANGELOG.md @@ -4,6 +4,8 @@ ## 2.11.1 +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.1. + ## 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/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md index 9ad0437bef9..c1e86271ba7 100644 --- a/packages/remix-eslint-config/CHANGELOG.md +++ b/packages/remix-eslint-config/CHANGELOG.md @@ -4,6 +4,8 @@ ## 2.11.1 +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.1. + ## 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. From 6f74098a08c010e3a02614b877f1efd9b837199a Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 Aug 2024 14:58:14 -0400 Subject: [PATCH 11/17] Fix missing paren in release notes --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 078dec4f68b..4bcdc46d671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -214,7 +214,7 @@ Date: 2024-08-15 - `@remix-run/react` - Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously discovered routes (see https://github.com/remix-run/react-router/pull/11883) ([#9860](https://github.com/remix-run/remix/pull/9860)) - ⚠️ This changes the return signature of the internal `/__manifest` endpoint since we no longer need the `notFoundPaths` field - `@remix-run/react` - Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) ([#9860](https://github.com/remix-run/remix/pull/9860)) -- `@remix-run/server-runtime` - Single Fetch: Fix redirects when a `basename` is present ([#9848](https://github.com/remix-run/remix/pull/9848) +- `@remix-run/server-runtime` - Single Fetch: Fix redirects when a `basename` is present ([#9848](https://github.com/remix-run/remix/pull/9848)) - `@remix-run/server-runtime` - Single Fetch: Update `turbo-stream` to `v2.3.0` ([#9856](https://github.com/remix-run/remix/pull/9856)) - Stabilize object key order for serialized payloads - Remove memory limitations payloads sizes From 5887992db7ef7d9524cea0493836726f519a8239 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 15 Aug 2024 12:26:11 -0400 Subject: [PATCH 12/17] Bump router (#9866) --- .changeset/forty-lions-sing.md | 5 +++ integration/package.json | 2 +- 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 +- pnpm-lock.yaml | 50 +++++++++++----------- 7 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 .changeset/forty-lions-sing.md diff --git a/.changeset/forty-lions-sing.md b/.changeset/forty-lions-sing.md new file mode 100644 index 00000000000..2a5c2e42de8 --- /dev/null +++ b/.changeset/forty-lions-sing.md @@ -0,0 +1,5 @@ +--- +"@remix-run/react": patch +--- + +[REMOVE] Bump router diff --git a/integration/package.json b/integration/package.json index 1ea9256ffcd..0c7613c1bba 100644 --- a/integration/package.json +++ b/integration/package.json @@ -14,7 +14,7 @@ "@remix-run/dev": "workspace:*", "@remix-run/express": "workspace:*", "@remix-run/node": "workspace:*", - "@remix-run/router": "1.19.1-pre.0", + "@remix-run/router": "1.19.1", "@remix-run/server-runtime": "workspace:*", "@types/express": "^4.17.9", "@vanilla-extract/css": "^1.10.0", diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index c50dbfe8fb5..592fe7a9e50 100644 --- a/packages/remix-dev/package.json +++ b/packages/remix-dev/package.json @@ -32,7 +32,7 @@ "@mdx-js/mdx": "^2.3.0", "@npmcli/package-json": "^4.0.1", "@remix-run/node": "workspace:*", - "@remix-run/router": "1.19.1-pre.0", + "@remix-run/router": "1.19.1", "@remix-run/server-runtime": "workspace:*", "@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 44ac557fa84..5da12fe65a7 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -19,10 +19,10 @@ "tsc": "tsc" }, "dependencies": { - "@remix-run/router": "1.19.1-pre.0", + "@remix-run/router": "1.19.1", "@remix-run/server-runtime": "workspace:*", - "react-router": "6.26.1-pre.0", - "react-router-dom": "6.26.1-pre.0", + "react-router": "6.26.1", + "react-router-dom": "6.26.1", "turbo-stream": "2.3.0" }, "devDependencies": { diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index 78bd5d10dad..31d9d580f89 100644 --- a/packages/remix-server-runtime/package.json +++ b/packages/remix-server-runtime/package.json @@ -19,7 +19,7 @@ "tsc": "tsc" }, "dependencies": { - "@remix-run/router": "1.19.1-pre.0", + "@remix-run/router": "1.19.1", "@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 90909a12f9f..82c4b34c862 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -21,8 +21,8 @@ "dependencies": { "@remix-run/node": "workspace:*", "@remix-run/react": "workspace:*", - "@remix-run/router": "1.19.1-pre.0", - "react-router-dom": "6.26.1-pre.0" + "@remix-run/router": "1.19.1", + "react-router-dom": "6.26.1" }, "devDependencies": { "@remix-run/server-runtime": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 112d0c72f5d..0e38a6c0bf0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -323,8 +323,8 @@ importers: specifier: workspace:* version: link:../packages/remix-node '@remix-run/router': - specifier: 1.19.1-pre.0 - version: 1.19.1-pre.0 + specifier: 1.19.1 + version: 1.19.1 '@remix-run/server-runtime': specifier: workspace:* version: link:../packages/remix-server-runtime @@ -871,8 +871,8 @@ importers: specifier: ^2.11.2-pre.0 version: link:../remix-react '@remix-run/router': - specifier: 1.19.1-pre.0 - version: 1.19.1-pre.0 + specifier: 1.19.1 + version: 1.19.1 '@remix-run/server-runtime': specifier: workspace:* version: link:../remix-server-runtime @@ -1217,17 +1217,17 @@ importers: packages/remix-react: dependencies: '@remix-run/router': - specifier: 1.19.1-pre.0 - version: 1.19.1-pre.0 + specifier: 1.19.1 + version: 1.19.1 '@remix-run/server-runtime': specifier: workspace:* version: link:../remix-server-runtime react-router: - specifier: 6.26.1-pre.0 - version: 6.26.1-pre.0(react@18.2.0) + specifier: 6.26.1 + version: 6.26.1(react@18.2.0) react-router-dom: - specifier: 6.26.1-pre.0 - version: 6.26.1-pre.0(react-dom@18.2.0)(react@18.2.0) + specifier: 6.26.1 + version: 6.26.1(react-dom@18.2.0)(react@18.2.0) turbo-stream: specifier: 2.3.0 version: 2.3.0 @@ -1303,8 +1303,8 @@ importers: packages/remix-server-runtime: dependencies: '@remix-run/router': - specifier: 1.19.1-pre.0 - version: 1.19.1-pre.0 + specifier: 1.19.1 + version: 1.19.1 '@types/cookie': specifier: ^0.6.0 version: 0.6.0 @@ -1340,11 +1340,11 @@ importers: specifier: workspace:* version: link:../remix-react '@remix-run/router': - specifier: 1.19.1-pre.0 - version: 1.19.1-pre.0 + specifier: 1.19.1 + version: 1.19.1 react-router-dom: - specifier: 6.26.1-pre.0 - version: 6.26.1-pre.0(react-dom@18.2.0)(react@18.2.0) + specifier: 6.26.1 + version: 6.26.1(react-dom@18.2.0)(react@18.2.0) devDependencies: '@remix-run/server-runtime': specifier: workspace:* @@ -4201,8 +4201,8 @@ packages: - encoding dev: false - /@remix-run/router@1.19.1-pre.0: - resolution: {integrity: sha512-5d0nLNwmjZEcufZl8OAMRadEynNd9h8rGkFgqFY+5wQRL5H6SRuaJpcaWqtSJRwMRLg2MBoHNI23uxWsEsm14g==} + /@remix-run/router@1.19.1: + resolution: {integrity: sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg==} engines: {node: '>=14.0.0'} dev: false @@ -12786,26 +12786,26 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-router-dom@6.26.1-pre.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-rr1u+sgemQ6L7q2E0q6syU3w7LABWWlePBJ1s1+B5NKujMUJDAziUEAxD43r0J2dZKsdZQvD2vqmlUbtQBFqPw==} + /react-router-dom@6.26.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-veut7m41S1fLql4pLhxeSW3jlqs+4MtjRLj0xvuCEXsxusJCbs6I8yn9BxzzDX2XDgafrccY6hwjmd/bL54tFw==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 1.19.1-pre.0 + '@remix-run/router': 1.19.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.26.1-pre.0(react@18.2.0) + react-router: 6.26.1(react@18.2.0) dev: false - /react-router@6.26.1-pre.0(react@18.2.0): - resolution: {integrity: sha512-8HL55H0kg/Qapx1nrz+vM3c/kiF7DzR2/EtaWDz5gL07JSyzMvGnp9LyFvpaZNAVYj+2ZNdg6af9QJbNUAFgbQ==} + /react-router@6.26.1(react@18.2.0): + resolution: {integrity: sha512-kIwJveZNwp7teQRI5QmwWo39A5bXRyqpH0COKKmPnyD2vBvDwgFXSqDUYtt1h+FEyfnE8eXr7oe0MxRzVwCcvQ==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 1.19.1-pre.0 + '@remix-run/router': 1.19.1 react: 18.2.0 dev: false From c189f1287945ec8a384787c2fdd13a0404b12192 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 15 Aug 2024 12:29:45 -0400 Subject: [PATCH 13/17] Update release notes --- CHANGELOG.md | 130 ++++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 63 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bcdc46d671..305c1ba26a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,65 +13,69 @@ 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) + - [v2.11.2](#v2112) - [Patch Changes](#patch-changes) + - [Updated Dependencies](#updated-dependencies) - [Changes by Package](#changes-by-package) + - [v2.11.1](#v2111) + - [Patch Changes](#patch-changes-1) + - [Changes by Package](#changes-by-package-1) - [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) - [Removed `response` stub in Single Fetch (unstable)](#removed-response-stub-in-single-fetch-unstable) - [Minor Changes](#minor-changes) - - [Patch Changes](#patch-changes) - - [Updated Dependencies](#updated-dependencies) - - [Changes by Package](#changes-by-package) - - [v2.10.3](#v2103) - - [Patch Changes](#patch-changes-1) - - [Updated Dependencies](#updated-dependencies-1) - - [Changes by Package](#changes-by-package-1) - - [v2.10.2](#v2102) - [Patch Changes](#patch-changes-2) + - [Updated Dependencies](#updated-dependencies-1) - [Changes by Package](#changes-by-package-2) - - [v2.10.1](#v2101) + - [v2.10.3](#v2103) - [Patch Changes](#patch-changes-3) - [Updated Dependencies](#updated-dependencies-2) - [Changes by Package](#changes-by-package-3) + - [v2.10.2](#v2102) + - [Patch Changes](#patch-changes-4) + - [Changes by Package](#changes-by-package-4) + - [v2.10.1](#v2101) + - [Patch Changes](#patch-changes-5) + - [Updated Dependencies](#updated-dependencies-3) + - [Changes by Package](#changes-by-package-5) - [v2.10.0](#v2100) - [What's Changed](#whats-changed-1) - [Lazy Route Discovery (a.k.a. "Fog of War")](#lazy-route-discovery-aka-fog-of-war) - [Minor Changes](#minor-changes-1) - - [Patch Changes](#patch-changes-4) - - [Updated Dependencies](#updated-dependencies-3) - - [Changes by Package](#changes-by-package-4) + - [Patch Changes](#patch-changes-6) + - [Updated Dependencies](#updated-dependencies-4) + - [Changes by Package](#changes-by-package-6) - [v2.9.2](#v292) - [What's Changed](#whats-changed-2) - [Updated Type-Safety for Single Fetch](#updated-type-safety-for-single-fetch) - - [Patch Changes](#patch-changes-5) - - [Updated Dependencies](#updated-dependencies-4) - - [Changes by Package](#changes-by-package-5) + - [Patch Changes](#patch-changes-7) + - [Updated Dependencies](#updated-dependencies-5) + - [Changes by Package](#changes-by-package-7) - [v2.9.1](#v291) - - [Patch Changes](#patch-changes-6) - - [Changes by Package](#changes-by-package-6) + - [Patch Changes](#patch-changes-8) + - [Changes by Package](#changes-by-package-8) - [v2.9.0](#v290) - [What's Changed](#whats-changed-3) - [Single Fetch (unstable)](#single-fetch-unstable) - [Undici](#undici) - [Minor Changes](#minor-changes-2) - - [Patch Changes](#patch-changes-7) - - [Updated Dependencies](#updated-dependencies-5) - - [Changes by Package](#changes-by-package-7) - - [v2.8.1](#v281) - - [Patch Changes](#patch-changes-8) + - [Patch Changes](#patch-changes-9) - [Updated Dependencies](#updated-dependencies-6) - - [Changes by Package](#changes-by-package-8) + - [Changes by Package](#changes-by-package-9) + - [v2.8.1](#v281) + - [Patch Changes](#patch-changes-10) + - [Updated Dependencies](#updated-dependencies-7) + - [Changes by Package](#changes-by-package-10) - [v2.8.0](#v280) - [Minor Changes](#minor-changes-3) - - [Patch Changes](#patch-changes-9) - - [Updated Dependencies](#updated-dependencies-7) - - [Changes by Package](#changes-by-package-9) + - [Patch Changes](#patch-changes-11) + - [Updated Dependencies](#updated-dependencies-8) + - [Changes by Package](#changes-by-package-11) - [2.7.2](#272) - - [Patch Changes](#patch-changes-10) + - [Patch Changes](#patch-changes-12) - [2.7.1](#271) - - [Patch Changes](#patch-changes-11) + - [Patch Changes](#patch-changes-13) - [v2.7.0](#v270) - [What's Changed](#whats-changed-4) - [Stabilized Vite Plugin](#stabilized-vite-plugin) @@ -79,72 +83,72 @@ We manage release notes in this file instead of the paginated Github Releases Pa - [Basename support](#basename-support) - [Cloudflare Proxy as a Vite Plugin](#cloudflare-proxy-as-a-vite-plugin) - [Minor Changes](#minor-changes-4) - - [Patch Changes](#patch-changes-12) - - [Updated Dependencies](#updated-dependencies-8) - - [Changes by Package](#changes-by-package-10) + - [Patch Changes](#patch-changes-14) + - [Updated Dependencies](#updated-dependencies-9) + - [Changes by Package](#changes-by-package-12) - [v2.6.0](#v260) - [What's Changed](#whats-changed-5) - [Unstable Vite Plugin updates](#unstable-vite-plugin-updates) - [Minor Changes](#minor-changes-5) - - [Patch Changes](#patch-changes-13) - - [Updated Dependencies](#updated-dependencies-9) - - [Changes by Package](#changes-by-package-11) - - [v2.5.1](#v251) - - [Patch Changes](#patch-changes-14) + - [Patch Changes](#patch-changes-15) - [Updated Dependencies](#updated-dependencies-10) - - [Changes by Package](#changes-by-package-12) + - [Changes by Package](#changes-by-package-13) + - [v2.5.1](#v251) + - [Patch Changes](#patch-changes-16) + - [Updated Dependencies](#updated-dependencies-11) + - [Changes by Package](#changes-by-package-14) - [v2.5.0](#v250) - [What's Changed](#whats-changed-6) - [SPA Mode (unstable)](#spa-mode-unstable) - [Server Bundles (unstable)](#server-bundles-unstable) - [Minor Changes](#minor-changes-6) - - [Patch Changes](#patch-changes-15) - - [Updated Dependencies](#updated-dependencies-11) - - [Changes by Package](#changes-by-package-13) - - [v2.4.1](#v241) - - [Patch Changes](#patch-changes-16) + - [Patch Changes](#patch-changes-17) - [Updated Dependencies](#updated-dependencies-12) - - [Changes by Package](#changes-by-package-14) + - [Changes by Package](#changes-by-package-15) + - [v2.4.1](#v241) + - [Patch Changes](#patch-changes-18) + - [Updated Dependencies](#updated-dependencies-13) + - [Changes by Package](#changes-by-package-16) - [v2.4.0](#v240) - [What's Changed](#whats-changed-7) - [Client Data](#client-data) - [`future.v3_relativeSplatPath`](#futurev3_relativesplatpath) - [Vite Updates (Unstable)](#vite-updates-unstable) - [Minor Changes](#minor-changes-7) - - [Patch Changes](#patch-changes-17) - - [Updated Dependencies](#updated-dependencies-13) - - [Changes by Package](#changes-by-package-15) - - [v2.3.1](#v231) - - [Patch Changes](#patch-changes-18) + - [Patch Changes](#patch-changes-19) - [Updated Dependencies](#updated-dependencies-14) - - [Changes by Package](#changes-by-package-16) + - [Changes by Package](#changes-by-package-17) + - [v2.3.1](#v231) + - [Patch Changes](#patch-changes-20) + - [Updated Dependencies](#updated-dependencies-15) + - [Changes by Package](#changes-by-package-18) - [v2.3.0](#v230) - [What's Changed](#whats-changed-8) - [Stabilized `useBlocker`](#stabilized-useblocker) - [`unstable_flushSync` API](#unstable_flushsync-api) - [Minor Changes](#minor-changes-8) - - [Patch Changes](#patch-changes-19) - - [Updated Dependencies](#updated-dependencies-15) - - [Changes by Package](#changes-by-package-17) + - [Patch Changes](#patch-changes-21) + - [Updated Dependencies](#updated-dependencies-16) + - [Changes by Package](#changes-by-package-19) - [v2.2.0](#v220) - [What's Changed](#whats-changed-9) - [Vite!](#vite) - [New Fetcher APIs](#new-fetcher-apis) - [Persistence Future Flag](#persistence-future-flag) - [Minor Changes](#minor-changes-9) - - [Patch Changes](#patch-changes-20) - - [Updated Dependencies](#updated-dependencies-16) - - [Changes by Package](#changes-by-package-18) + - [Patch Changes](#patch-changes-22) + - [Updated Dependencies](#updated-dependencies-17) + - [Changes by Package](#changes-by-package-20) - [v2.1.0](#v210) - [What's Changed](#whats-changed-10) - [View Transitions](#view-transitions) - [Stable `createRemixStub`](#stable-createremixstub) - [Minor Changes](#minor-changes-10) - - [Patch Changes](#patch-changes-21) - - [Updated Dependencies](#updated-dependencies-17) - - [Changes by Package](#changes-by-package-19) + - [Patch Changes](#patch-changes-23) + - [Updated Dependencies](#updated-dependencies-18) + - [Changes by Package](#changes-by-package-21) - [v2.0.1](#v201) - - [Patch Changes](#patch-changes-22) + - [Patch Changes](#patch-changes-24) - [Changes by Package 🔗](#changes-by-package-) - [v2.0.0](#v200) - [Breaking Changes](#breaking-changes) @@ -156,8 +160,8 @@ We manage release notes in this file instead of the paginated Github Releases Pa - [Breaking Type Changes](#breaking-type-changes) - [New Features](#new-features) - [Other Notable Changes](#other-notable-changes) - - [Updated Dependencies](#updated-dependencies-18) - - [Changes by Package](#changes-by-package-20) + - [Updated Dependencies](#updated-dependencies-19) + - [Changes by Package](#changes-by-package-22) @@ -229,7 +233,7 @@ Date: 2024-08-15 - [`@remix-run/react`](https://github.com/remix-run/remix/blob/remix%402.11.2/packages/remix-react/CHANGELOG.md#2112) - [`@remix-run/server-runtime`](https://github.com/remix-run/remix/blob/remix%402.11.2/packages/remix-server-runtime/CHANGELOG.md#2112) -**Full Changelog**: [`v2.11.1...v2.11.2`](https://github.com/remix-run/remix/compare/remix@2.X.Y...remix@2.X.Y) +**Full Changelog**: [`v2.11.1...v2.11.2`](https://github.com/remix-run/remix/compare/remix@2.11.1...remix@2.11.2) ## v2.11.1 From 6e75e9a65bc863434ca0032fead8dd73093a2aa7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 12:29:58 -0400 Subject: [PATCH 14/17] chore: Update version for release (pre) (#9867) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 1 + integration/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 | 7 +++++++ 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 | 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 | 2 ++ 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, 115 insertions(+), 25 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index c4203a8f203..94154f5ebda 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -26,6 +26,7 @@ "@remix-run/testing": "2.11.1" }, "changesets": [ + "forty-lions-sing", "rich-teachers-warn", "shy-ducks-repeat", "sweet-roses-shake" diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json index 98868d7d8f9..c20fdb501ad 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.2-pre.0", - "@remix-run/cloudflare-pages": "2.11.2-pre.0", - "@remix-run/react": "2.11.2-pre.0", + "@remix-run/cloudflare": "2.11.2-pre.1", + "@remix-run/cloudflare-pages": "2.11.2-pre.1", + "@remix-run/react": "2.11.2-pre.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 f6e90728137..4a3af9f1fda 100644 --- a/packages/create-remix/CHANGELOG.md +++ b/packages/create-remix/CHANGELOG.md @@ -1,5 +1,7 @@ # `create-remix` +## 2.11.2-pre.1 + ## 2.11.2-pre.0 ## 2.11.1 diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json index 9649734d6e0..da1c186954e 100644 --- a/packages/create-remix/package.json +++ b/packages/create-remix/package.json @@ -1,6 +1,6 @@ { "name": "create-remix", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 da3754ca701..32a5a33dc23 100644 --- a/packages/remix-architect/CHANGELOG.md +++ b/packages/remix-architect/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/architect` +## 2.11.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json index ed3cc6b5490..7557d7180dd 100644 --- a/packages/remix-architect/package.json +++ b/packages/remix-architect/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/architect", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 168c5ec8b65..da8cbe2b518 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.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/cloudflare@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json index e6eb6b070b1..2c50a9c0e7e 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.2-pre.0", + "version": "2.11.2-pre.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 5e067899fff..5a8da9b1855 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.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/cloudflare@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json index 8c6a464ddcd..bfd76910033 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.2-pre.0", + "version": "2.11.2-pre.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 a1ec7e24780..d5b088341eb 100644 --- a/packages/remix-cloudflare/CHANGELOG.md +++ b/packages/remix-cloudflare/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/cloudflare` +## 2.11.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json index 060980f325f..e96fa4c3c8d 100644 --- a/packages/remix-cloudflare/package.json +++ b/packages/remix-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/cloudflare", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 d721c77a900..7f6e71ee96a 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.2-pre.1 + ## 2.11.2-pre.0 ## 2.11.1 diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json index 4c093de51b7..2f3fe7eb767 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.2-pre.0", + "version": "2.11.2-pre.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 8358992e819..6b0e923fb19 100644 --- a/packages/remix-deno/CHANGELOG.md +++ b/packages/remix-deno/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/deno` +## 2.11.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json index d43a35347a4..3e9cd8624d0 100644 --- a/packages/remix-deno/package.json +++ b/packages/remix-deno/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/deno", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 1da91b72f07..2340d295cbb 100644 --- a/packages/remix-dev/CHANGELOG.md +++ b/packages/remix-dev/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/dev` +## 2.11.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.2-pre.1` + - `@remix-run/server-runtime@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index 592fe7a9e50..2236dc013a1 100644 --- a/packages/remix-dev/package.json +++ b/packages/remix-dev/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/dev", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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.2-pre.0", - "@remix-run/serve": "^2.11.2-pre.0", + "@remix-run/react": "^2.11.2-pre.1", + "@remix-run/serve": "^2.11.2-pre.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 c1e86271ba7..8a4b64c0627 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.2-pre.1 + ## 2.11.2-pre.0 ## 2.11.1 diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json index 03727486f23..0ec6a9ca355 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.2-pre.0", + "version": "2.11.2-pre.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 ad9480aaa31..2606deda2a6 100644 --- a/packages/remix-express/CHANGELOG.md +++ b/packages/remix-express/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/express` +## 2.11.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/node@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json index 05bc46c6bd8..d7992443b1f 100644 --- a/packages/remix-express/package.json +++ b/packages/remix-express/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/express", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 e14d16a2f62..46d92b22964 100644 --- a/packages/remix-node/CHANGELOG.md +++ b/packages/remix-node/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/node` +## 2.11.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json index 0caf33739d8..6e147de5051 100644 --- a/packages/remix-node/package.json +++ b/packages/remix-node/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/node", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 97edfa06555..91f8704f9db 100644 --- a/packages/remix-react/CHANGELOG.md +++ b/packages/remix-react/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/react` +## 2.11.2-pre.1 + +### Patch Changes + +- [REMOVE] Bump router ([#9866](https://github.com/remix-run/remix/pull/9866)) +- Updated dependencies: + - `@remix-run/server-runtime@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index 5da12fe65a7..3cfef1bf9bf 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/react", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 fc2ae87b7c1..8fa9e213f48 100644 --- a/packages/remix-serve/CHANGELOG.md +++ b/packages/remix-serve/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/serve` +## 2.11.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/express@2.11.2-pre.1` + - `@remix-run/node@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json index 9661d232f42..5d8e4322fa9 100644 --- a/packages/remix-serve/package.json +++ b/packages/remix-serve/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/serve", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 fbdb0f1d96d..8381520287c 100644 --- a/packages/remix-server-runtime/CHANGELOG.md +++ b/packages/remix-server-runtime/CHANGELOG.md @@ -1,5 +1,7 @@ # `@remix-run/server-runtime` +## 2.11.2-pre.1 + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index 31d9d580f89..98aac346353 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.2-pre.0", + "version": "2.11.2-pre.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 14678b6ac07..27b7537bd47 100644 --- a/packages/remix-testing/CHANGELOG.md +++ b/packages/remix-testing/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/testing` +## 2.11.2-pre.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/react@2.11.2-pre.1` + - `@remix-run/node@2.11.2-pre.1` + ## 2.11.2-pre.0 ### Patch Changes diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index 82c4b34c862..3361c789727 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/testing", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.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 5f6d7cd9a3e..d5df1975fee 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -1,6 +1,6 @@ { "name": "remix", - "version": "2.11.2-pre.0", + "version": "2.11.2-pre.1", "description": "A framework for building better websites", "homepage": "https://remix.run", "bugs": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0e38a6c0bf0..1cc89ae356f 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.2-pre.0 + specifier: 2.11.2-pre.1 version: link:../../../packages/remix-cloudflare '@remix-run/cloudflare-pages': - specifier: 2.11.2-pre.0 + specifier: 2.11.2-pre.1 version: link:../../../packages/remix-cloudflare-pages '@remix-run/react': - specifier: 2.11.2-pre.0 + specifier: 2.11.2-pre.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.2-pre.0 + specifier: ^2.11.2-pre.1 version: link:../remix-react '@remix-run/router': specifier: 1.19.1 From c46d73edeb9d6630640e9512f7f8c7f8f9cede1a Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 15 Aug 2024 12:30:19 -0400 Subject: [PATCH 15/17] Exit prerelease mode --- .changeset/pre.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 94154f5ebda..371d4570ccf 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 23c43b76773e8e8029e99d1bdc5083f8c6136f91 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 12:32:25 -0400 Subject: [PATCH 16/17] chore: Update version for release (pre) (#9868) Co-authored-by: github-actions[bot] From 37219b41ea8811d323b3f092924ead14e0ba2389 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 13:33:25 -0400 Subject: [PATCH 17/17] chore: Update version for release (#9869) Co-authored-by: github-actions[bot] Co-authored-by: Matt Brophy --- .changeset/forty-lions-sing.md | 5 --- .changeset/pre.json | 34 ------------------- .changeset/rich-teachers-warn.md | 5 --- .changeset/shy-ducks-repeat.md | 8 ----- .changeset/sweet-roses-shake.md | 8 ----- .../vite-cloudflare-template/package.json | 6 ++-- packages/create-remix/CHANGELOG.md | 4 +-- packages/create-remix/package.json | 2 +- packages/remix-architect/CHANGELOG.md | 11 ++---- packages/remix-architect/package.json | 2 +- packages/remix-cloudflare-pages/CHANGELOG.md | 11 ++---- packages/remix-cloudflare-pages/package.json | 2 +- .../remix-cloudflare-workers/CHANGELOG.md | 11 ++---- .../remix-cloudflare-workers/package.json | 2 +- packages/remix-cloudflare/CHANGELOG.md | 11 ++---- packages/remix-cloudflare/package.json | 2 +- packages/remix-css-bundle/CHANGELOG.md | 4 +-- packages/remix-css-bundle/package.json | 2 +- packages/remix-deno/CHANGELOG.md | 11 ++---- packages/remix-deno/package.json | 2 +- packages/remix-dev/CHANGELOG.md | 16 ++------- packages/remix-dev/package.json | 6 ++-- packages/remix-eslint-config/CHANGELOG.md | 4 +-- packages/remix-eslint-config/package.json | 2 +- packages/remix-express/CHANGELOG.md | 11 ++---- packages/remix-express/package.json | 2 +- packages/remix-node/CHANGELOG.md | 11 ++---- packages/remix-node/package.json | 2 +- packages/remix-react/CHANGELOG.md | 24 +++++-------- packages/remix-react/package.json | 2 +- packages/remix-serve/CHANGELOG.md | 14 ++------ packages/remix-serve/package.json | 2 +- packages/remix-server-runtime/CHANGELOG.md | 18 +++++----- packages/remix-server-runtime/package.json | 2 +- packages/remix-testing/CHANGELOG.md | 14 ++------ packages/remix-testing/package.json | 2 +- packages/remix/package.json | 2 +- pnpm-lock.yaml | 8 ++--- 38 files changed, 70 insertions(+), 215 deletions(-) delete mode 100644 .changeset/forty-lions-sing.md delete mode 100644 .changeset/pre.json delete mode 100644 .changeset/rich-teachers-warn.md delete mode 100644 .changeset/shy-ducks-repeat.md delete mode 100644 .changeset/sweet-roses-shake.md diff --git a/.changeset/forty-lions-sing.md b/.changeset/forty-lions-sing.md deleted file mode 100644 index 2a5c2e42de8..00000000000 --- a/.changeset/forty-lions-sing.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/react": patch ---- - -[REMOVE] Bump router diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 371d4570ccf..00000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,34 +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.1", - "remix": "2.11.1", - "@remix-run/architect": "2.11.1", - "@remix-run/cloudflare": "2.11.1", - "@remix-run/cloudflare-pages": "2.11.1", - "@remix-run/cloudflare-workers": "2.11.1", - "@remix-run/css-bundle": "2.11.1", - "@remix-run/deno": "2.11.1", - "@remix-run/dev": "2.11.1", - "@remix-run/eslint-config": "2.11.1", - "@remix-run/express": "2.11.1", - "@remix-run/node": "2.11.1", - "@remix-run/react": "2.11.1", - "@remix-run/serve": "2.11.1", - "@remix-run/server-runtime": "2.11.1", - "@remix-run/testing": "2.11.1" - }, - "changesets": [ - "forty-lions-sing", - "rich-teachers-warn", - "shy-ducks-repeat", - "sweet-roses-shake" - ] -} diff --git a/.changeset/rich-teachers-warn.md b/.changeset/rich-teachers-warn.md deleted file mode 100644 index 3ecb557abbe..00000000000 --- a/.changeset/rich-teachers-warn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/server-runtime": patch ---- - -Single Fetch: Fix redirects when a `basename` is present diff --git a/.changeset/shy-ducks-repeat.md b/.changeset/shy-ducks-repeat.md deleted file mode 100644 index cbec80cfe1a..00000000000 --- a/.changeset/shy-ducks-repeat.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@remix-run/react": patch -"@remix-run/server-runtime": patch ---- - -- Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously discovered routes (see https://github.com/remix-run/react-router/pull/11883) - - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field -- Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) diff --git a/.changeset/sweet-roses-shake.md b/.changeset/sweet-roses-shake.md deleted file mode 100644 index 8ef5b4d54d3..00000000000 --- a/.changeset/sweet-roses-shake.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@remix-run/react": patch -"@remix-run/server-runtime": patch ---- - -Single Fetch: Update `turbo-stream` to `v2.3.0` - - Stabilize object key order for serialized payloads - - Remove memory limitations payloads sizes diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json index c20fdb501ad..1f7b245e474 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.2-pre.1", - "@remix-run/cloudflare-pages": "2.11.2-pre.1", - "@remix-run/react": "2.11.2-pre.1", + "@remix-run/cloudflare": "2.11.2", + "@remix-run/cloudflare-pages": "2.11.2", + "@remix-run/react": "2.11.2", "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 4a3af9f1fda..0b297c517b8 100644 --- a/packages/create-remix/CHANGELOG.md +++ b/packages/create-remix/CHANGELOG.md @@ -1,8 +1,8 @@ # `create-remix` -## 2.11.2-pre.1 +## 2.11.2 -## 2.11.2-pre.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.2. ## 2.11.1 diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json index da1c186954e..8d13800eca4 100644 --- a/packages/create-remix/package.json +++ b/packages/create-remix/package.json @@ -1,6 +1,6 @@ { "name": "create-remix", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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 32a5a33dc23..7c38a5bb93b 100644 --- a/packages/remix-architect/CHANGELOG.md +++ b/packages/remix-architect/CHANGELOG.md @@ -1,18 +1,11 @@ # `@remix-run/architect` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/node@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/node@2.11.2-pre.0` + - `@remix-run/node@2.11.2` ## 2.11.1 diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json index 7557d7180dd..e0213431353 100644 --- a/packages/remix-architect/package.json +++ b/packages/remix-architect/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/architect", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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 da8cbe2b518..7944c07a0ed 100644 --- a/packages/remix-cloudflare-pages/CHANGELOG.md +++ b/packages/remix-cloudflare-pages/CHANGELOG.md @@ -1,18 +1,11 @@ # `@remix-run/cloudflare-pages` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/cloudflare@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/cloudflare@2.11.2-pre.0` + - `@remix-run/cloudflare@2.11.2` ## 2.11.1 diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json index 2c50a9c0e7e..70038b118a7 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.2-pre.1", + "version": "2.11.2", "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 5a8da9b1855..b48f2f776fb 100644 --- a/packages/remix-cloudflare-workers/CHANGELOG.md +++ b/packages/remix-cloudflare-workers/CHANGELOG.md @@ -1,18 +1,11 @@ # `@remix-run/cloudflare-workers` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/cloudflare@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/cloudflare@2.11.2-pre.0` + - `@remix-run/cloudflare@2.11.2` ## 2.11.1 diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json index bfd76910033..bdc342d0c24 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.2-pre.1", + "version": "2.11.2", "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 d5b088341eb..12b7800d9f3 100644 --- a/packages/remix-cloudflare/CHANGELOG.md +++ b/packages/remix-cloudflare/CHANGELOG.md @@ -1,18 +1,11 @@ # `@remix-run/cloudflare` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.0` + - `@remix-run/server-runtime@2.11.2` ## 2.11.1 diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json index e96fa4c3c8d..1ad526c9a03 100644 --- a/packages/remix-cloudflare/package.json +++ b/packages/remix-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/cloudflare", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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 7f6e71ee96a..30fd4082b8a 100644 --- a/packages/remix-css-bundle/CHANGELOG.md +++ b/packages/remix-css-bundle/CHANGELOG.md @@ -1,8 +1,8 @@ # @remix-run/css-bundle -## 2.11.2-pre.1 +## 2.11.2 -## 2.11.2-pre.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.2. ## 2.11.1 diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json index 2f3fe7eb767..5eee7c7d4a5 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.2-pre.1", + "version": "2.11.2", "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 6b0e923fb19..39b40a427c3 100644 --- a/packages/remix-deno/CHANGELOG.md +++ b/packages/remix-deno/CHANGELOG.md @@ -1,18 +1,11 @@ # `@remix-run/deno` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.0` + - `@remix-run/server-runtime@2.11.2` ## 2.11.1 diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json index 3e9cd8624d0..864eadcd91f 100644 --- a/packages/remix-deno/package.json +++ b/packages/remix-deno/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/deno", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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 2340d295cbb..12354b7deb8 100644 --- a/packages/remix-dev/CHANGELOG.md +++ b/packages/remix-dev/CHANGELOG.md @@ -1,22 +1,12 @@ # `@remix-run/dev` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/node@2.11.2-pre.1` - - `@remix-run/server-runtime@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.0` - - `@remix-run/react@2.11.2-pre.0` - - `@remix-run/node@2.11.2-pre.0` - - `@remix-run/serve@2.11.2-pre.0` + - `@remix-run/server-runtime@2.11.2` + - `@remix-run/node@2.11.2` ## 2.11.1 diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index 2236dc013a1..83ce64325f6 100644 --- a/packages/remix-dev/package.json +++ b/packages/remix-dev/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/dev", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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.2-pre.1", - "@remix-run/serve": "^2.11.2-pre.1", + "@remix-run/react": "^2.11.2", + "@remix-run/serve": "^2.11.2", "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 8a4b64c0627..f708370c3f6 100644 --- a/packages/remix-eslint-config/CHANGELOG.md +++ b/packages/remix-eslint-config/CHANGELOG.md @@ -1,8 +1,8 @@ # `@remix-run/eslint-config` -## 2.11.2-pre.1 +## 2.11.2 -## 2.11.2-pre.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.2. ## 2.11.1 diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json index 0ec6a9ca355..02a74260069 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.2-pre.1", + "version": "2.11.2", "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 2606deda2a6..b685717a35b 100644 --- a/packages/remix-express/CHANGELOG.md +++ b/packages/remix-express/CHANGELOG.md @@ -1,18 +1,11 @@ # `@remix-run/express` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/node@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/node@2.11.2-pre.0` + - `@remix-run/node@2.11.2` ## 2.11.1 diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json index d7992443b1f..4bed3d973d4 100644 --- a/packages/remix-express/package.json +++ b/packages/remix-express/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/express", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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 46d92b22964..b179612806f 100644 --- a/packages/remix-node/CHANGELOG.md +++ b/packages/remix-node/CHANGELOG.md @@ -1,18 +1,11 @@ # `@remix-run/node` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.0` + - `@remix-run/server-runtime@2.11.2` ## 2.11.1 diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json index 6e147de5051..3e92e8f9bec 100644 --- a/packages/remix-node/package.json +++ b/packages/remix-node/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/node", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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 91f8704f9db..6ee1d05ea57 100644 --- a/packages/remix-react/CHANGELOG.md +++ b/packages/remix-react/CHANGELOG.md @@ -1,25 +1,17 @@ # `@remix-run/react` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes -- [REMOVE] Bump router ([#9866](https://github.com/remix-run/remix/pull/9866)) +- Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously discovered routes (see ) ([#9860](https://github.com/remix-run/remix/pull/9860)) + - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field +- Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see ) ([#9860](https://github.com/remix-run/remix/pull/9860)) +- Single Fetch: Update `turbo-stream` to `v2.3.0` ([#9856](https://github.com/remix-run/remix/pull/9856)) + - Stabilize object key order for serialized payloads + - Remove memory limitations payloads sizes - Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- - Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously disscovered routes (see https://github.com/remix-run/react-router/pull/11883) ([#9860](https://github.com/remix-run/remix/pull/9860)) - - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field - - Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) -- fix: update turbo-stream to v2.3.0 ([#9856](https://github.com/remix-run/remix/pull/9856)) - fix: stabilize object key order for unstable_singleFetch - fix: unstable_singleFetch can now have payloads as large as you have memory -- Updated dependencies: - - `@remix-run/server-runtime@2.11.2-pre.0` + - `@remix-run/server-runtime@2.11.2` ## 2.11.1 diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json index 3cfef1bf9bf..3cc3240cea1 100644 --- a/packages/remix-react/package.json +++ b/packages/remix-react/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/react", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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 8fa9e213f48..0f0a2d60459 100644 --- a/packages/remix-serve/CHANGELOG.md +++ b/packages/remix-serve/CHANGELOG.md @@ -1,20 +1,12 @@ # `@remix-run/serve` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/express@2.11.2-pre.1` - - `@remix-run/node@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/node@2.11.2-pre.0` - - `@remix-run/express@2.11.2-pre.0` + - `@remix-run/node@2.11.2` + - `@remix-run/express@2.11.2` ## 2.11.1 diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json index 5d8e4322fa9..9aa07aca725 100644 --- a/packages/remix-serve/package.json +++ b/packages/remix-serve/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/serve", - "version": "2.11.2-pre.1", + "version": "2.11.2", "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 8381520287c..7ef0650750e 100644 --- a/packages/remix-server-runtime/CHANGELOG.md +++ b/packages/remix-server-runtime/CHANGELOG.md @@ -1,18 +1,16 @@ # `@remix-run/server-runtime` -## 2.11.2-pre.1 - -## 2.11.2-pre.0 +## 2.11.2 ### Patch Changes -- Single Fetch: Fix redirects when a `basename` is presernt ([#9848](https://github.com/remix-run/remix/pull/9848)) -- - Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously disscovered routes (see https://github.com/remix-run/react-router/pull/11883) ([#9860](https://github.com/remix-run/remix/pull/9860)) - - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field - - Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see https://github.com/remix-run/react-router/pull/11888) -- fix: update turbo-stream to v2.3.0 ([#9856](https://github.com/remix-run/remix/pull/9856)) - fix: stabilize object key order for unstable_singleFetch - fix: unstable_singleFetch can now have payloads as large as you have memory +- Single Fetch: Fix redirects when a `basename` is present ([#9848](https://github.com/remix-run/remix/pull/9848)) +- Fog of War: Simplify implementation now that React Router handles slug/splat edge cases and tracks previously discovered routes (see ) ([#9860](https://github.com/remix-run/remix/pull/9860)) + - This changes the return signature of the internal `__manifest` endpoint since we no longer need the `notFoundPaths` field +- Fog of War: Update to use renamed `unstable_patchRoutesOnNavigation` function in RR (see ) ([#9860](https://github.com/remix-run/remix/pull/9860)) +- Single Fetch: Update `turbo-stream` to `v2.3.0` ([#9856](https://github.com/remix-run/remix/pull/9856)) + - Stabilize object key order for serialized payloads + - Remove memory limitations payloads sizes ## 2.11.1 diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json index 98aac346353..47fd5cbc006 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.2-pre.1", + "version": "2.11.2", "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 27b7537bd47..13e4cc2948c 100644 --- a/packages/remix-testing/CHANGELOG.md +++ b/packages/remix-testing/CHANGELOG.md @@ -1,20 +1,12 @@ # `@remix-run/testing` -## 2.11.2-pre.1 +## 2.11.2 ### Patch Changes - Updated dependencies: - - `@remix-run/react@2.11.2-pre.1` - - `@remix-run/node@2.11.2-pre.1` - -## 2.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/react@2.11.2-pre.0` - - `@remix-run/node@2.11.2-pre.0` + - `@remix-run/react@2.11.2` + - `@remix-run/node@2.11.2` ## 2.11.1 diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json index 3361c789727..f1c89a10a75 100644 --- a/packages/remix-testing/package.json +++ b/packages/remix-testing/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/testing", - "version": "2.11.2-pre.1", + "version": "2.11.2", "description": "Testing utilities for Remix apps", "homepage": "https://remix.run", "bugs": { diff --git a/packages/remix/package.json b/packages/remix/package.json index d5df1975fee..0b0a0f44a0b 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -1,6 +1,6 @@ { "name": "remix", - "version": "2.11.2-pre.1", + "version": "2.11.2", "description": "A framework for building better websites", "homepage": "https://remix.run", "bugs": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1cc89ae356f..d2ae31ecf59 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.2-pre.1 + specifier: 2.11.2 version: link:../../../packages/remix-cloudflare '@remix-run/cloudflare-pages': - specifier: 2.11.2-pre.1 + specifier: 2.11.2 version: link:../../../packages/remix-cloudflare-pages '@remix-run/react': - specifier: 2.11.2-pre.1 + specifier: 2.11.2 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.2-pre.1 + specifier: ^2.11.2 version: link:../remix-react '@remix-run/router': specifier: 1.19.1