Skip to content

Commit ac553e6

Browse files
authored
Merge pull request #293 from FormidableLabs/jp-upgrade-react
upgrade to React 17
2 parents cddbc60 + 829a54c commit ac553e6

File tree

6 files changed

+70
-385
lines changed

6 files changed

+70
-385
lines changed

jest.setup.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

package.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,21 @@
4343
"@rollup/plugin-replace": "^3.0.0",
4444
"@storybook/addon-controls": "^6.4.13",
4545
"@storybook/react": "^6.4.13",
46-
"@types/react": "^16.0.36",
46+
"@types/react": "^17.0.38",
4747
"babel-jest": "^27.0.6",
4848
"babel-loader": "^8.2.2",
4949
"babel-plugin-add-module-exports": "^1.0.4",
5050
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
51-
"enzyme": "^3.3.0",
52-
"enzyme-adapter-react-16": "^1.1.1",
5351
"eslint": "^8.7.0",
5452
"eslint-plugin-filenames": "^1.3.2",
5553
"eslint-plugin-import": "^2.25.4",
5654
"eslint-plugin-prettier": "^4.0.0",
5755
"eslint-plugin-react": "^7.28.0",
5856
"jest": "^27.0.6",
5957
"prettier": "^2.5.1",
60-
"react": "^16.8.0",
61-
"react-dom": "^16.8.0",
58+
"react": "^17.0.2",
59+
"react-dom": "^17.0.2",
60+
"react-test-renderer": "^17.0.2",
6261
"rollup": "^2.55.1",
6362
"rollup-plugin-filesize": "^9.1.1",
6463
"rollup-plugin-terser": "^7.0.2",
@@ -95,9 +94,6 @@
9594
],
9695
"jest": {
9796
"rootDir": "./src",
98-
"setupFiles": [
99-
"../jest.setup.js"
100-
],
10197
"testURL": "http://localhost/"
10298
},
10399
"sideEffects": false

src/utils/test/errorBoundary.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import errorBoundary from "../transpile/errorBoundary";
3-
import { render } from "enzyme";
3+
import { render } from "./renderer";
44

55
describe("errorBoundary", () => {
66
it("should wrap PFCs in an error boundary", () => {

src/utils/test/renderer.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import ShallowRenderer from "react-test-renderer/shallow";
2+
import ReactDOMServer from "react-dom/server";
3+
4+
const renderShallow = (Component) => {
5+
const renderer = new ShallowRenderer();
6+
renderer.render(Component);
7+
return renderer.getRenderOutput();
8+
};
9+
10+
export const render = (Component) =>
11+
ReactDOMServer.renderToStaticMarkup(renderShallow(Component)) || null;
12+
13+
export const shallow = (Component) => ({
14+
html: () => render(Component),
15+
text: () => renderShallow(Component).props.children,
16+
});

src/utils/test/transpile.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { generateElement, renderElementAsync } from "../transpile";
3-
import { shallow } from "enzyme";
3+
import { shallow } from "./renderer";
44

55
describe("transpile", () => {
66
describe("generateElement", () => {

0 commit comments

Comments
 (0)