Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: migrate to ts 5.3.3 #33235

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+65 −65
Open

chore: migrate to ts 5.3.3 #33235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3d9dd7
chore: upgrade typescrit to 5.3.3
mainframev Nov 8, 2024
a80f98e
fix(ContextualMenu): fix typing issue
mainframev Nov 8, 2024
5b46f6d
chore: update change files
mainframev Nov 8, 2024
ae904e7
chore: bump ts-node to 10.9.2
mainframev Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/@fluentui-react-1bdbe475-2d17-453e-b058-b152322278cd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: update react.api.md",
"packageName": "@fluentui/react",
"email": "[email protected]",
"dependentChangeType": "none"
}
9 changes: 4 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@griffel/webpack-loader": "2.2.10",
mainframev marked this conversation as resolved.
Show resolved Hide resolved
mainframev marked this conversation as resolved.
Show resolved Hide resolved
"@jest/reporters": "29.7.0",
"@mdx-js/loader": "2.3.0",
"@microsoft/api-extractor": "7.38.5",
"@microsoft/api-extractor": "7.39.0",
"@microsoft/api-extractor-model": "7.28.3",
"@microsoft/eslint-plugin-sdl": "0.1.9",
"@microsoft/load-themed-styles": "1.10.26",
Expand Down Expand Up @@ -336,11 +336,11 @@
"tmp": "0.2.1",
"ts-jest": "29.1.1",
"ts-loader": "9.4.2",
"ts-node": "10.9.1",
"ts-node": "10.9.2",
Copy link
Contributor Author

@mainframev mainframev Nov 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixes: TypeStrong/ts-node#2091, in our codebase was failing on scripts/**

"tsconfig-paths": "4.2.0",
"tsconfig-paths-webpack-plugin": "4.1.0",
"tslib": "2.6.3",
"typescript": "5.2.2",
"typescript": "5.3.3",
"vinyl": "2.2.0",
"webpack": "5.94.0",
"webpack-bundle-analyzer": "4.10.1",
Expand Down Expand Up @@ -377,8 +377,7 @@
"eslint": "8.57.0",
"swc-loader": "^0.2.6",
"prettier": "2.8.8",
"puppeteer": "19.6.0",
"@microsoft/api-extractor/typescript": "5.2.2"
Copy link
Contributor Author

@mainframev mainframev Nov 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after bump it has the same ts version, removed

"puppeteer": "19.6.0"
},
"nx": {
"includedScripts": []
Expand Down
44 changes: 22 additions & 22 deletions packages/react/etc/react.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,49 +1599,49 @@ export { FabricPerformance }
// @public (undocumented)
export enum FabricSlots {
// (undocumented)
black = 21,
black = 21,// BaseSlots.primaryColor, Shade[Shade.Unshaded]);
// (undocumented)
neutralDark = 20,
neutralDark = 20,// BaseSlots.primaryColor, Shade[Shade.Shade1]);
// (undocumented)
neutralLight = 11,
neutralLight = 11,// BaseSlots.primaryColor, Shade[Shade.Shade2]);
// (undocumented)
neutralLighter = 10,
neutralLighter = 10,// BaseSlots.primaryColor, Shade[Shade.Shade3]);
// (undocumented)
neutralLighterAlt = 9,
neutralLighterAlt = 9,// BaseSlots.primaryColor, Shade[Shade.Shade4]);
// (undocumented)
neutralPrimary = 19,
neutralPrimary = 19,// BaseSlots.primaryColor, Shade[Shade.Shade5]);
// (undocumented)
neutralPrimaryAlt = 18,
neutralPrimaryAlt = 18,// BaseSlots.primaryColor, Shade[Shade.Shade6]);
// (undocumented)
neutralQuaternary = 13,
neutralQuaternary = 13,// BaseSlots.primaryColor, Shade[Shade.Shade7]);
// (undocumented)
neutralQuaternaryAlt = 12,
neutralQuaternaryAlt = 12,// BaseSlots.primaryColor, Shade[Shade.Shade8]);
// (undocumented)
neutralSecondary = 17,
neutralSecondary = 17,// BaseSlots.backgroundColor, Shade[Shade.Shade1]);
// (undocumented)
neutralSecondaryAlt = 16,
neutralSecondaryAlt = 16,// BaseSlots.backgroundColor, Shade[Shade.Shade2]);
// (undocumented)
neutralTertiary = 15,
neutralTertiary = 15,// BaseSlots.backgroundColor, Shade[Shade.Shade3]);
// (undocumented)
neutralTertiaryAlt = 14,
neutralTertiaryAlt = 14,// BaseSlots.backgroundColor, Shade[Shade.Shade4]);
// (undocumented)
themeDark = 7,
themeDark = 7,// BaseSlots.backgroundColor, Shade[Shade.Shade5]);
// (undocumented)
themeDarkAlt = 6,
themeDarkAlt = 6,// BaseSlots.backgroundColor, Shade[Shade.Shade6]); // bg6 or fg2
// (undocumented)
themeDarker = 8,
themeDarker = 8,// BaseSlots.foregroundColor, Shade[Shade.Shade3]);
// (undocumented)
themeLight = 3,
themeLight = 3,// BaseSlots.foregroundColor, Shade[Shade.Shade4]);
// (undocumented)
themeLighter = 2,
themeLighter = 2,// BaseSlots.foregroundColor, Shade[Shade.Shade5]);
// (undocumented)
themeLighterAlt = 1,
themeLighterAlt = 1,// BaseSlots.foregroundColor, Shade[Shade.Shade6]);
// (undocumented)
themePrimary = 0,
themePrimary = 0,// BaseSlots.foregroundColor, Shade[Shade.Unshaded]);
// (undocumented)
themeSecondary = 5,
themeSecondary = 5,// BaseSlots.foregroundColor, Shade[Shade.Shade7]);
// (undocumented)
themeTertiary = 4,
themeTertiary = 4,// BaseSlots.foregroundColor, Shade[Shade.Shade8]);
// (undocumented)
white = 22
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/ContextualMenu/ContextualMenu.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ const _getMenuItemStylesFunction = memoizeFunction(
...styles: (IStyleFunctionOrObject<IContextualMenuItemStyleProps, IContextualMenuItemStyles> | undefined)[]
): IStyleFunctionOrObject<IContextualMenuItemStyleProps, IContextualMenuItemStyles> => {
return (styleProps: IContextualMenuItemStyleProps) =>
concatStyleSetsWithProps(styleProps, getItemStyles, ...styles);
concatStyleSetsWithProps(styleProps, getItemStyles, ...styles) as IContextualMenuItemStyles;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after bump gives a pretty huge error, expects only DeepPartial<...> but because of concatStyleWithProps infers to DeepPartial<DeepPartial<...>
Screenshot 2024-11-12 at 13 11 18

},
);

Expand Down
68 changes: 31 additions & 37 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2485,10 +2485,10 @@
"@microsoft/tsdoc-config" "~0.16.1"
"@rushstack/node-core-library" "3.62.0"

"@microsoft/api-extractor@7.38.5":
version "7.38.5"
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.38.5.tgz#51d4cd917a31fa1a5c6d6a02e446526de763ac32"
integrity sha512-c/w2zfqBcBJxaCzpJNvFoouWewcYrUOfeu5ZkWCCIXTF9a/gXM85RGevEzlMAIEGM/kssAAZSXRJIZ3Q5vLFow==
"@microsoft/api-extractor@7.39.0":
version "7.39.0"
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.39.0.tgz#41c25f7f522e8b9376debda07364ff234e602eff"
integrity sha512-PuXxzadgnvp+wdeZFPonssRAj/EW4Gm4s75TXzPk09h3wJ8RS3x7typf95B4vwZRrPTQBGopdUl+/vHvlPdAcg==
dependencies:
"@microsoft/api-extractor-model" "7.28.3"
"@microsoft/tsdoc" "0.14.2"
Expand All @@ -2501,7 +2501,7 @@
resolve "~1.22.1"
semver "~7.5.4"
source-map "~0.6.1"
typescript "~5.0.4"
typescript "5.3.3"

"@microsoft/[email protected]":
version "3.3.0"
Expand Down Expand Up @@ -21515,7 +21515,7 @@ string-length@^5.0.1:
char-regex "^2.0.0"
strip-ansi "^7.0.1"

"string-width-cjs@npm:string-width@^4.2.0":
"string-width-cjs@npm:string-width@^4.2.0", 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==
Expand Down Expand Up @@ -21550,15 +21550,6 @@ string-width@^3.0.0, string-width@^3.1.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"

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==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^5.0.1, string-width@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
Expand Down Expand Up @@ -21659,7 +21650,7 @@ stringify-object@^3.3.0:
is-obj "^1.0.1"
is-regexp "^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==
Expand Down Expand Up @@ -21694,13 +21685,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.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, strip-ansi@^7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
Expand Down Expand Up @@ -22570,6 +22554,25 @@ [email protected]:
v8-compile-cache-lib "^3.0.1"
yn "3.1.1"

[email protected]:
version "10.9.2"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
dependencies:
"@cspotcode/source-map-support" "^0.8.0"
"@tsconfig/node10" "^1.0.7"
"@tsconfig/node12" "^1.0.7"
"@tsconfig/node14" "^1.0.0"
"@tsconfig/node16" "^1.0.2"
acorn "^8.4.1"
acorn-walk "^8.1.1"
arg "^4.1.0"
create-require "^1.1.0"
diff "^4.0.1"
make-error "^1.1.1"
v8-compile-cache-lib "^3.0.1"
yn "3.1.1"

[email protected]:
version "9.6.0"
resolved "https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz#50a25426cfed500d4a09bd1b3afb6f28879edfd5"
Expand Down Expand Up @@ -22758,10 +22761,10 @@ typescript-eslint@^8.0.0:
"@typescript-eslint/parser" "8.8.1"
"@typescript-eslint/utils" "8.8.1"

typescript@5.2.2, typescript@~5.0.4:
version "5.2.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
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.4.2:
version "5.4.5"
Expand Down Expand Up @@ -23945,7 +23948,7 @@ workspace-tools@^0.27.0:
js-yaml "^4.1.0"
micromatch "^4.0.0"

"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==
Expand Down Expand Up @@ -23980,15 +23983,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.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down
Loading