Skip to content

chore(react-server/deps): react canary 20240408 #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hi-ogawa merged 6 commits into from
Apr 13, 2024
Merged

chore(react-server/deps): react canary 20240408 #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc891f1
chore(react-server): react canary 20240408
hi-ogawa Apr 11, 2024
bea6d80
Merge branch 'main' into chore-canary-20240408
hi-ogawa Apr 13, 2024
dd80a4e
test: no dev double effect
hi-ogawa Apr 13, 2024
df569b0
Merge remote-tracking branch 'origin/chore-canary-20240408' into chor…
hi-ogawa Apr 13, 2024
74bd4cd
chore: comment
hi-ogawa Apr 13, 2024
95e700c
test: one more
hi-ogawa Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/react-server/examples/basic/e2e/basic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ test("render count", async ({ page }) => {
await page.goto("/test");
await waitForHydration(page);

// strict mode doubles initial effect
const count = process.env.E2E_PREVIEW ? 1 : 2;
// no strict mode double effect since canary 20240408 ?
const count = process.env.E2E_PREVIEW ? 1 : 1;
Comment on lines -34 to +35
Copy link
Owner Author

@hi-ogawa hi-ogawa Apr 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did something change with strict mode or could it be a bug?

await page.getByText(`[effect: ${count}]`).click();
await page.getByRole("link", { name: "/test/other" }).click();
await page.getByText(`[effect: ${count}]`).click();
Expand Down Expand Up @@ -492,7 +492,7 @@ test("server action with js", async ({ page }) => {
await checkClientState();

// check layout doesn't re-render
const count = process.env.E2E_PREVIEW ? 1 : 2;
const count = process.env.E2E_PREVIEW ? 1 : 1;
await page.getByText(`[effect: ${count}]`).click();
});

Expand Down Expand Up @@ -524,7 +524,7 @@ test("server action after client render", async ({ page }) => {
await checkClientState();

// check layout doesn't re-render
const count = process.env.E2E_PREVIEW ? 1 : 2;
const count = process.env.E2E_PREVIEW ? 1 : 1;
await page.getByText(`[effect: ${count}]`).click();
});

Expand Down Expand Up @@ -724,7 +724,7 @@ test("revalidate on action", async ({ page }) => {

const checkClientState = await setupCheckClientState(page);

const count = process.env.E2E_PREVIEW ? 1 : 2;
const count = process.env.E2E_PREVIEW ? 1 : 1;
await page.getByText(`[effect: ${count}]`).click();
await page.getByRole("button", { name: "Action" }).click();
await page.getByText(`[effect: ${count + 1}]`).click();
Expand All @@ -740,7 +740,7 @@ test("revalidate on navigation", async ({ page }) => {

const checkClientState = await setupCheckClientState(page);

const count = process.env.E2E_PREVIEW ? 1 : 2;
const count = process.env.E2E_PREVIEW ? 1 : 1;
await page.getByText(`[effect: ${count}]`).click();
await page.getByRole("link", { name: "Navigation" }).click();
await page.getByText(`[effect: ${count + 1}]`).click();
Expand Down
6 changes: 3 additions & 3 deletions packages/react-server/examples/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"@hiogawa/test-dep-server-component": "file:deps/server-component",
"@hiogawa/test-dep-use-client": "file:deps/use-client",
"cookie": "^0.6.0",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"react-server-dom-webpack": "18.3.0-canary-14898b6a9-20240318",
"react": "19.0.0-canary-4c12339ce-20240408",
"react-dom": "19.0.0-canary-4c12339ce-20240408",
"react-server-dom-webpack": "19.0.0-canary-4c12339ce-20240408",
"react-wrap-balancer": "^1.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server/examples/basic/src/routes/test/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default async function Page() {
<CommonComponent message="from server" />
<div className="text-sm">
<pre>Server Time: {new Date().toISOString()}</pre>
<Fetch url="https://unpkg.com/react@18.3.0-canary-14898b6a9-20240318/package.json" />
<Fetch url="https://unpkg.com/react@19.0.0-canary-4c12339ce-20240408/package.json" />
</div>
<Counter />
</div>
Expand Down
6 changes: 3 additions & 3 deletions packages/react-server/examples/starter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
},
"dependencies": {
"@hiogawa/react-server": "latest",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"react-server-dom-webpack": "18.3.0-canary-14898b6a9-20240318"
"react": "19.0.0-canary-4c12339ce-20240408",
"react-dom": "19.0.0-canary-4c12339ce-20240408",
"react-server-dom-webpack": "19.0.0-canary-4c12339ce-20240408"
},
"devDependencies": {
"@hattip/adapter-node": "^0.0.44",
Expand Down
12 changes: 6 additions & 6 deletions packages/react-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@
"@types/react": "18.2.66",
"@types/react-dom": "18.2.22",
"@types/use-sync-external-store": "^0.0.6",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"react-server-dom-webpack": "18.3.0-canary-14898b6a9-20240318"
"react": "19.0.0-canary-4c12339ce-20240408",
"react-dom": "19.0.0-canary-4c12339ce-20240408",
"react-server-dom-webpack": "19.0.0-canary-4c12339ce-20240408"
},
"peerDependencies": {
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"react-server-dom-webpack": "18.3.0-canary-14898b6a9-20240318",
"react": "19.0.0-canary-4c12339ce-20240408",
"react-dom": "19.0.0-canary-4c12339ce-20240408",
"react-server-dom-webpack": "19.0.0-canary-4c12339ce-20240408",
"vite": "*"
}
}
96 changes: 45 additions & 51 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.