Skip to content

Commit 24c969a

Browse files
Merge pull request #183 from remarkablemark/build/dependencies
build: upgrade dependencies and fix tests
2 parents d56944d + d138b01 commit 24c969a

File tree

3 files changed

+44
-30
lines changed

3 files changed

+44
-30
lines changed

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,34 @@
3232
"dom"
3333
],
3434
"dependencies": {
35-
"@types/htmlparser2": "3.10.1",
35+
"@types/htmlparser2": "3.10.2",
3636
"html-dom-parser": "0.3.0",
3737
"react-property": "1.0.1",
3838
"style-to-js": "1.1.0"
3939
},
4040
"devDependencies": {
41-
"@commitlint/cli": "^8.3.5",
42-
"@commitlint/config-conventional": "^8.3.4",
43-
"@rollup/plugin-commonjs": "^12.0.0",
44-
"@rollup/plugin-node-resolve": "^8.0.0",
45-
"@types/react": "^16.9.35",
46-
"@typescript-eslint/parser": "^3.1.0",
41+
"@commitlint/cli": "^11.0.0",
42+
"@commitlint/config-conventional": "^11.0.0",
43+
"@rollup/plugin-commonjs": "^16.0.0",
44+
"@rollup/plugin-node-resolve": "^10.0.0",
45+
"@types/react": "^17.0.0",
46+
"@typescript-eslint/parser": "^4.8.2",
4747
"benchmark": "^2.1.4",
48-
"dtslint": "^3.6.10",
49-
"eslint": "^7.1.0",
50-
"eslint-plugin-prettier": "^3.1.3",
51-
"husky": "^4.2.5",
52-
"jest": "^26.0.1",
53-
"lint-staged": "^10.2.7",
54-
"preact": "^10.4.4",
55-
"prettier": "^2.0.5",
56-
"react": "^16",
57-
"react-dom": "^16",
48+
"dtslint": "^4.0.6",
49+
"eslint": "^7.14.0",
50+
"eslint-plugin-prettier": "^3.1.4",
51+
"husky": "^4.3.0",
52+
"jest": "^26.6.3",
53+
"lint-staged": "^10.5.2",
54+
"preact": "^10.5.7",
55+
"prettier": "^2.2.0",
56+
"react": "^17",
57+
"react-dom": "^17",
5858
"rimraf": "^3.0.2",
59-
"rollup": "^2.12.1",
59+
"rollup": "^2.33.3",
6060
"rollup-plugin-terser": "^7.0.2",
6161
"standard-version": "5",
62-
"typescript": "^3.9.3"
62+
"typescript": "^4.1.2"
6363
},
6464
"peerDependencies": {
6565
"react": "^0.14 || ^15 || ^16 || ^17"

test/dom-to-react.test.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,27 @@ describe('DOM to React', () => {
9595
const Preact = require('preact');
9696

9797
it('converts with React (default)', () => {
98-
const html = data.html.single;
99-
const reactElement = domToReact(htmlToDOM(html));
98+
const reactElement = domToReact(htmlToDOM(data.html.single));
10099

101100
expect(React.isValidElement(reactElement)).toBe(true);
101+
expect(Preact.isValidElement(reactElement)).toBe(false);
102+
102103
expect(reactElement).toEqual(React.createElement('p', {}, 'foo'));
103104
});
104105

105106
it('converts with Preact instead of React', () => {
106-
const html = data.html.single;
107-
const preactElement = domToReact(htmlToDOM(html), { library: Preact });
107+
const parsedElement = domToReact(htmlToDOM(data.html.single), {
108+
library: Preact
109+
});
110+
const preactElement = Preact.createElement('p', {}, 'foo');
111+
112+
expect(React.isValidElement(parsedElement)).toBe(false);
113+
expect(Preact.isValidElement(parsedElement)).toBe(true);
108114

109-
expect(Preact.isValidElement(preactElement)).toBe(true);
110-
expect(preactElement).toEqual(Preact.createElement('p', {}, 'foo'));
115+
// remove `__v` key since it's causing test equality to fail
116+
delete parsedElement.__v;
117+
delete preactElement.__v;
118+
expect(parsedElement).toEqual(preactElement);
111119
});
112120
});
113121

test/html-to-react.test.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,19 @@ describe('HTML to React', () => {
168168
});
169169

170170
describe('library', () => {
171+
const Preact = require('preact');
172+
171173
it('converts with Preact instead of React', () => {
172-
const Preact = require('preact');
173-
const html = data.html.single;
174-
const options = { library: Preact };
175-
const preactElement = parse(html, options);
174+
const parsedElement = parse(data.html.single, { library: Preact });
175+
const preactElement = Preact.createElement('p', {}, 'foo');
176+
177+
expect(React.isValidElement(parsedElement)).toBe(false);
178+
expect(Preact.isValidElement(parsedElement)).toBe(true);
176179

177-
expect(preactElement).toEqual(Preact.createElement('p', {}, 'foo'));
180+
// remove `__v` key since it's causing test equality to fail
181+
delete parsedElement.__v;
182+
delete preactElement.__v;
183+
expect(parsedElement).toEqual(preactElement);
178184
});
179185
});
180186

0 commit comments

Comments
 (0)