From 525c00889a614ffaf34a7af6e357a39bca89d36e Mon Sep 17 00:00:00 2001 From: alongdate <167442392+alongdate@users.noreply.github.com> Date: Fri, 19 Apr 2024 21:52:49 +0800 Subject: [PATCH] chore: remove repetitive words (#9260) Signed-off-by: alongdate --- DEVELOPMENT.md | 2 +- contributors.yml | 1 + decisions/0007-remix-on-react-router-6-4-0.md | 2 +- integration/error-sanitization-test.ts | 10 +++++----- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 3db2cd30156..6f81c06e48d 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -69,7 +69,7 @@ You may need to make changes to a pre-release prior to publishing a final stable - Create a new changeset: `yarn changeset` - **IMPORTANT:** This is required even if you ultimately don't want to include these changes in the logs - Remember, changelogs can be edited prior to publishing, but the Changeset version script needs to see new changesets in order to create a new version -- Commit the changesets and push the the `release-*` branch to GitHub +- Commit the changesets and push the `release-*` branch to GitHub - Wait for the release workflow to finish and the Changesets action to open its PR that will increment all versions - Review the PR, make any adjustments necessary, and merge it into the `release-*` branch - Once the PR is merged, the release workflow will publish the updated packages to npm diff --git a/contributors.yml b/contributors.yml index 042ecc33f3d..e8a0d2986f2 100644 --- a/contributors.yml +++ b/contributors.yml @@ -31,6 +31,7 @@ - alireza-bonab - alisd23 - ally1002 +- alongdate - AltanS - alvinthen - amir-ziaei diff --git a/decisions/0007-remix-on-react-router-6-4-0.md b/decisions/0007-remix-on-react-router-6-4-0.md index 4eb50a8b919..7d925c4299d 100644 --- a/decisions/0007-remix-on-react-router-6-4-0.md +++ b/decisions/0007-remix-on-react-router-6-4-0.md @@ -129,7 +129,7 @@ We can also split this into iterative approaches on the server too, and do `hand 5. `handleDocumentRequest` 1. This is the big one. It simplifies down pretty far, but has the biggest surface area where some things don't quite match up 2. We need to map query "errors" to Remix's definition of error/catch and bubble them upwards accordingly. - 1. For example, in a URL like `/a/b/c`, if C exports a a `CatchBoundary` but not an `ErrorBoundary`, then it'll be represented in the `DataRouteObject` with `hasErrorBoundary=true` since the `@remix-run/router` doesn't distinguish + 1. For example, in a URL like `/a/b/c`, if C exports a `CatchBoundary` but not an `ErrorBoundary`, then it'll be represented in the `DataRouteObject` with `hasErrorBoundary=true` since the `@remix-run/router` doesn't distinguish 2. If C's loader throws an error, the router will "catch" that at C's `errorElement`, but we then need to re-bubble that upwards to the nearest `ErrorBoundary` 3. See `differentiateCatchVersusErrorBoundaries` in the `brophdawg11/rrr` branch 3. New `RemixContext` diff --git a/integration/error-sanitization-test.ts b/integration/error-sanitization-test.ts index 63f57fc3a18..c8fcf1d5bdc 100644 --- a/integration/error-sanitization-test.ts +++ b/integration/error-sanitization-test.ts @@ -206,7 +206,7 @@ test.describe("Error Sanitization", () => { expect(html).toMatch("Defer Route"); expect(html).toMatch("RESOLVED"); expect(html).not.toMatch("MESSAGE:"); - // Defer errors are not not part of the JSON blob but rather rejected + // Defer errors are not part of the JSON blob but rather rejected // against a pending promise and therefore are inlined JS. expect(html).not.toMatch("x.stack=e.stack;"); }); @@ -217,7 +217,7 @@ test.describe("Error Sanitization", () => { expect(html).toMatch("Defer Error"); expect(html).not.toMatch("RESOLVED"); expect(html).toMatch('{"message":"Unexpected Server Error"}'); - // Defer errors are not not part of the JSON blob but rather rejected + // Defer errors are not part of the JSON blob but rather rejected // against a pending promise and therefore are inlined JS. expect(html).toMatch("x.stack=undefined;"); // defer errors are not logged to the server console since the request @@ -371,7 +371,7 @@ test.describe("Error Sanitization", () => { let html = await response.text(); expect(html).toMatch("Defer Error"); expect(html).not.toMatch("RESOLVED"); - // Defer errors are not not part of the JSON blob but rather rejected + // Defer errors are not part of the JSON blob but rather rejected // against a pending promise and therefore are inlined JS. expect(html).toMatch("x.stack=e.stack;"); // defer errors are not logged to the server console since the request @@ -567,7 +567,7 @@ test.describe("Error Sanitization", () => { expect(html).toMatch("Defer Route"); expect(html).toMatch("RESOLVED"); expect(html).not.toMatch("MESSAGE:"); - // Defer errors are not not part of the JSON blob but rather rejected + // Defer errors are not part of the JSON blob but rather rejected // against a pending promise and therefore are inlined JS. expect(html).not.toMatch("x.stack=e.stack;"); }); @@ -578,7 +578,7 @@ test.describe("Error Sanitization", () => { expect(html).toMatch("Defer Error"); expect(html).not.toMatch("RESOLVED"); expect(html).toMatch('{"message":"Unexpected Server Error"}'); - // Defer errors are not not part of the JSON blob but rather rejected + // Defer errors are not part of the JSON blob but rather rejected // against a pending promise and therefore are inlined JS. expect(html).toMatch("x.stack=undefined;"); // defer errors are not logged to the server console since the request