From c22698345a8772667c9111d222ec9fd44e3f9f17 Mon Sep 17 00:00:00 2001 From: Jon Koops Date: Tue, 9 Apr 2024 18:06:31 +0200 Subject: [PATCH] chore: upgrade TypeScript to version 5 Closes #10156 Signed-off-by: Jon Koops --- package.json | 2 +- packages/react-charts/package.json | 5 +- packages/react-code-editor/package.json | 5 +- packages/react-core/package.json | 5 +- packages/react-drag-drop/package.json | 3 - packages/react-icons/package.json | 3 +- .../demo-app-ts/package.json | 1 - packages/react-integration/package.json | 1 - packages/react-styles/package.json | 3 +- packages/react-table/package.json | 5 +- packages/react-templates/package.json | 7 +- scripts/generators/package/package.json.hbs | 3 +- yarn.lock | 85 +++++++------------ 13 files changed, 44 insertions(+), 84 deletions(-) diff --git a/package.json b/package.json index 51bf68cac5e..5eb81150435 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "surge": "^0.23.1", "ts-node": "^10.9.1", "ts-patch": "^2.1.0", - "typescript": "^4.7.4" + "typescript": "^5.4.5" }, "scripts": { "build": "yarn clean && yarn build:generate && yarn build:esm && yarn build:cjs && yarn build:subpaths && yarn build:single:packages", diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json index e3a3ee3460e..ca7897e2dfc 100644 --- a/packages/react-charts/package.json +++ b/packages/react-charts/package.json @@ -32,7 +32,7 @@ "@patternfly/react-tokens": "^5.4.0-prerelease.3", "hoist-non-react-statics": "^3.3.0", "lodash": "^4.17.21", - "tslib": "^2.5.0", + "tslib": "^2.6.2", "victory-area": "^36.9.1", "victory-axis": "^36.9.1", "victory-bar": "^36.9.1", @@ -63,7 +63,6 @@ "@types/lodash": "^4.14.157", "css": "^2.2.3", "fs-extra": "^11.0.0", - "glob": "^7.1.2", - "typescript": "^4.7.4" + "glob": "^7.1.2" } } diff --git a/packages/react-code-editor/package.json b/packages/react-code-editor/package.json index 5c0555d6d0b..e28789de50b 100644 --- a/packages/react-code-editor/package.json +++ b/packages/react-code-editor/package.json @@ -34,14 +34,13 @@ "@patternfly/react-icons": "^5.4.0-prerelease.3", "@patternfly/react-styles": "^5.4.0-prerelease.3", "react-dropzone": "14.2.3", - "tslib": "^2.5.0" + "tslib": "^2.6.2" }, "peerDependencies": { "react": "^17 || ^18", "react-dom": "^17 || ^18" }, "devDependencies": { - "monaco-editor": "^0.47.0", - "typescript": "^4.7.4" + "monaco-editor": "^0.47.0" } } diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 0517f66ce14..13ed5cb68dd 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -51,7 +51,7 @@ "@patternfly/react-tokens": "^5.4.0-prerelease.3", "focus-trap": "7.5.2", "react-dropzone": "^14.2.3", - "tslib": "^2.5.0" + "tslib": "^2.6.2" }, "devDependencies": { "@patternfly/patternfly": "5.4.0-prerelease.2", @@ -64,8 +64,7 @@ "rollup": "^3.21.5", "rollup-plugin-scss": "^4.0.0", "rollup-plugin-svg": "2.0.0", - "rollup-plugin-terser": "^7.0.2", - "typescript": "^4.7.4" + "rollup-plugin-terser": "^7.0.2" }, "peerDependencies": { "react": "^17 || ^18", diff --git a/packages/react-drag-drop/package.json b/packages/react-drag-drop/package.json index c092ab094ab..84e45c1d85e 100644 --- a/packages/react-drag-drop/package.json +++ b/packages/react-drag-drop/package.json @@ -41,8 +41,5 @@ "peerDependencies": { "react": "^17 || ^18", "react-dom": "^17 || ^18" - }, - "devDependencies": { - "typescript": "^4.7.4" } } diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index d4687156dcb..6099259d157 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -35,8 +35,7 @@ "@patternfly/patternfly": "5.4.0-prerelease.2", "fs-extra": "^11.1.1", "glob": "^7.1.2", - "tslib": "^2.5.0", - "typescript": "^4.7.4" + "tslib": "^2.6.2" }, "peerDependencies": { "react": "^17 || ^18", diff --git a/packages/react-integration/demo-app-ts/package.json b/packages/react-integration/demo-app-ts/package.json index 7014631e142..e003d33d45d 100644 --- a/packages/react-integration/demo-app-ts/package.json +++ b/packages/react-integration/demo-app-ts/package.json @@ -35,7 +35,6 @@ "react-refresh-typescript": "2.0.7", "style-loader": "3.3.1", "ts-loader": "^8.3.0", - "typescript": "^4.7.4", "url-loader": "^4.1.0", "webpack": "5.73.0", "webpack-cli": "4.10.0", diff --git a/packages/react-integration/package.json b/packages/react-integration/package.json index 9a1d6a0c2ba..3fdce557291 100644 --- a/packages/react-integration/package.json +++ b/packages/react-integration/package.json @@ -33,7 +33,6 @@ "jasmine-xml2html-converter": "^0.0.2", "junit-merge": "^2.0.0", "ts-loader": "^8.3.0", - "typescript": "^4.7.4", "webpack": "^4.43.0" } } diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index e6c67496f51..da53fdb48bb 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -23,8 +23,7 @@ "css": "^2.2.3", "fs-extra": "^11.1.1", "glob": "^7.1.2", - "jsdom": "^15.1.0", - "typescript": "^4.7.4" + "jsdom": "^15.1.0" }, "license": "MIT" } diff --git a/packages/react-table/package.json b/packages/react-table/package.json index 7d4c707c6d6..9192985da1b 100644 --- a/packages/react-table/package.json +++ b/packages/react-table/package.json @@ -44,10 +44,7 @@ "@patternfly/react-styles": "^5.4.0-prerelease.3", "@patternfly/react-tokens": "^5.4.0-prerelease.3", "lodash": "^4.17.19", - "tslib": "^2.5.0" - }, - "devDependencies": { - "typescript": "^4.7.4" + "tslib": "^2.6.2" }, "peerDependencies": { "react": "^17 || ^18", diff --git a/packages/react-templates/package.json b/packages/react-templates/package.json index f6955f3505c..1a11acc12a4 100644 --- a/packages/react-templates/package.json +++ b/packages/react-templates/package.json @@ -37,13 +37,10 @@ "@patternfly/react-icons": "^5.4.0-prerelease.3", "@patternfly/react-styles": "^5.4.0-prerelease.3", "@patternfly/react-tokens": "^5.4.0-prerelease.3", - "tslib": "^2.5.0" + "tslib": "^2.6.2" }, "peerDependencies": { "react": "^17 || ^18", "react-dom": "^17 || ^18" - }, - "devDependencies": { - "typescript": "^4.7.4" } -} +} \ No newline at end of file diff --git a/scripts/generators/package/package.json.hbs b/scripts/generators/package/package.json.hbs index c7e129fbdb7..061bbe2b171 100644 --- a/scripts/generators/package/package.json.hbs +++ b/scripts/generators/package/package.json.hbs @@ -35,8 +35,7 @@ "dependencies": {}, "devDependencies": { {{#if buildsWithTypescript}} - "tslib": "1.13.0",, - "typescript": "^3.8.3" + "tslib": "^2.6.2" {{/if}} }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 052f65ae2a4..c78fce3ad7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9479,26 +9479,26 @@ glob@^10.3.7: minipass "^7.0.4" path-scurry "^1.10.2" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.4: - version "7.1.6" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" +glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.3, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.4: + version "7.1.6" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.1.1" + minimatch "^3.0.4" once "^1.3.0" path-is-absolute "^1.0.0" @@ -10424,7 +10424,8 @@ internal-slot@^1.0.3, internal-slot@^1.0.5: interpret@^1.0.0: version "1.4.0" - resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== interpret@^2.2.0: version "2.2.0" @@ -15752,7 +15753,8 @@ readdirp@~3.6.0: rechoir@^0.6.2: version "0.6.2" - resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw== dependencies: resolve "^1.1.6" @@ -16142,7 +16144,16 @@ resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz" -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.14.2, resolve@^1.22.4: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^1.10.0, resolve@^1.3.2: version "1.17.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz" dependencies: @@ -16157,15 +16168,6 @@ resolve@^1.10.1: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^1.14.2, resolve@^1.22.4: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== - dependencies: - is-core-module "^2.13.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - resolve@^1.20.0: version "1.20.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz" @@ -17293,16 +17295,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -17435,7 +17428,7 @@ stringify-entities@^3.0.1: is-decimal "^1.0.2" is-hexadecimal "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -17454,13 +17447,6 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -18143,7 +18129,7 @@ tslib@^1.9.0: version "1.13.0" resolved "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz" -tslib@^2.0.0, tslib@^2.5.0, tslib@^2.6.2: +tslib@^2.0.0, tslib@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== @@ -18333,10 +18319,10 @@ typescript@4.3.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274" integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA== -typescript@^4.7.4: - version "4.7.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" - integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== +typescript@^5.4.5: + version "5.4.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" + integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== typical@^2.6.0, typical@^2.6.1: version "2.6.1" @@ -19543,7 +19529,7 @@ worker-farm@^1.7.0: dependencies: errno "~0.1.7" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -19561,15 +19547,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"