Skip to content

Commit

Permalink
chore: remove repetitive words (remix-run#9260)
Browse files Browse the repository at this point in the history
Signed-off-by: alongdate <[email protected]>
  • Loading branch information
alongdate authored Apr 19, 2024
1 parent 98a012d commit 525c008
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
- alireza-bonab
- alisd23
- ally1002
- alongdate
- AltanS
- alvinthen
- amir-ziaei
Expand Down
2 changes: 1 addition & 1 deletion decisions/0007-remix-on-react-router-6-4-0.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
10 changes: 5 additions & 5 deletions integration/error-sanitization-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;");
});
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;");
});
Expand All @@ -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
Expand Down

0 comments on commit 525c008

Please sign in to comment.