diff --git a/package-lock.json b/package-lock.json index ab5f7fdbdf..4809063816 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@definitelytyped/dtslint": "^0.2.7", + "@definitelytyped/dtslint": "^0.2.10", "@definitelytyped/eslint-plugin": "^0.1.4", "@expo/spawn-async": "^1.7.2", "@octokit/rest": "^20.0.2", @@ -61,11 +61,11 @@ "integrity": "sha512-Jh15/qVmrLGhkKJBdXlK1+9tY4lZruYjsgkDFj08ZmDiWVBLJcqkok7Z0/R0In+i1rScBpJlSvrTS2Lm41Pbnw==" }, "node_modules/@arethetypeswrong/cli": { - "version": "0.13.8", - "resolved": "https://registry.npmjs.org/@arethetypeswrong/cli/-/cli-0.13.8.tgz", - "integrity": "sha512-tQCXVBLuSfFlXdQLl17ZlBuHB1zo03H7uTLDFumoOl/dibXw1osYJ+Fd9Oju34buFDzI1DuFS2vba/Bsk95E5Q==", + "version": "0.13.10", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/cli/-/cli-0.13.10.tgz", + "integrity": "sha512-UV5Vk2ZaERQb0jS82rVWviKQieVpodiWKTOE/l8QN5fvG83AdhpI4QG8I5F1qSU/xq3K5RK44Bbgn6/JqwlT/A==", "dependencies": { - "@arethetypeswrong/core": "0.13.6", + "@arethetypeswrong/core": "0.13.9", "chalk": "^4.1.2", "cli-table3": "^0.6.3", "commander": "^10.0.1", @@ -89,12 +89,12 @@ } }, "node_modules/@arethetypeswrong/core": { - "version": "0.13.6", - "resolved": "https://registry.npmjs.org/@arethetypeswrong/core/-/core-0.13.6.tgz", - "integrity": "sha512-e3CHQUK1aIIk8VOUavXPu3aVie3ZpxSGQHQoeBabzy81T4xWfQDrc68CqFmfGIEr8Apug47Yq+pYkCG2lsS10w==", + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/core/-/core-0.13.9.tgz", + "integrity": "sha512-JBvXC6fgHFWnTh0wrVsHbl+GPLdwD2IracDpHLvCLlnL4hx6fLCOdZL6Q4qdPAodcsehDL7M2fIrCMluk7kDeQ==", "dependencies": { "@andrewbranch/untar.js": "^1.0.3", - "fflate": "^0.7.4", + "fflate": "^0.8.2", "semver": "^7.5.4", "ts-expose-internals-conditionally": "1.0.0-empty.0", "typescript": "5.3.3", @@ -286,12 +286,12 @@ } }, "node_modules/@definitelytyped/dtslint": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/@definitelytyped/dtslint/-/dtslint-0.2.7.tgz", - "integrity": "sha512-y+u2ZqXeFySDSIpCh1xDc+ceSMeTVRJ4trCpCawhTw/Yy2G2IkewHCuiKwjY+vOBk6DIxyRw4qXMKP3bHTSnnA==", + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/@definitelytyped/dtslint/-/dtslint-0.2.10.tgz", + "integrity": "sha512-V7EWXuPtvM53xzOypyq15kN9FCnwNbGThmLDCSYSSIPsyIVFRu55DshmO62cLDhkouYb2EkWnfmkFq3E6hq88w==", "dependencies": { - "@arethetypeswrong/cli": "0.13.8", - "@arethetypeswrong/core": "0.13.6", + "@arethetypeswrong/cli": "0.13.10", + "@arethetypeswrong/core": "0.13.9", "@definitelytyped/header-parser": "0.2.3", "@definitelytyped/typescript-versions": "0.1.0", "@definitelytyped/utils": "0.1.2", @@ -3555,9 +3555,9 @@ } }, "node_modules/fflate": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz", - "integrity": "sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==" + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", + "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==" }, "node_modules/figures": { "version": "3.2.0", diff --git a/package.json b/package.json index cea7cb5aa0..95b5e57aa6 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "type-check": "tsc --noEmit" }, "dependencies": { - "@definitelytyped/dtslint": "^0.2.7", + "@definitelytyped/dtslint": "^0.2.10", "@definitelytyped/eslint-plugin": "^0.1.4", "@expo/spawn-async": "^1.7.2", "@octokit/rest": "^20.0.2", diff --git a/patches/@definitelytyped+dtslint+0.2.7.patch b/patches/@definitelytyped+dtslint+0.2.10.patch similarity index 89% rename from patches/@definitelytyped+dtslint+0.2.7.patch rename to patches/@definitelytyped+dtslint+0.2.10.patch index 01976d1778..f041a0e8ec 100644 --- a/patches/@definitelytyped+dtslint+0.2.7.patch +++ b/patches/@definitelytyped+dtslint+0.2.10.patch @@ -1,7 +1,7 @@ See https://github.com/microsoft/DefinitelyTyped-tools/issues/850 diff --git a/node_modules/@definitelytyped/dtslint/dist/index.js b/node_modules/@definitelytyped/dtslint/dist/index.js -index d40f0dd..d6c9049 100755 +index 10ad089..c7cb896 100755 --- a/node_modules/@definitelytyped/dtslint/dist/index.js +++ b/node_modules/@definitelytyped/dtslint/dist/index.js @@ -131,10 +131,7 @@ async function runTests(dirPath, onlyTestTsNext, expectOnly, npmChecks, tsLocal) @@ -13,6 +13,6 @@ index d40f0dd..d6c9049 100755 - throw new Error("\n\t* " + packageJson.join("\n\t* ")); - } + const packageJson = {nonNpm:true}; - await assertNpmIgnoreExpected(dirPath); - assertNoOtherFiles(dirPath); + const warnings = []; + const errors = []; let implementationPackage; diff --git a/src/app.ts b/src/app.ts index 26fa3dd5b5..e6b79e11bd 100644 --- a/src/app.ts +++ b/src/app.ts @@ -890,7 +890,6 @@ export class App { '.npmrc', '.npmIgnore'.toLowerCase(), '.eslintrc.json', - 'tslint.json', 'tsconfig.json', ].map(fileName => copyFile( diff --git a/src/template/template.tslint.json b/src/template/template.tslint.json deleted file mode 100644 index b0a453f4d4..0000000000 --- a/src/template/template.tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@definitelytyped/dtslint/dt.json" -}