From 1e84d0d98cd31e2e41e2a98bcb4ff2a9d8f3a751 Mon Sep 17 00:00:00 2001 From: Andrew Moravec Date: Wed, 6 Jul 2022 10:22:06 -0500 Subject: [PATCH] Update sevearl packages fixes #3 --- package.json | 35 ++++++++++++++----------------- src/HtmlTextToReact.tsx | 4 ++-- src/test/HtmlTextToReact-test.tsx | 2 +- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index b62c5b3..785acbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "html-text-to-react", - "version": "0.0.5", + "version": "0.1.0", "description": "A safe way to display HTML as React components without the risk of cross-site-scripting", "main": "dist/HtmlTextToReact.js", "types": "dist/HtmlTextToReact.d.ts", @@ -21,24 +21,21 @@ "author": "Code42", "license": "MIT", "peerDependencies": { - "react": "^0.14.0 || ^15.0.0 || ^16.0.0-0" + "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" }, "devDependencies": { - "@types/chai": "^4.1.1", - "@types/enzyme": "^3.1.6", - "@types/enzyme-adapter-react-16": "^1.0.1", - "@types/mocha": "^2.2.46", - "@types/react": "^16.0.34", - "chai": "^4.1.2", - "enzyme": "^3.3.0", - "enzyme-adapter-react-16": "^1.1.1", - "jsdom": "^11.5.1", + "@types/chai": "^4.3.1", + "@types/mocha": "^9.1.1", + "@types/react": "^18.0.15", + "chai": "^4.3.6", + "enzyme": "^3.11.0", + "@zarconontol/enzyme-adapter-react-18": "^0.7.3", + "jsdom": "^20.0.0", "jsdom-global": "^3.0.2", - "mocha": "^4.1.0", - "react": "^16.2.0", - "react-dom": "^16.2.0", - "ts-node": "^4.1.0", - "typescript": "^2.6.2" - }, - "dependencies": {} -} + "mocha": "^10.0.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "ts-node": "^10.8.2", + "typescript": "^4.7.4" + } +} \ No newline at end of file diff --git a/src/HtmlTextToReact.tsx b/src/HtmlTextToReact.tsx index f075c9d..509c48d 100644 --- a/src/HtmlTextToReact.tsx +++ b/src/HtmlTextToReact.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -type WHITELISTED_HTML_TAGS = keyof ElementTagNameMap; -type WHITELISTED_HTML_ATTRIBUTES = keyof React.AllHTMLAttributes < any > | string; +type WHITELISTED_HTML_TAGS = keyof (HTMLElementTagNameMap & Pick>); +type WHITELISTED_HTML_ATTRIBUTES = keyof React.AllHTMLAttributes | string; // Node object isn't available when testing, so hardcode Node.ELEMENT_NODE as 1 const ELEMENT_NODE_TYPE = 1; diff --git a/src/test/HtmlTextToReact-test.tsx b/src/test/HtmlTextToReact-test.tsx index 19b6cfe..eca0eb3 100644 --- a/src/test/HtmlTextToReact-test.tsx +++ b/src/test/HtmlTextToReact-test.tsx @@ -5,7 +5,7 @@ import { createElementsFromText } from '../HtmlTextToReact'; // setup enzyme import { configure } from 'enzyme'; -import * as Adapter from 'enzyme-adapter-react-16'; +import * as Adapter from '@zarconontol/enzyme-adapter-react-18'; configure({ adapter: new Adapter() }); describe('createElementsFromText', () => {