From cb759de9f29d31d25d126526f7fab62cb3d3f11e Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 05:45:31 +0000 Subject: [PATCH 01/18] Create eng/tools/package.json --- eng/tools/package.json | 11 +++++++++++ package.json | 7 ++----- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 eng/tools/package.json diff --git a/eng/tools/package.json b/eng/tools/package.json new file mode 100644 index 000000000000..0e0bd569b41b --- /dev/null +++ b/eng/tools/package.json @@ -0,0 +1,11 @@ +{ + "name": "azure-rest-api-specs-eng-tools", + "devDependencies": { + "@azure-tools/typespec-validation": "file:TypeSpecValidation", + "typescript": "~5.0.4" + }, + "scripts": { + "postinstall": "npx --no tsc -- -p TypeSpecValidation" + }, + "private": true +} diff --git a/package.json b/package.json index aa91a25e21fc..f6040f99d7d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "azure-rest-api-specs", "devDependencies": { + "@azure/avocado": "^0.8.4", "@azure-tools/cadl-apiview": "0.3.5", "@azure-tools/cadl-autorest": "0.26.0", "@azure-tools/cadl-azure-core": "0.26.0", @@ -12,19 +13,15 @@ "@azure-tools/typespec-azure-resource-manager": "0.31.0", "@azure-tools/typespec-client-generator-core": "0.31.0", "@azure-tools/typespec-providerhub": "0.31.0", - "@azure-tools/typespec-validation": "file:eng/tools/TypeSpecValidation", "@typespec/compiler": "0.45.2", "@typespec/http": "0.45.0", "@typespec/openapi": "0.45.0", "@typespec/rest": "0.45.0", "@typespec/versioning": "0.45.0", - "@azure/avocado": "^0.8.4", "@types/prettier": "^2.7.2", + "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "^2.8.8", "typescript": "~5.0.4" }, - "scripts": { - "build": "npx --no tsc -- -p eng/tools/TypeSpecValidation" - }, "private": true } From d5ed2bd37161614c3f00cb71f53741d34edf9db0 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 05:47:52 +0000 Subject: [PATCH 02/18] Update package-lock.json --- package-lock.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 02ca27ba7c69..fd930e42949d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,6 @@ "@azure-tools/typespec-azure-resource-manager": "0.31.0", "@azure-tools/typespec-client-generator-core": "0.31.0", "@azure-tools/typespec-providerhub": "0.31.0", - "@azure-tools/typespec-validation": "file:eng/tools/TypeSpecValidation", "@azure/avocado": "^0.8.4", "@types/prettier": "^2.7.2", "@typespec/compiler": "0.45.2", @@ -25,10 +24,19 @@ "@typespec/openapi": "0.45.0", "@typespec/rest": "0.45.0", "@typespec/versioning": "0.45.0", + "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "^2.8.8", "typescript": "~5.0.4" } }, + "eng/tools": { + "dev": true, + "hasInstallScript": true, + "devDependencies": { + "@azure-tools/typespec-validation": "file:TypeSpecValidation", + "typescript": "~5.0.4" + } + }, "eng/tools/TypeSpecValidation": { "name": "@azure-tools/typespec-validation", "version": "0.0.1", @@ -1275,6 +1283,10 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "dev": true }, + "node_modules/azure-rest-api-specs-eng-tools": { + "resolved": "eng/tools", + "link": true + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", From ed966844fff3316bd6ee8ae3ce786f88c7de0ba4 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 05:52:01 +0000 Subject: [PATCH 03/18] Move postinstall to tool package.json --- eng/tools/TypeSpecValidation/package.json | 36 +++++++++++++---------- eng/tools/package.json | 6 +--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/tools/TypeSpecValidation/package.json b/eng/tools/TypeSpecValidation/package.json index 970c2e834420..24778daa7d95 100644 --- a/eng/tools/TypeSpecValidation/package.json +++ b/eng/tools/TypeSpecValidation/package.json @@ -1,18 +1,22 @@ { - "name": "@azure-tools/typespec-validation", - "private": true, - "version": "0.0.1", - "type": "module", - "main": "dist/TypeSpecValidation.js", - "bin": { - "tsv": "cmd/tsv.js" - }, - "dependencies": { - "debug": "^4.3.4", - "simple-git": "^3.16.0" - }, - "devDependencies": { - "@types/debug": "^4.1.8", - "@types/node": "^18.16.18" - } + "name": "@azure-tools/typespec-validation", + "private": true, + "version": "0.0.1", + "type": "module", + "main": "dist/TypeSpecValidation.js", + "bin": { + "tsv": "cmd/tsv.js" + }, + "dependencies": { + "debug": "^4.3.4", + "simple-git": "^3.16.0" + }, + "devDependencies": { + "@types/debug": "^4.1.8", + "@types/node": "^18.16.18", + "typescript": "~5.0.4" +}, + "scripts": { + "postinstall": "npx --no tsc" + } } diff --git a/eng/tools/package.json b/eng/tools/package.json index 0e0bd569b41b..28c6f7e96e7d 100644 --- a/eng/tools/package.json +++ b/eng/tools/package.json @@ -1,11 +1,7 @@ { "name": "azure-rest-api-specs-eng-tools", "devDependencies": { - "@azure-tools/typespec-validation": "file:TypeSpecValidation", - "typescript": "~5.0.4" - }, - "scripts": { - "postinstall": "npx --no tsc -- -p TypeSpecValidation" + "@azure-tools/typespec-validation": "file:TypeSpecValidation" }, "private": true } From e3592de434d3094931f04d452e76a25575b03212 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 05:59:25 +0000 Subject: [PATCH 04/18] Update package-lock.json --- package-lock.json | 12 ++++-------- package.json | 5 ++++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd930e42949d..9e54705dfe3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "packages": { "": { "name": "azure-rest-api-specs", + "hasInstallScript": true, "devDependencies": { "@azure-tools/cadl-apiview": "0.3.5", "@azure-tools/cadl-autorest": "0.26.0", @@ -17,6 +18,7 @@ "@azure-tools/typespec-azure-resource-manager": "0.31.0", "@azure-tools/typespec-client-generator-core": "0.31.0", "@azure-tools/typespec-providerhub": "0.31.0", + "@azure-tools/typespec-validation": "file:eng/tools/TypeSpecValidation", "@azure/avocado": "^0.8.4", "@types/prettier": "^2.7.2", "@typespec/compiler": "0.45.2", @@ -24,17 +26,15 @@ "@typespec/openapi": "0.45.0", "@typespec/rest": "0.45.0", "@typespec/versioning": "0.45.0", - "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "^2.8.8", "typescript": "~5.0.4" } }, "eng/tools": { + "name": "azure-rest-api-specs-eng-tools", "dev": true, - "hasInstallScript": true, "devDependencies": { - "@azure-tools/typespec-validation": "file:TypeSpecValidation", - "typescript": "~5.0.4" + "@azure-tools/typespec-validation": "file:TypeSpecValidation" } }, "eng/tools/TypeSpecValidation": { @@ -1283,10 +1283,6 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "dev": true }, - "node_modules/azure-rest-api-specs-eng-tools": { - "resolved": "eng/tools", - "link": true - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", diff --git a/package.json b/package.json index f6040f99d7d2..5f52039387c5 100644 --- a/package.json +++ b/package.json @@ -13,15 +13,18 @@ "@azure-tools/typespec-azure-resource-manager": "0.31.0", "@azure-tools/typespec-client-generator-core": "0.31.0", "@azure-tools/typespec-providerhub": "0.31.0", + "@azure-tools/typespec-validation": "file:eng/tools/TypeSpecValidation", "@typespec/compiler": "0.45.2", "@typespec/http": "0.45.0", "@typespec/openapi": "0.45.0", "@typespec/rest": "0.45.0", "@typespec/versioning": "0.45.0", "@types/prettier": "^2.7.2", - "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "^2.8.8", "typescript": "~5.0.4" }, + "scripts": { + "postinstall": "npx --no tsc -- -p eng/tools/TypeSpecValidation" + }, "private": true } From f0f9c54ddbf823f17cde57485448340db8ac9aa2 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 06:00:57 +0000 Subject: [PATCH 05/18] Remove postinstall from root package.json --- package-lock.json | 5 +++-- package.json | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e54705dfe3c..1d40a4a6e358 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "packages": { "": { "name": "azure-rest-api-specs", - "hasInstallScript": true, "devDependencies": { "@azure-tools/cadl-apiview": "0.3.5", "@azure-tools/cadl-autorest": "0.26.0", @@ -41,6 +40,7 @@ "name": "@azure-tools/typespec-validation", "version": "0.0.1", "dev": true, + "hasInstallScript": true, "dependencies": { "debug": "^4.3.4", "simple-git": "^3.16.0" @@ -50,7 +50,8 @@ }, "devDependencies": { "@types/debug": "^4.1.8", - "@types/node": "^18.16.18" + "@types/node": "^18.16.18", + "typescript": "~5.0.4" } }, "eng/tools/TypeSpecValidation/node_modules/@types/node": { diff --git a/package.json b/package.json index 5f52039387c5..490436b69f8e 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,5 @@ "prettier": "^2.8.8", "typescript": "~5.0.4" }, - "scripts": { - "postinstall": "npx --no tsc -- -p eng/tools/TypeSpecValidation" - }, "private": true } From 05eea05dbe32479a56ea677d523647bf82909758 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 06:01:23 +0000 Subject: [PATCH 06/18] Format --- eng/tools/TypeSpecValidation/package.json | 42 +++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/tools/TypeSpecValidation/package.json b/eng/tools/TypeSpecValidation/package.json index 24778daa7d95..739448a2a3c3 100644 --- a/eng/tools/TypeSpecValidation/package.json +++ b/eng/tools/TypeSpecValidation/package.json @@ -1,22 +1,22 @@ { - "name": "@azure-tools/typespec-validation", - "private": true, - "version": "0.0.1", - "type": "module", - "main": "dist/TypeSpecValidation.js", - "bin": { - "tsv": "cmd/tsv.js" - }, - "dependencies": { - "debug": "^4.3.4", - "simple-git": "^3.16.0" - }, - "devDependencies": { - "@types/debug": "^4.1.8", - "@types/node": "^18.16.18", - "typescript": "~5.0.4" -}, - "scripts": { - "postinstall": "npx --no tsc" - } -} + "name": "@azure-tools/typespec-validation", + "private": true, + "version": "0.0.1", + "type": "module", + "main": "dist/TypeSpecValidation.js", + "bin": { + "tsv": "cmd/tsv.js" + }, + "dependencies": { + "debug": "^4.3.4", + "simple-git": "^3.16.0" + }, + "devDependencies": { + "@types/debug": "^4.1.8", + "@types/node": "^18.16.18", + "typescript": "~5.0.4" + }, + "scripts": { + "postinstall": "npx --no tsc" + } +} \ No newline at end of file From 74bce7a7106dacfb3508421948625e58040c90be Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 06:01:40 +0000 Subject: [PATCH 07/18] Add trailing newline --- eng/tools/TypeSpecValidation/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/tools/TypeSpecValidation/package.json b/eng/tools/TypeSpecValidation/package.json index 739448a2a3c3..4404cc770e6b 100644 --- a/eng/tools/TypeSpecValidation/package.json +++ b/eng/tools/TypeSpecValidation/package.json @@ -19,4 +19,4 @@ "scripts": { "postinstall": "npx --no tsc" } -} \ No newline at end of file +} From 33bd6244ea7fc9c37c228dfa32beb3067d0cb6a3 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 06:02:20 +0000 Subject: [PATCH 08/18] Revert avocado move --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 490436b69f8e..2cbb6d77e62d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "azure-rest-api-specs", "devDependencies": { - "@azure/avocado": "^0.8.4", "@azure-tools/cadl-apiview": "0.3.5", "@azure-tools/cadl-autorest": "0.26.0", "@azure-tools/cadl-azure-core": "0.26.0", @@ -19,6 +18,7 @@ "@typespec/openapi": "0.45.0", "@typespec/rest": "0.45.0", "@typespec/versioning": "0.45.0", + "@azure/avocado": "^0.8.4", "@types/prettier": "^2.7.2", "prettier": "^2.8.8", "typescript": "~5.0.4" From c48a6b3b430849e451e3984ef7ce7d22efb3fd53 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 06:03:22 +0000 Subject: [PATCH 09/18] Remove eng/tools --- package-lock.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d40a4a6e358..77fa8f6c8d45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,13 +29,6 @@ "typescript": "~5.0.4" } }, - "eng/tools": { - "name": "azure-rest-api-specs-eng-tools", - "dev": true, - "devDependencies": { - "@azure-tools/typespec-validation": "file:TypeSpecValidation" - } - }, "eng/tools/TypeSpecValidation": { "name": "@azure-tools/typespec-validation", "version": "0.0.1", From fdd9d27401ee83618939ef9787233353ca0999a2 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 06:54:11 +0000 Subject: [PATCH 10/18] Use eng/tools intermediate package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2cbb6d77e62d..3d075b225a99 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "@azure-tools/typespec-azure-resource-manager": "0.31.0", "@azure-tools/typespec-client-generator-core": "0.31.0", "@azure-tools/typespec-providerhub": "0.31.0", - "@azure-tools/typespec-validation": "file:eng/tools/TypeSpecValidation", "@typespec/compiler": "0.45.2", "@typespec/http": "0.45.0", "@typespec/openapi": "0.45.0", @@ -20,6 +19,7 @@ "@typespec/versioning": "0.45.0", "@azure/avocado": "^0.8.4", "@types/prettier": "^2.7.2", + "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "^2.8.8", "typescript": "~5.0.4" }, From 51e7491fbed2a6f97ea8fe5c4dbef1c27f389ba3 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 06:54:22 +0000 Subject: [PATCH 11/18] Update package-lock.json --- package-lock.json | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 77fa8f6c8d45..17cf69116d16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,6 @@ "@azure-tools/typespec-azure-resource-manager": "0.31.0", "@azure-tools/typespec-client-generator-core": "0.31.0", "@azure-tools/typespec-providerhub": "0.31.0", - "@azure-tools/typespec-validation": "file:eng/tools/TypeSpecValidation", "@azure/avocado": "^0.8.4", "@types/prettier": "^2.7.2", "@typespec/compiler": "0.45.2", @@ -25,12 +24,24 @@ "@typespec/openapi": "0.45.0", "@typespec/rest": "0.45.0", "@typespec/versioning": "0.45.0", + "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "^2.8.8", "typescript": "~5.0.4" } }, + "eng/tools": { + "dev": true, + "devDependencies": { + "@azure-tools/typespec-validation": "file:TypeSpecValidation" + } + }, + "eng/tools/node_modules/@types/node": { + "version": "18.16.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.19.tgz", + "integrity": "sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==", + "dev": true + }, "eng/tools/TypeSpecValidation": { - "name": "@azure-tools/typespec-validation", "version": "0.0.1", "dev": true, "hasInstallScript": true, @@ -47,12 +58,6 @@ "typescript": "~5.0.4" } }, - "eng/tools/TypeSpecValidation/node_modules/@types/node": { - "version": "18.16.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz", - "integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==", - "dev": true - }, "node_modules/@azure-tools/cadl-apiview": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/@azure-tools/cadl-apiview/-/cadl-apiview-0.3.5.tgz", @@ -1277,6 +1282,10 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "dev": true }, + "node_modules/azure-rest-api-specs-eng-tools": { + "resolved": "eng/tools", + "link": true + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", From 03f34f6cdcf53daf95b4046cc0900773cdaff788 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 07:03:51 +0000 Subject: [PATCH 12/18] Add tslib dependency to TypeSpecValidation --- package-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-lock.json b/package-lock.json index 17cf69116d16..a4a507d9e038 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,6 +55,7 @@ "devDependencies": { "@types/debug": "^4.1.8", "@types/node": "^18.16.18", + "tslib": "^2.6.0", "typescript": "~5.0.4" } }, From 43c5712ee237924c785b3df035e9e9981406ab51 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 07:04:40 +0000 Subject: [PATCH 13/18] Add tslib dep to TypeSpecValidation --- eng/tools/TypeSpecValidation/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/tools/TypeSpecValidation/package.json b/eng/tools/TypeSpecValidation/package.json index 4404cc770e6b..78dd6bc832f3 100644 --- a/eng/tools/TypeSpecValidation/package.json +++ b/eng/tools/TypeSpecValidation/package.json @@ -14,6 +14,7 @@ "devDependencies": { "@types/debug": "^4.1.8", "@types/node": "^18.16.18", + "tslib": "^2.6.0", "typescript": "~5.0.4" }, "scripts": { From cefa130ddb3e812e54931c8df146978665a79daf Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 07:15:57 +0000 Subject: [PATCH 14/18] Remove call to "npm run build" --- eng/pipelines/typespec-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/pipelines/typespec-ci.yml b/eng/pipelines/typespec-ci.yml index 27aebf70c9b4..91574df6ec45 100644 --- a/eng/pipelines/typespec-ci.yml +++ b/eng/pipelines/typespec-ci.yml @@ -40,10 +40,6 @@ jobs: displayName: npm ls -a condition: succeededOrFailed() - - script: npm run build - displayName: npm run build - condition: succeededOrFailed() - - template: templates/steps/typespec-ci.yml parameters: Folder: specification/contosowidgetmanager/Contoso.WidgetManager From b5446c614c5e88a36e764f9f757ef3e450b556f5 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 07:22:03 +0000 Subject: [PATCH 15/18] Revert @types/node --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a4a507d9e038..bfc809f12cfc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,9 +36,9 @@ } }, "eng/tools/node_modules/@types/node": { - "version": "18.16.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.19.tgz", - "integrity": "sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==", + "version": "18.16.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz", + "integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==", "dev": true }, "eng/tools/TypeSpecValidation": { From 6fc6fd303d5c42770ff01fa38db7c9967196d830 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 10:29:10 -0700 Subject: [PATCH 16/18] Simplify compile step Co-authored-by: Timothee Guerin --- eng/tools/TypeSpecValidation/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/tools/TypeSpecValidation/package.json b/eng/tools/TypeSpecValidation/package.json index 78dd6bc832f3..35af7568b347 100644 --- a/eng/tools/TypeSpecValidation/package.json +++ b/eng/tools/TypeSpecValidation/package.json @@ -18,6 +18,6 @@ "typescript": "~5.0.4" }, "scripts": { - "postinstall": "npx --no tsc" + "postinstall": "tsc" } } From 287edb7e5a435c16c394a7614c5fc75d0d3826ce Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 17:44:09 +0000 Subject: [PATCH 17/18] Set importHelpers:false --- eng/tools/TypeSpecValidation/package.json | 1 - eng/tools/TypeSpecValidation/tsconfig.json | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/tools/TypeSpecValidation/package.json b/eng/tools/TypeSpecValidation/package.json index 35af7568b347..db9f95fbd43c 100644 --- a/eng/tools/TypeSpecValidation/package.json +++ b/eng/tools/TypeSpecValidation/package.json @@ -14,7 +14,6 @@ "devDependencies": { "@types/debug": "^4.1.8", "@types/node": "^18.16.18", - "tslib": "^2.6.0", "typescript": "~5.0.4" }, "scripts": { diff --git a/eng/tools/TypeSpecValidation/tsconfig.json b/eng/tools/TypeSpecValidation/tsconfig.json index e22799e0549a..6966315fab5d 100644 --- a/eng/tools/TypeSpecValidation/tsconfig.json +++ b/eng/tools/TypeSpecValidation/tsconfig.json @@ -3,6 +3,9 @@ "compilerOptions": { "target": "ES6", "module": "Node16", - "outDir": "./dist" + "outDir": "./dist", + + // override "importHelpers:true" in root tsconfig.json + "importHelpers": false } } From ab8d34df3cfff38c30d0e14aec657e8cba057db0 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 11 Jul 2023 17:45:17 +0000 Subject: [PATCH 18/18] Update package-lock.json --- package-lock.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index bfc809f12cfc..0b2654b4a752 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,7 +55,6 @@ "devDependencies": { "@types/debug": "^4.1.8", "@types/node": "^18.16.18", - "tslib": "^2.6.0", "typescript": "~5.0.4" } },