Skip to content

Commit 0fd4eef

Browse files
NavyaNavya
authored andcommitted
refactoring react
1 parent 05a08d9 commit 0fd4eef

File tree

6 files changed

+110
-63
lines changed

6 files changed

+110
-63
lines changed

client/start.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { BreakingNews, CLIENT_SIDE_RENDERED, NAVIGATE_TO_PAGE, PAGE_LOADING } fr
1111
import { createBrowserHistory } from "history";
1212
import get from "lodash/get";
1313
import React from "react";
14-
import ReactDOM from "react-dom";
14+
import { createRoot, hydrateRoot } from "react-dom/client";
1515
import { Provider } from "react-redux";
1616
import { IsomorphicComponent } from "../isomorphic/component";
1717
import { makePickComponentSync } from "../isomorphic/impl/make-pick-component-sync";
@@ -201,9 +201,14 @@ export function renderComponent(clazz, container, store, props = {}, callback) {
201201
}
202202

203203
if (props.hydrate) {
204-
return ReactDOM.hydrate(component, containerEle, callback);
204+
const root = hydrateRoot(containerEle, component);
205+
if (typeof callback === "function") callback();
206+
return root;
205207
}
206-
return ReactDOM.render(component, containerEle, callback);
208+
const root = createRoot(containerEle);
209+
root.render(component);
210+
if (typeof callback === "function") callback();
211+
return root;
207212
}
208213

209214
/**

package-lock.json

Lines changed: 94 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
"mocha-snapshots": "^4.2.0",
5555
"morgan": "^1.10.0",
5656
"path-to-regexp": "^6.2.0",
57-
"react": "^16.14.0",
58-
"react-dom": "^16.14.0",
59-
"react-redux": "^7.2.5",
57+
"react": "^19.1.0",
58+
"react-dom": "^19.1.0",
59+
"react-redux": "^9.1.2",
6060
"react-router": "^5.2.1",
6161
"redux": "^4.1.1",
6262
"request-promise": "^4.2.6",

test/integration/amp-handler-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-disable no-unused-vars */
22
/* eslint-disable no-undef */
33
/* eslint-disable func-names */
4-
import supertest from "supertest";
5-
import { ampRoutes } from "../../server/routes";
4+
const supertest = require("supertest");
5+
const { ampRoutes } = require("../../server/routes");
66

77
const assert = require("assert");
88
const express = require("express");

test/unit/amp/amp-setcorsheaders-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable func-names */
22
/* eslint-disable consistent-return */
3-
import supertest from "supertest";
4-
import { setCorsHeaders } from "../../../server/amp/helpers";
3+
const supertest = require("supertest");
4+
const { setCorsHeaders } = require("../../../server/amp/helpers");
55

66
const express = require("express");
77
const assert = require("assert");

test/unit/create-store-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NAVIGATE_TO_PAGE, SERVICE_WORKER_UPDATED } from "@quintype/components";
1+
const { NAVIGATE_TO_PAGE, SERVICE_WORKER_UPDATED } = require("@quintype/components");
22

33
const assert = require("assert");
44

0 commit comments

Comments
 (0)