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.

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

chore: switch to single version policy for typescript #16592

Merged
merged 5 commits into from
Feb 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions apps/codesandbox-react-northstar-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"@fluentui/eslint-plugin": "^1.0.0-beta.1",
"@types/react": "16.9.42",
"@types/react-dom": "16.9.10",
"@fluentui/scripts": "^1.0.0",
"typescript": "3.7.2"
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@fluentui/code-sandbox": "^0.52.0",
Expand Down
3 changes: 1 addition & 2 deletions apps/codesandbox-react-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"@fluentui/eslint-plugin": "^1.0.0-beta.1",
"@types/react": "16.9.42",
"@types/react-dom": "16.9.10",
"@fluentui/scripts": "^1.0.0",
"typescript": "3.7.2"
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@microsoft/load-themed-styles": "^1.10.26",
Expand Down
1 change: 0 additions & 1 deletion apps/todo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
3 changes: 1 addition & 2 deletions apps/vr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"screener-runner": "^0.10.43",
"screener-storybook": "^0.18.6",
"style-loader": "^2.0.0",
"tslib": "^1.10.0",
"typescript": "3.7.2"
"tslib": "^1.10.0"
}
}
Original file line number Diff line number Diff line change
@@ -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-22T18:27:27.385Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "Remove typescript dependency",
"packageName": "@fluentui/react-monaco-editor",
"email": "martinhochel@microsoft.com",
"dependentChangeType": "patch",
"date": "2021-01-22T18:27:31.116Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "none",
"comment": "chore: use exact version for typescript devDep",
"packageName": "@fluentui/web-components",
"email": "martinhochel@microsoft.com",
"dependentChangeType": "none",
"date": "2021-01-22T18:28:04.050Z"
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"lerna": "^3.15.0",
"lint-staged": "^10.2.9",
"satisfied": "^1.1.1",
"syncpack": "^5.6.10"
"syncpack": "^5.6.10",
"typescript": "3.7.2"
},
"license": "MIT",
"workspaces": {
Expand Down
3 changes: 1 addition & 2 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/ability-attributes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/accessibility/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"@types/react": "16.9.42",
"@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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/circulars-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/code-sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"@fluentui/eslint-plugin": "^1.0.0-beta",
"@fluentui/react-northstar": "^0.52.0",
"@fluentui/scripts": "^1.0.0",
"react": "16.8.6",
"typescript": "3.7.2"
"react": "16.8.6"
},
"files": [
"dist"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/digest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
},
"devDependencies": {
"@types/node": "^10.3.2",
"@types/webpack": "4.41.26",
"typescript": "3.7.2"
"@types/webpack": "4.41.26"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/docs-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@
"@types/react-virtualized": "^9.21.8",
"@types/react-window": "^1.8.2",
"@types/webpack-env": "1.16.0",
"gulp": "^4.0.2",
"typescript": "3.7.2"
"gulp": "^4.0.2"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion packages/fluentui/local-sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"react-dom": "16.8.6",
"source-map-loader": "^2.0.0",
"terser-webpack-plugin": "^5.1.1",
"typescript": "3.7.2",
"webpack": "^5.12.3",
"webpack-bundle-analyzer": "^4.4.0",
"webpack-cli": "^4.3.1"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/perf-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
"just-scripts": "1.3.1",
"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"
Expand Down
4 changes: 1 addition & 3 deletions packages/fluentui/perf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
"react": "16.8.6",
"react-dom": "16.8.6"
},
"devDependencies": {
"typescript": "3.7.2"
},
"devDependencies": {},
"publishConfig": {
"access": "public"
},
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/projects-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion packages/fluentui/projects-test/src/typings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export async function typings() {
logger(`✔️ Temporary directory was created: ${tmpDirectory}`);

// Install dependencies, ensuring we specify the same TS version as our projects use
const tsVersion = fs.readJSONSync(config.paths.base('scripts', 'package.json')).dependencies.typescript;
const rootPkgJson: { devDependencies: Record<string, string> } = fs.readJSONSync(config.paths.base('package.json'));
const { typescript: tsVersion } = rootPkgJson.devDependencies;

const dependencies = ['@types/react', '@types/react-dom', 'react', 'react-dom', `typescript@${tsVersion}`].join(' ');
await sh(`yarn add ${dependencies}`, tmpDirectory);
Expand All @@ -32,6 +33,9 @@ export async function typings() {
fs.copyFileSync(scaffoldPath('tsconfig.json'), path.resolve(tmpDirectory, 'tsconfig.json'));
logger(`✔️ Source and configs were copied`);

await sh(`which yarn`);
await sh(`yarn --version`);
await sh(`yarn tsc --version`);
Hotell marked this conversation as resolved.
Show resolved Hide resolved
await sh(`yarn tsc --noEmit`, tmpDirectory);
logger(`✔️ Example project was successfully built: ${tmpDirectory}`);
}
3 changes: 1 addition & 2 deletions packages/fluentui/react-bindings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/react-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"@types/react": "16.9.42",
"@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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/react-component-ref/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/react-context-selector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"lerna-alias": "^3.0.3-0",
"react": "16.8.6",
"react-is": "^16.6.3",
"scheduler": "^0.20.1",
"typescript": "3.7.2"
"scheduler": "^0.20.1"
},
"peerDependencies": {
"react": "^16.8.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/react-icons-northstar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"@types/react": "16.9.42",
"@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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
"@types/react": "16.9.42",
"@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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/react-northstar-prototypes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
"@types/react-dom": "16.9.10",
"@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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"@types/react": "16.9.42",
"@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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/react-northstar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/react-proptypes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"@fluentui/eslint-plugin": "^1.0.0-beta",
"@types/react": "16.9.42",
"@fluentui/scripts": "^1.0.0",
"lerna-alias": "^3.0.3-0",
"typescript": "3.7.2"
"lerna-alias": "^3.0.3-0"
},
"files": [
"dist"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/react-telemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/state/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packages/fluentui/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"@fluentui/eslint-plugin": "^1.0.0-beta",
"@types/react": "16.9.42",
"@fluentui/scripts": "^1.0.0",
"lerna-alias": "^3.0.3-0",
"typescript": "3.7.2"
"lerna-alias": "^3.0.3-0"
},
"files": [
"dist"
Expand Down
3 changes: 1 addition & 2 deletions packages/react-conformance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading