From 8d1cd0bbf677389df5c86e0c6cbb9762de5cffe7 Mon Sep 17 00:00:00 2001 From: Jane Chu <7559015+janechu@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:52:52 -0700 Subject: [PATCH] Update TypeScript dependency to 4.3.x (#130) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Pull Request ## 📖 Description This change fixes an issue with CSSLayout components type definitions and updates all packages to depend on TypeScript 4.3.x. ## ✅ Checklist ### General - [ ] I have added tests for my changes. - [x] I have tested my changes. - [ ] I have updated the project documentation to reflect my changes. --- ...-90f28e61-cb67-4901-bf24-91724bd19d1d.json | 7 ++ ...-9ecd8891-793c-4156-b7c7-c3a0ca58d530.json | 7 ++ package-lock.json | 117 ++++++++++++++++-- packages/fast-tooling-react/package.json | 4 +- packages/fast-tooling-wasm/package.json | 2 +- packages/fast-tooling/package.json | 6 +- .../css-layout/css-layout.form-associated.ts | 16 +-- tsconfig.json | 1 + 8 files changed, 133 insertions(+), 27 deletions(-) create mode 100644 change/@microsoft-fast-tooling-90f28e61-cb67-4901-bf24-91724bd19d1d.json create mode 100644 change/@microsoft-fast-tooling-react-9ecd8891-793c-4156-b7c7-c3a0ca58d530.json diff --git a/change/@microsoft-fast-tooling-90f28e61-cb67-4901-bf24-91724bd19d1d.json b/change/@microsoft-fast-tooling-90f28e61-cb67-4901-bf24-91724bd19d1d.json new file mode 100644 index 0000000..0f28655 --- /dev/null +++ b/change/@microsoft-fast-tooling-90f28e61-cb67-4901-bf24-91724bd19d1d.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Update TypeScript dependency to 4.3.x", + "packageName": "@microsoft/fast-tooling", + "email": "7559015+janechu@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/change/@microsoft-fast-tooling-react-9ecd8891-793c-4156-b7c7-c3a0ca58d530.json b/change/@microsoft-fast-tooling-react-9ecd8891-793c-4156-b7c7-c3a0ca58d530.json new file mode 100644 index 0000000..a2fe591 --- /dev/null +++ b/change/@microsoft-fast-tooling-react-9ecd8891-793c-4156-b7c7-c3a0ca58d530.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Update TypeScript dependency to 4.3.x", + "packageName": "@microsoft/fast-tooling-react", + "email": "7559015+janechu@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/package-lock.json b/package-lock.json index f10636d..30080be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,9 @@ "version": "0.1.0", "license": "MIT", "workspaces": [ + "./packages/fast-tooling", "./packages/fast-tooling-react", - "./packages/fast-tooling" + "./packages/fast-tooling-wasm" ], "devDependencies": { "@typescript-eslint/eslint-plugin": "^2.23.0", @@ -2565,6 +2566,10 @@ "resolved": "packages/fast-tooling-react", "link": true }, + "node_modules/@microsoft/fast-tooling-wasm": { + "resolved": "packages/fast-tooling-wasm", + "link": true + }, "node_modules/@microsoft/fast-web-utilities": { "version": "4.8.1", "resolved": "https://registry.npmjs.org/@microsoft/fast-web-utilities/-/fast-web-utilities-4.8.1.tgz", @@ -21425,6 +21430,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", "dev": true, + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -24324,7 +24330,7 @@ }, "packages/fast-tooling": { "name": "@microsoft/fast-tooling", - "version": "0.29.0", + "version": "0.30.1", "license": "MIT", "dependencies": { "@microsoft/fast-colors": "^5.1.3", @@ -24378,7 +24384,7 @@ "source-map-loader": "^0.2.4", "style-loader": "^1.2.1", "ts-loader": "^4.0.1", - "typescript": "^3.9.0", + "typescript": "~4.3.0", "webpack": "^4.44.0", "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.11.0", @@ -24391,8 +24397,7 @@ }, "packages/fast-tooling-react": { "name": "@microsoft/fast-tooling-react", - "version": "2.11.4", - "hasInstallScript": true, + "version": "2.12.0", "license": "MIT", "dependencies": { "@microsoft/fast-colors": "^5.1.3", @@ -24403,7 +24408,7 @@ "@microsoft/fast-foundation": "^2.13.1", "@microsoft/fast-jss-manager-react": "^3.0.0 || ^4.0.0", "@microsoft/fast-jss-utilities": "^4.8.0", - "@microsoft/fast-tooling": "^0.29.0", + "@microsoft/fast-tooling": "^0.30.1", "@microsoft/fast-web-utilities": "^4.8.1", "@skatejs/val": "^0.5.0", "exenv-es6": "^1.0.0", @@ -24438,7 +24443,7 @@ "rimraf": "^3.0.2", "ts-jest": "^25.4.0", "ts-loader": "^4.0.1", - "typescript": "^3.9.0", + "typescript": "~4.3.0", "webpack": "^4.44.0", "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.11.0", @@ -24449,6 +24454,59 @@ "lodash-es": "^4.0.0", "react": "^16.8.0" } + }, + "packages/fast-tooling-react/node_modules/typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "packages/fast-tooling-wasm": { + "name": "@microsoft/fast-tooling-wasm", + "version": "1.1.4", + "license": "MIT", + "devDependencies": { + "html-webpack-plugin": "^3.2.0", + "ts-loader": "^4.0.1", + "typescript": "~4.3.0", + "webpack": "^4.44.0", + "webpack-cli": "^3.1.1", + "webpack-dev-server": "^3.11.0", + "yargs": "^16.2.0" + } + }, + "packages/fast-tooling-wasm/node_modules/typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "packages/fast-tooling/node_modules/typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } } }, "dependencies": { @@ -26337,7 +26395,7 @@ "source-map-loader": "^0.2.4", "style-loader": "^1.2.1", "ts-loader": "^4.0.1", - "typescript": "^3.9.0", + "typescript": "~4.3.0", "vscode-html-languageservice": "^3.1.3", "vscode-web-custom-data": "^0.3.5", "webpack": "^4.44.0", @@ -26345,6 +26403,14 @@ "webpack-dev-server": "^3.11.0", "webpack-merge": "^4.2.2", "worker-loader": "^2.0.0" + }, + "dependencies": { + "typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "dev": true + } } }, "@microsoft/fast-tooling-react": { @@ -26361,7 +26427,7 @@ "@microsoft/fast-foundation": "^2.13.1", "@microsoft/fast-jss-manager-react": "^3.0.0 || ^4.0.0", "@microsoft/fast-jss-utilities": "^4.8.0", - "@microsoft/fast-tooling": "^0.29.0", + "@microsoft/fast-tooling": "^0.30.1", "@microsoft/fast-web-utilities": "^4.8.1", "@skatejs/val": "^0.5.0", "@types/jest": "^25.2.1", @@ -26391,11 +26457,39 @@ "rimraf": "^3.0.2", "ts-jest": "^25.4.0", "ts-loader": "^4.0.1", - "typescript": "^3.9.0", + "typescript": "~4.3.0", "webpack": "^4.44.0", "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.11.0", "yargs": "^16.2.0" + }, + "dependencies": { + "typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "dev": true + } + } + }, + "@microsoft/fast-tooling-wasm": { + "version": "file:packages/fast-tooling-wasm", + "requires": { + "html-webpack-plugin": "^3.2.0", + "ts-loader": "^4.0.1", + "typescript": "~4.3.0", + "webpack": "^4.44.0", + "webpack-cli": "^3.1.1", + "webpack-dev-server": "^3.11.0", + "yargs": "^16.2.0" + }, + "dependencies": { + "typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "dev": true + } } }, "@microsoft/fast-web-utilities": { @@ -41548,7 +41642,8 @@ "version": "3.9.10", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", - "dev": true + "dev": true, + "peer": true }, "ua-parser-js": { "version": "0.7.28", diff --git a/packages/fast-tooling-react/package.json b/packages/fast-tooling-react/package.json index c4fc346..3ba5603 100644 --- a/packages/fast-tooling-react/package.json +++ b/packages/fast-tooling-react/package.json @@ -18,7 +18,7 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { - "build": "tsc -p ./tsconfig.json", + "build": "tsc --project ./tsconfig.json", "build:app": "webpack --progress --mode=production", "clean:dist": "node ../../build/clean.js dist", "coverage": "jest --coverage", @@ -101,7 +101,7 @@ "rimraf": "^3.0.2", "ts-jest": "^25.4.0", "ts-loader": "^4.0.1", - "typescript": "^3.9.0", + "typescript": "~4.3.0", "webpack": "^4.44.0", "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.11.0", diff --git a/packages/fast-tooling-wasm/package.json b/packages/fast-tooling-wasm/package.json index 3eb13b8..7ab2aeb 100644 --- a/packages/fast-tooling-wasm/package.json +++ b/packages/fast-tooling-wasm/package.json @@ -26,7 +26,7 @@ "devDependencies": { "html-webpack-plugin": "^3.2.0", "ts-loader": "^4.0.1", - "typescript": "^3.9.0", + "typescript": "~4.3.0", "webpack": "^4.44.0", "webpack-cli": "^3.1.1", "webpack-dev-server": "^3.11.0", diff --git a/packages/fast-tooling/package.json b/packages/fast-tooling/package.json index c5f7159..ce842c9 100644 --- a/packages/fast-tooling/package.json +++ b/packages/fast-tooling/package.json @@ -21,8 +21,8 @@ "scripts": { "build": "npm run build:esm && npm run build:cjs && npm run build:message-system", "build:app": "npm run build:message-system && webpack --progress --mode=production", - "build:esm": "tsc -p ./tsconfig.esm.json", - "build:cjs": "tsc -p ./tsconfig.cjs.json", + "build:esm": "tsc --project ./tsconfig.esm.json", + "build:cjs": "tsc --project ./tsconfig.cjs.json", "build:message-system": "webpack --config webpack.message-system.config.cjs", "clean:dist": "node ../../build/clean.js dist && node ../../build/clean.js .tmp", "convert:mdn-data": "node -r esm ./build/generate-mdn-data-files", @@ -90,7 +90,7 @@ "source-map-loader": "^0.2.4", "style-loader": "^1.2.1", "ts-loader": "^4.0.1", - "typescript": "^3.9.0", + "typescript": "~4.3.0", "webpack": "^4.44.0", "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.11.0", diff --git a/packages/fast-tooling/src/web-components/css-layout/css-layout.form-associated.ts b/packages/fast-tooling/src/web-components/css-layout/css-layout.form-associated.ts index 41e84be..e388f9c 100644 --- a/packages/fast-tooling/src/web-components/css-layout/css-layout.form-associated.ts +++ b/packages/fast-tooling/src/web-components/css-layout/css-layout.form-associated.ts @@ -1,17 +1,13 @@ import { FormAssociated, FoundationElement } from "@microsoft/fast-foundation"; +class _CSSLayout extends FoundationElement {} +interface _CSSLayout extends FormAssociated {} + /** * A form-associated base class for the flexbox component. * * @internal */ -export class FormAssociatedCSSLayout extends FormAssociated( - class extends FoundationElement { - public proxy: HTMLInputElement = document.createElement("input"); - } -) {} - -/** - * @internal - */ -export interface FormAssociatedCSSLayout extends FormAssociated {} +export class FormAssociatedCSSLayout extends FormAssociated(_CSSLayout) { + proxy: HTMLInputElement = document.createElement("input"); +} diff --git a/tsconfig.json b/tsconfig.json index 0d6dc69..4be0e41 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "baseUrl": "./", "declaration": true, "esModuleInterop": true, "experimentalDecorators": true,