From 78b7a8e8a52b23676a5d86ef60ee9c57683839e3 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 13 Feb 2024 19:12:30 -0500 Subject: [PATCH 1/2] fix(package): move `@types/react` from devDependencies to dependencies Fixes #1313 --- package-lock.json | 16 ++++------------ package.json | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 29c91ff7..e465501b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "5.1.4", "license": "MIT", "dependencies": { + "@types/react": "18.2.55", "domhandler": "5.0.3", "html-dom-parser": "5.0.8", "react-property": "2.0.2", @@ -24,7 +25,6 @@ "@size-limit/preset-big-lib": "11.0.2", "@types/benchmark": "2.1.5", "@types/jest": "29.5.12", - "@types/react": "18.2.55", "@types/react-dom": "18.2.19", "@typescript-eslint/eslint-plugin": "7.0.1", "@typescript-eslint/parser": "7.0.1", @@ -2208,14 +2208,12 @@ }, "node_modules/@types/prop-types": { "version": "15.7.5", - "dev": true, "license": "MIT" }, "node_modules/@types/react": { "version": "18.2.55", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.55.tgz", "integrity": "sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA==", - "dev": true, "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2238,7 +2236,6 @@ }, "node_modules/@types/scheduler": { "version": "0.16.3", - "dev": true, "license": "MIT" }, "node_modules/@types/semver": { @@ -3657,7 +3654,6 @@ }, "node_modules/csstype": { "version": "3.1.2", - "dev": true, "license": "MIT" }, "node_modules/dargs": { @@ -11458,14 +11454,12 @@ "dev": true }, "@types/prop-types": { - "version": "15.7.5", - "dev": true + "version": "15.7.5" }, "@types/react": { "version": "18.2.55", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.55.tgz", "integrity": "sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA==", - "dev": true, "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -11486,8 +11480,7 @@ "dev": true }, "@types/scheduler": { - "version": "0.16.3", - "dev": true + "version": "0.16.3" }, "@types/semver": { "version": "7.5.7", @@ -12470,8 +12463,7 @@ } }, "csstype": { - "version": "3.1.2", - "dev": true + "version": "3.1.2" }, "dargs": { "version": "7.0.0", diff --git a/package.json b/package.json index 7d467723..87101f4c 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "dom" ], "dependencies": { + "@types/react": "18.2.55", "domhandler": "5.0.3", "html-dom-parser": "5.0.8", "react-property": "2.0.2", @@ -63,7 +64,6 @@ "@size-limit/preset-big-lib": "11.0.2", "@types/benchmark": "2.1.5", "@types/jest": "29.5.12", - "@types/react": "18.2.55", "@types/react-dom": "18.2.19", "@typescript-eslint/eslint-plugin": "7.0.1", "@typescript-eslint/parser": "7.0.1", From e3c7931d4918d158d02286a7f8b30d53c521dcb4 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 13 Feb 2024 19:15:44 -0500 Subject: [PATCH 2/2] fix(esm): fix attributes-to-props and dom-to-react exported types --- esm/attributes-to-props.d.mts | 5 ++++- esm/dom-to-react.d.mts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/esm/attributes-to-props.d.mts b/esm/attributes-to-props.d.mts index 76cda8c7..ef267d3b 100644 --- a/esm/attributes-to-props.d.mts +++ b/esm/attributes-to-props.d.mts @@ -1 +1,4 @@ -export { default } from '../lib/attributes-to-props'; +import attributesToProps from '../lib/attributes-to-props.js'; + +// @ts-expect-error Property 'default' exists on type +export default attributesToProps.default || attributesToProps; diff --git a/esm/dom-to-react.d.mts b/esm/dom-to-react.d.mts index 35068a7f..aa01ec21 100644 --- a/esm/dom-to-react.d.mts +++ b/esm/dom-to-react.d.mts @@ -1 +1,4 @@ -export { default } from '../lib/dom-to-react'; +import domToReact from '../lib/dom-to-react.js'; + +// @ts-expect-error Property 'default' exists on type +export default domToReact.default || domToReact;