From eafb6b6acdb61021b26fc7642c0a6f8c0fe0ec54 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 20 Jan 2021 13:23:20 +0100 Subject: [PATCH 1/5] chore: switch to single version policy with typescript --- apps/codesandbox-react-northstar-template/package.json | 3 +-- apps/codesandbox-react-template/package.json | 3 +-- apps/todo-app/package.json | 1 - apps/vr-tests/package.json | 3 +-- package.json | 3 ++- packages/eslint-plugin/package.json | 3 +-- packages/fluentui/ability-attributes/package.json | 3 +-- packages/fluentui/accessibility/package.json | 3 +-- packages/fluentui/circulars-test/package.json | 3 +-- packages/fluentui/code-sandbox/package.json | 3 +-- packages/fluentui/digest/package.json | 3 +-- packages/fluentui/docs-components/package.json | 3 +-- packages/fluentui/docs/package.json | 3 +-- packages/fluentui/e2e/package.json | 3 +-- packages/fluentui/local-sandbox/package.json | 1 - packages/fluentui/perf-test/package.json | 3 +-- packages/fluentui/perf/package.json | 4 +--- packages/fluentui/projects-test/package.json | 3 +-- packages/fluentui/react-bindings/package.json | 3 +-- packages/fluentui/react-builder/package.json | 3 +-- packages/fluentui/react-component-event-listener/package.json | 3 +-- .../fluentui/react-component-nesting-registry/package.json | 3 +-- packages/fluentui/react-component-ref/package.json | 3 +-- packages/fluentui/react-context-selector/package.json | 3 +-- packages/fluentui/react-icons-northstar/package.json | 3 +-- .../fluentui/react-northstar-emotion-renderer/package.json | 3 +-- packages/fluentui/react-northstar-fela-renderer/package.json | 3 +-- packages/fluentui/react-northstar-prototypes/package.json | 3 +-- .../fluentui/react-northstar-styles-renderer/package.json | 3 +-- packages/fluentui/react-northstar/package.json | 3 +-- packages/fluentui/react-proptypes/package.json | 3 +-- packages/fluentui/react-telemetry/package.json | 3 +-- packages/fluentui/state/package.json | 3 +-- packages/fluentui/styles/package.json | 3 +-- packages/react-conformance/package.json | 3 +-- packages/react-monaco-editor/package.json | 3 +-- packages/web-components/package.json | 2 +- scripts/package.json | 1 - yarn.lock | 2 +- 39 files changed, 37 insertions(+), 73 deletions(-) diff --git a/apps/codesandbox-react-northstar-template/package.json b/apps/codesandbox-react-northstar-template/package.json index 5e30c25444847..006b39f4de0c3 100644 --- a/apps/codesandbox-react-northstar-template/package.json +++ b/apps/codesandbox-react-northstar-template/package.json @@ -14,8 +14,7 @@ "@fluentui/eslint-plugin": "^1.0.0-beta.0", "@types/react": "16.8.25", "@types/react-dom": "16.8.4", - "@fluentui/scripts": "^1.0.0", - "typescript": "3.7.2" + "@fluentui/scripts": "^1.0.0" }, "dependencies": { "@fluentui/code-sandbox": "^0.51.0", diff --git a/apps/codesandbox-react-template/package.json b/apps/codesandbox-react-template/package.json index 5da8b8857d45d..6bb3d25973247 100644 --- a/apps/codesandbox-react-template/package.json +++ b/apps/codesandbox-react-template/package.json @@ -14,8 +14,7 @@ "@fluentui/eslint-plugin": "^1.0.0-beta.0", "@types/react": "16.8.25", "@types/react-dom": "16.8.4", - "@fluentui/scripts": "^1.0.0", - "typescript": "3.7.2" + "@fluentui/scripts": "^1.0.0" }, "dependencies": { "@microsoft/load-themed-styles": "^1.10.26", diff --git a/apps/todo-app/package.json b/apps/todo-app/package.json index 77f35591987a9..6476f4a482279 100644 --- a/apps/todo-app/package.json +++ b/apps/todo-app/package.json @@ -28,7 +28,6 @@ "react": "16.8.6", "react-app-polyfill": "~1.0.1", "react-dom": "16.8.6", - "typescript": "3.7.2", "tslib": "^1.10.0" } } diff --git a/apps/vr-tests/package.json b/apps/vr-tests/package.json index f02569740a6a5..b4a3af3fdfb65 100644 --- a/apps/vr-tests/package.json +++ b/apps/vr-tests/package.json @@ -48,7 +48,6 @@ "screener-runner": "^0.10.43", "screener-storybook": "^0.18.6", "style-loader": "^1.2.1", - "tslib": "^1.10.0", - "typescript": "3.7.2" + "tslib": "^1.10.0" } } diff --git a/package.json b/package.json index 6b1d0942523e9..be2dee1c59a94 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,8 @@ "lint-staged": "^10.2.9", "sass-loader": "^6.0.6", "satisfied": "^1.1.1", - "syncpack": "^5.6.10" + "syncpack": "^5.6.10", + "typescript": "3.7.2" }, "license": "MIT", "workspaces": { diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 619af491552ab..7a72b2e44e272 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -28,8 +28,7 @@ }, "devDependencies": { "@types/eslint": "^7.2.0", - "eslint": "^7.1.0", - "typescript": "3.7.2" + "eslint": "^7.1.0" }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0", diff --git a/packages/fluentui/ability-attributes/package.json b/packages/fluentui/ability-attributes/package.json index bfaa4a6e0f827..87142464d837a 100644 --- a/packages/fluentui/ability-attributes/package.json +++ b/packages/fluentui/ability-attributes/package.json @@ -8,8 +8,7 @@ "ability-attributes": "^0.0.8" }, "devDependencies": { - "ability-attributes-generator": "^0.0.8", - "typescript": "3.7.2" + "ability-attributes-generator": "^0.0.8" }, "files": [ "dist" diff --git a/packages/fluentui/accessibility/package.json b/packages/fluentui/accessibility/package.json index aa27e97c1c981..12e2237410c1f 100644 --- a/packages/fluentui/accessibility/package.json +++ b/packages/fluentui/accessibility/package.json @@ -15,8 +15,7 @@ "@types/react": "16.8.25", "@fluentui/scripts": "^1.0.0", "gulp": "^4.0.2", - "lerna-alias": "^3.0.3-0", - "typescript": "3.7.2" + "lerna-alias": "^3.0.3-0" }, "files": [ "dist" diff --git a/packages/fluentui/circulars-test/package.json b/packages/fluentui/circulars-test/package.json index abf5fa6260646..fba816aa86bd0 100644 --- a/packages/fluentui/circulars-test/package.json +++ b/packages/fluentui/circulars-test/package.json @@ -8,8 +8,7 @@ }, "devDependencies": { "@fluentui/scripts": "^1.0.0", - "gulp": "^4.0.2", - "typescript": "3.7.2" + "gulp": "^4.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/fluentui/code-sandbox/package.json b/packages/fluentui/code-sandbox/package.json index 1a69b9d6da87c..0afd056633cd9 100644 --- a/packages/fluentui/code-sandbox/package.json +++ b/packages/fluentui/code-sandbox/package.json @@ -12,8 +12,7 @@ "@fluentui/eslint-plugin": "^1.0.0-beta", "@fluentui/react-northstar": "^0.51.0", "@fluentui/scripts": "^1.0.0", - "react": "16.8.6", - "typescript": "3.7.2" + "react": "16.8.6" }, "files": [ "dist" diff --git a/packages/fluentui/digest/package.json b/packages/fluentui/digest/package.json index d028aac1a8afb..744b4c4899a03 100644 --- a/packages/fluentui/digest/package.json +++ b/packages/fluentui/digest/package.json @@ -24,8 +24,7 @@ }, "devDependencies": { "@types/node": "^10.3.2", - "@types/webpack": "4.4.0", - "typescript": "3.7.2" + "@types/webpack": "4.4.0" }, "publishConfig": { "access": "public" diff --git a/packages/fluentui/docs-components/package.json b/packages/fluentui/docs-components/package.json index b150539284829..43353f3a9147f 100644 --- a/packages/fluentui/docs-components/package.json +++ b/packages/fluentui/docs-components/package.json @@ -22,8 +22,7 @@ "@fluentui/scripts": "^1.0.0", "gulp": "^4.0.2", "prettier": "~1.19.1", - "react": "16.8.6", - "typescript": "3.7.2" + "react": "16.8.6" }, "files": [ "dist" diff --git a/packages/fluentui/docs/package.json b/packages/fluentui/docs/package.json index 0acd0052460d0..781973e392def 100644 --- a/packages/fluentui/docs/package.json +++ b/packages/fluentui/docs/package.json @@ -65,8 +65,7 @@ "@types/react-virtualized": "^9.21.8", "@types/react-window": "^1.8.2", "@types/webpack-env": "1.15.1", - "gulp": "^4.0.2", - "typescript": "3.7.2" + "gulp": "^4.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/fluentui/e2e/package.json b/packages/fluentui/e2e/package.json index 35743e461d130..e850b0cf07fba 100644 --- a/packages/fluentui/e2e/package.json +++ b/packages/fluentui/e2e/package.json @@ -24,8 +24,7 @@ "@fluentui/scripts": "^1.0.0", "@fluentui/eslint-plugin": "^1.0.0-beta", "@fluentui/react": "^8.0.0-beta", - "gulp": "^4.0.2", - "typescript": "3.7.2" + "gulp": "^4.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/fluentui/local-sandbox/package.json b/packages/fluentui/local-sandbox/package.json index 6fd288078a86a..d6344cd9cf297 100644 --- a/packages/fluentui/local-sandbox/package.json +++ b/packages/fluentui/local-sandbox/package.json @@ -23,7 +23,6 @@ "react-dom": "16.8.6", "source-map-loader": "^0.2.4", "terser-webpack-plugin": "^1.4.3", - "typescript": "3.7.2", "webpack": "4.43.0", "webpack-bundle-analyzer": "^3.6.0", "webpack-cli": "^3.3.10" diff --git a/packages/fluentui/perf-test/package.json b/packages/fluentui/perf-test/package.json index 0fbd0964c3f4b..a9735710d2e2d 100644 --- a/packages/fluentui/perf-test/package.json +++ b/packages/fluentui/perf-test/package.json @@ -25,8 +25,7 @@ "just-scripts": "0.44.5", "node-fetch": "^2.6.1", "react": "16.8.6", - "react-dom": "16.8.6", - "typescript": "3.7.2" + "react-dom": "16.8.6" }, "publishConfig": { "access": "public" diff --git a/packages/fluentui/perf/package.json b/packages/fluentui/perf/package.json index f95ea70e73527..7951c88002e4a 100644 --- a/packages/fluentui/perf/package.json +++ b/packages/fluentui/perf/package.json @@ -16,9 +16,7 @@ "react": "16.8.6", "react-dom": "16.8.6" }, - "devDependencies": { - "typescript": "3.7.2" - }, + "devDependencies": {}, "publishConfig": { "access": "public" }, diff --git a/packages/fluentui/projects-test/package.json b/packages/fluentui/projects-test/package.json index 2830c06bdd48b..c5b5eea7b3c2a 100644 --- a/packages/fluentui/projects-test/package.json +++ b/packages/fluentui/projects-test/package.json @@ -16,8 +16,7 @@ "fs-extra": "^8.1.0", "portfinder": "^1.0.20", "puppeteer": "^1.13.0", - "tmp": "^0.0.33", - "typescript": "3.7.2" + "tmp": "^0.0.33" }, "publishConfig": { "access": "public" diff --git a/packages/fluentui/react-bindings/package.json b/packages/fluentui/react-bindings/package.json index 15cd3099ccc3e..be580cead9b70 100644 --- a/packages/fluentui/react-bindings/package.json +++ b/packages/fluentui/react-bindings/package.json @@ -33,8 +33,7 @@ "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", "react": "16.8.6", - "react-dom": "16.8.6", - "typescript": "3.7.2" + "react-dom": "16.8.6" }, "files": [ "dist" diff --git a/packages/fluentui/react-builder/package.json b/packages/fluentui/react-builder/package.json index ec75e8651e608..d9308db7ab412 100644 --- a/packages/fluentui/react-builder/package.json +++ b/packages/fluentui/react-builder/package.json @@ -25,8 +25,7 @@ "@fluentui/eslint-plugin": "^1.0.0-beta", "@types/react-frame-component": "^4.1.1", "@fluentui/scripts": "^1.0.0", - "lerna-alias": "^3.0.3-0", - "typescript": "3.7.2" + "lerna-alias": "^3.0.3-0" }, "peerDependencies": { "@babel/standalone": "^7.8.3" diff --git a/packages/fluentui/react-component-event-listener/package.json b/packages/fluentui/react-component-event-listener/package.json index bf0e28f01ef34..d96114fee204a 100644 --- a/packages/fluentui/react-component-event-listener/package.json +++ b/packages/fluentui/react-component-event-listener/package.json @@ -14,8 +14,7 @@ "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", "react": "16.8.6", - "simulant": "^0.2.2", - "typescript": "3.7.2" + "simulant": "^0.2.2" }, "files": [ "dist" diff --git a/packages/fluentui/react-component-nesting-registry/package.json b/packages/fluentui/react-component-nesting-registry/package.json index 79b53d734ae2b..6ab8d6b9971fa 100644 --- a/packages/fluentui/react-component-nesting-registry/package.json +++ b/packages/fluentui/react-component-nesting-registry/package.json @@ -13,8 +13,7 @@ "@types/react": "16.8.25", "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", - "react": "16.8.6", - "typescript": "3.7.2" + "react": "16.8.6" }, "files": [ "dist" diff --git a/packages/fluentui/react-component-ref/package.json b/packages/fluentui/react-component-ref/package.json index 267b0545b14dd..89ff12ffa3331 100644 --- a/packages/fluentui/react-component-ref/package.json +++ b/packages/fluentui/react-component-ref/package.json @@ -17,8 +17,7 @@ "lerna-alias": "^3.0.3-0", "react": "16.8.6", "react-dom": "16.8.6", - "react-test-renderer": "^16.3.0", - "typescript": "3.7.2" + "react-test-renderer": "^16.3.0" }, "files": [ "dist" diff --git a/packages/fluentui/react-context-selector/package.json b/packages/fluentui/react-context-selector/package.json index c45cd618ec047..f2969ad84d362 100644 --- a/packages/fluentui/react-context-selector/package.json +++ b/packages/fluentui/react-context-selector/package.json @@ -14,8 +14,7 @@ "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", "react": "16.8.6", - "react-is": "^16.6.3", - "typescript": "3.7.2" + "react-is": "^16.6.3" }, "peerDependencies": { "react": "^16.8.0" diff --git a/packages/fluentui/react-icons-northstar/package.json b/packages/fluentui/react-icons-northstar/package.json index 08e1085f60d27..107ee19aecea0 100644 --- a/packages/fluentui/react-icons-northstar/package.json +++ b/packages/fluentui/react-icons-northstar/package.json @@ -19,8 +19,7 @@ "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", "react": "16.8.6", - "react-is": "^16.6.3", - "typescript": "3.7.2" + "react-is": "^16.6.3" }, "files": [ "dist" diff --git a/packages/fluentui/react-northstar-emotion-renderer/package.json b/packages/fluentui/react-northstar-emotion-renderer/package.json index 7b2fd6b3d8e5c..647bb9abef791 100644 --- a/packages/fluentui/react-northstar-emotion-renderer/package.json +++ b/packages/fluentui/react-northstar-emotion-renderer/package.json @@ -19,8 +19,7 @@ "@types/react": "16.8.25", "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", - "react": "16.8.6", - "typescript": "3.7.2" + "react": "16.8.6" }, "files": [ "dist" diff --git a/packages/fluentui/react-northstar-fela-renderer/package.json b/packages/fluentui/react-northstar-fela-renderer/package.json index 8546696972306..63d06564e744b 100644 --- a/packages/fluentui/react-northstar-fela-renderer/package.json +++ b/packages/fluentui/react-northstar-fela-renderer/package.json @@ -24,8 +24,7 @@ "@types/react": "16.8.25", "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", - "react": "16.8.6", - "typescript": "3.7.2" + "react": "16.8.6" }, "files": [ "dist" diff --git a/packages/fluentui/react-northstar-prototypes/package.json b/packages/fluentui/react-northstar-prototypes/package.json index b7a27fb32e6f4..11f9e56086ecd 100644 --- a/packages/fluentui/react-northstar-prototypes/package.json +++ b/packages/fluentui/react-northstar-prototypes/package.json @@ -41,8 +41,7 @@ "@types/react-dom": "16.8.4", "@types/react-virtualized": "^9.21.8", "@types/react-window": "^1.8.2", - "gulp": "^4.0.2", - "typescript": "3.7.2" + "gulp": "^4.0.2" }, "files": [ "dist" diff --git a/packages/fluentui/react-northstar-styles-renderer/package.json b/packages/fluentui/react-northstar-styles-renderer/package.json index 6549c776d18ef..8ce6d45cd637a 100644 --- a/packages/fluentui/react-northstar-styles-renderer/package.json +++ b/packages/fluentui/react-northstar-styles-renderer/package.json @@ -12,8 +12,7 @@ "@types/react": "16.8.25", "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", - "react": "16.8.6", - "typescript": "3.7.2" + "react": "16.8.6" }, "files": [ "dist" diff --git a/packages/fluentui/react-northstar/package.json b/packages/fluentui/react-northstar/package.json index 162e0da26e7b8..11e4ab30148a4 100644 --- a/packages/fluentui/react-northstar/package.json +++ b/packages/fluentui/react-northstar/package.json @@ -52,8 +52,7 @@ "qs": "^6.8.0", "react": "16.8.6", "react-dom": "16.8.6", - "simulant": "^0.2.2", - "typescript": "3.7.2" + "simulant": "^0.2.2" }, "files": [ "dist" diff --git a/packages/fluentui/react-proptypes/package.json b/packages/fluentui/react-proptypes/package.json index dbcd4f03e0578..a3c2a7c68c6d1 100644 --- a/packages/fluentui/react-proptypes/package.json +++ b/packages/fluentui/react-proptypes/package.json @@ -13,8 +13,7 @@ "@fluentui/eslint-plugin": "^1.0.0-beta", "@types/react": "16.8.25", "@fluentui/scripts": "^1.0.0", - "lerna-alias": "^3.0.3-0", - "typescript": "3.7.2" + "lerna-alias": "^3.0.3-0" }, "files": [ "dist" diff --git a/packages/fluentui/react-telemetry/package.json b/packages/fluentui/react-telemetry/package.json index 9e47735cee9f0..70a83fa920fd0 100644 --- a/packages/fluentui/react-telemetry/package.json +++ b/packages/fluentui/react-telemetry/package.json @@ -19,8 +19,7 @@ "@fluentui/scripts": "^1.0.0", "lerna-alias": "^3.0.3-0", "react": "16.8.6", - "react-dom": "16.8.6", - "typescript": "3.7.2" + "react-dom": "16.8.6" }, "files": [ "dist" diff --git a/packages/fluentui/state/package.json b/packages/fluentui/state/package.json index 55985509bd284..79246740bd5a7 100644 --- a/packages/fluentui/state/package.json +++ b/packages/fluentui/state/package.json @@ -10,8 +10,7 @@ "devDependencies": { "@fluentui/eslint-plugin": "^1.0.0-beta", "@fluentui/scripts": "^1.0.0", - "lerna-alias": "^3.0.3-0", - "typescript": "3.7.2" + "lerna-alias": "^3.0.3-0" }, "files": [ "dist" diff --git a/packages/fluentui/styles/package.json b/packages/fluentui/styles/package.json index 99ff49ae13de7..7449a7afcb17a 100644 --- a/packages/fluentui/styles/package.json +++ b/packages/fluentui/styles/package.json @@ -13,8 +13,7 @@ "@fluentui/eslint-plugin": "^1.0.0-beta", "@types/react": "16.8.25", "@fluentui/scripts": "^1.0.0", - "lerna-alias": "^3.0.3-0", - "typescript": "3.7.2" + "lerna-alias": "^3.0.3-0" }, "files": [ "dist" diff --git a/packages/react-conformance/package.json b/packages/react-conformance/package.json index 6dd41705f3adb..1682ad7ec6095 100644 --- a/packages/react-conformance/package.json +++ b/packages/react-conformance/package.json @@ -35,8 +35,7 @@ "jest": "~24.9.0", "react": "16.8.6", "react-app-polyfill": "~1.0.1", - "react-dom": "16.8.6", - "typescript": "3.7.2" + "react-dom": "16.8.6" }, "dependencies": { "doctrine": "^3.0.0", diff --git a/packages/react-monaco-editor/package.json b/packages/react-monaco-editor/package.json index 2f3a761960fd2..8e38570bbc5d8 100644 --- a/packages/react-monaco-editor/package.json +++ b/packages/react-monaco-editor/package.json @@ -44,8 +44,7 @@ "@fluentui/react-hooks": "^8.0.0-beta.8", "raw-loader": "^0.5.1", "react-syntax-highlighter": "^10.1.3", - "tslib": "^1.10.0", - "typescript": "3.7.2" + "tslib": "^1.10.0" }, "peerDependencies": { "@types/react": ">=16.8.0 <17.0.0", diff --git a/packages/web-components/package.json b/packages/web-components/package.json index 13bb4a43fc5b9..9be204633604d 100644 --- a/packages/web-components/package.json +++ b/packages/web-components/package.json @@ -88,7 +88,7 @@ "ts-loader": "^7.0.2", "ts-node": "^8.0.0", "tsconfig-paths": "^3.9.0", - "typescript": "^3.9.0", + "typescript": "3.9.7", "webpack": "^4.43.0" }, "dependencies": { diff --git a/scripts/package.json b/scripts/package.json index 21df086dfd501..fd0704609e738 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -139,7 +139,6 @@ "ts-loader": "^4.1.0", "ts-node": "^7.0.0", "tsconfig-paths": "^3.9.0", - "typescript": "3.7.2", "webpack": "4.43.0", "webpack-bundle-analyzer": "^3.6.0", "webpack-cli": "^3.3.10", diff --git a/yarn.lock b/yarn.lock index 6b6477203ea05..420616afa7ba0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23644,7 +23644,7 @@ typescript@3.7.2, typescript@~3.7.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb" integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ== -typescript@^3.9.0: +typescript@3.9.7, typescript@^3.9.0: version "3.9.7" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== From 1dd4e00bedc4fafa0a153af2cabf7f159fabdc89 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 20 Jan 2021 13:29:52 +0100 Subject: [PATCH 2/5] chore: bump TS to latest 3.9 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index be2dee1c59a94..c2add5523fb85 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "sass-loader": "^6.0.6", "satisfied": "^1.1.1", "syncpack": "^5.6.10", - "typescript": "3.7.2" + "typescript": "3.9.7" }, "license": "MIT", "workspaces": { diff --git a/yarn.lock b/yarn.lock index 420616afa7ba0..deae4da698de0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23639,16 +23639,16 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@3.7.2, typescript@~3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb" - integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ== - typescript@3.9.7, typescript@^3.9.0: version "3.9.7" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== +typescript@~3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb" + integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ== + ua-parser-js@0.7.21, ua-parser-js@^0.7.18: version "0.7.21" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777" From 811c36706781bb7f915ba8dba1d5c4b3cd0362ed Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 20 Jan 2021 13:51:22 +0100 Subject: [PATCH 3/5] Change files --- ...021-01-20-13-51-22-hotell-build-system-ts-in-root.json | 8 ++++++++ ...021-01-20-13-51-22-hotell-build-system-ts-in-root.json | 8 ++++++++ ...021-01-20-13-51-22-hotell-build-system-ts-in-root.json | 8 ++++++++ 3 files changed, 24 insertions(+) create mode 100644 change/@fluentui-eslint-plugin-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json create mode 100644 change/@fluentui-react-monaco-editor-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json create mode 100644 change/@fluentui-web-components-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json diff --git a/change/@fluentui-eslint-plugin-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json b/change/@fluentui-eslint-plugin-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json new file mode 100644 index 0000000000000..55121c14b138c --- /dev/null +++ b/change/@fluentui-eslint-plugin-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json @@ -0,0 +1,8 @@ +{ + "type": "none", + "comment": "chore: switch to single version policy with typescript", + "packageName": "@fluentui/eslint-plugin", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none", + "date": "2021-01-20T12:50:57.444Z" +} diff --git a/change/@fluentui-react-monaco-editor-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json b/change/@fluentui-react-monaco-editor-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json new file mode 100644 index 0000000000000..6e72599b1c8a8 --- /dev/null +++ b/change/@fluentui-react-monaco-editor-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json @@ -0,0 +1,8 @@ +{ + "type": "none", + "comment": "chore: switch to single version policy with typescript", + "packageName": "@fluentui/react-monaco-editor", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none", + "date": "2021-01-20T12:51:01.983Z" +} diff --git a/change/@fluentui-web-components-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json b/change/@fluentui-web-components-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json new file mode 100644 index 0000000000000..4c63051c7881b --- /dev/null +++ b/change/@fluentui-web-components-2021-01-20-13-51-22-hotell-build-system-ts-in-root.json @@ -0,0 +1,8 @@ +{ + "type": "none", + "comment": "chore: switch to single version policy with typescript", + "packageName": "@fluentui/web-components", + "email": "martinhochel@microsoft.com", + "dependentChangeType": "none", + "date": "2021-01-20T12:51:22.239Z" +} From 968187b4c62dec04ed2a1d1aa0acdb003e5d6eaa Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 20 Jan 2021 15:50:04 +0100 Subject: [PATCH 4/5] chore: apply ts-expect-error on problematic parts of codebase --- .../react-bindings/test/hooks/useTriggerElement-test.tsx | 1 + packages/foundation-legacy/src/createComponent.tsx | 2 ++ .../src/components/ChoiceGroup/ChoiceGroup.base.tsx | 2 ++ .../react-internal/src/components/Persona/Persona.test.tsx | 4 ++++ packages/react/src/components/ComboBox/ComboBox.tsx | 2 ++ packages/utilities/src/dom/getRect.ts | 2 ++ packages/utilities/src/object.ts | 7 +++++++ 7 files changed, 20 insertions(+) diff --git a/packages/fluentui/react-bindings/test/hooks/useTriggerElement-test.tsx b/packages/fluentui/react-bindings/test/hooks/useTriggerElement-test.tsx index c8ad6cb74cf82..3b90ff13a6065 100644 --- a/packages/fluentui/react-bindings/test/hooks/useTriggerElement-test.tsx +++ b/packages/fluentui/react-bindings/test/hooks/useTriggerElement-test.tsx @@ -5,6 +5,7 @@ import * as React from 'react'; import * as consoleUtil from '../consoleUtil'; const TestComponent: React.FC<{ trigger?: React.ReactElement | null }> = props => { + // @ts-expect-error - FIXME (TS 3.9 migration) return useTriggerElement(props); }; diff --git a/packages/foundation-legacy/src/createComponent.tsx b/packages/foundation-legacy/src/createComponent.tsx index fd96ad288f3a7..19d7cdaa4b5e1 100644 --- a/packages/foundation-legacy/src/createComponent.tsx +++ b/packages/foundation-legacy/src/createComponent.tsx @@ -78,6 +78,8 @@ export function createComponent< componentProps.styles, ); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error - FIXME (TS 3.9 migration) const viewProps = { ...componentProps, styles, diff --git a/packages/react-internal/src/components/ChoiceGroup/ChoiceGroup.base.tsx b/packages/react-internal/src/components/ChoiceGroup/ChoiceGroup.base.tsx index f847372807852..21b78ed0b3f9f 100644 --- a/packages/react-internal/src/components/ChoiceGroup/ChoiceGroup.base.tsx +++ b/packages/react-internal/src/components/ChoiceGroup/ChoiceGroup.base.tsx @@ -126,6 +126,8 @@ export const ChoiceGroupBase: React.FunctionComponent = React {options.map((option: IChoiceGroupOption) => { return ( { describe('image', () => { it('renders empty alt text by default', () => { const wrapper = mount(); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error - FIXME (TS 3.9 migration) const image: ReactWrapper, unknown> = wrapper.find('ImageBase'); expect(image.props().alt).toEqual(''); @@ -208,6 +210,8 @@ describe('Persona', () => { it('renders its given alt text', () => { const wrapper = mount(); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error - FIXME (TS 3.9 migration) const image: ReactWrapper, unknown> = wrapper.find('ImageBase'); expect(image.props().alt).toEqual('ALT TEXT'); diff --git a/packages/react/src/components/ComboBox/ComboBox.tsx b/packages/react/src/components/ComboBox/ComboBox.tsx index e6c177024e44a..7f27092e28b18 100644 --- a/packages/react/src/components/ComboBox/ComboBox.tsx +++ b/packages/react/src/components/ComboBox/ComboBox.tsx @@ -448,6 +448,8 @@ class ComboBoxInternal extends React.Component ({ ...item, index: index })), onDismiss: this._onDismiss, }, + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error - FIXME (TS 3.9 migration) this._onRenderContainer, )}
(a: TA, b: TB): boolean { for (let propName in a) { + // @ts-expect-error - FIXME (TS 3.9 migration) - FIX generic constraints https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-9.html#type-parameters-that-extend-any-no-longer-act-as-any if (a.hasOwnProperty(propName)) { + // @ts-expect-error - FIXME (TS 3.9 migration) if (!b.hasOwnProperty(propName) || b[propName] !== a[propName]) { return false; } } } for (let propName in b) { + // @ts-expect-error - FIXME (TS 3.9 migration) if (b.hasOwnProperty(propName)) { + // @ts-expect-error - FIXME (TS 3.9 migration) if (!a.hasOwnProperty(propName)) { return false; } @@ -21,6 +27,7 @@ export function shallowCompare(a: TA, b: TB): bo } return true; } +/* eslint-enable @typescript-eslint/ban-ts-comment */ /** * Makes a resulting merge of a bunch of objects. Pass in the target object followed by 1 or more From e1f8dbe398be276b3671fcf709fc31de4a71ba5b Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Wed, 20 Jan 2021 16:07:31 +0100 Subject: [PATCH 5/5] docs: re-generate docs --- .../react-compose/etc/react-compose.api.md | 2 +- .../react-internal/etc/react-internal.api.md | 18 +++++++++--------- .../etc/react-stylesheets.api.md | 2 +- .../etc/react-theme-provider.api.md | 4 +--- .../style-utilities/etc/style-utilities.api.md | 2 +- packages/utilities/etc/utilities.api.md | 6 +++--- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/packages/react-compose/etc/react-compose.api.md b/packages/react-compose/etc/react-compose.api.md index d074f61775258..4a748ab8fbf80 100644 --- a/packages/react-compose/etc/react-compose.api.md +++ b/packages/react-compose/etc/react-compose.api.md @@ -90,7 +90,7 @@ export type ComposeRenderFunction React.ReactElement | null; // @public -export const createClassResolver: (classes: Record) => (state: Record) => Record; +export const createClassResolver: (classes: ClassDictionary) => (state: GenericDictionary) => ClassDictionary; // @public export type GenericDictionary = Record; diff --git a/packages/react-internal/etc/react-internal.api.md b/packages/react-internal/etc/react-internal.api.md index 98eb8f8e31c9f..da5e2f20898b8 100644 --- a/packages/react-internal/etc/react-internal.api.md +++ b/packages/react-internal/etc/react-internal.api.md @@ -131,11 +131,11 @@ export class BaseExtendedPicker> extend // (undocumented) protected onInputChange: (value: string, composing?: boolean | undefined) => void; // (undocumented) - protected onInputClick: (ev: React.MouseEvent) => void; + protected onInputClick: (ev: React.MouseEvent) => void; // (undocumented) protected onInputFocus: (ev: React.FocusEvent) => void; // (undocumented) - protected onPaste: (ev: React.ClipboardEvent) => void; + protected onPaste: (ev: React.ClipboardEvent) => void; // (undocumented) protected _onSelectedItemsChanged: () => void; // (undocumented) @@ -196,9 +196,9 @@ export class BaseFloatingPicker> extend // (undocumented) protected onSelectionChange(): void; // (undocumented) - protected onSuggestionClick: (ev: React.MouseEvent, item: T, index: number) => void; + protected onSuggestionClick: (ev: React.MouseEvent, item: T, index: number) => void; // (undocumented) - protected onSuggestionRemove: (ev: React.MouseEvent, item: T, index: number) => void; + protected onSuggestionRemove: (ev: React.MouseEvent, item: T, index: number) => void; // (undocumented) render(): JSX.Element; // (undocumented) @@ -284,7 +284,7 @@ export class BasePicker> extends React.Componen protected onBlur: (ev: React.FocusEvent) => void; // (undocumented) protected onChange(items?: T[]): void; - protected onClick: (ev: React.MouseEvent) => void; + protected onClick: (ev: React.MouseEvent) => void; protected onEmptyInputFocus(): void; // (undocumented) protected onGetMoreResults: () => void; @@ -301,13 +301,13 @@ export class BasePicker> extends React.Componen // (undocumented) protected onSelectionChange(): void; // (undocumented) - protected onSuggestionClick: (ev: React.MouseEvent, item: any, index: number) => void; + protected onSuggestionClick: (ev: React.MouseEvent, item: any, index: number) => void; // (undocumented) - protected onSuggestionRemove: (ev: React.MouseEvent, item: T, index: number) => void; + protected onSuggestionRemove: (ev: React.MouseEvent, item: T, index: number) => void; // (undocumented) protected onSuggestionSelect(): void; // (undocumented) - refocusSuggestions: (keyCode: number) => void; + refocusSuggestions: (keyCode: KeyCodes) => void; // (undocumented) protected removeItem: (item: IPickerItemProps, focusNextItem?: boolean | undefined) => void; // (undocumented) @@ -830,7 +830,7 @@ export const getNextResizeGroupStateProvider: (measurementCache?: { addMeasurementToCache: (data: any, measurement: number) => void; }) => { getNextState: (props: IResizeGroupProps, currentState: IResizeGroupState, getElementToMeasureDimension: () => number, newContainerDimension?: number | undefined) => IResizeGroupState | undefined; - shouldRenderDataForMeasurement: (dataToMeasure: any) => boolean; + shouldRenderDataForMeasurement: (dataToMeasure: any | undefined) => boolean; getInitialResizeGroupState: (data: any) => IResizeGroupState; }; diff --git a/packages/react-stylesheets/etc/react-stylesheets.api.md b/packages/react-stylesheets/etc/react-stylesheets.api.md index 2190c1be98427..d0354e6f44fcc 100644 --- a/packages/react-stylesheets/etc/react-stylesheets.api.md +++ b/packages/react-stylesheets/etc/react-stylesheets.api.md @@ -21,7 +21,7 @@ export interface StylesheetProviderProps { } // @public -export const useStylesheet: (sheets: string | string[] | undefined) => void; +export const useStylesheet: (sheets: undefined | string | string[]) => void; // (No @packageDocumentation comment for this package) diff --git a/packages/react-theme-provider/etc/react-theme-provider.api.md b/packages/react-theme-provider/etc/react-theme-provider.api.md index b0df55e7604c1..3e3c36f0313a0 100644 --- a/packages/react-theme-provider/etc/react-theme-provider.api.md +++ b/packages/react-theme-provider/etc/react-theme-provider.api.md @@ -60,9 +60,7 @@ export type MakeVariantClassesOptions = { }; // @public (undocumented) -export const MergeStylesProvider: ({ children }: { - children?: React.ReactNode; -}) => JSX.Element; +export const MergeStylesProvider: ({ children }: React.PropsWithChildren<{}>) => JSX.Element; // @public (undocumented) export const mergeStylesRenderer: StyleRenderer; diff --git a/packages/style-utilities/etc/style-utilities.api.md b/packages/style-utilities/etc/style-utilities.api.md index 8d9f42b9cfbda..6ad742b814faf 100644 --- a/packages/style-utilities/etc/style-utilities.api.md +++ b/packages/style-utilities/etc/style-utilities.api.md @@ -122,7 +122,7 @@ export function getIcon(name?: string): IIconRecord | undefined; export function getIconClassName(name: string): string; // @public -export const getInputFocusStyle: (borderColor: string, borderRadius: string | number, borderType?: "border" | "borderBottom", borderPosition?: number) => IRawStyle; +export const getInputFocusStyle: (borderColor: string, borderRadius: string | number, borderType?: 'border' | 'borderBottom', borderPosition?: number) => IRawStyle; // @public export function getPlaceholderStyles(styles: IStyle): IStyle; diff --git a/packages/utilities/etc/utilities.api.md b/packages/utilities/etc/utilities.api.md index 48a0043e3cc41..f023360fd9693 100644 --- a/packages/utilities/etc/utilities.api.md +++ b/packages/utilities/etc/utilities.api.md @@ -46,7 +46,7 @@ export function arraysEqual(array1: T[], array2: T[]): boolean; // @public export function asAsync(options: IAsAsyncOptions): React.ForwardRefExoticComponent | React.FunctionComponent | "keygen" | "menuitem" | "noindex" | "webview" | "svg" | "animate" | "animateMotion" | "animateTransform" | "circle" | "clipPath" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feDropShadow" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "filter" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "mpath" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "switch" | "textPath" | "tspan" | "use" | "view" | undefined; + asyncPlaceholder?: "symbol" | "object" | "input" | "progress" | "select" | "a" | "abbr" | "address" | "area" | "article" | "aside" | "audio" | "b" | "base" | "bdi" | "bdo" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dialog" | "div" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "footer" | "form" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "main" | "map" | "mark" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "q" | "rp" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "small" | "source" | "span" | "strong" | "style" | "sub" | "summary" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr" | "big" | React.FunctionComponent | "keygen" | "menuitem" | "noindex" | "webview" | "svg" | "animate" | "animateMotion" | "animateTransform" | "circle" | "clipPath" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feDropShadow" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "filter" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "mpath" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "switch" | "text" | "textPath" | "tspan" | "use" | "view" | React.ComponentClass | undefined; }> & React.RefAttributes>>; // @public @@ -1043,10 +1043,10 @@ export function resetIds(counter?: number): void; export function resetMemoizations(): void; // @public -export const safeRequestAnimationFrame: (component: React.Component<{}, {}, any>) => (cb: Function) => void; +export const safeRequestAnimationFrame: (component: React.Component) => (cb: Function) => void; // @public -export const safeSetTimeout: (component: React.Component<{}, {}, any>) => (cb: Function, duration: number) => void; +export const safeSetTimeout: (component: React.Component) => (cb: Function, duration: number) => void; // @public (undocumented) export class Selection implements ISelection {