Skip to content

Commit 8389d48

Browse files
markdalgleishmarkdalgleish
authored
Update dev dependencies to React 19 (#13558)
1 parent 860d5d9 commit 8389d48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+617
-489
lines changed

‎integration/defer-test.ts

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -552,14 +552,27 @@ test.describe("non-aborted", () => {
552552
return `<p id="count-${id}">${val}</p>`;
553553
}
554554

555+
const deferredHTMLStartString = "<template id=";
556+
function getCriticalHTML(html: string) {
557+
return html.slice(
558+
0,
559+
html.indexOf(deferredHTMLStartString) + deferredHTMLStartString.length
560+
);
561+
}
562+
function getDeferredHTML(html: string) {
563+
return html.slice(
564+
html.indexOf(deferredHTMLStartString) + deferredHTMLStartString.length
565+
);
566+
}
567+
555568
test("works with critical JSON like data", async ({ page }) => {
556569
let response = await fixture.requestDocument("/");
557570
let html = await response.text();
558-
let criticalHTML = html.slice(0, html.indexOf("</html>") + 7);
571+
let criticalHTML = getCriticalHTML(html);
559572
expect(criticalHTML).toContain(counterHtml(ROOT_ID, 0));
560573
expect(criticalHTML).toContain(counterHtml(INDEX_ID, 0));
561-
let deferredHTML = html.slice(html.indexOf("</html>") + 7);
562-
expect(deferredHTML).not.toBe("");
574+
let deferredHTML = getDeferredHTML(html);
575+
expect(deferredHTML.replace("</body></html>", "")).not.toBe("");
563576
expect(deferredHTML).not.toContain('<p id="count-');
564577

565578
let app = new PlaywrightFixture(appFixture, page);
@@ -579,12 +592,12 @@ test.describe("non-aborted", () => {
579592
}) => {
580593
let response = await fixture.requestDocument("/deferred-noscript-resolved");
581594
let html = await response.text();
582-
let criticalHTML = html.slice(0, html.indexOf("</html>") + 7);
595+
let criticalHTML = getCriticalHTML(html);
583596
expect(criticalHTML).toContain(counterHtml(ROOT_ID, 0));
584597
expect(criticalHTML).toContain(counterHtml(DEFERRED_ID, 0));
585-
expect(criticalHTML).toContain(FALLBACK_ID);
586598
expect(criticalHTML).not.toContain(counterHtml(RESOLVED_DEFERRED_ID, 0));
587-
let deferredHTML = html.slice(html.indexOf("</html>") + 7);
599+
let deferredHTML = getDeferredHTML(html);
600+
expect(deferredHTML).toContain(FALLBACK_ID);
588601
expect(deferredHTML).toContain(counterHtml(RESOLVED_DEFERRED_ID, 0));
589602

590603
let app = new PlaywrightFixture(appFixture, page);
@@ -599,12 +612,12 @@ test.describe("non-aborted", () => {
599612
"/deferred-noscript-unresolved"
600613
);
601614
let html = await response.text();
602-
let criticalHTML = html.slice(0, html.indexOf("</html>") + 7);
615+
let criticalHTML = getCriticalHTML(html);
603616
expect(criticalHTML).toContain(counterHtml(ROOT_ID, 0));
604617
expect(criticalHTML).toContain(counterHtml(DEFERRED_ID, 0));
605-
expect(criticalHTML).toContain(`<div id="${FALLBACK_ID}">`);
606618
expect(criticalHTML).not.toContain(RESOLVED_DEFERRED_ID);
607-
let deferredHTML = html.slice(html.indexOf("</html>") + 7);
619+
let deferredHTML = getDeferredHTML(html);
620+
expect(deferredHTML).toContain(`<div id="${FALLBACK_ID}">`);
608621
expect(deferredHTML).toContain(counterHtml(RESOLVED_DEFERRED_ID, 0));
609622

610623
let app = new PlaywrightFixture(appFixture, page);
@@ -619,11 +632,11 @@ test.describe("non-aborted", () => {
619632
}) => {
620633
let response = await fixture.requestDocument("/deferred-script-resolved");
621634
let html = await response.text();
622-
let criticalHTML = html.slice(0, html.indexOf("</html>") + 7);
635+
let criticalHTML = getCriticalHTML(html);
623636
expect(criticalHTML).toContain(counterHtml(ROOT_ID, 0));
624637
expect(criticalHTML).toContain(counterHtml(DEFERRED_ID, 0));
625-
expect(criticalHTML).toContain(FALLBACK_ID);
626-
let deferredHTML = html.slice(html.indexOf("</html>") + 7);
638+
let deferredHTML = getDeferredHTML(html);
639+
expect(deferredHTML).toContain(FALLBACK_ID);
627640
expect(deferredHTML).toContain(counterHtml(RESOLVED_DEFERRED_ID, 0));
628641

629642
let app = new PlaywrightFixture(appFixture, page);
@@ -645,12 +658,12 @@ test.describe("non-aborted", () => {
645658
}) => {
646659
let response = await fixture.requestDocument("/deferred-script-unresolved");
647660
let html = await response.text();
648-
let criticalHTML = html.slice(0, html.indexOf("</html>") + 7);
661+
let criticalHTML = getCriticalHTML(html);
649662
expect(criticalHTML).toContain(counterHtml(ROOT_ID, 0));
650663
expect(criticalHTML).toContain(counterHtml(DEFERRED_ID, 0));
651-
expect(criticalHTML).toContain(`<div id="${FALLBACK_ID}">`);
652664
expect(criticalHTML).not.toContain(RESOLVED_DEFERRED_ID);
653-
let deferredHTML = html.slice(html.indexOf("</html>") + 7);
665+
let deferredHTML = getDeferredHTML(html);
666+
expect(deferredHTML).toContain(`<div id="${FALLBACK_ID}">`);
654667
expect(deferredHTML).toContain(counterHtml(RESOLVED_DEFERRED_ID, 0));
655668

656669
let app = new PlaywrightFixture(appFixture, page);
@@ -672,11 +685,11 @@ test.describe("non-aborted", () => {
672685
}) => {
673686
let response = await fixture.requestDocument("/deferred-script-rejected");
674687
let html = await response.text();
675-
let criticalHTML = html.slice(0, html.indexOf("</html>") + 7);
688+
let criticalHTML = getCriticalHTML(html);
676689
expect(criticalHTML).toContain(counterHtml(ROOT_ID, 0));
677690
expect(criticalHTML).toContain(counterHtml(DEFERRED_ID, 0));
678-
expect(criticalHTML).toContain(FALLBACK_ID);
679-
let deferredHTML = html.slice(html.indexOf("</html>") + 7);
691+
let deferredHTML = getDeferredHTML(html);
692+
expect(deferredHTML).toContain(FALLBACK_ID);
680693
expect(deferredHTML).toContain(counterHtml(ERROR_ID, 0));
681694

682695
let app = new PlaywrightFixture(appFixture, page);
@@ -698,12 +711,12 @@ test.describe("non-aborted", () => {
698711
}) => {
699712
let response = await fixture.requestDocument("/deferred-script-unrejected");
700713
let html = await response.text();
701-
let criticalHTML = html.slice(0, html.indexOf("</html>") + 7);
714+
let criticalHTML = getCriticalHTML(html);
702715
expect(criticalHTML).toContain(counterHtml(ROOT_ID, 0));
703716
expect(criticalHTML).toContain(counterHtml(DEFERRED_ID, 0));
704-
expect(criticalHTML).toContain(`<div id="${FALLBACK_ID}">`);
705717
expect(criticalHTML).not.toContain(ERROR_ID);
706-
let deferredHTML = html.slice(html.indexOf("</html>") + 7);
718+
let deferredHTML = getDeferredHTML(html);
719+
expect(deferredHTML).toContain(`<div id="${FALLBACK_ID}">`);
707720
expect(deferredHTML).toContain(counterHtml(ERROR_ID, 0));
708721

709722
let app = new PlaywrightFixture(appFixture, page);

‎integration/helpers/cloudflare-dev-proxy-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"@react-router/cloudflare": "workspace:*",
1515
"isbot": "^4.1.0",
1616
"miniflare": "^3.20250214.0",
17-
"react": "^18.2.0",
18-
"react-dom": "^18.2.0",
17+
"react": "^19.1.0",
18+
"react-dom": "^19.1.0",
1919
"react-router": "workspace:*"
2020
},
2121
"devDependencies": {

‎integration/helpers/vite-5-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"@vanilla-extract/vite-plugin": "^3.9.2",
1919
"express": "^4.19.2",
2020
"isbot": "^5.1.11",
21-
"react": "^18.2.0",
22-
"react-dom": "^18.2.0",
21+
"react": "^19.1.0",
22+
"react-dom": "^19.1.0",
2323
"react-router": "workspace:*",
2424
"serialize-javascript": "^6.0.1"
2525
},

‎integration/helpers/vite-6-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"@vanilla-extract/vite-plugin": "^3.9.2",
1919
"express": "^4.19.2",
2020
"isbot": "^5.1.11",
21-
"react": "^18.2.0",
22-
"react-dom": "^18.2.0",
21+
"react": "^19.1.0",
22+
"react-dom": "^19.1.0",
2323
"react-router": "workspace:*",
2424
"serialize-javascript": "^6.0.1"
2525
},

‎integration/helpers/vite-plugin-cloudflare-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"dependencies": {
1313
"express": "^4.19.2",
1414
"isbot": "^5.1.11",
15-
"react": "^18.2.0",
16-
"react-dom": "^18.2.0",
15+
"react": "^19.1.0",
16+
"react-dom": "^19.1.0",
1717
"react-router": "workspace:*",
1818
"serialize-javascript": "^6.0.1"
1919
},

‎integration/helpers/vite-rolldown-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"@vanilla-extract/vite-plugin": "^3.9.2",
1919
"express": "^4.19.2",
2020
"isbot": "^5.1.11",
21-
"react": "^18.2.0",
22-
"react-dom": "^18.2.0",
21+
"react": "^19.1.0",
22+
"react-dom": "^19.1.0",
2323
"react-router": "workspace:*",
2424
"serialize-javascript": "^6.0.1"
2525
},

‎integration/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"postcss": "^8.4.19",
3232
"postcss-import": "^15.1.0",
3333
"prettier": "^2.7.1",
34-
"react": "^18.2.0",
35-
"react-dom": "^18.2.0",
34+
"react": "^19.1.0",
35+
"react-dom": "^19.1.0",
3636
"react-router": "workspace:*",
3737
"serialize-javascript": "^6.0.1",
3838
"shelljs": "^0.8.5",

0 commit comments

Comments
 (0)