From a9909c1575f2f747ea8e2a9f4f04065fe1668b02 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Mon, 13 May 2024 17:13:46 +1000 Subject: [PATCH 1/9] Typescript 5.5.0 upgrade --- package.json | 2 +- .../@internationalized/number/src/NumberParser.ts | 6 +++--- packages/@react-spectrum/color/src/ColorEditor.tsx | 10 ++++++++-- .../meter/stories/Meter.stories.tsx | 3 ++- .../stories/ColorPicker.stories.tsx | 14 +++++++++++--- tsconfig.json | 2 +- yarn.lock | 8 ++++---- 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index b3382475f54..16ff025196d 100644 --- a/package.json +++ b/package.json @@ -183,7 +183,7 @@ "tailwindcss": "^3.4.0", "tailwindcss-animate": "^1.0.7", "tempy": "^0.5.0", - "typescript": "^5.3.3", + "typescript": "^5.5.0-dev.20240512", "typescript-strict-plugin": "^2.0.0", "verdaccio": "^5.13.0", "walk-object": "^4.0.0", diff --git a/packages/@internationalized/number/src/NumberParser.ts b/packages/@internationalized/number/src/NumberParser.ts index 41bf24de7a6..64c03451f3b 100644 --- a/packages/@internationalized/number/src/NumberParser.ts +++ b/packages/@internationalized/number/src/NumberParser.ts @@ -164,9 +164,9 @@ class NumberParserImpl { // extra step for rounding percents to what our formatter would output let options = { ...this.options, - style: 'decimal', - minimumFractionDigits: Math.min(this.options.minimumFractionDigits + 2, 20), - maximumFractionDigits: Math.min(this.options.maximumFractionDigits + 2, 20) + style: 'decimal' as const, + minimumFractionDigits: Math.min((this.options.minimumFractionDigits ?? 0) + 2, 20), + maximumFractionDigits: Math.min((this.options.maximumFractionDigits ?? 0) + 2, 20) }; return (new NumberParser(this.locale, options)).parse(new NumberFormatter(this.locale, options).format(newValue)); } diff --git a/packages/@react-spectrum/color/src/ColorEditor.tsx b/packages/@react-spectrum/color/src/ColorEditor.tsx index e4b8789ac2d..a0941d1f601 100644 --- a/packages/@react-spectrum/color/src/ColorEditor.tsx +++ b/packages/@react-spectrum/color/src/ColorEditor.tsx @@ -19,6 +19,12 @@ export interface SpectrumColorEditorProps { function ColorEditor(props: SpectrumColorEditorProps, ref: DOMRef) { let [format, setFormat] = useState('hex'); + let resolvedFormat: ColorSpace; + if (format === 'hex') { + resolvedFormat = 'rgb'; + } else { + resolvedFormat = format; + } let domRef = useDOMRef(ref); let formatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/color'); @@ -32,7 +38,7 @@ function ColorEditor(props: SpectrumColorEditorProps, ref: DOMRef
- : getColorChannels(format).map(channel => ( - + ))} {!props.hideAlphaChannel && } diff --git a/packages/@react-spectrum/meter/stories/Meter.stories.tsx b/packages/@react-spectrum/meter/stories/Meter.stories.tsx index b230fb46e09..ba5bf5e691f 100644 --- a/packages/@react-spectrum/meter/stories/Meter.stories.tsx +++ b/packages/@react-spectrum/meter/stories/Meter.stories.tsx @@ -12,6 +12,7 @@ import {ComponentMeta, ComponentStoryObj} from '@storybook/react'; import {Meter} from '../'; +import {NumberFormatOptions} from '@internationalized/number'; import React from 'react'; type MeterStory = ComponentStoryObj; @@ -19,7 +20,7 @@ type MeterStory = ComponentStoryObj; const formatOptions = { style: 'currency', currency: 'JPY' -}; +} as NumberFormatOptions; export default { title: 'Meter', diff --git a/packages/react-aria-components/stories/ColorPicker.stories.tsx b/packages/react-aria-components/stories/ColorPicker.stories.tsx index 4d28bda2b43..5fd7330f1d1 100644 --- a/packages/react-aria-components/stories/ColorPicker.stories.tsx +++ b/packages/react-aria-components/stories/ColorPicker.stories.tsx @@ -24,8 +24,16 @@ export default { title: 'React Aria Components' }; +type AllColorSpaces = ColorSpace | 'hex'; + export const ColorPickerExample = (args) => { - let [format, setFormat] = useState('hex'); + let [format, setFormat] = useState('hex'); + let resolvedFormat: ColorSpace; + if (format === 'hex') { + resolvedFormat = 'rgb'; + } else { + resolvedFormat = format; + } return ( @@ -42,14 +50,14 @@ export const ColorPickerExample = (args) => {
- {format === 'hex' + {format === 'hex' ? ( ) : getColorChannels(format).map(channel => ( - + diff --git a/tsconfig.json b/tsconfig.json index 2a299fcf891..08b709abbc7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ // we can explicitly declare `any`, but we don't want to infer `any` "noImplicitAny": false, // maybe bump to 'esNext'? - "target": "es6", + "target": "es2018", // allows react jsx in tsx files "jsx": "react", // Eventually turn off, one we have no more assumed default exports. diff --git a/yarn.lock b/yarn.lock index 26c547ea072..f8b1aecc21b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22398,10 +22398,10 @@ typescript-strict-plugin@^2.0.0: ora "^5.4.1" yargs "^16.2.0" -typescript@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== +typescript@^5.5.0-dev.20240512: + version "5.5.0-dev.20240512" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240512.tgz#0125f77789f1f9cc0d1f3111523cf19ca9713e9a" + integrity sha512-qaBthiey39OUkoC0p3r83WKUG4KEvgTJg968MxJ548G6lYhpsFhp1Qryxrf32BonZwzfVi46Ltb9maSHVceLMg== ua-parser-js@0.7.17: version "0.7.17" From bce50f0648c05cea1b571b533b6bfaaac597510c Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Mon, 13 May 2024 17:31:56 +1000 Subject: [PATCH 2/9] resolve issue with framer motion --- package.json | 2 +- yarn.lock | 22 ++++------------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 16ff025196d..8f8350e6100 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "eslint-plugin-rulesdir": "^0.2.2", "fast-check": "^2.19.0", "fast-glob": "^3.1.0", - "framer-motion": "^10.16.4", + "framer-motion": "^11.1.9", "fs-extra": "^10.0.0", "full-icu": "^1.3.0", "glob-promise": "^6.0.5", diff --git a/yarn.lock b/yarn.lock index f8b1aecc21b..645944366a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1374,18 +1374,6 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@emotion/is-prop-valid@^0.8.2": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" - integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== - dependencies: - "@emotion/memoize" "0.7.4" - -"@emotion/memoize@0.7.4": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" - integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== - "@emotion/use-insertion-effect-with-fallbacks@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz#08de79f54eb3406f9daaf77c76e35313da963963" @@ -11407,14 +11395,12 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -framer-motion@^10.16.4: - version "10.16.4" - resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-10.16.4.tgz#30279ef5499b8d85db3a298ee25c83429933e9f8" - integrity sha512-p9V9nGomS3m6/CALXqv6nFGMuFOxbWsmaOrdmhyQimMIlLl3LC7h7l86wge/Js/8cRu5ktutS/zlzgR7eBOtFA== +framer-motion@^11.1.9: + version "11.1.9" + resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-11.1.9.tgz#1ef021fc35615eb83d6baa903a47ba872be99187" + integrity sha512-flECDIPV4QDNcOrDafVFiIazp8X01HFpzc01eDKJsdNH/wrATcYydJSH9JbPWMS8UD5lZlw+J1sK8LG2kICgqw== dependencies: tslib "^2.4.0" - optionalDependencies: - "@emotion/is-prop-valid" "^0.8.2" fresh@0.5.2, fresh@^0.5.2: version "0.5.2" From 5e9199dda464b7446d711a70daa44c04633ad52f Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Wed, 15 May 2024 11:10:42 +1000 Subject: [PATCH 3/9] Review comments --- package.json | 2 +- packages/@react-spectrum/color/src/ColorEditor.tsx | 8 +------- packages/@react-spectrum/meter/stories/Meter.stories.tsx | 2 +- .../react-aria-components/stories/ColorPicker.stories.tsx | 8 +------- yarn.lock | 8 ++++---- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 8f8350e6100..ff8b91c6e7e 100644 --- a/package.json +++ b/package.json @@ -183,7 +183,7 @@ "tailwindcss": "^3.4.0", "tailwindcss-animate": "^1.0.7", "tempy": "^0.5.0", - "typescript": "^5.5.0-dev.20240512", + "typescript": "^5.5.0-dev.20240514", "typescript-strict-plugin": "^2.0.0", "verdaccio": "^5.13.0", "walk-object": "^4.0.0", diff --git a/packages/@react-spectrum/color/src/ColorEditor.tsx b/packages/@react-spectrum/color/src/ColorEditor.tsx index a0941d1f601..416f90f67d4 100644 --- a/packages/@react-spectrum/color/src/ColorEditor.tsx +++ b/packages/@react-spectrum/color/src/ColorEditor.tsx @@ -19,12 +19,6 @@ export interface SpectrumColorEditorProps { function ColorEditor(props: SpectrumColorEditorProps, ref: DOMRef) { let [format, setFormat] = useState('hex'); - let resolvedFormat: ColorSpace; - if (format === 'hex') { - resolvedFormat = 'rgb'; - } else { - resolvedFormat = format; - } let domRef = useDOMRef(ref); let formatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/color'); @@ -53,7 +47,7 @@ function ColorEditor(props: SpectrumColorEditorProps, ref: DOMRef : getColorChannels(format).map(channel => ( - + ))} {!props.hideAlphaChannel && } diff --git a/packages/@react-spectrum/meter/stories/Meter.stories.tsx b/packages/@react-spectrum/meter/stories/Meter.stories.tsx index ba5bf5e691f..c54d848c6b6 100644 --- a/packages/@react-spectrum/meter/stories/Meter.stories.tsx +++ b/packages/@react-spectrum/meter/stories/Meter.stories.tsx @@ -20,7 +20,7 @@ type MeterStory = ComponentStoryObj; const formatOptions = { style: 'currency', currency: 'JPY' -} as NumberFormatOptions; +} satisfies NumberFormatOptions; export default { title: 'Meter', diff --git a/packages/react-aria-components/stories/ColorPicker.stories.tsx b/packages/react-aria-components/stories/ColorPicker.stories.tsx index 5fd7330f1d1..d0b91e21eed 100644 --- a/packages/react-aria-components/stories/ColorPicker.stories.tsx +++ b/packages/react-aria-components/stories/ColorPicker.stories.tsx @@ -28,12 +28,6 @@ type AllColorSpaces = ColorSpace | 'hex'; export const ColorPickerExample = (args) => { let [format, setFormat] = useState('hex'); - let resolvedFormat: ColorSpace; - if (format === 'hex') { - resolvedFormat = 'rgb'; - } else { - resolvedFormat = format; - } return ( @@ -57,7 +51,7 @@ export const ColorPickerExample = (args) => { ) : getColorChannels(format).map(channel => ( - + diff --git a/yarn.lock b/yarn.lock index 645944366a2..ad10c295df2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22384,10 +22384,10 @@ typescript-strict-plugin@^2.0.0: ora "^5.4.1" yargs "^16.2.0" -typescript@^5.5.0-dev.20240512: - version "5.5.0-dev.20240512" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240512.tgz#0125f77789f1f9cc0d1f3111523cf19ca9713e9a" - integrity sha512-qaBthiey39OUkoC0p3r83WKUG4KEvgTJg968MxJ548G6lYhpsFhp1Qryxrf32BonZwzfVi46Ltb9maSHVceLMg== +typescript@^5.5.0-dev.20240514: + version "5.5.0-dev.20240514" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240514.tgz#e5af4601760955c53fe5eb42298419862f01a262" + integrity sha512-NccALPZlTF/kDNV2Q071Or2T5CcoAHodWjsKseA4LZKfdqufQzebaQlPuZatC8AgHY2cnQJBcKMCHNFWW9ubpA== ua-parser-js@0.7.17: version "0.7.17" From 719fa8c4a8396c8b42f9f8d85fd6aaa377aa0235 Mon Sep 17 00:00:00 2001 From: Robert Snow Date: Wed, 15 May 2024 12:48:15 +1000 Subject: [PATCH 4/9] Update ColorPicker.stories.tsx remove extraneous type --- .../react-aria-components/stories/ColorPicker.stories.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/react-aria-components/stories/ColorPicker.stories.tsx b/packages/react-aria-components/stories/ColorPicker.stories.tsx index d0b91e21eed..ba747b73dd4 100644 --- a/packages/react-aria-components/stories/ColorPicker.stories.tsx +++ b/packages/react-aria-components/stories/ColorPicker.stories.tsx @@ -24,10 +24,8 @@ export default { title: 'React Aria Components' }; -type AllColorSpaces = ColorSpace | 'hex'; - export const ColorPickerExample = (args) => { - let [format, setFormat] = useState('hex'); + let [format, setFormat] = useState('hex'); return ( From 9ff27d5b1eff28f366bad16aa5bb8dd9fe02a2c9 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Fri, 24 May 2024 16:47:34 +1000 Subject: [PATCH 5/9] Deduped, fixed a new ts error, patched problem dependency --- package.json | 4 +-- .../numberfield/src/useNumberField.ts | 2 +- yarn.lock | 26 +++++++------------ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index ff8b91c6e7e..64182b6df17 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "react-dom": "^18.2.0", "react-frame-component": "^5.0.0", "react-test-renderer": "^16.9.0", - "recast": "^0.20", + "recast": "^0.23", "recursive-readdir": "^2.2.2", "regenerator-runtime": "0.13.3", "rimraf": "^2.6.3", @@ -183,7 +183,7 @@ "tailwindcss": "^3.4.0", "tailwindcss-animate": "^1.0.7", "tempy": "^0.5.0", - "typescript": "^5.5.0-dev.20240514", + "typescript": "^5.5.0-dev.20240523", "typescript-strict-plugin": "^2.0.0", "verdaccio": "^5.13.0", "walk-object": "^4.0.0", diff --git a/packages/@react-aria/numberfield/src/useNumberField.ts b/packages/@react-aria/numberfield/src/useNumberField.ts index 9f9b4a52955..875382a776b 100644 --- a/packages/@react-aria/numberfield/src/useNumberField.ts +++ b/packages/@react-aria/numberfield/src/useNumberField.ts @@ -153,7 +153,7 @@ export function useNumberField(props: AriaNumberFieldProps, state: NumberFieldSt // Browsers and operating systems are quite inconsistent about what keys are available, however. // We choose between numeric and decimal based on whether we allow negative and fractional numbers, // and based on testing on various devices to determine what keys are available in each inputMode. - let hasDecimals = intlOptions.maximumFractionDigits > 0; + let hasDecimals = (intlOptions.maximumFractionDigits ?? 0) > 0; let hasNegative = (state.minValue === undefined || isNaN(state.minValue)) || state.minValue < 0; let inputMode: TextInputDOMProps['inputMode'] = 'numeric'; if (isIPhone()) { diff --git a/yarn.lock b/yarn.lock index ad10c295df2..fbcf20ff072 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6799,13 +6799,6 @@ ast-types-flow@^0.0.7: resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= -ast-types@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd" - integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA== - dependencies: - tslib "^2.0.1" - ast-types@^0.16.1: version "0.16.1" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.16.1.tgz#7a9da1617c9081bc121faafe91711b4c8bb81da2" @@ -19771,14 +19764,15 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -recast@^0.20: - version "0.20.5" - resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae" - integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ== +recast@^0.23: + version "0.23.7" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.7.tgz#1e08f164e10402b075c904a2b01022b3da039c72" + integrity sha512-MpQlLZVpqbbxYcqEjwpRWo88sGvjOYoXptySz710RuddNMHx+wPkoNX6YyLZJlXAh5VZr1qmPrTwcTuFMh0Lag== dependencies: - ast-types "0.14.2" + ast-types "^0.16.1" esprima "~4.0.0" source-map "~0.6.1" + tiny-invariant "^1.3.3" tslib "^2.0.1" recast@^0.23.1, recast@^0.23.3: @@ -22384,10 +22378,10 @@ typescript-strict-plugin@^2.0.0: ora "^5.4.1" yargs "^16.2.0" -typescript@^5.5.0-dev.20240514: - version "5.5.0-dev.20240514" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240514.tgz#e5af4601760955c53fe5eb42298419862f01a262" - integrity sha512-NccALPZlTF/kDNV2Q071Or2T5CcoAHodWjsKseA4LZKfdqufQzebaQlPuZatC8AgHY2cnQJBcKMCHNFWW9ubpA== +typescript@^5.5.0-dev.20240523: + version "5.5.0-dev.20240523" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240523.tgz#1ad5c838946cfb885d584780ed4f4fd36b4b29e3" + integrity sha512-YOB70i/IXEmSACEQ87NIPif84AGq4mjufwmoAp4HCOpgTjq6KFZe51OtNGvZbi+kMwlmQiKSrKlkfRGMndmsRA== ua-parser-js@0.7.17: version "0.7.17" From 452f18bc835375908071e35f4387fab469414c38 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Fri, 24 May 2024 16:47:41 +1000 Subject: [PATCH 6/9] patch --- patches/ast-types+0.16.1.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 patches/ast-types+0.16.1.patch diff --git a/patches/ast-types+0.16.1.patch b/patches/ast-types+0.16.1.patch new file mode 100644 index 00000000000..e88de790a90 --- /dev/null +++ b/patches/ast-types+0.16.1.patch @@ -0,0 +1,15 @@ +diff --git a/node_modules/ast-types/lib/main.d.ts b/node_modules/ast-types/lib/main.d.ts +index 9b54fef..5c38539 100644 +--- a/node_modules/ast-types/lib/main.d.ts ++++ b/node_modules/ast-types/lib/main.d.ts +@@ -1,7 +1,7 @@ +-import { ASTNode, Type, AnyType, Field } from "./types"; +-import { NodePath } from "./node-path"; ++import { ASTNode, type Type, AnyType, Field } from "./types"; ++import { type NodePath } from "./node-path"; + import { namedTypes } from "./gen/namedTypes"; +-import { builders } from "./gen/builders"; ++import { type builders } from "./gen/builders"; + import { Visitor } from "./gen/visitor"; + declare const astNodesAreEquivalent: { + (a: any, b: any, problemPath?: any): boolean; From 19518da566617123950588dfa5eb3f8716eb2638 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Fri, 24 May 2024 17:39:34 +1000 Subject: [PATCH 7/9] fix our docs typecheck --- scripts/extractExamples.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/extractExamples.mjs b/scripts/extractExamples.mjs index ed1fe971f0c..5d89c6f08ea 100644 --- a/scripts/extractExamples.mjs +++ b/scripts/extractExamples.mjs @@ -108,7 +108,7 @@ import ReactDOM from 'react-dom'; fs.writeFileSync(`${distDir}/tsconfig.json`, `{ "compilerOptions": { - "target": "es6", + "target": "es2018", "lib": [ "dom", "dom.iterable", From c7fd13ad0f85e507dc55e9dc8ebc9a434adb9e70 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Fri, 31 May 2024 09:09:48 +1000 Subject: [PATCH 8/9] Bump to 5.5 beta --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 247ab4dd594..fdea2c98bd7 100644 --- a/package.json +++ b/package.json @@ -183,7 +183,7 @@ "tailwindcss": "^3.4.0", "tailwindcss-animate": "^1.0.7", "tempy": "^0.5.0", - "typescript": "^5.5.0-dev.20240523", + "typescript": "^5.5.0-beta", "typescript-strict-plugin": "^2.0.0", "verdaccio": "^5.13.0", "walk-object": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 341a8d45c29..0fc498efc28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22372,10 +22372,10 @@ typescript-strict-plugin@^2.0.0: ora "^5.4.1" yargs "^16.2.0" -typescript@^5.5.0-dev.20240523: - version "5.5.0-dev.20240523" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240523.tgz#1ad5c838946cfb885d584780ed4f4fd36b4b29e3" - integrity sha512-YOB70i/IXEmSACEQ87NIPif84AGq4mjufwmoAp4HCOpgTjq6KFZe51OtNGvZbi+kMwlmQiKSrKlkfRGMndmsRA== +typescript@^5.5.0-beta: + version "5.5.0-dev.20240530" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240530.tgz#90a13ecaabb535086e036e910b8d0fa703bd579b" + integrity sha512-r/4r/a9tbtPRHfif0An0GLycB70C3ci3m9fhpgiv6Ekyl7mxYc4w8aX/R+vQ4OJlmPosJJUCjUbljH11g6C56g== ua-parser-js@0.7.17: version "0.7.17" From 73e0d086807566c4840726ff25ae7107a84a07b8 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Fri, 31 May 2024 15:58:35 +1000 Subject: [PATCH 9/9] bump ts version --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fdea2c98bd7..78044ba63c5 100644 --- a/package.json +++ b/package.json @@ -183,7 +183,7 @@ "tailwindcss": "^3.4.0", "tailwindcss-animate": "^1.0.7", "tempy": "^0.5.0", - "typescript": "^5.5.0-beta", + "typescript": "^5.5.0-dev.20240530", "typescript-strict-plugin": "^2.0.0", "verdaccio": "^5.13.0", "walk-object": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 0fc498efc28..497d0efc921 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22372,7 +22372,7 @@ typescript-strict-plugin@^2.0.0: ora "^5.4.1" yargs "^16.2.0" -typescript@^5.5.0-beta: +typescript@^5.5.0-dev.20240530: version "5.5.0-dev.20240530" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240530.tgz#90a13ecaabb535086e036e910b8d0fa703bd579b" integrity sha512-r/4r/a9tbtPRHfif0An0GLycB70C3ci3m9fhpgiv6Ekyl7mxYc4w8aX/R+vQ4OJlmPosJJUCjUbljH11g6C56g==