From 294974ee05cf1734d6d6949ce777080f1f5f77ad Mon Sep 17 00:00:00 2001 From: Evan McLaughlin <70530636+emmclaughlin@users.noreply.github.com> Date: Tue, 4 Jun 2024 10:06:51 -0400 Subject: [PATCH] feat(react): upgrade dev dependency to react 18 (#119) --- package.json | 8 ++-- src/extensions/mjml-comment.ts | 2 +- src/extensions/mjml-conditional-comment.tsx | 1 + src/extensions/mjml-yahoo-style.tsx | 2 +- yarn.lock | 53 +++++++++------------ 5 files changed, 29 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index dd86dc3..d0a21ff 100644 --- a/package.json +++ b/package.json @@ -50,8 +50,8 @@ "@types/lodash.upperfirst": "^4.3.7", "@types/mjml": "^4.7.0", "@types/node": "^18.8.2", - "@types/react": "^17.0.4", - "@types/react-dom": "^17.0.4", + "@types/react": "^18.3", + "@types/react-dom": "^18.3", "@typescript-eslint/eslint-plugin": "^5.40.1", "@typescript-eslint/parser": "^5.40.1", "del": "^6.0.0", @@ -69,8 +69,8 @@ "mjml": "^4.14.1", "prettier": "^2.2.1", "pretty-quick": "^3.1.3", - "react": "^17.0.0", - "react-dom": "^17.0.0", + "react": "^18.3", + "react-dom": "^18.3", "semantic-release": "^19.0.5", "ts-jest": "^29.0.3", "ts-node": "^10.3.0", diff --git a/src/extensions/mjml-comment.ts b/src/extensions/mjml-comment.ts index 17494ff..aa13d12 100644 --- a/src/extensions/mjml-comment.ts +++ b/src/extensions/mjml-comment.ts @@ -2,7 +2,7 @@ import React, { Component } from "react"; import { convertPropsToMjmlAttributes } from "../utils"; -export class MjmlComment extends Component { +export class MjmlComment extends Component<{ children?: React.ReactNode }> { render() { const { children, ...rest } = this.props; if (children && children.toString().trim().length) { diff --git a/src/extensions/mjml-conditional-comment.tsx b/src/extensions/mjml-conditional-comment.tsx index 0869195..c363ad0 100644 --- a/src/extensions/mjml-conditional-comment.tsx +++ b/src/extensions/mjml-conditional-comment.tsx @@ -3,6 +3,7 @@ import React, { Component } from "react"; import { MjmlComment } from "./mjml-comment"; interface IMjmlConditionalComment { + children?: React.ReactNode; condition?: string; } diff --git a/src/extensions/mjml-yahoo-style.tsx b/src/extensions/mjml-yahoo-style.tsx index 6632d0a..c8cac84 100644 --- a/src/extensions/mjml-yahoo-style.tsx +++ b/src/extensions/mjml-yahoo-style.tsx @@ -2,7 +2,7 @@ import React, { Component } from "react"; import { MjmlRaw } from ".."; -export class MjmlYahooStyle extends Component { +export class MjmlYahooStyle extends Component<{ children?: React.ReactNode }> { render() { const { children, ...rest } = this.props; if (children && children.toString().trim().length) { diff --git a/yarn.lock b/yarn.lock index 3ec8af2..e863991 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,20 +1386,19 @@ resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/react-dom@^17.0.4": - version "17.0.17" - resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1" - integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg== +"@types/react-dom@^18.3": + version "18.3.0" + resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0" + integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg== dependencies: - "@types/react" "^17" + "@types/react" "*" -"@types/react@^17", "@types/react@^17.0.4": - version "17.0.50" - resolved "https://registry.npmjs.org/@types/react/-/react-17.0.50.tgz#39abb4f7098f546cfcd6b51207c90c4295ee81fc" - integrity sha512-ZCBHzpDb5skMnc1zFXAXnL3l1FAdi+xZvwxK+PkglMmBrwjpp9nKaWuEvrGnSifCJmBFGxZOOFuwC6KH/s0NuA== +"@types/react@*", "@types/react@^18.3": + version "18.3.3" + resolved "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f" + integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw== dependencies: "@types/prop-types" "*" - "@types/scheduler" "*" csstype "^3.0.2" "@types/relateurl@*": @@ -1412,11 +1411,6 @@ resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== -"@types/scheduler@*": - version "0.16.2" - resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== - "@types/semver@^7.3.12": version "7.3.12" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c" @@ -6083,14 +6077,13 @@ rc@1.2.8, rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-dom@^17.0.0: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== +react-dom@^18.3: + version "18.3.1" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4" + integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.2" + scheduler "^0.23.2" react-is@^16.13.1: version "16.13.1" @@ -6107,13 +6100,12 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -react@^17.0.0: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== +react@^18.3: + version "18.3.1" + resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" + integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" read-cmd-shim@^3.0.0: version "3.0.1" @@ -6352,13 +6344,12 @@ safe-regex-test@^1.0.0: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -scheduler@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" - integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== +scheduler@^0.23.2: + version "0.23.2" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" + integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" semantic-release@^19.0.5: version "19.0.5"