From 0c296073cb182dc14a51b85ec2ac5970b5670292 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Wed, 16 Sep 2020 21:28:39 +0200 Subject: [PATCH 01/55] Update the `.npmignore` file to exclude `.github` --- .npmignore | 3 +++ gulp/npmignore.diff | 7 +++++-- packages/generator-ts-project/templates/npmignore.diff | 9 +++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.npmignore b/.npmignore index bf1aa6e6..493e1e80 100644 --- a/.npmignore +++ b/.npmignore @@ -116,5 +116,8 @@ dist # Unit-Tests [Ll]ib/tests/ +# GitHub configuration +.github/ + # Drone configuration .drone.yml diff --git a/gulp/npmignore.diff b/gulp/npmignore.diff index 07142809..0010c527 100644 --- a/gulp/npmignore.diff +++ b/gulp/npmignore.diff @@ -1,11 +1,14 @@ diff --git a/.npmignore b/.npmignore -index 9d3909d..e8a353f 100644 +index 74af7d7..e8a353f 100644 --- a/.npmignore +++ b/.npmignore -@@ -123,6 +123,3 @@ tsconfig.*.json +@@ -123,9 +123,3 @@ tsconfig.*.json # Visual Studio Code-Environment .vscode/ - +-# GitHub configuration +-.github/ +- -# Drone configuration -.drone.yml diff --git a/packages/generator-ts-project/templates/npmignore.diff b/packages/generator-ts-project/templates/npmignore.diff index 55c5595d..4b55c6a1 100644 --- a/packages/generator-ts-project/templates/npmignore.diff +++ b/packages/generator-ts-project/templates/npmignore.diff @@ -1,5 +1,5 @@ diff --git a/.npmignore b/.npmignore -index bf1aa6e..9d3909d 100644 +index 493e1e8..74af7d7 100644 --- a/.npmignore +++ b/.npmignore @@ -1,6 +1,3 @@ @@ -9,7 +9,7 @@ index bf1aa6e..9d3909d 100644 # Logs logs *.log -@@ -107,14 +104,25 @@ dist +@@ -107,15 +104,26 @@ dist .tern-port # Source-files @@ -35,5 +35,6 @@ index bf1aa6e..9d3909d 100644 +# Visual Studio Code-Environment +.vscode/ + - # Drone configuration - .drone.yml + # GitHub configuration + .github/ + From 09cbe63b59f9a415467b1ecc41773bfa59df1d9e Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Wed, 16 Sep 2020 23:18:19 +0200 Subject: [PATCH 02/55] Add tests for the new `.npmignore` file --- .../FileMappings/NPMIgnoreFileMapping.test.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/generator-ts-project/src/tests/Project/FileMappings/NPMIgnoreFileMapping.test.ts b/packages/generator-ts-project/src/tests/Project/FileMappings/NPMIgnoreFileMapping.test.ts index ebaac0a5..ded6a038 100644 --- a/packages/generator-ts-project/src/tests/Project/FileMappings/NPMIgnoreFileMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Project/FileMappings/NPMIgnoreFileMapping.test.ts @@ -1,5 +1,5 @@ import Assert = require("assert"); -import { lstat, readdir } from "fs-extra"; +import { ensureDir, ensureFile, lstat, readdir } from "fs-extra"; import packlist = require("npm-packlist"); import { resolve } from "upath"; import { TSProjectGenerator } from "../../../Project/TSProjectGenerator"; @@ -116,5 +116,16 @@ export function NPMIgnoreFileMappingTests(context: TestContext + { + let testFile = context.RandomString; + let dirName = ".github"; + await ensureDir(await DestinationPath(dirName)); + await ensureFile(await DestinationPath(dirName, testFile)); + await AssertDirectoryIgnored(".github"); + }); }); } From cc0e12056a2fa3b24aaa8ebc8abef4bd52e8c7d9 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Wed, 16 Sep 2020 23:49:52 +0200 Subject: [PATCH 03/55] Update all packages --- package-lock.json | 6 +++--- package.json | 2 +- packages/generator-my-ts-project/package-lock.json | 6 +++--- packages/generator-my-ts-project/package.json | 2 +- packages/generator-ts-project/package-lock.json | 6 +++--- packages/generator-ts-project/package.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index bcf2f513..5af49d48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1798,9 +1798,9 @@ "dev": true }, "@types/node": { - "version": "14.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.2.tgz", - "integrity": "sha512-IzMhbDYCpv26pC2wboJ4MMOa9GKtjplXfcAqrMeNJpUUwpM/2ATt2w1JPUXwS6spu856TvKZL2AOmeU2rAxskw==", + "version": "14.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.3.tgz", + "integrity": "sha512-zdN0hor7TLkjAdKTnYW+Y22oIhUUpil5ZD1V1OFq0CR0CLKw+NdR6dkziTfkWRLo6sKzisayoj/GNpNbe4LY9Q==", "dev": true }, "@types/normalize-package-data": { diff --git a/package.json b/package.json index b10acc0d..43e39a33 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@types/gulp-rename": "0.0.33", "@types/merge-stream": "^1.1.2", "@types/minimist": "^1.2.0", - "@types/node": "^14.10.2", + "@types/node": "^14.10.3", "@types/npm-which": "^3.0.0", "@types/through2": "^2.0.36", "@types/vinyl": "^2.0.4", diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index 9c4631e2..fe9379ac 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -509,9 +509,9 @@ "dev": true }, "@types/node": { - "version": "14.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.2.tgz", - "integrity": "sha512-IzMhbDYCpv26pC2wboJ4MMOa9GKtjplXfcAqrMeNJpUUwpM/2ATt2w1JPUXwS6spu856TvKZL2AOmeU2rAxskw==" + "version": "14.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.3.tgz", + "integrity": "sha512-zdN0hor7TLkjAdKTnYW+Y22oIhUUpil5ZD1V1OFq0CR0CLKw+NdR6dkziTfkWRLo6sKzisayoj/GNpNbe4LY9Q==" }, "@types/normalize-package-data": { "version": "2.4.0", diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index 2f270c37..8b917deb 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -58,7 +58,7 @@ "@types/dedent": "^0.7.0", "@types/fs-extra": "^9.0.1", "@types/mocha": "^8.0.3", - "@types/node": "^14.10.2", + "@types/node": "^14.10.3", "@types/yaml": "^1.9.7", "@types/yosay": "0.0.29", "@typescript-eslint/eslint-plugin": "^4.1.1", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index a977e296..99f014f1 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -682,9 +682,9 @@ "dev": true }, "@types/node": { - "version": "14.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.2.tgz", - "integrity": "sha512-IzMhbDYCpv26pC2wboJ4MMOa9GKtjplXfcAqrMeNJpUUwpM/2ATt2w1JPUXwS6spu856TvKZL2AOmeU2rAxskw==" + "version": "14.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.3.tgz", + "integrity": "sha512-zdN0hor7TLkjAdKTnYW+Y22oIhUUpil5ZD1V1OFq0CR0CLKw+NdR6dkziTfkWRLo6sKzisayoj/GNpNbe4LY9Q==" }, "@types/normalize-package-data": { "version": "2.4.0", diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index d457ee92..c5262768 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -78,7 +78,7 @@ "@types/lodash.camelcase": "^4.3.6", "@types/lodash.kebabcase": "^4.1.6", "@types/mocha": "^8.0.3", - "@types/node": "^14.10.2", + "@types/node": "^14.10.3", "@types/npm-packlist": "^1.1.1", "@types/npm-which": "^3.0.0", "@types/validate-npm-package-name": "^3.0.0", From 39605269cd48d0c5572f105f5c76fa36578e45a4 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Thu, 17 Sep 2020 23:33:27 +0200 Subject: [PATCH 04/55] Remove deprecated directives from tsconfig --- packages/generator-my-ts-project/tsconfig.json | 1 - packages/generator-ts-project/tsconfig.json | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/generator-my-ts-project/tsconfig.json b/packages/generator-my-ts-project/tsconfig.json index 323fc4f3..4436f633 100644 --- a/packages/generator-my-ts-project/tsconfig.json +++ b/packages/generator-my-ts-project/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "./tsconfig.base.json", - "compileOnSave": true, "compilerOptions": { "composite": true, "rootDir": "./src", diff --git a/packages/generator-ts-project/tsconfig.json b/packages/generator-ts-project/tsconfig.json index bd6591ea..10b266bf 100644 --- a/packages/generator-ts-project/tsconfig.json +++ b/packages/generator-ts-project/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "./tsconfig.base.json", - "compileOnSave": true, "compilerOptions": { "composite": true, "rootDir": "./src", From a74cea0fe4247cbc4d0a3bd412b31d2c7adc9625 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 11:55:36 +0200 Subject: [PATCH 05/55] Refactor terminology in `.drone.yml` --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9efb85b6..3bcfc3d1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: image: node commands: - npm run test - - name: publish module to npm + - name: publish package to npm image: node environment: NPM_TOKEN: @@ -32,7 +32,7 @@ steps: - tag ref: - refs/tags/v[0-9].[0-9].[0-9] - - name: publish module to github + - name: publish package to github image: node environment: GITHUB_TOKEN: @@ -68,7 +68,7 @@ steps: when: event: - tag - - name: publish + - name: publish release image: plugins/github-release commands: [] settings: From 3ef0d1a531841fbd016552e0bd2ccd4e54e428c4 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 13:40:09 +0200 Subject: [PATCH 06/55] Update all packages --- package-lock.json | 6 +++--- package.json | 2 +- packages/generator-my-ts-project/package-lock.json | 6 +++--- packages/generator-my-ts-project/package.json | 2 +- packages/generator-ts-project/package-lock.json | 6 +++--- packages/generator-ts-project/package.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5af49d48..5101819f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1798,9 +1798,9 @@ "dev": true }, "@types/node": { - "version": "14.10.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.3.tgz", - "integrity": "sha512-zdN0hor7TLkjAdKTnYW+Y22oIhUUpil5ZD1V1OFq0CR0CLKw+NdR6dkziTfkWRLo6sKzisayoj/GNpNbe4LY9Q==", + "version": "14.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", + "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==", "dev": true }, "@types/normalize-package-data": { diff --git a/package.json b/package.json index 43e39a33..715bd3de 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@types/gulp-rename": "0.0.33", "@types/merge-stream": "^1.1.2", "@types/minimist": "^1.2.0", - "@types/node": "^14.10.3", + "@types/node": "^14.11.1", "@types/npm-which": "^3.0.0", "@types/through2": "^2.0.36", "@types/vinyl": "^2.0.4", diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index fe9379ac..ce6c30b6 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -509,9 +509,9 @@ "dev": true }, "@types/node": { - "version": "14.10.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.3.tgz", - "integrity": "sha512-zdN0hor7TLkjAdKTnYW+Y22oIhUUpil5ZD1V1OFq0CR0CLKw+NdR6dkziTfkWRLo6sKzisayoj/GNpNbe4LY9Q==" + "version": "14.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", + "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==" }, "@types/normalize-package-data": { "version": "2.4.0", diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index 8b917deb..d7f1c9e8 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -58,7 +58,7 @@ "@types/dedent": "^0.7.0", "@types/fs-extra": "^9.0.1", "@types/mocha": "^8.0.3", - "@types/node": "^14.10.3", + "@types/node": "^14.11.1", "@types/yaml": "^1.9.7", "@types/yosay": "0.0.29", "@typescript-eslint/eslint-plugin": "^4.1.1", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index 99f014f1..3c4a2397 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -682,9 +682,9 @@ "dev": true }, "@types/node": { - "version": "14.10.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.3.tgz", - "integrity": "sha512-zdN0hor7TLkjAdKTnYW+Y22oIhUUpil5ZD1V1OFq0CR0CLKw+NdR6dkziTfkWRLo6sKzisayoj/GNpNbe4LY9Q==" + "version": "14.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", + "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==" }, "@types/normalize-package-data": { "version": "2.4.0", diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index c5262768..b2addf31 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -78,7 +78,7 @@ "@types/lodash.camelcase": "^4.3.6", "@types/lodash.kebabcase": "^4.1.6", "@types/mocha": "^8.0.3", - "@types/node": "^14.10.3", + "@types/node": "^14.11.1", "@types/npm-packlist": "^1.1.1", "@types/npm-which": "^3.0.0", "@types/validate-npm-package-name": "^3.0.0", From 22f3350b2dd9dbb0a98f2cc9c3bf37cf5597bafa Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 17:23:42 +0200 Subject: [PATCH 07/55] Update eslint-config to prevent deprecated api --- package-lock.json | 94 +++++++++++++++---- package.json | 3 +- .../generator-my-ts-project/package-lock.json | 69 +++++++++++++- packages/generator-my-ts-project/package.json | 3 +- .../generator-ts-project/package-lock.json | 69 +++++++++++++- packages/generator-ts-project/package.json | 3 +- .../Dependencies/LintEssentials.ts | 1 + 7 files changed, 217 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5101819f..94a77cdb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1357,16 +1357,6 @@ "write-file-atomic": "^2.3.0" } }, - "@manuth/eslint-plugin-typescript": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.0.tgz", - "integrity": "sha512-/GDq+IJoG8dYkHBzxf6hzVHXr5y8N6wSfAgkz1DNx4ks/GhcIEB67nYt76F/AUCe+IXESmMEd4Zs42bYb3e02w==", - "dev": true, - "requires": { - "lodash.merge": "^4.6.2", - "upath": "^1.2.0" - } - }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -4446,6 +4436,84 @@ } } }, + "eslint-plugin-deprecation": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.1.0.tgz", + "integrity": "sha512-+oDa6JbdZXyh7Bx2zx7VoDFZvFnV1pZVPVo/bEGVkuXlLih/evX0LQG2/nSuNg83CmwZTcAFZXXpLgsX4ctIDQ==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "^2.19.2 || ^3.0.0", + "tslib": "^1.10.0", + "tsutils": "^3.0.0" + }, + "dependencies": { + "@typescript-eslint/experimental-utils": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz", + "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/typescript-estree": "3.10.1", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" + } + }, + "@typescript-eslint/types": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz", + "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz", + "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==", + "dev": true, + "requires": { + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/visitor-keys": "3.10.1", + "debug": "^4.1.1", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz", + "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + } + } + }, "eslint-plugin-import": { "version": "2.22.0", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz", @@ -7272,12 +7340,6 @@ "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=", "dev": true }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, "lodash.set": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", diff --git a/package.json b/package.json index 715bd3de..0fbae7cb 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "prepare": "lerna bootstrap && npm run rebuild" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.0", + "@manuth/eslint-plugin-typescript": "^2.3.1", "@types/diff": "^4.0.2", "@types/fs-extra": "^9.0.1", "@types/git-branch": "^2.0.1", @@ -38,6 +38,7 @@ "copy-and-watch": "^0.1.5", "diff": "^4.0.2", "eslint": "^7.9.0", + "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.0", "eslint-plugin-jsdoc": "^30.5.1", "fs-extra": "^9.0.1", diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index ce6c30b6..591a52ee 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -101,9 +101,9 @@ } }, "@manuth/eslint-plugin-typescript": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.0.tgz", - "integrity": "sha512-/GDq+IJoG8dYkHBzxf6hzVHXr5y8N6wSfAgkz1DNx4ks/GhcIEB67nYt76F/AUCe+IXESmMEd4Zs42bYb3e02w==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.1.tgz", + "integrity": "sha512-9Bqbb4O5FbnTvr6xxOBwIHIDHF+0UI0IC+o4m7gZVW5Hi11O+633jAS8gBE/au8zF2CHh75nM54GbbaOa5eMkA==", "dev": true, "requires": { "lodash.merge": "^4.6.2", @@ -2782,6 +2782,69 @@ } } }, + "eslint-plugin-deprecation": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.1.0.tgz", + "integrity": "sha512-+oDa6JbdZXyh7Bx2zx7VoDFZvFnV1pZVPVo/bEGVkuXlLih/evX0LQG2/nSuNg83CmwZTcAFZXXpLgsX4ctIDQ==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "^2.19.2 || ^3.0.0", + "tslib": "^1.10.0", + "tsutils": "^3.0.0" + }, + "dependencies": { + "@typescript-eslint/experimental-utils": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz", + "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/typescript-estree": "3.10.1", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" + } + }, + "@typescript-eslint/types": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz", + "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz", + "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==", + "dev": true, + "requires": { + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/visitor-keys": "3.10.1", + "debug": "^4.1.1", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz", + "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } + } + }, "eslint-plugin-import": { "version": "2.22.0", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz", diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index d7f1c9e8..7847fed2 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -52,7 +52,7 @@ "yosay": "^2.0.2" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.0", + "@manuth/eslint-plugin-typescript": "^2.3.1", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", "@types/dedent": "^0.7.0", @@ -66,6 +66,7 @@ "@typescript-eslint/parser": "^4.1.1", "concurrently": "^5.3.0", "eslint": "^7.9.0", + "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.0", "eslint-plugin-jsdoc": "^30.5.1", "mocha": "^8.1.3", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index 3c4a2397..8580b0c2 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -124,9 +124,9 @@ } }, "@manuth/eslint-plugin-typescript": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.0.tgz", - "integrity": "sha512-/GDq+IJoG8dYkHBzxf6hzVHXr5y8N6wSfAgkz1DNx4ks/GhcIEB67nYt76F/AUCe+IXESmMEd4Zs42bYb3e02w==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.1.tgz", + "integrity": "sha512-9Bqbb4O5FbnTvr6xxOBwIHIDHF+0UI0IC+o4m7gZVW5Hi11O+633jAS8gBE/au8zF2CHh75nM54GbbaOa5eMkA==", "dev": true, "requires": { "lodash.merge": "^4.6.2", @@ -2994,6 +2994,69 @@ } } }, + "eslint-plugin-deprecation": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.1.0.tgz", + "integrity": "sha512-+oDa6JbdZXyh7Bx2zx7VoDFZvFnV1pZVPVo/bEGVkuXlLih/evX0LQG2/nSuNg83CmwZTcAFZXXpLgsX4ctIDQ==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "^2.19.2 || ^3.0.0", + "tslib": "^1.10.0", + "tsutils": "^3.0.0" + }, + "dependencies": { + "@typescript-eslint/experimental-utils": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz", + "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/typescript-estree": "3.10.1", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" + } + }, + "@typescript-eslint/types": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz", + "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz", + "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==", + "dev": true, + "requires": { + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/visitor-keys": "3.10.1", + "debug": "^4.1.1", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz", + "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } + } + }, "eslint-plugin-import": { "version": "2.22.0", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz", diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index b2addf31..a62ad67b 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -66,7 +66,7 @@ "yosay": "^2.0.2" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.0", + "@manuth/eslint-plugin-typescript": "^2.3.1", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", "@types/comment-json": "^1.1.1", @@ -88,6 +88,7 @@ "@typescript-eslint/parser": "^4.1.1", "concurrently": "^5.3.0", "eslint": "^7.9.0", + "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.0", "eslint-plugin-jsdoc": "^30.5.1", "markdownlint-cli": "^0.23.2", diff --git a/packages/generator-ts-project/src/NPMPackaging/Dependencies/LintEssentials.ts b/packages/generator-ts-project/src/NPMPackaging/Dependencies/LintEssentials.ts index 555677b2..489df462 100644 --- a/packages/generator-ts-project/src/NPMPackaging/Dependencies/LintEssentials.ts +++ b/packages/generator-ts-project/src/NPMPackaging/Dependencies/LintEssentials.ts @@ -14,6 +14,7 @@ export class LintEssentials extends PackageDependencyCollection { devDependencies: [ "eslint", + "eslint-plugin-deprecation", "eslint-plugin-import", "eslint-plugin-jsdoc", "@manuth/eslint-plugin-typescript", From b1e51c6c4d95f00248d87f3dc91c416b9b671a4c Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 17:36:42 +0200 Subject: [PATCH 08/55] Fix incorrectly installed module --- package-lock.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package-lock.json b/package-lock.json index 94a77cdb..312f28c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1357,6 +1357,16 @@ "write-file-atomic": "^2.3.0" } }, + "@manuth/eslint-plugin-typescript": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.1.tgz", + "integrity": "sha512-9Bqbb4O5FbnTvr6xxOBwIHIDHF+0UI0IC+o4m7gZVW5Hi11O+633jAS8gBE/au8zF2CHh75nM54GbbaOa5eMkA==", + "dev": true, + "requires": { + "lodash.merge": "^4.6.2", + "upath": "^1.2.0" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -7340,6 +7350,12 @@ "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=", "dev": true }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "lodash.set": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", From 875b2f10f6de6441673398bf7309a952486fd976 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 19:10:57 +0200 Subject: [PATCH 09/55] Add a trailing new-line to transformed json-files --- .../src/Components/Transformation/JSONTransformMapping.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/generator-ts-project/src/Components/Transformation/JSONTransformMapping.ts b/packages/generator-ts-project/src/Components/Transformation/JSONTransformMapping.ts index c8ab565f..062c23bc 100644 --- a/packages/generator-ts-project/src/Components/Transformation/JSONTransformMapping.ts +++ b/packages/generator-ts-project/src/Components/Transformation/JSONTransformMapping.ts @@ -1,5 +1,7 @@ +import { EOL } from "os"; import { GeneratorOptions, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; import JSON = require("comment-json"); +import { split } from "eol"; import { TransformFileMapping } from "./TransformFileMapping"; /** @@ -43,6 +45,7 @@ export abstract class JSONTransformMapping { - return JSON.stringify(data); + let text = split(JSON.stringify(data, null, 4)).join(EOL); + return text + EOL; } } From 1167016709fe021484e18bed1155cf541bdb5012 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 19:13:07 +0200 Subject: [PATCH 10/55] Add unit-tests for ensuring the new behavior works --- .../Transformation/JSONTransformMapping.test.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts b/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts index 13684e7a..0ac7b504 100644 --- a/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts @@ -1,4 +1,5 @@ import Assert = require("assert"); +import { EOL } from "os"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TempFile } from "@manuth/temp-files"; @@ -14,7 +15,7 @@ import { TestContext } from "../../TestContext"; */ export function JSONTransformMappingTests(context: TestContext>): void { - suite( + suite.only( "JSONTransformMapping", () => { @@ -100,5 +101,13 @@ export function JSONTransformMappingTests(context: TestContext + { + await tester.Run(); + Assert.ok((await tester.Content).endsWith(EOL)); + }); }); } From b7e44a98180dce3926f503c4ba9c5fe08dbf7914 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 19:13:39 +0200 Subject: [PATCH 11/55] Add a method for creating json-files --- .../FileMappings/CodeFileMappingCreator.ts | 56 ++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/packages/generator-ts-project/src/VSCode/FileMappings/CodeFileMappingCreator.ts b/packages/generator-ts-project/src/VSCode/FileMappings/CodeFileMappingCreator.ts index 656eb4b5..f95a4bbd 100644 --- a/packages/generator-ts-project/src/VSCode/FileMappings/CodeFileMappingCreator.ts +++ b/packages/generator-ts-project/src/VSCode/FileMappings/CodeFileMappingCreator.ts @@ -1,4 +1,5 @@ -import { GeneratorOptions, IFileMapping, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; +import { FileMapping, GeneratorOptions, IFileMapping, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; +import { JSONTransformMapping } from "../../Components/Transformation/JSONTransformMapping"; import { CodeWorkspaceComponent } from "../Components/CodeWorkspaceComponent"; /** @@ -42,4 +43,57 @@ export abstract class CodeFileMappingCreator>; + + /** + * Creates a file-mapping for writing the specified `data` to a file located at the specified `filePath`. + * + * @param filePath + * The path to copy the json-content to. + * + * @param data + * The data to copy. + * + * @returns + * The newly created file-mapping. + */ + protected CreateJSONMapping(filePath: string, data: T | Promise): IFileMapping + { + return { + Destination: filePath, + Processor: async (fileMapping, generator) => + { + await new FileMapping( + generator, + new class extends JSONTransformMapping + { + /** + * @inheritdoc + */ + public get Source(): string + { + return null; + } + + /** + * @inheritdoc + */ + public get Destination(): string + { + return fileMapping.Destination; + } + + /** + * @inheritdoc + * + * @returns + * The contents of the source-file. + */ + public async ReadSource(): Promise + { + return this.Dump(data instanceof Promise ? await data : data); + } + }(generator)).Processor(); + } + }; + } } From ec82cefd6dc9ca74691e082cf0f83a3da406a931 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 19:14:25 +0200 Subject: [PATCH 12/55] Create vscode-files using the JSONTransformMapping --- .../FileMappings/WorkspaceFileCreator.ts | 11 +-------- .../FileMappings/WorkspaceFolderCreator.ts | 23 ++++--------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFileCreator.ts b/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFileCreator.ts index 9e63e130..37d14adf 100644 --- a/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFileCreator.ts +++ b/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFileCreator.ts @@ -1,7 +1,4 @@ -import { EOL } from "os"; import { GeneratorOptions, IFileMapping, IGeneratorSettings } from "@manuth/extended-yo-generator"; -import JSON = require("comment-json"); -import { split } from "eol"; import { CodeWorkspaceComponent } from "../Components/CodeWorkspaceComponent"; import { CodeFileMappingCreator } from "./CodeFileMappingCreator"; @@ -44,13 +41,7 @@ export class WorkspaceFileCreator> { return [ - { - Destination: this.FileName, - Processor: async (fileMapping, generator) => - { - generator.fs.write(fileMapping.Destination, split(JSON.stringify(await this.Component.WorkspaceMetadata, null, 4)).join(EOL)); - } - } + this.CreateJSONMapping(this.FileName, this.Component.WorkspaceMetadata) ]; } } diff --git a/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFolderCreator.ts b/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFolderCreator.ts index ef1402d2..4f6cee61 100644 --- a/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFolderCreator.ts +++ b/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFolderCreator.ts @@ -1,7 +1,4 @@ -import { EOL } from "os"; import { GeneratorOptions, IFileMapping, IGeneratorSettings } from "@manuth/extended-yo-generator"; -import JSON = require("comment-json"); -import { split } from "eol"; import { join } from "upath"; import { CodeWorkspaceComponent } from "../Components/CodeWorkspaceComponent"; import { CodeFileMappingCreator } from "./CodeFileMappingCreator"; @@ -74,20 +71,10 @@ export class WorkspaceFolderCreator> = []; - - for (let fileEntry of files) - { - result.push( - { - Destination: join(this.SettingsFolderName, fileEntry[0]), - Processor: async (fileMapping, generator) => - { - generator.fs.write(fileMapping.Destination, split(JSON.stringify(await fileEntry[1], null, 4)).join(EOL)); - } - }); - } - - return result; + return files.map( + (fileEntry) => + { + return this.CreateJSONMapping(join(this.SettingsFolderName, fileEntry[0]), fileEntry[1]); + }); } } From fb86fe63594b3e9767223e29a481f1713029c165 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 19:14:58 +0200 Subject: [PATCH 13/55] Remove `.only` statement from unit-test --- .../Components/Transformation/JSONTransformMapping.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts b/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts index 0ac7b504..a731fe96 100644 --- a/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts @@ -15,7 +15,7 @@ import { TestContext } from "../../TestContext"; */ export function JSONTransformMappingTests(context: TestContext>): void { - suite.only( + suite( "JSONTransformMapping", () => { From dab4ae9845b527986e3ff187f1a00e25dcacf388 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 20:47:04 +0200 Subject: [PATCH 14/55] Simplify the creation of json file-mappings --- .../src/VSCode/FileMappings/CodeFileMappingCreator.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/generator-ts-project/src/VSCode/FileMappings/CodeFileMappingCreator.ts b/packages/generator-ts-project/src/VSCode/FileMappings/CodeFileMappingCreator.ts index f95a4bbd..18c93389 100644 --- a/packages/generator-ts-project/src/VSCode/FileMappings/CodeFileMappingCreator.ts +++ b/packages/generator-ts-project/src/VSCode/FileMappings/CodeFileMappingCreator.ts @@ -84,13 +84,10 @@ export abstract class CodeFileMappingCreator + public get Metadata(): Promise { - return this.Dump(data instanceof Promise ? await data : data); + return Promise.resolve(data); } }(generator)).Processor(); } From c8ad54a463458e7ce044f10ce65857c10c3c013b Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 20:47:24 +0200 Subject: [PATCH 15/55] Fix the EOL characters of YAMLTransformMappings --- .../src/Components/Transformation/YAMLTransformMapping.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/generator-ts-project/src/Components/Transformation/YAMLTransformMapping.ts b/packages/generator-ts-project/src/Components/Transformation/YAMLTransformMapping.ts index 85db8fef..838bcf41 100644 --- a/packages/generator-ts-project/src/Components/Transformation/YAMLTransformMapping.ts +++ b/packages/generator-ts-project/src/Components/Transformation/YAMLTransformMapping.ts @@ -1,4 +1,6 @@ +import { EOL } from "os"; import { GeneratorOptions, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; +import { split } from "eol"; import { Document, parseAllDocuments, scalarOptions } from "yaml"; import { TransformFileMapping } from "./TransformFileMapping"; @@ -43,7 +45,7 @@ export abstract class YAMLTransformMapping { - return metadata.map( + return split(metadata.map( (document, index) => { let initialWidth = scalarOptions.str.fold.lineWidth; @@ -62,6 +64,6 @@ export abstract class YAMLTransformMapping Date: Fri, 18 Sep 2020 21:50:39 +0200 Subject: [PATCH 16/55] Add a class for creating json-files --- .../src/Components/JSONCreatorMapping.ts | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 packages/generator-ts-project/src/Components/JSONCreatorMapping.ts diff --git a/packages/generator-ts-project/src/Components/JSONCreatorMapping.ts b/packages/generator-ts-project/src/Components/JSONCreatorMapping.ts new file mode 100644 index 00000000..58cb433a --- /dev/null +++ b/packages/generator-ts-project/src/Components/JSONCreatorMapping.ts @@ -0,0 +1,61 @@ +import { GeneratorOptions, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; +import { JSONTransformMapping } from "./Transformation/JSONTransformMapping"; + +/** + * Provides the functionality to create a json-file. + */ +export class JSONCreatorMapping extends JSONTransformMapping +{ + /** + * The data to write. + */ + private data: any; + + /** + * The destination to save the file to. + */ + private destination: string; + + /** + * Initializes a new instance of the `JSONCreatorMapping` class. + * + * @param generator + * The generator of this file-mapping. + * + * @param fileName + * The name of the file to write the json-file to. + * + * @param data + * The data to write to the file. + */ + public constructor(generator: IGenerator, fileName: string, data: any) + { + super(generator); + this.destination = fileName; + this.data = data; + } + + /** + * @inheritdoc + */ + public get Source(): string + { + return null; + } + + /** + * @inheritdoc + */ + public get Destination(): string + { + return this.destination; + } + + /** + * @inheritdoc + */ + public get Metadata(): Promise + { + return this.data; + } +} From 19acbb986ad6fff2068d7a05a49bc5469d1b1fc2 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 21:50:55 +0200 Subject: [PATCH 17/55] Add tests for the new class --- .../Components/JSONCreatorMapping.test.ts | 49 +++++++++++++++++++ .../src/tests/Components/index.ts | 2 + 2 files changed, 51 insertions(+) create mode 100644 packages/generator-ts-project/src/tests/Components/JSONCreatorMapping.test.ts diff --git a/packages/generator-ts-project/src/tests/Components/JSONCreatorMapping.test.ts b/packages/generator-ts-project/src/tests/Components/JSONCreatorMapping.test.ts new file mode 100644 index 00000000..8880d7e5 --- /dev/null +++ b/packages/generator-ts-project/src/tests/Components/JSONCreatorMapping.test.ts @@ -0,0 +1,49 @@ +import Assert = require("assert"); +import { GeneratorOptions } from "@manuth/extended-yo-generator"; +import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, JSONFileMappingTester, TestContext, TestGenerator } from "@manuth/extended-yo-generator-test"; +import { TempFile } from "@manuth/temp-files"; +import { JSONCreatorMapping } from "../../Components/JSONCreatorMapping"; + +/** + * Registers tests for the `JSONCreatorMapping` class. + * + * @param context + * The test-context. + */ +export function JSONCreatorMappingTests(context: TestContext>): void +{ + suite( + "JSONCreatorMapping", + () => + { + let generator: TestGenerator; + let tempFile: TempFile; + let fileMappingOptions: JSONCreatorMapping; + let tester: JSONFileMappingTester>; + let randomObject: any; + + suiteSetup( + async function() + { + this.timeout(0); + generator = await context.Generator; + tempFile = new TempFile(); + }); + + setup( + () => + { + randomObject = context.RandomObject; + fileMappingOptions = new JSONCreatorMapping(generator, tempFile.FullName, randomObject); + tester = new JSONFileMappingTester(generator, fileMappingOptions); + }); + + test( + "Checking whether the json-data is written correctly…", + async () => + { + await tester.Run(); + Assert.deepStrictEqual(await tester.Metadata, randomObject); + }); + }); +} diff --git a/packages/generator-ts-project/src/tests/Components/index.ts b/packages/generator-ts-project/src/tests/Components/index.ts index e22913c1..5e706d8a 100644 --- a/packages/generator-ts-project/src/tests/Components/index.ts +++ b/packages/generator-ts-project/src/tests/Components/index.ts @@ -1,6 +1,7 @@ import { ITestGeneratorOptions, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TestContext } from "../TestContext"; import { FileMappingBaseTests } from "./FileMappingBase.test"; +import { JSONCreatorMappingTests } from "./JSONCreatorMapping.test"; import { TransformationTests } from "./Transformation"; /** @@ -17,5 +18,6 @@ export function ComponentTests(context: TestContext Date: Fri, 18 Sep 2020 23:47:22 +0200 Subject: [PATCH 18/55] Create a file-mapping for creating YAML-documents --- .../src/Components/YAMLCreatorMapping.ts | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 packages/generator-ts-project/src/Components/YAMLCreatorMapping.ts diff --git a/packages/generator-ts-project/src/Components/YAMLCreatorMapping.ts b/packages/generator-ts-project/src/Components/YAMLCreatorMapping.ts new file mode 100644 index 00000000..3823ffd2 --- /dev/null +++ b/packages/generator-ts-project/src/Components/YAMLCreatorMapping.ts @@ -0,0 +1,63 @@ +import { GeneratorOptions, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; +import { Document } from "yaml"; +import { YAMLTransformMapping } from "./Transformation/YAMLTransformMapping"; + +/** + * Provides the functionality to create yaml-files. + */ +export class YAMLCreatorMapping extends YAMLTransformMapping +{ + /** + * The data to write. + */ + private data: Document[]; + + /** + * The destination to save the file to. + */ + private destination: string; + + /** + * Initializes a new instance of the `YAMLCreatorMapping` class. + * + * @param generator + * The generator of this file-mapping. + * + * @param fileName + * The name of the file to write the json-file to. + * + * @param data + * The data to write to the file. + */ + public constructor(generator: IGenerator, fileName: string, data: Document[]) + { + super(generator); + this.destination = fileName; + this.data = data; + } + + /** + * @inheritdoc + */ + public get Source(): string + { + return null; + } + + /** + * @inheritdoc + */ + public get Destination(): string + { + return this.destination; + } + + /** + * @inheritdoc + */ + public get Metadata(): Promise + { + return this.Parse(this.data.map( + (document) => document.toString()).join("")); + } +} From f104b1969ee4c1cb4dfaedca5a64b739317eca21 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 23:47:39 +0200 Subject: [PATCH 19/55] Add new unit-tests --- .../Components/YAMLCreatorMapping.test.ts | 86 +++++++++++++++++++ .../src/tests/Components/index.ts | 2 + 2 files changed, 88 insertions(+) create mode 100644 packages/generator-ts-project/src/tests/Components/YAMLCreatorMapping.test.ts diff --git a/packages/generator-ts-project/src/tests/Components/YAMLCreatorMapping.test.ts b/packages/generator-ts-project/src/tests/Components/YAMLCreatorMapping.test.ts new file mode 100644 index 00000000..68ef376f --- /dev/null +++ b/packages/generator-ts-project/src/tests/Components/YAMLCreatorMapping.test.ts @@ -0,0 +1,86 @@ +import Assert = require("assert"); +import { GeneratorOptions } from "@manuth/extended-yo-generator"; +import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; +import { TempFile } from "@manuth/temp-files"; +import { Document } from "yaml"; +import { YAMLTransformMapping } from "../../Components/Transformation/YAMLTransformMapping"; +import { YAMLCreatorMapping } from "../../Components/YAMLCreatorMapping"; +import { TestContext } from "../TestContext"; + +/** + * Registers tests for the `YAMLCreatorMapping`class. + * + * @param context + * The test-context. + */ +export function YAMLCreatorMappingTests(context: TestContext>): void +{ + suite.only( + "YAMLCreatorMapping", + () => + { + let generator: TestGenerator; + let tempFile: TempFile; + let fileMappingOptions: YAMLCreatorMapping; + let tester: FileMappingTester>; + let checker: YAMLTransformMapping; + let randomObject: any; + + suiteSetup( + async function() + { + this.timeout(0); + generator = await context.Generator; + tempFile = new TempFile(); + }); + + setup( + () => + { + let document = new Document(); + randomObject = context.RandomObject; + document.contents = randomObject; + + fileMappingOptions = new YAMLCreatorMapping( + generator, + tempFile.FullName, + [ + document + ]); + + tester = new FileMappingTester(generator, fileMappingOptions); + + checker = new class extends YAMLTransformMapping + { + /** + * @inheritdoc + */ + public get Source(): string + { + return tempFile.FullName; + } + + /** + * @inheritdoc + */ + public get Destination(): string + { + return null; + } + }(generator); + }); + + test( + "Checking whether the yaml-data is written correctly…", + async function() + { + this.timeout(1 * 1000); + this.slow(1 * 1000); + await tester.Run(); + let documents = await checker.Metadata; + Assert.strictEqual(documents.length, 1); + let document = documents[0]; + Assert.deepStrictEqual(document.toJSON(), randomObject); + }); + }); +} diff --git a/packages/generator-ts-project/src/tests/Components/index.ts b/packages/generator-ts-project/src/tests/Components/index.ts index 5e706d8a..ad220d18 100644 --- a/packages/generator-ts-project/src/tests/Components/index.ts +++ b/packages/generator-ts-project/src/tests/Components/index.ts @@ -3,6 +3,7 @@ import { TestContext } from "../TestContext"; import { FileMappingBaseTests } from "./FileMappingBase.test"; import { JSONCreatorMappingTests } from "./JSONCreatorMapping.test"; import { TransformationTests } from "./Transformation"; +import { YAMLCreatorMappingTests } from "./YAMLCreatorMapping.test"; /** * Registers tests for `Components`. @@ -19,5 +20,6 @@ export function ComponentTests(context: TestContext Date: Fri, 18 Sep 2020 23:47:54 +0200 Subject: [PATCH 20/55] Add the new classes to the index of the module --- packages/generator-ts-project/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/generator-ts-project/src/index.ts b/packages/generator-ts-project/src/index.ts index 339f4aad..1071cf9e 100644 --- a/packages/generator-ts-project/src/index.ts +++ b/packages/generator-ts-project/src/index.ts @@ -6,7 +6,9 @@ export { ComponentCategoryBase } from "./Components/ComponentCategoryBase"; export { ComponentCollectionBase } from "./Components/ComponentCollectionBase"; export { FileMappingBase } from "./Components/FileMappingBase"; export { GeneratrorComponent } from "./Components/GeneratorComponent"; +export { JSONCreatorMapping } from "./Components/JSONCreatorMapping"; export { JSONProcessor } from "./Components/JSONProcessor"; +export { YAMLCreatorMapping } from "./Components/YAMLCreatorMapping"; export { JSONTransformMapping } from "./Components/Transformation/JSONTransformMapping"; export { TransformFileMapping } from "./Components/Transformation/TransformFileMapping"; export { TypeScriptTransformMapping } from "./Components/Transformation/TypeScriptTransformMapping"; From 4eec11d6aca7349cbd7ac4d4999b684987b7cf83 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 18 Sep 2020 23:54:16 +0200 Subject: [PATCH 21/55] Utilize the new JSON classes --- .../src/Project/TSProjectGenerator.ts | 7 ++- .../FileMappings/CodeFileMappingCreator.ts | 53 +------------------ .../FileMappings/WorkspaceFileCreator.ts | 3 +- .../FileMappings/WorkspaceFolderCreator.ts | 3 +- 4 files changed, 8 insertions(+), 58 deletions(-) diff --git a/packages/generator-ts-project/src/Project/TSProjectGenerator.ts b/packages/generator-ts-project/src/Project/TSProjectGenerator.ts index 5e232363..47eb00bc 100644 --- a/packages/generator-ts-project/src/Project/TSProjectGenerator.ts +++ b/packages/generator-ts-project/src/Project/TSProjectGenerator.ts @@ -1,5 +1,4 @@ import { createRequire } from "module"; -import { EOL } from "os"; import { relative } from "path"; import { Generator, GeneratorOptions, GeneratorSettingKey, IComponentCollection, IFileMapping, Question } from "@manuth/extended-yo-generator"; import { Package } from "@manuth/package-json-editor"; @@ -7,13 +6,13 @@ import { TempDirectory } from "@manuth/temp-files"; import chalk = require("chalk"); import JSON = require("comment-json"); import dedent = require("dedent"); -import { split } from "eol"; import { ESLint } from "eslint"; import { readFile, readJSON, writeFile, writeJSON } from "fs-extra"; import npmWhich = require("npm-which"); import { Linter } from "tslint"; import { Program } from "typescript"; import { join, resolve } from "upath"; +import { JSONCreatorMapping } from "../Components/JSONCreatorMapping"; import { BuildDependencies } from "../NPMPackaging/Dependencies/BuildDependencies"; import { LintEssentials } from "../NPMPackaging/Dependencies/LintEssentials"; import { TSProjectComponentCollection } from "./Components/TSProjectComponentCollection"; @@ -103,7 +102,7 @@ export class TSProjectGenerator>; - - /** - * Creates a file-mapping for writing the specified `data` to a file located at the specified `filePath`. - * - * @param filePath - * The path to copy the json-content to. - * - * @param data - * The data to copy. - * - * @returns - * The newly created file-mapping. - */ - protected CreateJSONMapping(filePath: string, data: T | Promise): IFileMapping - { - return { - Destination: filePath, - Processor: async (fileMapping, generator) => - { - await new FileMapping( - generator, - new class extends JSONTransformMapping - { - /** - * @inheritdoc - */ - public get Source(): string - { - return null; - } - - /** - * @inheritdoc - */ - public get Destination(): string - { - return fileMapping.Destination; - } - - /** - * @inheritdoc - */ - public get Metadata(): Promise - { - return Promise.resolve(data); - } - }(generator)).Processor(); - } - }; - } } diff --git a/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFileCreator.ts b/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFileCreator.ts index 37d14adf..99d07bde 100644 --- a/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFileCreator.ts +++ b/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFileCreator.ts @@ -1,4 +1,5 @@ import { GeneratorOptions, IFileMapping, IGeneratorSettings } from "@manuth/extended-yo-generator"; +import { JSONCreatorMapping } from "../../Components/JSONCreatorMapping"; import { CodeWorkspaceComponent } from "../Components/CodeWorkspaceComponent"; import { CodeFileMappingCreator } from "./CodeFileMappingCreator"; @@ -41,7 +42,7 @@ export class WorkspaceFileCreator> { return [ - this.CreateJSONMapping(this.FileName, this.Component.WorkspaceMetadata) + new JSONCreatorMapping(this.Generator, this.FileName, this.Component.WorkspaceMetadata) ]; } } diff --git a/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFolderCreator.ts b/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFolderCreator.ts index 4f6cee61..1b854673 100644 --- a/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFolderCreator.ts +++ b/packages/generator-ts-project/src/VSCode/FileMappings/WorkspaceFolderCreator.ts @@ -1,5 +1,6 @@ import { GeneratorOptions, IFileMapping, IGeneratorSettings } from "@manuth/extended-yo-generator"; import { join } from "upath"; +import { JSONCreatorMapping } from "../../Components/JSONCreatorMapping"; import { CodeWorkspaceComponent } from "../Components/CodeWorkspaceComponent"; import { CodeFileMappingCreator } from "./CodeFileMappingCreator"; @@ -74,7 +75,7 @@ export class WorkspaceFolderCreator { - return this.CreateJSONMapping(join(this.SettingsFolderName, fileEntry[0]), fileEntry[1]); + return new JSONCreatorMapping(this.Generator, join(this.SettingsFolderName, fileEntry[0]), fileEntry[1]); }); } } From d114090cb9c1cecf2fe37e084a14c3cd21ef7f98 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 19 Sep 2020 00:31:56 +0200 Subject: [PATCH 22/55] Add changelog entries --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e61737df..4285225b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## TSProjectGenerator [Unreleased] +### Updated + - The development environment + - The format of transformed JSON and YAML files [Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.1.4...dev) From 00d95958e76cdb4689810d1587e1069441ba0c88 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 19 Sep 2020 15:33:09 +0200 Subject: [PATCH 23/55] Update all packages --- package-lock.json | 12 ++++++------ package.json | 4 ++-- packages/generator-my-ts-project/package-lock.json | 12 ++++++------ packages/generator-my-ts-project/package.json | 4 ++-- packages/generator-ts-project/package-lock.json | 12 ++++++------ packages/generator-ts-project/package.json | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 312f28c1..34d8eeca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1358,9 +1358,9 @@ } }, "@manuth/eslint-plugin-typescript": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.1.tgz", - "integrity": "sha512-9Bqbb4O5FbnTvr6xxOBwIHIDHF+0UI0IC+o4m7gZVW5Hi11O+633jAS8gBE/au8zF2CHh75nM54GbbaOa5eMkA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.2.tgz", + "integrity": "sha512-kKCaZLJ0aN+x/U011Let2keLF28qoJzcFUmurpHJQj09RnbxBKt22oIdpuQXu1rrEjx08jABKet6y4Rtog/vRw==", "dev": true, "requires": { "lodash.merge": "^4.6.2", @@ -10361,9 +10361,9 @@ "dev": true }, "typescript": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz", - "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 0fbae7cb..4675a6eb 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "prepare": "lerna bootstrap && npm run rebuild" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.1", + "@manuth/eslint-plugin-typescript": "^2.3.2", "@types/diff": "^4.0.2", "@types/fs-extra": "^9.0.1", "@types/git-branch": "^2.0.1", @@ -56,7 +56,7 @@ "through2": "^4.0.2", "ts-node": "^9.0.0", "tslint": "^6.1.3", - "typescript": "^4.0.2", + "typescript": "^4.0.3", "upath": "^1.2.0", "vinyl": "^2.2.0" } diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index 591a52ee..b0824618 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -101,9 +101,9 @@ } }, "@manuth/eslint-plugin-typescript": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.1.tgz", - "integrity": "sha512-9Bqbb4O5FbnTvr6xxOBwIHIDHF+0UI0IC+o4m7gZVW5Hi11O+633jAS8gBE/au8zF2CHh75nM54GbbaOa5eMkA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.2.tgz", + "integrity": "sha512-kKCaZLJ0aN+x/U011Let2keLF28qoJzcFUmurpHJQj09RnbxBKt22oIdpuQXu1rrEjx08jABKet6y4Rtog/vRw==", "dev": true, "requires": { "lodash.merge": "^4.6.2", @@ -8122,9 +8122,9 @@ "dev": true }, "typescript": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz", - "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", "dev": true }, "typescript-eslint-plugin": { diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index 7847fed2..c691df12 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -52,7 +52,7 @@ "yosay": "^2.0.2" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.1", + "@manuth/eslint-plugin-typescript": "^2.3.2", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", "@types/dedent": "^0.7.0", @@ -73,7 +73,7 @@ "rimraf": "^3.0.2", "shusher": "^0.1.1", "tslint": "^6.1.3", - "typescript": "^4.0.2", + "typescript": "^4.0.3", "typescript-eslint-plugin": "^1.2.1", "yo": "^3.1.1" } diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index 8580b0c2..9dcb04fd 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -124,9 +124,9 @@ } }, "@manuth/eslint-plugin-typescript": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.1.tgz", - "integrity": "sha512-9Bqbb4O5FbnTvr6xxOBwIHIDHF+0UI0IC+o4m7gZVW5Hi11O+633jAS8gBE/au8zF2CHh75nM54GbbaOa5eMkA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.2.tgz", + "integrity": "sha512-kKCaZLJ0aN+x/U011Let2keLF28qoJzcFUmurpHJQj09RnbxBKt22oIdpuQXu1rrEjx08jABKet6y4Rtog/vRw==", "dev": true, "requires": { "lodash.merge": "^4.6.2", @@ -8673,9 +8673,9 @@ "dev": true }, "typescript": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz", - "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==" }, "typescript-eslint-plugin": { "version": "1.2.1", diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index a62ad67b..7d0406e4 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -60,13 +60,13 @@ "parse-pkg-name": "^2.0.0", "shusher": "^0.1.1", "ts-morph": "^8.1.0", - "typescript": "^4.0.2", + "typescript": "^4.0.3", "validate-npm-package-name": "^3.0.0", "yaml": "^1.10.0", "yosay": "^2.0.2" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.1", + "@manuth/eslint-plugin-typescript": "^2.3.2", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", "@types/comment-json": "^1.1.1", From d6947c74ad8ad68fd08f285a42b2bda94890b8c4 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 26 Sep 2020 20:05:52 +0200 Subject: [PATCH 24/55] Fix broken typescript-configuration --- packages/generator-my-ts-project/src/tests/tsconfig.json | 4 ++-- packages/generator-ts-project/src/tests/tsconfig.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/generator-my-ts-project/src/tests/tsconfig.json b/packages/generator-my-ts-project/src/tests/tsconfig.json index 61b3c714..2952c6da 100644 --- a/packages/generator-my-ts-project/src/tests/tsconfig.json +++ b/packages/generator-my-ts-project/src/tests/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "rootDir": ".", - "outDir": "../../lib/tests" + "rootDir": "..", + "outDir": "../../lib" }, "include": [ "./**/*" diff --git a/packages/generator-ts-project/src/tests/tsconfig.json b/packages/generator-ts-project/src/tests/tsconfig.json index 29891cf1..234e4485 100644 --- a/packages/generator-ts-project/src/tests/tsconfig.json +++ b/packages/generator-ts-project/src/tests/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "rootDir": ".", - "outDir": "../../lib/tests" + "rootDir": "..", + "outDir": "../../lib" }, "include": [ "./**/*" From cb186755ae56184779eb1608bdbfd89329a02d6d Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 26 Sep 2020 20:14:36 +0200 Subject: [PATCH 25/55] Update all packages --- package-lock.json | 126 +++++++++++++++++++++++----------------------- package.json | 12 ++--- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34d8eeca..78f162c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1798,9 +1798,9 @@ "dev": true }, "@types/node": { - "version": "14.11.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", - "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==", + "version": "14.11.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", + "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==", "dev": true }, "@types/normalize-package-data": { @@ -1865,13 +1865,13 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.1.tgz", - "integrity": "sha512-Hoxyt99EA9LMmqo/5PuWWPeWeB3mKyvibfJ1Hy5SfiUpjE8Nqp+5QNd9fOkzL66+fqvIWSIE+Ett16LGMzCGnQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz", + "integrity": "sha512-zBNRkzvLSwo6y5TG0DVcmshZIYBHKtmzD4N+LYnfTFpzc4bc79o8jNRSb728WV7A4Cegbs+MV5IRAj8BKBgOVQ==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.1.1", - "@typescript-eslint/scope-manager": "4.1.1", + "@typescript-eslint/experimental-utils": "4.2.0", + "@typescript-eslint/scope-manager": "4.2.0", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -1880,12 +1880,12 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "semver": { @@ -1897,76 +1897,76 @@ } }, "@typescript-eslint/eslint-plugin-tslint": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.1.1.tgz", - "integrity": "sha512-ekqz3pS5RrOWoX8VYiRXNzLJM+DH8k73zpL4OvtNMnmekpH0UlHfSsHaBHQoHwvC/nRMGBTP+DX8PDe8X2jyDA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.2.0.tgz", + "integrity": "sha512-JUO9Evsjwc5tK0t7XOHgCZLYXzaopAAn2WjA6iaWJosyE+I2npuYX2i3iiYn3Y0JwMotUHj/SPjw0WAz4Swe+g==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.1.1", + "@typescript-eslint/experimental-utils": "4.2.0", "lodash": "^4.17.15" } }, "@typescript-eslint/experimental-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.1.tgz", - "integrity": "sha512-jzYsNciHoa4Z3c1URtmeT/bamYm8Dwfw6vuN3WHIE/BXb1iC4KveAnXDErTAZtPVxTYBaYn3n2gbt6F6D2rm1A==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.2.0.tgz", + "integrity": "sha512-5BBj6BjgHEndBaQQpUVzRIPERz03LBc0MCQkHwUaH044FJFL08SwWv/sQftk7gf0ShZ2xZysz0LTwCwNt4Xu3w==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.1.1", - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/typescript-estree": "4.1.1", + "@typescript-eslint/scope-manager": "4.2.0", + "@typescript-eslint/types": "4.2.0", + "@typescript-eslint/typescript-estree": "4.2.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.1.1.tgz", - "integrity": "sha512-NLIhmicpKGfJbdXyQBz9j48PA6hq6e+SDOoXy7Ak6bq1ebGqbgG+fR1UIDAuay6OjQdot69c/URu2uLlsP8GQQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.2.0.tgz", + "integrity": "sha512-54jJ6MwkOtowpE48C0QJF9iTz2/NZxfKVJzv1ha5imigzHbNSLN9yvbxFFH1KdlRPQrlR8qxqyOvLHHxd397VA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.1.1", - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/typescript-estree": "4.1.1", + "@typescript-eslint/scope-manager": "4.2.0", + "@typescript-eslint/types": "4.2.0", + "@typescript-eslint/typescript-estree": "4.2.0", "debug": "^4.1.1" }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } } } }, "@typescript-eslint/scope-manager": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.1.1.tgz", - "integrity": "sha512-0W8TTobCvIIQ2FsrYTffyZGAAFUyIbEHq5EYJb1m7Rpd005jrnOvKOo8ywCLhs/Bm17C+KsrUboBvBAARQVvyA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.2.0.tgz", + "integrity": "sha512-Tb402cxxObSxWIVT+PnBp5ruT2V/36yj6gG4C9AjkgRlZpxrLAzWDk3neen6ToMBGeGdxtnfFLoJRUecGz9mYQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/visitor-keys": "4.1.1" + "@typescript-eslint/types": "4.2.0", + "@typescript-eslint/visitor-keys": "4.2.0" } }, "@typescript-eslint/types": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.1.1.tgz", - "integrity": "sha512-zrBiqOKYerMTllKcn+BP+i1b7LW/EbMMYytroXMxUTvFPn1smkCu0D7lSAx29fTUO4jnwV0ljSvYQtn2vNrNxA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.2.0.tgz", + "integrity": "sha512-xkv5nIsxfI/Di9eVwN+G9reWl7Me9R5jpzmZUch58uQ7g0/hHVuGUbbn4NcxcM5y/R4wuJIIEPKPDb5l4Fdmwg==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.1.tgz", - "integrity": "sha512-2AUg5v0liVBsqbGxBphbJ0QbGqSRVaF5qPoTPWcxop+66vMdU1h4CCvHxTC47+Qb+Pr4l2RhXDd41JNpwcQEKw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.2.0.tgz", + "integrity": "sha512-iWDLCB7z4MGkLipduF6EOotdHNtgxuNKnYD54nMS/oitFnsk4S3S/TE/UYXQTra550lHtlv9eGmp+dvN9pUDtA==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/visitor-keys": "4.1.1", + "@typescript-eslint/types": "4.2.0", + "@typescript-eslint/visitor-keys": "4.2.0", "debug": "^4.1.1", "globby": "^11.0.1", "is-glob": "^4.0.1", @@ -1997,12 +1997,12 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "dir-glob": { @@ -2103,12 +2103,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.1.tgz", - "integrity": "sha512-/EOOXbA2ferGLG6RmCHEQ0lTTLkOlXYDgblCmQk3tIU7mTPLm4gKhFMeeUSe+bcchTUsKeCk8xcpbop5Zr/8Rw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.2.0.tgz", + "integrity": "sha512-WIf4BNOlFOH2W+YqGWa6YKLcK/EB3gEj2apCrqLw6mme1RzBy0jtJ9ewJgnrZDB640zfnv8L+/gwGH5sYp/rGw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", + "@typescript-eslint/types": "4.2.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -4663,9 +4663,9 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.5.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.5.1.tgz", - "integrity": "sha512-cY3YNxdhFcQVkcQLnZw/iZGsTPMuWa9yWZclorMWkjdHprBQX0TMWMEcmJYM3IjHp1HJr7aD0Z0sCRifEBhnzg==", + "version": "30.5.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.5.2.tgz", + "integrity": "sha512-LJfjqVGYrPUZv4Gt+1OB5NHhySVPeX4Sdd1qUUjTPnBSwbezry7j3NdPVIeU67VwCVJU2rmqd6jhZ7VYec37Cw==", "dev": true, "requires": { "comment-parser": "^0.7.6", @@ -4678,12 +4678,12 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "lodash": { @@ -10609,9 +10609,9 @@ } }, "vinyl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", - "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", + "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", "dev": true, "requires": { "clone": "^2.1.1", diff --git a/package.json b/package.json index 4675a6eb..fd660700 100644 --- a/package.json +++ b/package.json @@ -27,20 +27,20 @@ "@types/gulp-rename": "0.0.33", "@types/merge-stream": "^1.1.2", "@types/minimist": "^1.2.0", - "@types/node": "^14.11.1", + "@types/node": "^14.11.2", "@types/npm-which": "^3.0.0", "@types/through2": "^2.0.36", "@types/vinyl": "^2.0.4", - "@typescript-eslint/eslint-plugin": "^4.1.1", - "@typescript-eslint/eslint-plugin-tslint": "^4.1.1", - "@typescript-eslint/parser": "^4.1.1", + "@typescript-eslint/eslint-plugin": "^4.2.0", + "@typescript-eslint/eslint-plugin-tslint": "^4.2.0", + "@typescript-eslint/parser": "^4.2.0", "concurrently": "^5.3.0", "copy-and-watch": "^0.1.5", "diff": "^4.0.2", "eslint": "^7.9.0", "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.0", - "eslint-plugin-jsdoc": "^30.5.1", + "eslint-plugin-jsdoc": "^30.5.2", "fs-extra": "^9.0.1", "git-branch": "^2.0.1", "glob": "^7.1.6", @@ -58,6 +58,6 @@ "tslint": "^6.1.3", "typescript": "^4.0.3", "upath": "^1.2.0", - "vinyl": "^2.2.0" + "vinyl": "^2.2.1" } } From 862b0cf6be61b99664b278476262f332f99a8584 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 26 Sep 2020 20:15:31 +0200 Subject: [PATCH 26/55] Add changelog entries --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4285225b..eb97de42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated - The development environment - The format of transformed JSON and YAML files + - Al dependencies + - The typescript-configuration for tests [Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.1.4...dev) From 51f25a4ca34bd973b9ed2f321af2c90633130291 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 26 Sep 2020 23:14:57 +0200 Subject: [PATCH 27/55] Fix broken debug-experience --- .../TSProjectGenerator.code-workspace | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/generator-ts-project/TSProjectGenerator.code-workspace b/packages/generator-ts-project/TSProjectGenerator.code-workspace index d24556d0..56e3d451 100644 --- a/packages/generator-ts-project/TSProjectGenerator.code-workspace +++ b/packages/generator-ts-project/TSProjectGenerator.code-workspace @@ -53,6 +53,10 @@ "cwd": "${workspaceFolder:TSProjectGenerator}", "sourceMaps": true, "autoAttachChildProcesses": false, + "outFiles": [ + "${workspaceFolder:TSProjectGenerator}/**/*.js", + "!**/node_modules/**" + ], "presentation": { "order": 3 } @@ -71,6 +75,10 @@ "cwd": "${workspaceFolder:Solution Items}/..", "sourceMaps": true, "autoAttachChildProcesses": false, + "outFiles": [ + "${workspaceFolder:MyTSProjectGenerator}/**/*.js", + "!**/node_modules/**" + ], "presentation": { "order": 4 } @@ -85,6 +93,10 @@ "cwd": "${workspaceFolder:MyTSProjectGenerator}", "sourceMaps": true, "autoAttachChildProcesses": false, + "outFiles": [ + "${workspaceFolder:TSProjectGenerator}/**/*.js", + "!**/node_modules/**" + ], "presentation": { "order": 5 } From a593e17a55dee96fc31b20f303d7d1014d198d6c Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 27 Sep 2020 01:14:55 +0200 Subject: [PATCH 28/55] Add a changelog-file to the project-generator --- .gitignore | 1 + gulp/gitignore.diff | 5 ++-- gulpfile.ts | 36 +++++++++++++++++++++++++++ package-lock.json | 60 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 ++ 5 files changed, 102 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e833b719..c465a7b3 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ typings/ packages/*/templates/.github/ packages/*/.npmignore packages/*/.drone.yml +packages/*/templates/CHANGELOG.md.ejs packages/*/LICENSE packages/generator-ts-project/templates/.gitignore.ejs diff --git a/gulp/gitignore.diff b/gulp/gitignore.diff index 13bcdf74..3ea6ae01 100644 --- a/gulp/gitignore.diff +++ b/gulp/gitignore.diff @@ -1,8 +1,8 @@ diff --git a/.gitignore b/.gitignore -index e833b71..347d0b8 100644 +index c465a7b..347d0b8 100644 --- a/.gitignore +++ b/.gitignore -@@ -68,13 +68,6 @@ typings/ +@@ -68,14 +68,6 @@ typings/ # Output of 'npm pack' *.tgz @@ -10,6 +10,7 @@ index e833b71..347d0b8 100644 -packages/*/templates/.github/ -packages/*/.npmignore -packages/*/.drone.yml +-packages/*/templates/CHANGELOG.md.ejs -packages/*/LICENSE -packages/generator-ts-project/templates/.gitignore.ejs - diff --git a/gulpfile.ts b/gulpfile.ts index 10ea2385..53ef3525 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -1,6 +1,8 @@ +import { EOL } from "os"; import glob = require("glob"); import { dest, parallel, series, src, watch } from "gulp"; import rename = require("gulp-rename"); +import replace = require("gulp-replace"); import merge = require("merge-stream"); import minimist = require("minimist"); import { basename, dirname, join, relative } from "upath"; @@ -11,6 +13,7 @@ let customProjectGeneratorName = "generator-my-ts-project"; let gitIgnoreFile = join(__dirname, ".gitignore"); let npmIgnoreFile = join(__dirname, ".npmignore"); let droneFile = join(__dirname, ".drone.yml"); +let changelogFile = join(__dirname, "CHANGELOG.md"); let licenseFile = join(__dirname, "LICENSE"); let gitDiffFile = GulpPath("gitignore.diff"); let npmDiffFile = CommonTemplatePath(projectGeneratorName, "npmignore.diff"); @@ -74,6 +77,7 @@ export let CopyFiles = CopyGitIgnore, CopyNPMIgnore, CopyDroneFile, + CopyChangelogFile, CopyLicenseFile, CopyDependabotFile ]), @@ -103,6 +107,12 @@ export let CopyFiles = ], CopyDroneFile); + watch( + [ + changelogFile + ], + CopyChangelogFile); + watch( [ licenseFile @@ -192,6 +202,32 @@ export function CopyDroneFile(): NodeJS.ReadWriteStream CopyDroneFile.description = `Copies the \`${basename(droneFile)}\` file to the mono-repo packages.`; +/** + * Copies the `CHANGELOG` file to the mono-repo packages. + * + * @returns + * The task. + */ +export function CopyChangelogFile(): NodeJS.ReadWriteStream +{ + return src(changelogFile).pipe( + replace( + /(# Changelog[\s\S]*?[\n$])##[\s\S]*$/g, + [ + "$1## <%- Name %> [Unreleased]", + " - Initial release" + ].join(EOL) + )).pipe( + rename( + (parsed) => + { + parsed.extname += ".ejs"; + }) + ).pipe( + dest(CommonTemplatePath(projectGeneratorName)) + ); +} + /** * Copies the `LICENSE` file to the mono-repo packages. * diff --git a/package-lock.json b/package-lock.json index 78f162c5..cdfaea34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1764,6 +1764,15 @@ "@types/node": "*" } }, + "@types/gulp-replace": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/@types/gulp-replace/-/gulp-replace-0.0.31.tgz", + "integrity": "sha512-dbgQ1u0N9ShXrzahBgQfMSu6qUh8nlTLt7whhQ0S0sEUHhV3scysppJ1UX0fl53PJENgAL99ueykddyrCaDt7g==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/json-schema": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", @@ -2666,6 +2675,12 @@ "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, + "binaryextensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz", + "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==", + "dev": true + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -3992,6 +4007,12 @@ "safer-buffer": "^2.1.0" } }, + "editions": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz", + "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==", + "dev": true + }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -6396,6 +6417,17 @@ "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==", "dev": true }, + "gulp-replace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.0.0.tgz", + "integrity": "sha512-lgdmrFSI1SdhNMXZQbrC75MOl1UjYWlOWNbNRnz+F/KHmgxt3l6XstBoAYIdadwETFyG/6i+vWUSCawdC3pqOw==", + "dev": true, + "requires": { + "istextorbinary": "2.2.1", + "readable-stream": "^2.0.1", + "replacestream": "^4.0.0" + } + }, "gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", @@ -7095,6 +7127,17 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, + "istextorbinary": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.2.1.tgz", + "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==", + "dev": true, + "requires": { + "binaryextensions": "2", + "editions": "^1.3.3", + "textextensions": "2" + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9152,6 +9195,17 @@ "remove-trailing-separator": "^1.1.0" } }, + "replacestream": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", + "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.3", + "object-assign": "^4.0.1", + "readable-stream": "^2.0.2" + } + }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", @@ -10047,6 +10101,12 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "textextensions": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz", + "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==", + "dev": true + }, "thenify": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", diff --git a/package.json b/package.json index fd660700..ab97d00f 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "@types/glob": "^7.1.3", "@types/gulp": "^4.0.6", "@types/gulp-rename": "0.0.33", + "@types/gulp-replace": "0.0.31", "@types/merge-stream": "^1.1.2", "@types/minimist": "^1.2.0", "@types/node": "^14.11.2", @@ -48,6 +49,7 @@ "gulp": "^4.0.2", "gulp-clone": "^2.0.1", "gulp-rename": "^2.0.0", + "gulp-replace": "^1.0.0", "lerna": "^3.22.1", "merge-stream": "^2.0.0", "minimist": "^1.2.5", From 1b557477a3991651e3f2b8e9fee2fe6498b6d5e2 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 27 Sep 2020 01:20:46 +0200 Subject: [PATCH 29/55] Add a file-mapping for the changelog-file --- .../src/Project/TSProjectGenerator.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/generator-ts-project/src/Project/TSProjectGenerator.ts b/packages/generator-ts-project/src/Project/TSProjectGenerator.ts index 47eb00bc..fb396159 100644 --- a/packages/generator-ts-project/src/Project/TSProjectGenerator.ts +++ b/packages/generator-ts-project/src/Project/TSProjectGenerator.ts @@ -83,6 +83,14 @@ export class TSProjectGenerator> { return [ + { + Source: this.commonTemplatePath("CHANGELOG.md.ejs"), + Destination: "CHANGELOG.md", + Context: () => ( + { + Name: this.Settings[TSProjectSettingKey.DisplayName] + }) + }, new TSProjectPackageFileMapping(this), { Source: this.commonTemplatePath(".gitignore.ejs"), From 1fc40c960a345240d4a0698c1017b13f9fedb06b Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 27 Sep 2020 01:26:43 +0200 Subject: [PATCH 30/55] Fix the `outFiles` option of `launch.json` --- .../src/Project/VSCode/TSProjectLaunchSettingsProcessor.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/generator-ts-project/src/Project/VSCode/TSProjectLaunchSettingsProcessor.ts b/packages/generator-ts-project/src/Project/VSCode/TSProjectLaunchSettingsProcessor.ts index d4a8d8a4..b3905bf2 100644 --- a/packages/generator-ts-project/src/Project/VSCode/TSProjectLaunchSettingsProcessor.ts +++ b/packages/generator-ts-project/src/Project/VSCode/TSProjectLaunchSettingsProcessor.ts @@ -78,6 +78,11 @@ export class TSProjectLaunchSettingsProcessor this.StripWorkspaceFolder(arg)); } + if (Array.isArray(debugConfig.outFiles)) + { + debugConfig.outFiles = debugConfig.outFiles.map((pattern) => this.StripWorkspaceFolder(pattern)); + } + if (typeof debugConfig.cwd === "string") { debugConfig.cwd = this.StripWorkspaceFolder(debugConfig.cwd); From a9a8bd3da39e8afda44b4ceaf2e36e1dcb471c06 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 27 Sep 2020 01:33:56 +0200 Subject: [PATCH 31/55] Add a trailing newline to the Changelog file --- gulpfile.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gulpfile.ts b/gulpfile.ts index 53ef3525..4645278d 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -215,7 +215,8 @@ export function CopyChangelogFile(): NodeJS.ReadWriteStream /(# Changelog[\s\S]*?[\n$])##[\s\S]*$/g, [ "$1## <%- Name %> [Unreleased]", - " - Initial release" + " - Initial release", + "" ].join(EOL) )).pipe( rename( From 85c52d6d6bc35927ab4146a5492176e2ff94355d Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 27 Sep 2020 01:34:45 +0200 Subject: [PATCH 32/55] Add changelog entries --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb97de42..5e78acb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## TSProjectGenerator [Unreleased] +### Added + - A feature for creating `CHANGELOG` files for new projects + ### Updated - The development environment - The format of transformed JSON and YAML files From 46f27dc1f19a3f6ac3af715dd845e0c2fafdd5b6 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Thu, 1 Oct 2020 15:09:02 +0200 Subject: [PATCH 33/55] Update the typescript-eslint-plugin --- .../generator-my-ts-project/package-lock.json | 297 ++++++++++++------ packages/generator-my-ts-project/package.json | 2 +- .../generator-ts-project/package-lock.json | 201 ++++++------ packages/generator-ts-project/package.json | 2 +- .../Dependencies/LintDependencies.ts | 2 +- .../generator-ts-project/tsconfig.base.json | 2 +- 6 files changed, 313 insertions(+), 193 deletions(-) diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index b0824618..f0439fca 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -139,6 +139,30 @@ "yeoman-test": "^3.0.0" } }, + "@manuth/interceptor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@manuth/interceptor/-/interceptor-2.0.0.tgz", + "integrity": "sha512-+9yPyY2VR9yOY5kGfcnXKaboYwtPek/AM6xQvAoiG/CVy5EXklYd9cHnWrLsBE7q8L3L8yZ1RgSXkkiQei9AAw==", + "dev": true, + "requires": { + "lodash.clonedeep": "^4.5.0" + } + }, + "@manuth/package-json-editor": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@manuth/package-json-editor/-/package-json-editor-1.4.1.tgz", + "integrity": "sha512-swyGZppW5uAI1fq/zSKjcZTibnSUXplsRd+/cEMcnhjA19PiwuDzZqC+Kq6SWg8DABaRUFbarUxhIpyi9h5Fpw==", + "dev": true, + "requires": { + "git-remote-origin-url": "^3.1.0", + "git-root-dir": "^1.0.2", + "normalize-package-data": "^2.5.0", + "parse-author": "^2.0.0", + "readme-filename": "^1.0.0", + "stringify-author": "^0.1.3", + "upath": "^1.2.0" + } + }, "@manuth/temp-files": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@manuth/temp-files/-/temp-files-2.0.0.tgz", @@ -154,6 +178,21 @@ "integrity": "sha512-TtkZlaXTcOQA73Kbqjw0haxqAtPiHHxXgrlMzMJlpisWpmcWV0yCe37RVJuAzom9xqeGeNHLsN41KIFy0/t72g==", "dev": true }, + "@manuth/typescript-eslint-plugin": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@manuth/typescript-eslint-plugin/-/typescript-eslint-plugin-1.3.0.tgz", + "integrity": "sha512-X6YOI2QZFXfAoX+WhKjwuSnzqx2GYpiRKkq/yuNWrPWbhPJAVb4oIx+pkqb5VTUtHh7Cweae4lGSH9l8+B6HgA==", + "dev": true, + "requires": { + "@manuth/interceptor": "^2.0.0", + "@manuth/package-json-editor": "^1.4.1", + "@thi.ng/cache": "^1.0.59", + "lodash.clonedeep": "^4.5.0", + "lodash.pick": "^4.4.0", + "upath": "^1.2.0", + "vscode-languageserver": "^6.1.1" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -248,12 +287,12 @@ "dev": true }, "@thi.ng/api": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@thi.ng/api/-/api-6.12.0.tgz", - "integrity": "sha512-WY+YfTcuxDvUGqDWqBkS3bfGftaa0h5GKLsTvWToQFsc4lz0uIkZejtCXx2H6hbYeFGfXNzlNP/haFCHWwDtCw==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@thi.ng/api/-/api-6.13.1.tgz", + "integrity": "sha512-JBdu+8WE6gzOHD4jht4w0Pq2AW+w82umvCdu+NRTuQaKUaTc26+RS9yfIwArPIlu/L33LtLZKqAeAyBp5J4wLA==", "dev": true, "requires": { - "tslib": "^2.0.0" + "tslib": "^2.0.1" }, "dependencies": { "tslib": { @@ -265,37 +304,37 @@ } }, "@thi.ng/arrays": { - "version": "0.6.13", - "resolved": "https://registry.npmjs.org/@thi.ng/arrays/-/arrays-0.6.13.tgz", - "integrity": "sha512-kHWyVWkiJ4K3BRG5qZNuQjlowLROQSzoWCxxzMykfj3xhMgojKdiCGU2TfRxX+VuWbsOr3YXRJbyGEDewAdXGA==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@thi.ng/arrays/-/arrays-0.8.1.tgz", + "integrity": "sha512-4IiJQBUlRbktuwb6lwWB5TqbILhQJoOl8F6o/H9RetxTluKb5zk26Sx8FnWyChhw4WYg4DcRFuVjlh1sGKFXsg==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/checks": "^2.7.4", - "@thi.ng/compare": "^1.3.12", - "@thi.ng/equiv": "^1.0.27", - "@thi.ng/errors": "^1.2.17", - "@thi.ng/random": "^1.4.15" + "@thi.ng/api": "^6.13.1", + "@thi.ng/checks": "^2.7.9", + "@thi.ng/compare": "^1.3.17", + "@thi.ng/equiv": "^1.0.32", + "@thi.ng/errors": "^1.2.22", + "@thi.ng/random": "^2.0.2" } }, "@thi.ng/cache": { - "version": "1.0.54", - "resolved": "https://registry.npmjs.org/@thi.ng/cache/-/cache-1.0.54.tgz", - "integrity": "sha512-iv1DLes9v0jhpiKCYU2aoOJgeDiJauoJUUo761HWPZArG/yB00Tb6ZEtPyaavOuyR1bZMrhZwWOAqWDcQelp5A==", + "version": "1.0.59", + "resolved": "https://registry.npmjs.org/@thi.ng/cache/-/cache-1.0.59.tgz", + "integrity": "sha512-s+yynQn5Asz0IVWlFU7+JBlGwucYCPx3jNqZSvqK9IUgPn7o/CF5NE5QfRKDm0kweXz2tnkTrOmYq9t5H2hmhA==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/dcons": "^2.2.27", - "@thi.ng/transducers": "^7.2.0" + "@thi.ng/api": "^6.13.1", + "@thi.ng/dcons": "^2.2.32", + "@thi.ng/transducers": "^7.4.0" } }, "@thi.ng/checks": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/@thi.ng/checks/-/checks-2.7.4.tgz", - "integrity": "sha512-PYPGJ0XJzDKgXCNVaQsUkRORzIKUTCyv/zoaKu16RaD31ibT+0V0HkdK3YlKAxhEWL0I60LodDYEIRMTXPjc3g==", + "version": "2.7.9", + "resolved": "https://registry.npmjs.org/@thi.ng/checks/-/checks-2.7.9.tgz", + "integrity": "sha512-567eiffVTkgL1gu2BLgPivLQdW9Pd4RuwqK76Z69OyhSiEHMcWuBWyPn0fkA4CSasUHteuecGfVeNoUPYCoyVQ==", "dev": true, "requires": { - "tslib": "^2.0.0" + "tslib": "^2.0.1" }, "dependencies": { "tslib": { @@ -307,52 +346,52 @@ } }, "@thi.ng/compare": { - "version": "1.3.12", - "resolved": "https://registry.npmjs.org/@thi.ng/compare/-/compare-1.3.12.tgz", - "integrity": "sha512-2ffPeP2WXE8bb6M5uhfkwTR06J8cYUaKkrASrIitTeBE+H+Asntyo4WBICPFLhAqP2l3qIOO+0fme5TvaVHgrw==", + "version": "1.3.17", + "resolved": "https://registry.npmjs.org/@thi.ng/compare/-/compare-1.3.17.tgz", + "integrity": "sha512-eZ3TL0t11QReUHsd4H2/Ug95POKDlvQfyVaOkM60g5xn3w4VCx+unjXbX38ZDM3BI8jSbc4Hq25z+7XgAAIbog==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0" + "@thi.ng/api": "^6.13.1" } }, "@thi.ng/compose": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@thi.ng/compose/-/compose-1.4.13.tgz", - "integrity": "sha512-JQyHsk1tEVQUb3M1u7cGyIQzzvyC8McMbWulbmj0VqOSX4bnyD//1bBDTW3ChA9wJ9AvryjlguyICXI16+KxEQ==", + "version": "1.4.18", + "resolved": "https://registry.npmjs.org/@thi.ng/compose/-/compose-1.4.18.tgz", + "integrity": "sha512-zgR7Jg91zBQSYT3sboFU205Kv7g8xwuATjbh7ow4ivJyaGKxQD34sRofb4n0viHStsG5GRi7kGzvgqyLHCtjQQ==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/errors": "^1.2.17" + "@thi.ng/api": "^6.13.1", + "@thi.ng/errors": "^1.2.22" } }, "@thi.ng/dcons": { - "version": "2.2.27", - "resolved": "https://registry.npmjs.org/@thi.ng/dcons/-/dcons-2.2.27.tgz", - "integrity": "sha512-TvgzSB+cen+WjPlKzh86FGTaEYMmhgUiY0HMxTc14Nz/chyd/uPMvQVZflpZh4DVh7H40OEkSOJW+lxVvzrDug==", + "version": "2.2.32", + "resolved": "https://registry.npmjs.org/@thi.ng/dcons/-/dcons-2.2.32.tgz", + "integrity": "sha512-XXCpVQpzpUGR9ZI7uCpBexUrDfpXC2b2vCHc1jSGZWTzjUWF6vQxZMzckBFcaBTEVV5Tj0WfttwxSB7h65fCPQ==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/checks": "^2.7.4", - "@thi.ng/compare": "^1.3.12", - "@thi.ng/equiv": "^1.0.27", - "@thi.ng/errors": "^1.2.17", - "@thi.ng/random": "^1.4.15", - "@thi.ng/transducers": "^7.2.0" + "@thi.ng/api": "^6.13.1", + "@thi.ng/checks": "^2.7.9", + "@thi.ng/compare": "^1.3.17", + "@thi.ng/equiv": "^1.0.32", + "@thi.ng/errors": "^1.2.22", + "@thi.ng/random": "^2.0.2", + "@thi.ng/transducers": "^7.4.0" } }, "@thi.ng/equiv": { - "version": "1.0.27", - "resolved": "https://registry.npmjs.org/@thi.ng/equiv/-/equiv-1.0.27.tgz", - "integrity": "sha512-2/tLQcu6WqEpHvOORtXF/zMGP+Y9Zs5e2/EFI8Q8ng9uaJ4gT8nzw/4H6aIdFMVIjfctFBbWjjyOL9A64dJGaw==", + "version": "1.0.32", + "resolved": "https://registry.npmjs.org/@thi.ng/equiv/-/equiv-1.0.32.tgz", + "integrity": "sha512-Zi4A/f2Ff5o8OqAmGKmpvv3dhIoA4K7oNjD5KUINqdJ+ZDZbuesvyticqHlqmNdvZZbuawsr+XBeIqaNHdIJUA==", "dev": true }, "@thi.ng/errors": { - "version": "1.2.17", - "resolved": "https://registry.npmjs.org/@thi.ng/errors/-/errors-1.2.17.tgz", - "integrity": "sha512-INBjF2IhKRum1BVkxuPZ4kVaKFm1fnXNYTbEW9Hq9oo/tpRs5OhGJ+dMmnWeC8qUpS+VThV7c8htcAwAfzuMlA==", + "version": "1.2.22", + "resolved": "https://registry.npmjs.org/@thi.ng/errors/-/errors-1.2.22.tgz", + "integrity": "sha512-MzkVEhVEHj9TJEDEt+ZLHZP5kJ51vBMQ/j0vofke3kcUXP+LGzdbb+TQ2DY5yLOtqCj8kFGStlMcHYeNupd/Dg==", "dev": true, "requires": { - "tslib": "^2.0.0" + "tslib": "^2.0.1" }, "dependencies": { "tslib": { @@ -364,46 +403,38 @@ } }, "@thi.ng/math": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@thi.ng/math/-/math-2.0.1.tgz", - "integrity": "sha512-tUxb43hsQQqFoSbtcgfCOYzUlPxomnl0JFDfPFRbXkiVQ1jz5kjlifGuyTUdtdnxAIAPOlwY17JCosLchVqMGg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@thi.ng/math/-/math-2.1.1.tgz", + "integrity": "sha512-O9JvH+2dF+jH4GLSgQVsTiaYBe0lo6kaq0t4yqUBLUCzGJit52Glhum+qfXYNhmKvfN6fsdS7scdsZC5DvjpTA==", "dev": true, "requires": { - "tslib": "^2.0.0" - }, - "dependencies": { - "tslib": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", - "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", - "dev": true - } + "@thi.ng/api": "^6.13.1" } }, "@thi.ng/random": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@thi.ng/random/-/random-1.4.15.tgz", - "integrity": "sha512-DV1zt/YK5WREi2i8yzkXtfI085NCjkDU04MCZPXSOVz4OSqBTdeTvfOeFnfpLRRxAqfZUwHLu+fgr1Q1T2ed4A==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@thi.ng/random/-/random-2.0.2.tgz", + "integrity": "sha512-Ce1B2U9GDkQBV2NPDqJ36Gqop96luKjOHFJkgdb9VqHgKjij519UCunjNdcfZWlUWo49HVByp+H4XiwSx7HIeQ==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/checks": "^2.7.4" + "@thi.ng/api": "^6.13.1", + "@thi.ng/checks": "^2.7.9" } }, "@thi.ng/transducers": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@thi.ng/transducers/-/transducers-7.2.0.tgz", - "integrity": "sha512-jkgZqS4Vo1/SDYUM/7MqyzaMiZPKzp8sFOzwGZSiprzth4WyKPuOvXeDimNQuz1q4o/NcPuyn5nc00qZQVfZcA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@thi.ng/transducers/-/transducers-7.4.0.tgz", + "integrity": "sha512-mom1Tpmhv+7kTqEpR8BOdISSygIHQmcIZYc7pq5a8enW5gjrSdKqKLrZZY4/+g3Ih4LSipnZ+avIr7m/pdV6Cg==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/arrays": "^0.6.13", - "@thi.ng/checks": "^2.7.4", - "@thi.ng/compare": "^1.3.12", - "@thi.ng/compose": "^1.4.13", - "@thi.ng/errors": "^1.2.17", - "@thi.ng/math": "^2.0.1", - "@thi.ng/random": "^1.4.15" + "@thi.ng/api": "^6.13.1", + "@thi.ng/arrays": "^0.8.1", + "@thi.ng/checks": "^2.7.9", + "@thi.ng/compare": "^1.3.17", + "@thi.ng/compose": "^1.4.18", + "@thi.ng/errors": "^1.2.22", + "@thi.ng/math": "^2.1.1", + "@thi.ng/random": "^2.0.2" } }, "@types/color-name": { @@ -1119,6 +1150,12 @@ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, + "author-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", + "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=", + "dev": true + }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -3740,6 +3777,78 @@ "is-plain-obj": "^1.1.0" } }, + "git-remote-origin-url": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-3.1.0.tgz", + "integrity": "sha512-yVSfaTMO7Bqk6Xx3696ufNfjdrajX7Ig9GuAeO2V3Ji7stkDoBNFldnWIAsy0qviUd0Z+X2P6ziJENKztW7cBQ==", + "dev": true, + "requires": { + "gitconfiglocal": "^2.1.0" + } + }, + "git-root-dir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/git-root-dir/-/git-root-dir-1.0.2.tgz", + "integrity": "sha512-VlhYYOIqHPL29sY6QcDYYCChuZ8jz3ecU0XexbtnmdOvCYimKMql8IQ/D/Aqqs7NJ4mZQOb2Oq0r43/mw5x0Eg==", + "dev": true, + "requires": { + "find-up": "^2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + } + } + }, + "gitconfiglocal": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz", + "integrity": "sha512-qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg==", + "dev": true, + "requires": { + "ini": "^1.3.2" + } + }, "github-username": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/github-username/-/github-username-3.0.0.tgz", @@ -6105,6 +6214,15 @@ "callsites": "^3.0.0" } }, + "parse-author": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", + "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=", + "dev": true, + "requires": { + "author-regex": "^1.0.0" + } + }, "parse-help": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-help/-/parse-help-1.0.0.tgz", @@ -6528,6 +6646,12 @@ "picomatch": "^2.2.1" } }, + "readme-filename": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/readme-filename/-/readme-filename-1.0.0.tgz", + "integrity": "sha1-COwt2iZSDNFvPoNtAVU/ihCO/l4=", + "dev": true + }, "rechoir": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", @@ -7352,6 +7476,12 @@ "safe-buffer": "~5.2.0" } }, + "stringify-author": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/stringify-author/-/stringify-author-0.1.3.tgz", + "integrity": "sha1-1YHgLOC1XNo8lT5irdIR+uSw72Y=", + "dev": true + }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -8127,19 +8257,6 @@ "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", "dev": true }, - "typescript-eslint-plugin": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/typescript-eslint-plugin/-/typescript-eslint-plugin-1.2.1.tgz", - "integrity": "sha512-lHNqyceTf0qJi6xK7zVVj66wkrTOpc89qwtAhWy9Fw7+AYNXwU+hCpisGZ6suSX7mYjNkf9ovn48AEM6va/AUQ==", - "dev": true, - "requires": { - "@thi.ng/cache": "^1.0.42", - "lodash.clonedeep": "^4.5.0", - "lodash.pick": "^4.4.0", - "upath": "^1.2.0", - "vscode-languageserver": "^6.1.1" - } - }, "union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index c691df12..6a5dc4a2 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -55,6 +55,7 @@ "@manuth/eslint-plugin-typescript": "^2.3.2", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", + "@manuth/typescript-eslint-plugin": "^1.3.0", "@types/dedent": "^0.7.0", "@types/fs-extra": "^9.0.1", "@types/mocha": "^8.0.3", @@ -74,7 +75,6 @@ "shusher": "^0.1.1", "tslint": "^6.1.3", "typescript": "^4.0.3", - "typescript-eslint-plugin": "^1.2.1", "yo": "^3.1.1" } } diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index 9dcb04fd..e00cc0a7 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -176,6 +176,15 @@ } } }, + "@manuth/interceptor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@manuth/interceptor/-/interceptor-2.0.0.tgz", + "integrity": "sha512-+9yPyY2VR9yOY5kGfcnXKaboYwtPek/AM6xQvAoiG/CVy5EXklYd9cHnWrLsBE7q8L3L8yZ1RgSXkkiQei9AAw==", + "dev": true, + "requires": { + "lodash.clonedeep": "^4.5.0" + } + }, "@manuth/package-json-editor": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@manuth/package-json-editor/-/package-json-editor-1.4.1.tgz", @@ -205,6 +214,21 @@ "integrity": "sha512-TtkZlaXTcOQA73Kbqjw0haxqAtPiHHxXgrlMzMJlpisWpmcWV0yCe37RVJuAzom9xqeGeNHLsN41KIFy0/t72g==", "dev": true }, + "@manuth/typescript-eslint-plugin": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@manuth/typescript-eslint-plugin/-/typescript-eslint-plugin-1.3.0.tgz", + "integrity": "sha512-X6YOI2QZFXfAoX+WhKjwuSnzqx2GYpiRKkq/yuNWrPWbhPJAVb4oIx+pkqb5VTUtHh7Cweae4lGSH9l8+B6HgA==", + "dev": true, + "requires": { + "@manuth/interceptor": "^2.0.0", + "@manuth/package-json-editor": "^1.4.1", + "@thi.ng/cache": "^1.0.59", + "lodash.clonedeep": "^4.5.0", + "lodash.pick": "^4.4.0", + "upath": "^1.2.0", + "vscode-languageserver": "^6.1.1" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -296,162 +320,154 @@ "dev": true }, "@thi.ng/api": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@thi.ng/api/-/api-6.12.0.tgz", - "integrity": "sha512-WY+YfTcuxDvUGqDWqBkS3bfGftaa0h5GKLsTvWToQFsc4lz0uIkZejtCXx2H6hbYeFGfXNzlNP/haFCHWwDtCw==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@thi.ng/api/-/api-6.13.1.tgz", + "integrity": "sha512-JBdu+8WE6gzOHD4jht4w0Pq2AW+w82umvCdu+NRTuQaKUaTc26+RS9yfIwArPIlu/L33LtLZKqAeAyBp5J4wLA==", "dev": true, "requires": { - "tslib": "^2.0.0" + "tslib": "^2.0.1" }, "dependencies": { "tslib": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", - "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", "dev": true } } }, "@thi.ng/arrays": { - "version": "0.6.13", - "resolved": "https://registry.npmjs.org/@thi.ng/arrays/-/arrays-0.6.13.tgz", - "integrity": "sha512-kHWyVWkiJ4K3BRG5qZNuQjlowLROQSzoWCxxzMykfj3xhMgojKdiCGU2TfRxX+VuWbsOr3YXRJbyGEDewAdXGA==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@thi.ng/arrays/-/arrays-0.8.1.tgz", + "integrity": "sha512-4IiJQBUlRbktuwb6lwWB5TqbILhQJoOl8F6o/H9RetxTluKb5zk26Sx8FnWyChhw4WYg4DcRFuVjlh1sGKFXsg==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/checks": "^2.7.4", - "@thi.ng/compare": "^1.3.12", - "@thi.ng/equiv": "^1.0.27", - "@thi.ng/errors": "^1.2.17", - "@thi.ng/random": "^1.4.15" + "@thi.ng/api": "^6.13.1", + "@thi.ng/checks": "^2.7.9", + "@thi.ng/compare": "^1.3.17", + "@thi.ng/equiv": "^1.0.32", + "@thi.ng/errors": "^1.2.22", + "@thi.ng/random": "^2.0.2" } }, "@thi.ng/cache": { - "version": "1.0.54", - "resolved": "https://registry.npmjs.org/@thi.ng/cache/-/cache-1.0.54.tgz", - "integrity": "sha512-iv1DLes9v0jhpiKCYU2aoOJgeDiJauoJUUo761HWPZArG/yB00Tb6ZEtPyaavOuyR1bZMrhZwWOAqWDcQelp5A==", + "version": "1.0.59", + "resolved": "https://registry.npmjs.org/@thi.ng/cache/-/cache-1.0.59.tgz", + "integrity": "sha512-s+yynQn5Asz0IVWlFU7+JBlGwucYCPx3jNqZSvqK9IUgPn7o/CF5NE5QfRKDm0kweXz2tnkTrOmYq9t5H2hmhA==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/dcons": "^2.2.27", - "@thi.ng/transducers": "^7.2.0" + "@thi.ng/api": "^6.13.1", + "@thi.ng/dcons": "^2.2.32", + "@thi.ng/transducers": "^7.4.0" } }, "@thi.ng/checks": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/@thi.ng/checks/-/checks-2.7.4.tgz", - "integrity": "sha512-PYPGJ0XJzDKgXCNVaQsUkRORzIKUTCyv/zoaKu16RaD31ibT+0V0HkdK3YlKAxhEWL0I60LodDYEIRMTXPjc3g==", + "version": "2.7.9", + "resolved": "https://registry.npmjs.org/@thi.ng/checks/-/checks-2.7.9.tgz", + "integrity": "sha512-567eiffVTkgL1gu2BLgPivLQdW9Pd4RuwqK76Z69OyhSiEHMcWuBWyPn0fkA4CSasUHteuecGfVeNoUPYCoyVQ==", "dev": true, "requires": { - "tslib": "^2.0.0" + "tslib": "^2.0.1" }, "dependencies": { "tslib": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", - "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", "dev": true } } }, "@thi.ng/compare": { - "version": "1.3.12", - "resolved": "https://registry.npmjs.org/@thi.ng/compare/-/compare-1.3.12.tgz", - "integrity": "sha512-2ffPeP2WXE8bb6M5uhfkwTR06J8cYUaKkrASrIitTeBE+H+Asntyo4WBICPFLhAqP2l3qIOO+0fme5TvaVHgrw==", + "version": "1.3.17", + "resolved": "https://registry.npmjs.org/@thi.ng/compare/-/compare-1.3.17.tgz", + "integrity": "sha512-eZ3TL0t11QReUHsd4H2/Ug95POKDlvQfyVaOkM60g5xn3w4VCx+unjXbX38ZDM3BI8jSbc4Hq25z+7XgAAIbog==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0" + "@thi.ng/api": "^6.13.1" } }, "@thi.ng/compose": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@thi.ng/compose/-/compose-1.4.13.tgz", - "integrity": "sha512-JQyHsk1tEVQUb3M1u7cGyIQzzvyC8McMbWulbmj0VqOSX4bnyD//1bBDTW3ChA9wJ9AvryjlguyICXI16+KxEQ==", + "version": "1.4.18", + "resolved": "https://registry.npmjs.org/@thi.ng/compose/-/compose-1.4.18.tgz", + "integrity": "sha512-zgR7Jg91zBQSYT3sboFU205Kv7g8xwuATjbh7ow4ivJyaGKxQD34sRofb4n0viHStsG5GRi7kGzvgqyLHCtjQQ==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/errors": "^1.2.17" + "@thi.ng/api": "^6.13.1", + "@thi.ng/errors": "^1.2.22" } }, "@thi.ng/dcons": { - "version": "2.2.27", - "resolved": "https://registry.npmjs.org/@thi.ng/dcons/-/dcons-2.2.27.tgz", - "integrity": "sha512-TvgzSB+cen+WjPlKzh86FGTaEYMmhgUiY0HMxTc14Nz/chyd/uPMvQVZflpZh4DVh7H40OEkSOJW+lxVvzrDug==", + "version": "2.2.32", + "resolved": "https://registry.npmjs.org/@thi.ng/dcons/-/dcons-2.2.32.tgz", + "integrity": "sha512-XXCpVQpzpUGR9ZI7uCpBexUrDfpXC2b2vCHc1jSGZWTzjUWF6vQxZMzckBFcaBTEVV5Tj0WfttwxSB7h65fCPQ==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/checks": "^2.7.4", - "@thi.ng/compare": "^1.3.12", - "@thi.ng/equiv": "^1.0.27", - "@thi.ng/errors": "^1.2.17", - "@thi.ng/random": "^1.4.15", - "@thi.ng/transducers": "^7.2.0" + "@thi.ng/api": "^6.13.1", + "@thi.ng/checks": "^2.7.9", + "@thi.ng/compare": "^1.3.17", + "@thi.ng/equiv": "^1.0.32", + "@thi.ng/errors": "^1.2.22", + "@thi.ng/random": "^2.0.2", + "@thi.ng/transducers": "^7.4.0" } }, "@thi.ng/equiv": { - "version": "1.0.27", - "resolved": "https://registry.npmjs.org/@thi.ng/equiv/-/equiv-1.0.27.tgz", - "integrity": "sha512-2/tLQcu6WqEpHvOORtXF/zMGP+Y9Zs5e2/EFI8Q8ng9uaJ4gT8nzw/4H6aIdFMVIjfctFBbWjjyOL9A64dJGaw==", + "version": "1.0.32", + "resolved": "https://registry.npmjs.org/@thi.ng/equiv/-/equiv-1.0.32.tgz", + "integrity": "sha512-Zi4A/f2Ff5o8OqAmGKmpvv3dhIoA4K7oNjD5KUINqdJ+ZDZbuesvyticqHlqmNdvZZbuawsr+XBeIqaNHdIJUA==", "dev": true }, "@thi.ng/errors": { - "version": "1.2.17", - "resolved": "https://registry.npmjs.org/@thi.ng/errors/-/errors-1.2.17.tgz", - "integrity": "sha512-INBjF2IhKRum1BVkxuPZ4kVaKFm1fnXNYTbEW9Hq9oo/tpRs5OhGJ+dMmnWeC8qUpS+VThV7c8htcAwAfzuMlA==", + "version": "1.2.22", + "resolved": "https://registry.npmjs.org/@thi.ng/errors/-/errors-1.2.22.tgz", + "integrity": "sha512-MzkVEhVEHj9TJEDEt+ZLHZP5kJ51vBMQ/j0vofke3kcUXP+LGzdbb+TQ2DY5yLOtqCj8kFGStlMcHYeNupd/Dg==", "dev": true, "requires": { - "tslib": "^2.0.0" + "tslib": "^2.0.1" }, "dependencies": { "tslib": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", - "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", "dev": true } } }, "@thi.ng/math": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@thi.ng/math/-/math-2.0.1.tgz", - "integrity": "sha512-tUxb43hsQQqFoSbtcgfCOYzUlPxomnl0JFDfPFRbXkiVQ1jz5kjlifGuyTUdtdnxAIAPOlwY17JCosLchVqMGg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@thi.ng/math/-/math-2.1.1.tgz", + "integrity": "sha512-O9JvH+2dF+jH4GLSgQVsTiaYBe0lo6kaq0t4yqUBLUCzGJit52Glhum+qfXYNhmKvfN6fsdS7scdsZC5DvjpTA==", "dev": true, "requires": { - "tslib": "^2.0.0" - }, - "dependencies": { - "tslib": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", - "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==", - "dev": true - } + "@thi.ng/api": "^6.13.1" } }, "@thi.ng/random": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@thi.ng/random/-/random-1.4.15.tgz", - "integrity": "sha512-DV1zt/YK5WREi2i8yzkXtfI085NCjkDU04MCZPXSOVz4OSqBTdeTvfOeFnfpLRRxAqfZUwHLu+fgr1Q1T2ed4A==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@thi.ng/random/-/random-2.0.2.tgz", + "integrity": "sha512-Ce1B2U9GDkQBV2NPDqJ36Gqop96luKjOHFJkgdb9VqHgKjij519UCunjNdcfZWlUWo49HVByp+H4XiwSx7HIeQ==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/checks": "^2.7.4" + "@thi.ng/api": "^6.13.1", + "@thi.ng/checks": "^2.7.9" } }, "@thi.ng/transducers": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@thi.ng/transducers/-/transducers-7.2.0.tgz", - "integrity": "sha512-jkgZqS4Vo1/SDYUM/7MqyzaMiZPKzp8sFOzwGZSiprzth4WyKPuOvXeDimNQuz1q4o/NcPuyn5nc00qZQVfZcA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@thi.ng/transducers/-/transducers-7.4.0.tgz", + "integrity": "sha512-mom1Tpmhv+7kTqEpR8BOdISSygIHQmcIZYc7pq5a8enW5gjrSdKqKLrZZY4/+g3Ih4LSipnZ+avIr7m/pdV6Cg==", "dev": true, "requires": { - "@thi.ng/api": "^6.12.0", - "@thi.ng/arrays": "^0.6.13", - "@thi.ng/checks": "^2.7.4", - "@thi.ng/compare": "^1.3.12", - "@thi.ng/compose": "^1.4.13", - "@thi.ng/errors": "^1.2.17", - "@thi.ng/math": "^2.0.1", - "@thi.ng/random": "^1.4.15" + "@thi.ng/api": "^6.13.1", + "@thi.ng/arrays": "^0.8.1", + "@thi.ng/checks": "^2.7.9", + "@thi.ng/compare": "^1.3.17", + "@thi.ng/compose": "^1.4.18", + "@thi.ng/errors": "^1.2.22", + "@thi.ng/math": "^2.1.1", + "@thi.ng/random": "^2.0.2" } }, "@ts-morph/common": { @@ -8677,19 +8693,6 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==" }, - "typescript-eslint-plugin": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/typescript-eslint-plugin/-/typescript-eslint-plugin-1.2.1.tgz", - "integrity": "sha512-lHNqyceTf0qJi6xK7zVVj66wkrTOpc89qwtAhWy9Fw7+AYNXwU+hCpisGZ6suSX7mYjNkf9ovn48AEM6va/AUQ==", - "dev": true, - "requires": { - "@thi.ng/cache": "^1.0.42", - "lodash.clonedeep": "^4.5.0", - "lodash.pick": "^4.4.0", - "upath": "^1.2.0", - "vscode-languageserver": "^6.1.1" - } - }, "uc.micro": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index 7d0406e4..9b95353b 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -69,6 +69,7 @@ "@manuth/eslint-plugin-typescript": "^2.3.2", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", + "@manuth/typescript-eslint-plugin": "^1.3.0", "@types/comment-json": "^1.1.1", "@types/dedent": "^0.7.0", "@types/diff": "^4.0.2", @@ -97,7 +98,6 @@ "random-js": "^2.1.0", "rimraf": "^3.0.2", "tslint": "^6.1.3", - "typescript-eslint-plugin": "^1.2.1", "upath": "^1.2.0", "util.chdir": "0.0.43", "yeoman-test": "^3.0.0", diff --git a/packages/generator-ts-project/src/NPMPackaging/Dependencies/LintDependencies.ts b/packages/generator-ts-project/src/NPMPackaging/Dependencies/LintDependencies.ts index b4b882a4..45c70075 100644 --- a/packages/generator-ts-project/src/NPMPackaging/Dependencies/LintDependencies.ts +++ b/packages/generator-ts-project/src/NPMPackaging/Dependencies/LintDependencies.ts @@ -17,7 +17,7 @@ export class LintDependencies extends LintEssentials new PackageDependencyCollection( { devDependencies: [ - "typescript-eslint-plugin" + "@manuth/typescript-eslint-plugin" ] })); } diff --git a/packages/generator-ts-project/tsconfig.base.json b/packages/generator-ts-project/tsconfig.base.json index ab3d3a91..fad3655f 100644 --- a/packages/generator-ts-project/tsconfig.base.json +++ b/packages/generator-ts-project/tsconfig.base.json @@ -12,7 +12,7 @@ ], "plugins": [ { - "name": "typescript-eslint-plugin" + "name": "@manuth/typescript-eslint-plugin" } ], "target": "ES6" From 0aacffbaa828fbc25b52be00de656424792decf1 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 00:42:41 +0200 Subject: [PATCH 34/55] Update all packages --- package-lock.json | 247 ++++++------------ package.json | 14 +- .../generator-my-ts-project/package-lock.json | 127 +++++---- packages/generator-my-ts-project/package.json | 16 +- .../generator-ts-project/package-lock.json | 123 ++++----- packages/generator-ts-project/package.json | 20 +- 6 files changed, 234 insertions(+), 313 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdfaea34..cd9250bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,12 +60,12 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "import-fresh": { @@ -1648,111 +1648,14 @@ } }, "@types/gulp": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.6.tgz", - "integrity": "sha512-0E8/iV/7FKWyQWSmi7jnUvgXXgaw+pfAzEB06Xu+l0iXVJppLbpOye5z7E2klw5akXd+8kPtYuk65YBcZPM4ow==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.7.tgz", + "integrity": "sha512-AjvRWEMr6pl9yQ5Yyg+2tiv/n6Ifowpi+NjhRqGwpHWSHH21uXPMHEqKVUT3HGVguACOuzgtk9jtWjChSREPFQ==", "dev": true, "requires": { "@types/undertaker": "*", "@types/vinyl-fs": "*", - "chokidar": "^2.1.2" - }, - "dependencies": { - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - }, - "dependencies": { - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - } - } - }, - "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true - }, - "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } - }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "dev": true, - "optional": true - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } - } + "chokidar": "^3.3.1" } }, "@types/gulp-rename": { @@ -1874,13 +1777,13 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz", - "integrity": "sha512-zBNRkzvLSwo6y5TG0DVcmshZIYBHKtmzD4N+LYnfTFpzc4bc79o8jNRSb728WV7A4Cegbs+MV5IRAj8BKBgOVQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz", + "integrity": "sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.2.0", - "@typescript-eslint/scope-manager": "4.2.0", + "@typescript-eslint/experimental-utils": "4.3.0", + "@typescript-eslint/scope-manager": "4.3.0", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -1906,38 +1809,38 @@ } }, "@typescript-eslint/eslint-plugin-tslint": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.2.0.tgz", - "integrity": "sha512-JUO9Evsjwc5tK0t7XOHgCZLYXzaopAAn2WjA6iaWJosyE+I2npuYX2i3iiYn3Y0JwMotUHj/SPjw0WAz4Swe+g==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.3.0.tgz", + "integrity": "sha512-LMGvtNfR92Ms8OHFnPKrKlViqUelcXpPG5RdR/n1p9xCCWZFHdwjguwVVsL0hcDJLvHHX1tJAU75noC564Zhrg==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.2.0", + "@typescript-eslint/experimental-utils": "4.3.0", "lodash": "^4.17.15" } }, "@typescript-eslint/experimental-utils": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.2.0.tgz", - "integrity": "sha512-5BBj6BjgHEndBaQQpUVzRIPERz03LBc0MCQkHwUaH044FJFL08SwWv/sQftk7gf0ShZ2xZysz0LTwCwNt4Xu3w==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz", + "integrity": "sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.2.0", - "@typescript-eslint/types": "4.2.0", - "@typescript-eslint/typescript-estree": "4.2.0", + "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/typescript-estree": "4.3.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.2.0.tgz", - "integrity": "sha512-54jJ6MwkOtowpE48C0QJF9iTz2/NZxfKVJzv1ha5imigzHbNSLN9yvbxFFH1KdlRPQrlR8qxqyOvLHHxd397VA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.3.0.tgz", + "integrity": "sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.2.0", - "@typescript-eslint/types": "4.2.0", - "@typescript-eslint/typescript-estree": "4.2.0", + "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/typescript-estree": "4.3.0", "debug": "^4.1.1" }, "dependencies": { @@ -1953,29 +1856,29 @@ } }, "@typescript-eslint/scope-manager": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.2.0.tgz", - "integrity": "sha512-Tb402cxxObSxWIVT+PnBp5ruT2V/36yj6gG4C9AjkgRlZpxrLAzWDk3neen6ToMBGeGdxtnfFLoJRUecGz9mYQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz", + "integrity": "sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==", "dev": true, "requires": { - "@typescript-eslint/types": "4.2.0", - "@typescript-eslint/visitor-keys": "4.2.0" + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/visitor-keys": "4.3.0" } }, "@typescript-eslint/types": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.2.0.tgz", - "integrity": "sha512-xkv5nIsxfI/Di9eVwN+G9reWl7Me9R5jpzmZUch58uQ7g0/hHVuGUbbn4NcxcM5y/R4wuJIIEPKPDb5l4Fdmwg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.3.0.tgz", + "integrity": "sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.2.0.tgz", - "integrity": "sha512-iWDLCB7z4MGkLipduF6EOotdHNtgxuNKnYD54nMS/oitFnsk4S3S/TE/UYXQTra550lHtlv9eGmp+dvN9pUDtA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz", + "integrity": "sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.2.0", - "@typescript-eslint/visitor-keys": "4.2.0", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/visitor-keys": "4.3.0", "debug": "^4.1.1", "globby": "^11.0.1", "is-glob": "^4.0.1", @@ -2112,12 +2015,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.2.0.tgz", - "integrity": "sha512-WIf4BNOlFOH2W+YqGWa6YKLcK/EB3gEj2apCrqLw6mme1RzBy0jtJ9ewJgnrZDB640zfnv8L+/gwGH5sYp/rGw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz", + "integrity": "sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.2.0", + "@typescript-eslint/types": "4.3.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -3951,13 +3854,12 @@ } }, "doctrine": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", - "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" + "esutils": "^2.0.2" } }, "dot-prop": { @@ -4169,9 +4071,9 @@ "dev": true }, "eslint": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz", - "integrity": "sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", + "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -4182,7 +4084,7 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "enquirer": "^2.3.5", - "eslint-scope": "^5.1.0", + "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", "eslint-visitor-keys": "^1.3.0", "espree": "^7.3.0", @@ -4266,21 +4168,12 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "esutils": "^2.0.2" + "ms": "2.1.2" } }, "eslint-visitor-keys": { @@ -4546,9 +4439,9 @@ } }, "eslint-plugin-import": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz", - "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==", + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", + "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", "dev": true, "requires": { "array-includes": "^3.1.1", @@ -4556,7 +4449,7 @@ "contains-path": "^0.1.0", "debug": "^2.6.9", "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.3", + "eslint-import-resolver-node": "^0.3.4", "eslint-module-utils": "^2.6.0", "has": "^1.0.3", "minimatch": "^3.0.4", @@ -4575,6 +4468,16 @@ "ms": "2.0.0" } }, + "doctrine": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", + "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "isarray": "^1.0.0" + } + }, "find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", @@ -4684,9 +4587,9 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.5.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.5.2.tgz", - "integrity": "sha512-LJfjqVGYrPUZv4Gt+1OB5NHhySVPeX4Sdd1qUUjTPnBSwbezry7j3NdPVIeU67VwCVJU2rmqd6jhZ7VYec37Cw==", + "version": "30.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.2.tgz", + "integrity": "sha512-LlRdsSQBSPsI3MvhWoGc+Ev3PfFRBk41wwkmbOgC7KP7WQlbeWPpASF5Vdv17XEZ7J+xvPB3KCMyR//6Dbjnnw==", "dev": true, "requires": { "comment-parser": "^0.7.6", diff --git a/package.json b/package.json index ab97d00f..8bcce32f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@types/fs-extra": "^9.0.1", "@types/git-branch": "^2.0.1", "@types/glob": "^7.1.3", - "@types/gulp": "^4.0.6", + "@types/gulp": "^4.0.7", "@types/gulp-rename": "0.0.33", "@types/gulp-replace": "0.0.31", "@types/merge-stream": "^1.1.2", @@ -32,16 +32,16 @@ "@types/npm-which": "^3.0.0", "@types/through2": "^2.0.36", "@types/vinyl": "^2.0.4", - "@typescript-eslint/eslint-plugin": "^4.2.0", - "@typescript-eslint/eslint-plugin-tslint": "^4.2.0", - "@typescript-eslint/parser": "^4.2.0", + "@typescript-eslint/eslint-plugin": "^4.3.0", + "@typescript-eslint/eslint-plugin-tslint": "^4.3.0", + "@typescript-eslint/parser": "^4.3.0", "concurrently": "^5.3.0", "copy-and-watch": "^0.1.5", "diff": "^4.0.2", - "eslint": "^7.9.0", + "eslint": "^7.10.0", "eslint-plugin-deprecation": "^1.1.0", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-jsdoc": "^30.5.2", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-jsdoc": "^30.6.2", "fs-extra": "^9.0.1", "git-branch": "^2.0.1", "glob": "^7.1.6", diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index f0439fca..c075ea15 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -179,14 +179,15 @@ "dev": true }, "@manuth/typescript-eslint-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@manuth/typescript-eslint-plugin/-/typescript-eslint-plugin-1.3.0.tgz", - "integrity": "sha512-X6YOI2QZFXfAoX+WhKjwuSnzqx2GYpiRKkq/yuNWrPWbhPJAVb4oIx+pkqb5VTUtHh7Cweae4lGSH9l8+B6HgA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@manuth/typescript-eslint-plugin/-/typescript-eslint-plugin-1.3.1.tgz", + "integrity": "sha512-/sxrEpFoQ2KdJMLa/GNPHnqYCWQVcW5hQcBX1Jgb5y/IU5BSeoMwoVD6dcjY9r17zhSJXqIZ8SdrDmE8QKx6eQ==", "dev": true, "requires": { "@manuth/interceptor": "^2.0.0", "@manuth/package-json-editor": "^1.4.1", "@thi.ng/cache": "^1.0.59", + "@types/eslint": "^7.2.3", "lodash.clonedeep": "^4.5.0", "lodash.pick": "^4.4.0", "upath": "^1.2.0", @@ -463,6 +464,22 @@ "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.0.4.tgz", "integrity": "sha512-ZxnwyBGO4KX/82AsFHTX82eMw0PsoBcIngEat+zx0y+3yxoNDJucAihg9nAcrc+g4Cwiv/4WcWsX4oiy0ySrRQ==" }, + "@types/eslint": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.3.tgz", + "integrity": "sha512-SPBkpC+awgFfyAn4sjt0JBZ3vzACoSp2zhGBJkkrs09EzPqLbxkzaE8kJs3EsRRgkZwWk9zyXT/swvhnJYX8pQ==", + "dev": true, + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/estree": { + "version": "0.0.45", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz", + "integrity": "sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==", + "dev": true + }, "@types/expect": { "version": "1.20.4", "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz", @@ -540,9 +557,9 @@ "dev": true }, "@types/node": { - "version": "14.11.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", - "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==" + "version": "14.11.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", + "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -629,13 +646,13 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.1.tgz", - "integrity": "sha512-Hoxyt99EA9LMmqo/5PuWWPeWeB3mKyvibfJ1Hy5SfiUpjE8Nqp+5QNd9fOkzL66+fqvIWSIE+Ett16LGMzCGnQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz", + "integrity": "sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.1.1", - "@typescript-eslint/scope-manager": "4.1.1", + "@typescript-eslint/experimental-utils": "4.3.0", + "@typescript-eslint/scope-manager": "4.3.0", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -644,65 +661,65 @@ } }, "@typescript-eslint/eslint-plugin-tslint": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.1.1.tgz", - "integrity": "sha512-ekqz3pS5RrOWoX8VYiRXNzLJM+DH8k73zpL4OvtNMnmekpH0UlHfSsHaBHQoHwvC/nRMGBTP+DX8PDe8X2jyDA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.3.0.tgz", + "integrity": "sha512-LMGvtNfR92Ms8OHFnPKrKlViqUelcXpPG5RdR/n1p9xCCWZFHdwjguwVVsL0hcDJLvHHX1tJAU75noC564Zhrg==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.1.1", + "@typescript-eslint/experimental-utils": "4.3.0", "lodash": "^4.17.15" } }, "@typescript-eslint/experimental-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.1.tgz", - "integrity": "sha512-jzYsNciHoa4Z3c1URtmeT/bamYm8Dwfw6vuN3WHIE/BXb1iC4KveAnXDErTAZtPVxTYBaYn3n2gbt6F6D2rm1A==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz", + "integrity": "sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.1.1", - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/typescript-estree": "4.1.1", + "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/typescript-estree": "4.3.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.1.1.tgz", - "integrity": "sha512-NLIhmicpKGfJbdXyQBz9j48PA6hq6e+SDOoXy7Ak6bq1ebGqbgG+fR1UIDAuay6OjQdot69c/URu2uLlsP8GQQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.3.0.tgz", + "integrity": "sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.1.1", - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/typescript-estree": "4.1.1", + "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/typescript-estree": "4.3.0", "debug": "^4.1.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.1.1.tgz", - "integrity": "sha512-0W8TTobCvIIQ2FsrYTffyZGAAFUyIbEHq5EYJb1m7Rpd005jrnOvKOo8ywCLhs/Bm17C+KsrUboBvBAARQVvyA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz", + "integrity": "sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/visitor-keys": "4.1.1" + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/visitor-keys": "4.3.0" } }, "@typescript-eslint/types": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.1.1.tgz", - "integrity": "sha512-zrBiqOKYerMTllKcn+BP+i1b7LW/EbMMYytroXMxUTvFPn1smkCu0D7lSAx29fTUO4jnwV0ljSvYQtn2vNrNxA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.3.0.tgz", + "integrity": "sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.1.tgz", - "integrity": "sha512-2AUg5v0liVBsqbGxBphbJ0QbGqSRVaF5qPoTPWcxop+66vMdU1h4CCvHxTC47+Qb+Pr4l2RhXDd41JNpwcQEKw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz", + "integrity": "sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/visitor-keys": "4.1.1", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/visitor-keys": "4.3.0", "debug": "^4.1.1", "globby": "^11.0.1", "is-glob": "^4.0.1", @@ -833,12 +850,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.1.tgz", - "integrity": "sha512-/EOOXbA2ferGLG6RmCHEQ0lTTLkOlXYDgblCmQk3tIU7mTPLm4gKhFMeeUSe+bcchTUsKeCk8xcpbop5Zr/8Rw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz", + "integrity": "sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", + "@typescript-eslint/types": "4.3.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -2663,9 +2680,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz", - "integrity": "sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", + "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -2676,7 +2693,7 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "enquirer": "^2.3.5", - "eslint-scope": "^5.1.0", + "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", "eslint-visitor-keys": "^1.3.0", "espree": "^7.3.0", @@ -2883,9 +2900,9 @@ } }, "eslint-plugin-import": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz", - "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==", + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", + "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", "dev": true, "requires": { "array-includes": "^3.1.1", @@ -2893,7 +2910,7 @@ "contains-path": "^0.1.0", "debug": "^2.6.9", "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.3", + "eslint-import-resolver-node": "^0.3.4", "eslint-module-utils": "^2.6.0", "has": "^1.0.3", "minimatch": "^3.0.4", @@ -3010,9 +3027,9 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.5.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.5.1.tgz", - "integrity": "sha512-cY3YNxdhFcQVkcQLnZw/iZGsTPMuWa9yWZclorMWkjdHprBQX0TMWMEcmJYM3IjHp1HJr7aD0Z0sCRifEBhnzg==", + "version": "30.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.2.tgz", + "integrity": "sha512-LlRdsSQBSPsI3MvhWoGc+Ev3PfFRBk41wwkmbOgC7KP7WQlbeWPpASF5Vdv17XEZ7J+xvPB3KCMyR//6Dbjnnw==", "dev": true, "requires": { "comment-parser": "^0.7.6", diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index 6a5dc4a2..69ad4780 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -55,21 +55,21 @@ "@manuth/eslint-plugin-typescript": "^2.3.2", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", - "@manuth/typescript-eslint-plugin": "^1.3.0", + "@manuth/typescript-eslint-plugin": "^1.3.1", "@types/dedent": "^0.7.0", "@types/fs-extra": "^9.0.1", "@types/mocha": "^8.0.3", - "@types/node": "^14.11.1", + "@types/node": "^14.11.2", "@types/yaml": "^1.9.7", "@types/yosay": "0.0.29", - "@typescript-eslint/eslint-plugin": "^4.1.1", - "@typescript-eslint/eslint-plugin-tslint": "^4.1.1", - "@typescript-eslint/parser": "^4.1.1", + "@typescript-eslint/eslint-plugin": "^4.3.0", + "@typescript-eslint/eslint-plugin-tslint": "^4.3.0", + "@typescript-eslint/parser": "^4.3.0", "concurrently": "^5.3.0", - "eslint": "^7.9.0", + "eslint": "^7.10.0", "eslint-plugin-deprecation": "^1.1.0", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-jsdoc": "^30.5.1", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-jsdoc": "^30.6.2", "mocha": "^8.1.3", "rimraf": "^3.0.2", "shusher": "^0.1.1", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index e00cc0a7..a22fe17d 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -215,14 +215,15 @@ "dev": true }, "@manuth/typescript-eslint-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@manuth/typescript-eslint-plugin/-/typescript-eslint-plugin-1.3.0.tgz", - "integrity": "sha512-X6YOI2QZFXfAoX+WhKjwuSnzqx2GYpiRKkq/yuNWrPWbhPJAVb4oIx+pkqb5VTUtHh7Cweae4lGSH9l8+B6HgA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@manuth/typescript-eslint-plugin/-/typescript-eslint-plugin-1.3.1.tgz", + "integrity": "sha512-/sxrEpFoQ2KdJMLa/GNPHnqYCWQVcW5hQcBX1Jgb5y/IU5BSeoMwoVD6dcjY9r17zhSJXqIZ8SdrDmE8QKx6eQ==", "dev": true, "requires": { "@manuth/interceptor": "^2.0.0", "@manuth/package-json-editor": "^1.4.1", "@thi.ng/cache": "^1.0.59", + "@types/eslint": "^7.2.3", "lodash.clonedeep": "^4.5.0", "lodash.pick": "^4.4.0", "upath": "^1.2.0", @@ -582,9 +583,9 @@ "integrity": "sha512-ZxnwyBGO4KX/82AsFHTX82eMw0PsoBcIngEat+zx0y+3yxoNDJucAihg9nAcrc+g4Cwiv/4WcWsX4oiy0ySrRQ==" }, "@types/eslint": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.2.tgz", - "integrity": "sha512-psWuwNXuKR2e6vMU5d2qH0Kqzrb2Zxwk+uBCF2LsyEph+Nex3lFIPMJXwxfGesdtJM2qtjKoCYsyh76K3x9wLg==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.3.tgz", + "integrity": "sha512-SPBkpC+awgFfyAn4sjt0JBZ3vzACoSp2zhGBJkkrs09EzPqLbxkzaE8kJs3EsRRgkZwWk9zyXT/swvhnJYX8pQ==", "dev": true, "requires": { "@types/estree": "*", @@ -698,9 +699,9 @@ "dev": true }, "@types/node": { - "version": "14.11.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", - "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==" + "version": "14.11.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", + "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -804,13 +805,13 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.1.tgz", - "integrity": "sha512-Hoxyt99EA9LMmqo/5PuWWPeWeB3mKyvibfJ1Hy5SfiUpjE8Nqp+5QNd9fOkzL66+fqvIWSIE+Ett16LGMzCGnQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz", + "integrity": "sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.1.1", - "@typescript-eslint/scope-manager": "4.1.1", + "@typescript-eslint/experimental-utils": "4.3.0", + "@typescript-eslint/scope-manager": "4.3.0", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -819,65 +820,65 @@ } }, "@typescript-eslint/eslint-plugin-tslint": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.1.1.tgz", - "integrity": "sha512-ekqz3pS5RrOWoX8VYiRXNzLJM+DH8k73zpL4OvtNMnmekpH0UlHfSsHaBHQoHwvC/nRMGBTP+DX8PDe8X2jyDA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.3.0.tgz", + "integrity": "sha512-LMGvtNfR92Ms8OHFnPKrKlViqUelcXpPG5RdR/n1p9xCCWZFHdwjguwVVsL0hcDJLvHHX1tJAU75noC564Zhrg==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.1.1", + "@typescript-eslint/experimental-utils": "4.3.0", "lodash": "^4.17.15" } }, "@typescript-eslint/experimental-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.1.tgz", - "integrity": "sha512-jzYsNciHoa4Z3c1URtmeT/bamYm8Dwfw6vuN3WHIE/BXb1iC4KveAnXDErTAZtPVxTYBaYn3n2gbt6F6D2rm1A==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz", + "integrity": "sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.1.1", - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/typescript-estree": "4.1.1", + "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/typescript-estree": "4.3.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.1.1.tgz", - "integrity": "sha512-NLIhmicpKGfJbdXyQBz9j48PA6hq6e+SDOoXy7Ak6bq1ebGqbgG+fR1UIDAuay6OjQdot69c/URu2uLlsP8GQQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.3.0.tgz", + "integrity": "sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.1.1", - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/typescript-estree": "4.1.1", + "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/typescript-estree": "4.3.0", "debug": "^4.1.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.1.1.tgz", - "integrity": "sha512-0W8TTobCvIIQ2FsrYTffyZGAAFUyIbEHq5EYJb1m7Rpd005jrnOvKOo8ywCLhs/Bm17C+KsrUboBvBAARQVvyA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz", + "integrity": "sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/visitor-keys": "4.1.1" + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/visitor-keys": "4.3.0" } }, "@typescript-eslint/types": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.1.1.tgz", - "integrity": "sha512-zrBiqOKYerMTllKcn+BP+i1b7LW/EbMMYytroXMxUTvFPn1smkCu0D7lSAx29fTUO4jnwV0ljSvYQtn2vNrNxA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.3.0.tgz", + "integrity": "sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.1.tgz", - "integrity": "sha512-2AUg5v0liVBsqbGxBphbJ0QbGqSRVaF5qPoTPWcxop+66vMdU1h4CCvHxTC47+Qb+Pr4l2RhXDd41JNpwcQEKw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz", + "integrity": "sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", - "@typescript-eslint/visitor-keys": "4.1.1", + "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/visitor-keys": "4.3.0", "debug": "^4.1.1", "globby": "^11.0.1", "is-glob": "^4.0.1", @@ -1008,12 +1009,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.1.tgz", - "integrity": "sha512-/EOOXbA2ferGLG6RmCHEQ0lTTLkOlXYDgblCmQk3tIU7mTPLm4gKhFMeeUSe+bcchTUsKeCk8xcpbop5Zr/8Rw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz", + "integrity": "sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.1.1", + "@typescript-eslint/types": "4.3.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -2854,9 +2855,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz", - "integrity": "sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", + "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -2867,7 +2868,7 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "enquirer": "^2.3.5", - "eslint-scope": "^5.1.0", + "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", "eslint-visitor-keys": "^1.3.0", "espree": "^7.3.0", @@ -3074,9 +3075,9 @@ } }, "eslint-plugin-import": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz", - "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==", + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", + "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", "dev": true, "requires": { "array-includes": "^3.1.1", @@ -3084,7 +3085,7 @@ "contains-path": "^0.1.0", "debug": "^2.6.9", "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.3", + "eslint-import-resolver-node": "^0.3.4", "eslint-module-utils": "^2.6.0", "has": "^1.0.3", "minimatch": "^3.0.4", @@ -3201,9 +3202,9 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.5.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.5.1.tgz", - "integrity": "sha512-cY3YNxdhFcQVkcQLnZw/iZGsTPMuWa9yWZclorMWkjdHprBQX0TMWMEcmJYM3IjHp1HJr7aD0Z0sCRifEBhnzg==", + "version": "30.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.2.tgz", + "integrity": "sha512-LlRdsSQBSPsI3MvhWoGc+Ev3PfFRBk41wwkmbOgC7KP7WQlbeWPpASF5Vdv17XEZ7J+xvPB3KCMyR//6Dbjnnw==", "dev": true, "requires": { "comment-parser": "^0.7.6", @@ -8485,9 +8486,9 @@ "dev": true }, "ts-morph": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-8.1.0.tgz", - "integrity": "sha512-Wc3SAqdh5E1/AEr6Tuwx3EANy4RmAwzHaaG/gbsQf5OVxu5audGSYof2TcZDmCodkzH9Ke/E3d//7rCOeZ7fSw==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-8.1.1.tgz", + "integrity": "sha512-tjtRAzY4A3huKVlEnTJveLfvNmRICMOhvRJY6kwJ3Oo7bkshJa0zBdsmb/ciIWIn6L/eJsihHjoeqvNJCBbzUA==", "requires": { "@dsherret/to-absolute-glob": "^2.0.2", "@ts-morph/common": "~0.6.0", diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index 9b95353b..52c4c099 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -59,7 +59,7 @@ "npm-which": "^3.0.1", "parse-pkg-name": "^2.0.0", "shusher": "^0.1.1", - "ts-morph": "^8.1.0", + "ts-morph": "^8.1.1", "typescript": "^4.0.3", "validate-npm-package-name": "^3.0.0", "yaml": "^1.10.0", @@ -69,29 +69,29 @@ "@manuth/eslint-plugin-typescript": "^2.3.2", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", - "@manuth/typescript-eslint-plugin": "^1.3.0", + "@manuth/typescript-eslint-plugin": "^1.3.1", "@types/comment-json": "^1.1.1", "@types/dedent": "^0.7.0", "@types/diff": "^4.0.2", - "@types/eslint": "^7.2.2", + "@types/eslint": "^7.2.3", "@types/fs-extra": "^9.0.1", "@types/inquirer": "^7.3.1", "@types/lodash.camelcase": "^4.3.6", "@types/lodash.kebabcase": "^4.1.6", "@types/mocha": "^8.0.3", - "@types/node": "^14.11.1", + "@types/node": "^14.11.2", "@types/npm-packlist": "^1.1.1", "@types/npm-which": "^3.0.0", "@types/validate-npm-package-name": "^3.0.0", "@types/yosay": "0.0.29", - "@typescript-eslint/eslint-plugin": "^4.1.1", - "@typescript-eslint/eslint-plugin-tslint": "^4.1.1", - "@typescript-eslint/parser": "^4.1.1", + "@typescript-eslint/eslint-plugin": "^4.3.0", + "@typescript-eslint/eslint-plugin-tslint": "^4.3.0", + "@typescript-eslint/parser": "^4.3.0", "concurrently": "^5.3.0", - "eslint": "^7.9.0", + "eslint": "^7.10.0", "eslint-plugin-deprecation": "^1.1.0", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-jsdoc": "^30.5.1", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-jsdoc": "^30.6.2", "markdownlint-cli": "^0.23.2", "mocha": "^8.1.3", "npm-packlist": "^2.1.2", From 6532a8d8e00154c936341b4beeb732d480d17f4e Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 00:44:08 +0200 Subject: [PATCH 35/55] Provide the functionality to use the existing package-name as default --- CHANGELOG.md | 1 + .../Project/Inquiry/TSProjectModuleNameQuestion.ts | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e78acb1..fcd2800c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## TSProjectGenerator [Unreleased] ### Added - A feature for creating `CHANGELOG` files for new projects + - A feature to set the default package-name to the name of the existing package ### Updated - The development environment diff --git a/packages/generator-ts-project/src/Project/Inquiry/TSProjectModuleNameQuestion.ts b/packages/generator-ts-project/src/Project/Inquiry/TSProjectModuleNameQuestion.ts index 1755bdf3..64dcfd44 100644 --- a/packages/generator-ts-project/src/Project/Inquiry/TSProjectModuleNameQuestion.ts +++ b/packages/generator-ts-project/src/Project/Inquiry/TSProjectModuleNameQuestion.ts @@ -1,6 +1,9 @@ import { GeneratorOptions, IGenerator } from "@manuth/extended-yo-generator"; +import { Package } from "@manuth/package-json-editor"; +import { pathExists } from "fs-extra"; import { InputQuestionOptions } from "inquirer"; import kebabCase = require("lodash.kebabcase"); +import { join } from "upath"; import validate = require("validate-npm-package-name"); import { QuestionBase } from "../../Components/Inquiry/QuestionBase"; import { ITSProjectSettings } from "../Settings/ITSProjectSettings"; @@ -57,7 +60,15 @@ export class TSProjectModuleNameQuestion { - return kebabCase(answers[TSProjectSettingKey.DisplayName]); + let fileName = join(answers[TSProjectSettingKey.Destination], "package.json"); + let originalName: string = null; + + if (await pathExists(fileName)) + { + originalName = new Package(fileName).Name; + } + + return originalName ?? kebabCase(answers[TSProjectSettingKey.DisplayName]); } /** From b6e5e4e1481c3481491b3438b11bd284fcfe68dc Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 00:58:37 +0200 Subject: [PATCH 36/55] Remove unnecessary module --- .../generator-my-ts-project/package-lock.json | 527 +++++++++--------- packages/generator-my-ts-project/package.json | 1 - 2 files changed, 260 insertions(+), 268 deletions(-) diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index c075ea15..5a98d41b 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -82,6 +82,15 @@ "regenerator-runtime": "^0.13.4" } }, + "@dsherret/to-absolute-glob": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", + "integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=", + "requires": { + "is-absolute": "^1.0.0", + "is-negated-glob": "^1.0.0" + } + }, "@eslint/eslintrc": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz", @@ -139,20 +148,52 @@ "yeoman-test": "^3.0.0" } }, - "@manuth/interceptor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@manuth/interceptor/-/interceptor-2.0.0.tgz", - "integrity": "sha512-+9yPyY2VR9yOY5kGfcnXKaboYwtPek/AM6xQvAoiG/CVy5EXklYd9cHnWrLsBE7q8L3L8yZ1RgSXkkiQei9AAw==", - "dev": true, + "@manuth/generator-ts-project": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@manuth/generator-ts-project/-/generator-ts-project-1.1.4.tgz", + "integrity": "sha512-QIqZjBEfWZxKRnZHo+s/p+uxvGYBluEO/VG5UGgKXRXuU8gMZrSn5KLLqE0Q9SbQwZlckGie9cdGF9WUdMhJkw==", "requires": { - "lodash.clonedeep": "^4.5.0" + "@manuth/extended-yo-generator": "^7.3.3", + "@manuth/package-json-editor": "^1.4.1", + "@manuth/temp-files": "^2.0.0", + "@types/vscode": "^1.49.0", + "chalk": "^4.1.0", + "comment-json": "^4.0.6", + "dedent": "^0.7.0", + "detect-newline": "^3.1.0", + "diff": "^4.0.2", + "eol": "^0.9.1", + "fs-extra": "^9.0.1", + "inquirer": "^7.3.3", + "lodash.camelcase": "^4.3.0", + "lodash.kebabcase": "^4.1.1", + "npm-which": "^3.0.1", + "parse-pkg-name": "^2.0.0", + "shusher": "^0.1.1", + "ts-morph": "^8.1.0", + "typescript": "^4.0.2", + "validate-npm-package-name": "^3.0.0", + "yaml": "^1.10.0", + "yosay": "^2.0.2" + }, + "dependencies": { + "comment-json": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.0.6.tgz", + "integrity": "sha512-zDy9tUDLaqbIHksqMlCg/gD6VUc5EIS7ei9CO0lasIrw1tU0qaXKctbtLVUCx4WNpmxg2CpJVEhSX4kCarcjhQ==", + "requires": { + "core-util-is": "^1.0.2", + "esprima": "^4.0.1", + "has-own-prop": "^2.0.0", + "repeat-string": "^1.6.1" + } + } } }, "@manuth/package-json-editor": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@manuth/package-json-editor/-/package-json-editor-1.4.1.tgz", "integrity": "sha512-swyGZppW5uAI1fq/zSKjcZTibnSUXplsRd+/cEMcnhjA19PiwuDzZqC+Kq6SWg8DABaRUFbarUxhIpyi9h5Fpw==", - "dev": true, "requires": { "git-remote-origin-url": "^3.1.0", "git-root-dir": "^1.0.2", @@ -178,22 +219,6 @@ "integrity": "sha512-TtkZlaXTcOQA73Kbqjw0haxqAtPiHHxXgrlMzMJlpisWpmcWV0yCe37RVJuAzom9xqeGeNHLsN41KIFy0/t72g==", "dev": true }, - "@manuth/typescript-eslint-plugin": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@manuth/typescript-eslint-plugin/-/typescript-eslint-plugin-1.3.1.tgz", - "integrity": "sha512-/sxrEpFoQ2KdJMLa/GNPHnqYCWQVcW5hQcBX1Jgb5y/IU5BSeoMwoVD6dcjY9r17zhSJXqIZ8SdrDmE8QKx6eQ==", - "dev": true, - "requires": { - "@manuth/interceptor": "^2.0.0", - "@manuth/package-json-editor": "^1.4.1", - "@thi.ng/cache": "^1.0.59", - "@types/eslint": "^7.2.3", - "lodash.clonedeep": "^4.5.0", - "lodash.pick": "^4.4.0", - "upath": "^1.2.0", - "vscode-languageserver": "^6.1.1" - } - }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -207,7 +232,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", - "dev": true, "requires": { "@nodelib/fs.stat": "2.0.3", "run-parallel": "^1.1.9" @@ -216,8 +240,7 @@ "@nodelib/fs.stat": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", - "dev": true + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" } } }, @@ -230,7 +253,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", - "dev": true, "requires": { "@nodelib/fs.scandir": "2.1.3", "fastq": "^1.6.0" @@ -287,157 +309,85 @@ "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", "dev": true }, - "@thi.ng/api": { - "version": "6.13.1", - "resolved": "https://registry.npmjs.org/@thi.ng/api/-/api-6.13.1.tgz", - "integrity": "sha512-JBdu+8WE6gzOHD4jht4w0Pq2AW+w82umvCdu+NRTuQaKUaTc26+RS9yfIwArPIlu/L33LtLZKqAeAyBp5J4wLA==", - "dev": true, - "requires": { - "tslib": "^2.0.1" - }, - "dependencies": { - "tslib": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", - "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", - "dev": true - } - } - }, - "@thi.ng/arrays": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@thi.ng/arrays/-/arrays-0.8.1.tgz", - "integrity": "sha512-4IiJQBUlRbktuwb6lwWB5TqbILhQJoOl8F6o/H9RetxTluKb5zk26Sx8FnWyChhw4WYg4DcRFuVjlh1sGKFXsg==", - "dev": true, - "requires": { - "@thi.ng/api": "^6.13.1", - "@thi.ng/checks": "^2.7.9", - "@thi.ng/compare": "^1.3.17", - "@thi.ng/equiv": "^1.0.32", - "@thi.ng/errors": "^1.2.22", - "@thi.ng/random": "^2.0.2" - } - }, - "@thi.ng/cache": { - "version": "1.0.59", - "resolved": "https://registry.npmjs.org/@thi.ng/cache/-/cache-1.0.59.tgz", - "integrity": "sha512-s+yynQn5Asz0IVWlFU7+JBlGwucYCPx3jNqZSvqK9IUgPn7o/CF5NE5QfRKDm0kweXz2tnkTrOmYq9t5H2hmhA==", - "dev": true, - "requires": { - "@thi.ng/api": "^6.13.1", - "@thi.ng/dcons": "^2.2.32", - "@thi.ng/transducers": "^7.4.0" - } - }, - "@thi.ng/checks": { - "version": "2.7.9", - "resolved": "https://registry.npmjs.org/@thi.ng/checks/-/checks-2.7.9.tgz", - "integrity": "sha512-567eiffVTkgL1gu2BLgPivLQdW9Pd4RuwqK76Z69OyhSiEHMcWuBWyPn0fkA4CSasUHteuecGfVeNoUPYCoyVQ==", - "dev": true, - "requires": { - "tslib": "^2.0.1" - }, - "dependencies": { - "tslib": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", - "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", - "dev": true - } - } - }, - "@thi.ng/compare": { - "version": "1.3.17", - "resolved": "https://registry.npmjs.org/@thi.ng/compare/-/compare-1.3.17.tgz", - "integrity": "sha512-eZ3TL0t11QReUHsd4H2/Ug95POKDlvQfyVaOkM60g5xn3w4VCx+unjXbX38ZDM3BI8jSbc4Hq25z+7XgAAIbog==", - "dev": true, - "requires": { - "@thi.ng/api": "^6.13.1" - } - }, - "@thi.ng/compose": { - "version": "1.4.18", - "resolved": "https://registry.npmjs.org/@thi.ng/compose/-/compose-1.4.18.tgz", - "integrity": "sha512-zgR7Jg91zBQSYT3sboFU205Kv7g8xwuATjbh7ow4ivJyaGKxQD34sRofb4n0viHStsG5GRi7kGzvgqyLHCtjQQ==", - "dev": true, - "requires": { - "@thi.ng/api": "^6.13.1", - "@thi.ng/errors": "^1.2.22" - } - }, - "@thi.ng/dcons": { - "version": "2.2.32", - "resolved": "https://registry.npmjs.org/@thi.ng/dcons/-/dcons-2.2.32.tgz", - "integrity": "sha512-XXCpVQpzpUGR9ZI7uCpBexUrDfpXC2b2vCHc1jSGZWTzjUWF6vQxZMzckBFcaBTEVV5Tj0WfttwxSB7h65fCPQ==", - "dev": true, - "requires": { - "@thi.ng/api": "^6.13.1", - "@thi.ng/checks": "^2.7.9", - "@thi.ng/compare": "^1.3.17", - "@thi.ng/equiv": "^1.0.32", - "@thi.ng/errors": "^1.2.22", - "@thi.ng/random": "^2.0.2", - "@thi.ng/transducers": "^7.4.0" - } - }, - "@thi.ng/equiv": { - "version": "1.0.32", - "resolved": "https://registry.npmjs.org/@thi.ng/equiv/-/equiv-1.0.32.tgz", - "integrity": "sha512-Zi4A/f2Ff5o8OqAmGKmpvv3dhIoA4K7oNjD5KUINqdJ+ZDZbuesvyticqHlqmNdvZZbuawsr+XBeIqaNHdIJUA==", - "dev": true - }, - "@thi.ng/errors": { - "version": "1.2.22", - "resolved": "https://registry.npmjs.org/@thi.ng/errors/-/errors-1.2.22.tgz", - "integrity": "sha512-MzkVEhVEHj9TJEDEt+ZLHZP5kJ51vBMQ/j0vofke3kcUXP+LGzdbb+TQ2DY5yLOtqCj8kFGStlMcHYeNupd/Dg==", - "dev": true, + "@ts-morph/common": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.6.0.tgz", + "integrity": "sha512-pI35nZz5bs3tL3btSVX2cWkAE8rc80F+Fn4TwSC6bQvn7fgn9IyLXVcAfpG6X6NBY5wN9TkSWXn/QYUkBvR/Fw==", "requires": { - "tslib": "^2.0.1" + "@dsherret/to-absolute-glob": "^2.0.2", + "fast-glob": "^3.2.4", + "fs-extra": "^9.0.1", + "is-negated-glob": "^1.0.0", + "multimatch": "^4.0.0", + "typescript": "~4.0.2" }, "dependencies": { - "tslib": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", - "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", - "dev": true + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "fast-glob": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", + "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } } } }, - "@thi.ng/math": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@thi.ng/math/-/math-2.1.1.tgz", - "integrity": "sha512-O9JvH+2dF+jH4GLSgQVsTiaYBe0lo6kaq0t4yqUBLUCzGJit52Glhum+qfXYNhmKvfN6fsdS7scdsZC5DvjpTA==", - "dev": true, - "requires": { - "@thi.ng/api": "^6.13.1" - } - }, - "@thi.ng/random": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@thi.ng/random/-/random-2.0.2.tgz", - "integrity": "sha512-Ce1B2U9GDkQBV2NPDqJ36Gqop96luKjOHFJkgdb9VqHgKjij519UCunjNdcfZWlUWo49HVByp+H4XiwSx7HIeQ==", - "dev": true, - "requires": { - "@thi.ng/api": "^6.13.1", - "@thi.ng/checks": "^2.7.9" - } - }, - "@thi.ng/transducers": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@thi.ng/transducers/-/transducers-7.4.0.tgz", - "integrity": "sha512-mom1Tpmhv+7kTqEpR8BOdISSygIHQmcIZYc7pq5a8enW5gjrSdKqKLrZZY4/+g3Ih4LSipnZ+avIr7m/pdV6Cg==", - "dev": true, - "requires": { - "@thi.ng/api": "^6.13.1", - "@thi.ng/arrays": "^0.8.1", - "@thi.ng/checks": "^2.7.9", - "@thi.ng/compare": "^1.3.17", - "@thi.ng/compose": "^1.4.18", - "@thi.ng/errors": "^1.2.22", - "@thi.ng/math": "^2.1.1", - "@thi.ng/random": "^2.0.2" - } - }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -464,22 +414,6 @@ "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.0.4.tgz", "integrity": "sha512-ZxnwyBGO4KX/82AsFHTX82eMw0PsoBcIngEat+zx0y+3yxoNDJucAihg9nAcrc+g4Cwiv/4WcWsX4oiy0ySrRQ==" }, - "@types/eslint": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.3.tgz", - "integrity": "sha512-SPBkpC+awgFfyAn4sjt0JBZ3vzACoSp2zhGBJkkrs09EzPqLbxkzaE8kJs3EsRRgkZwWk9zyXT/swvhnJYX8pQ==", - "dev": true, - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/estree": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz", - "integrity": "sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==", - "dev": true - }, "@types/expect": { "version": "1.20.4", "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz", @@ -594,6 +528,11 @@ "@types/node": "*" } }, + "@types/vscode": { + "version": "1.49.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.49.0.tgz", + "integrity": "sha512-wfNQmLmm1VdMBr6iuNdprWmC1YdrgZ9dQzadv+l2eSjJlElOdJw8OTm4RU4oGTBcfvG6RZI2jOcppkdSS18mZw==" + }, "@types/yaml": { "version": "1.9.7", "resolved": "https://registry.npmjs.org/@types/yaml/-/yaml-1.9.7.tgz", @@ -1170,8 +1109,7 @@ "author-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", - "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=", - "dev": true + "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=" }, "aws-sign2": { "version": "0.7.0", @@ -1479,6 +1417,11 @@ "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, + "builtins": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", + "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=" + }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -1871,6 +1814,11 @@ } } }, + "code-block-writer": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-10.1.0.tgz", + "integrity": "sha512-RG9hpXtWFeUWhuUav1YuP/vGcyncW+t90yJLk9fNZs1De2OuHTHKAKThVCokt29PYq5RoJ0QSZaIZ+rvPO23hA==" + }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -1914,8 +1862,7 @@ "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "comment-json": { "version": "3.0.3", @@ -3096,8 +3043,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { "version": "1.3.1", @@ -3403,7 +3349,6 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", - "dev": true, "requires": { "reusify": "^1.0.4" } @@ -3798,7 +3743,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-3.1.0.tgz", "integrity": "sha512-yVSfaTMO7Bqk6Xx3696ufNfjdrajX7Ig9GuAeO2V3Ji7stkDoBNFldnWIAsy0qviUd0Z+X2P6ziJENKztW7cBQ==", - "dev": true, "requires": { "gitconfiglocal": "^2.1.0" } @@ -3807,7 +3751,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/git-root-dir/-/git-root-dir-1.0.2.tgz", "integrity": "sha512-VlhYYOIqHPL29sY6QcDYYCChuZ8jz3ecU0XexbtnmdOvCYimKMql8IQ/D/Aqqs7NJ4mZQOb2Oq0r43/mw5x0Eg==", - "dev": true, "requires": { "find-up": "^2.1.0" }, @@ -3816,7 +3759,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, "requires": { "locate-path": "^2.0.0" } @@ -3825,7 +3767,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, "requires": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" @@ -3835,7 +3776,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, "requires": { "p-try": "^1.0.0" } @@ -3844,7 +3784,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, "requires": { "p-limit": "^1.1.0" } @@ -3852,8 +3791,7 @@ "p-try": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" } } }, @@ -3861,7 +3799,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz", "integrity": "sha512-qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg==", - "dev": true, "requires": { "ini": "^1.3.2" } @@ -4071,8 +4008,7 @@ "has-own-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz", - "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==", - "dev": true + "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==" }, "has-symbol-support-x": { "version": "1.4.2", @@ -4229,8 +4165,7 @@ "ini": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, "inquirer": { "version": "7.3.3", @@ -4493,6 +4428,15 @@ "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", "dev": true }, + "is-absolute": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", + "requires": { + "is-relative": "^1.0.0", + "is-windows": "^1.0.1" + } + }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -4643,6 +4587,11 @@ "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", "dev": true }, + "is-negated-glob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", + "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=" + }, "is-npm": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", @@ -4721,6 +4670,14 @@ "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", "dev": true }, + "is-relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", + "requires": { + "is-unc-path": "^1.0.0" + } + }, "is-retry-allowed": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", @@ -4777,6 +4734,14 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, + "is-unc-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", + "requires": { + "unc-path-regex": "^0.1.2" + } + }, "is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", @@ -5138,11 +5103,10 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" }, "lodash.debounce": { "version": "4.0.8", @@ -5156,6 +5120,11 @@ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, + "lodash.kebabcase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", + "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=" + }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -5180,12 +5149,6 @@ "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=", "dev": true }, - "lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=", - "dev": true - }, "log-symbols": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", @@ -5867,6 +5830,14 @@ } } }, + "npm-path": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz", + "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==", + "requires": { + "which": "^1.2.10" + } + }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -5882,6 +5853,16 @@ } } }, + "npm-which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz", + "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=", + "requires": { + "commander": "^2.9.0", + "npm-path": "^2.0.2", + "which": "^1.2.10" + } + }, "npmlog": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz", @@ -6055,6 +6036,21 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, + "ow": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/ow/-/ow-0.15.1.tgz", + "integrity": "sha512-rwiuvCnk3Ug9T4s5oKzw3QXQSiTXlTUiQgHmZ9Ozw/37YzeX8LycosVKOtO3v5+fuARGmCgz9rVhaBJeGV+2bQ==", + "requires": { + "type-fest": "^0.8.1" + }, + "dependencies": { + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" + } + } + }, "p-any": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-any/-/p-any-2.1.0.tgz", @@ -6235,7 +6231,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=", - "dev": true, "requires": { "author-regex": "^1.0.0" } @@ -6260,6 +6255,20 @@ "lines-and-columns": "^1.1.6" } }, + "parse-package-name": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/parse-package-name/-/parse-package-name-0.1.0.tgz", + "integrity": "sha1-P0Tdg4/rTCvkvzGLrkR313BrreQ=" + }, + "parse-pkg-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-pkg-name/-/parse-pkg-name-2.0.0.tgz", + "integrity": "sha512-jlikWandLTJEXOhr55uSnHfvnMUSW9g5PxWpkRt6mmuhdH9CfeJfnjJB97j7p9b7gCsJP1y78BovTF8dLjvoog==", + "requires": { + "ow": "^0.15.1", + "parse-package-name": "^0.1.0" + } + }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -6380,8 +6389,7 @@ "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" }, "pify": { "version": "4.0.1", @@ -6666,8 +6674,7 @@ "readme-filename": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/readme-filename/-/readme-filename-1.0.0.tgz", - "integrity": "sha1-COwt2iZSDNFvPoNtAVU/ihCO/l4=", - "dev": true + "integrity": "sha1-COwt2iZSDNFvPoNtAVU/ihCO/l4=" }, "rechoir": { "version": "0.6.2", @@ -6857,8 +6864,7 @@ "reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" }, "rimraf": { "version": "3.0.2", @@ -6908,8 +6914,7 @@ "run-parallel": { "version": "1.1.9", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", - "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", - "dev": true + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==" }, "rx": { "version": "4.1.0", @@ -7094,8 +7099,7 @@ "shusher": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/shusher/-/shusher-0.1.1.tgz", - "integrity": "sha512-MPROOr8E5ofK4ADGEmtnLixMYlmTHiXuemPXqtdYRD0F5zlCno+wa8EywDcUKnGi/0lueuehPt8vdVGrYSP8Cg==", - "dev": true + "integrity": "sha512-MPROOr8E5ofK4ADGEmtnLixMYlmTHiXuemPXqtdYRD0F5zlCno+wa8EywDcUKnGi/0lueuehPt8vdVGrYSP8Cg==" }, "signal-exit": { "version": "3.0.3", @@ -7496,8 +7500,7 @@ "stringify-author": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/stringify-author/-/stringify-author-0.1.3.tgz", - "integrity": "sha1-1YHgLOC1XNo8lT5irdIR+uSw72Y=", - "dev": true + "integrity": "sha1-1YHgLOC1XNo8lT5irdIR+uSw72Y=" }, "strip-ansi": { "version": "6.0.0", @@ -8080,6 +8083,16 @@ "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "dev": true }, + "ts-morph": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-8.1.1.tgz", + "integrity": "sha512-tjtRAzY4A3huKVlEnTJveLfvNmRICMOhvRJY6kwJ3Oo7bkshJa0zBdsmb/ciIWIn6L/eJsihHjoeqvNJCBbzUA==", + "requires": { + "@dsherret/to-absolute-glob": "^2.0.2", + "@ts-morph/common": "~0.6.0", + "code-block-writer": "^10.1.0" + } + }, "tsconfig-paths": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", @@ -8271,8 +8284,12 @@ "typescript": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", - "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", - "dev": true + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==" + }, + "unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" }, "union-value": { "version": "1.0.1", @@ -8348,8 +8365,7 @@ "upath": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", - "dev": true + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, "update-notifier": { "version": "2.5.0", @@ -8487,6 +8503,14 @@ "spdx-expression-parse": "^3.0.0" } }, + "validate-npm-package-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", + "requires": { + "builtins": "^1.0.3" + } + }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -8529,37 +8553,6 @@ } } }, - "vscode-jsonrpc": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz", - "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==", - "dev": true - }, - "vscode-languageserver": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz", - "integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==", - "dev": true, - "requires": { - "vscode-languageserver-protocol": "^3.15.3" - } - }, - "vscode-languageserver-protocol": { - "version": "3.15.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz", - "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==", - "dev": true, - "requires": { - "vscode-jsonrpc": "^5.0.1", - "vscode-languageserver-types": "3.15.1" - } - }, - "vscode-languageserver-types": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz", - "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==", - "dev": true - }, "walk": { "version": "2.3.14", "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz", diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index 69ad4780..72ee247c 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -55,7 +55,6 @@ "@manuth/eslint-plugin-typescript": "^2.3.2", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", - "@manuth/typescript-eslint-plugin": "^1.3.1", "@types/dedent": "^0.7.0", "@types/fs-extra": "^9.0.1", "@types/mocha": "^8.0.3", From 041973f609fbdde510996eb82e658c97b7431b5a Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 01:28:59 +0200 Subject: [PATCH 37/55] Fix monorepo --- .../generator-my-ts-project/package-lock.json | 392 ++---------------- 1 file changed, 25 insertions(+), 367 deletions(-) diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index 5a98d41b..7bd644f5 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -82,15 +82,6 @@ "regenerator-runtime": "^0.13.4" } }, - "@dsherret/to-absolute-glob": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", - "integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=", - "requires": { - "is-absolute": "^1.0.0", - "is-negated-glob": "^1.0.0" - } - }, "@eslint/eslintrc": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz", @@ -148,62 +139,6 @@ "yeoman-test": "^3.0.0" } }, - "@manuth/generator-ts-project": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@manuth/generator-ts-project/-/generator-ts-project-1.1.4.tgz", - "integrity": "sha512-QIqZjBEfWZxKRnZHo+s/p+uxvGYBluEO/VG5UGgKXRXuU8gMZrSn5KLLqE0Q9SbQwZlckGie9cdGF9WUdMhJkw==", - "requires": { - "@manuth/extended-yo-generator": "^7.3.3", - "@manuth/package-json-editor": "^1.4.1", - "@manuth/temp-files": "^2.0.0", - "@types/vscode": "^1.49.0", - "chalk": "^4.1.0", - "comment-json": "^4.0.6", - "dedent": "^0.7.0", - "detect-newline": "^3.1.0", - "diff": "^4.0.2", - "eol": "^0.9.1", - "fs-extra": "^9.0.1", - "inquirer": "^7.3.3", - "lodash.camelcase": "^4.3.0", - "lodash.kebabcase": "^4.1.1", - "npm-which": "^3.0.1", - "parse-pkg-name": "^2.0.0", - "shusher": "^0.1.1", - "ts-morph": "^8.1.0", - "typescript": "^4.0.2", - "validate-npm-package-name": "^3.0.0", - "yaml": "^1.10.0", - "yosay": "^2.0.2" - }, - "dependencies": { - "comment-json": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.0.6.tgz", - "integrity": "sha512-zDy9tUDLaqbIHksqMlCg/gD6VUc5EIS7ei9CO0lasIrw1tU0qaXKctbtLVUCx4WNpmxg2CpJVEhSX4kCarcjhQ==", - "requires": { - "core-util-is": "^1.0.2", - "esprima": "^4.0.1", - "has-own-prop": "^2.0.0", - "repeat-string": "^1.6.1" - } - } - } - }, - "@manuth/package-json-editor": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@manuth/package-json-editor/-/package-json-editor-1.4.1.tgz", - "integrity": "sha512-swyGZppW5uAI1fq/zSKjcZTibnSUXplsRd+/cEMcnhjA19PiwuDzZqC+Kq6SWg8DABaRUFbarUxhIpyi9h5Fpw==", - "requires": { - "git-remote-origin-url": "^3.1.0", - "git-root-dir": "^1.0.2", - "normalize-package-data": "^2.5.0", - "parse-author": "^2.0.0", - "readme-filename": "^1.0.0", - "stringify-author": "^0.1.3", - "upath": "^1.2.0" - } - }, "@manuth/temp-files": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@manuth/temp-files/-/temp-files-2.0.0.tgz", @@ -232,6 +167,7 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "dev": true, "requires": { "@nodelib/fs.stat": "2.0.3", "run-parallel": "^1.1.9" @@ -240,7 +176,8 @@ "@nodelib/fs.stat": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "dev": true } } }, @@ -253,6 +190,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "dev": true, "requires": { "@nodelib/fs.scandir": "2.1.3", "fastq": "^1.6.0" @@ -309,85 +247,6 @@ "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", "dev": true }, - "@ts-morph/common": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.6.0.tgz", - "integrity": "sha512-pI35nZz5bs3tL3btSVX2cWkAE8rc80F+Fn4TwSC6bQvn7fgn9IyLXVcAfpG6X6NBY5wN9TkSWXn/QYUkBvR/Fw==", - "requires": { - "@dsherret/to-absolute-glob": "^2.0.2", - "fast-glob": "^3.2.4", - "fs-extra": "^9.0.1", - "is-negated-glob": "^1.0.0", - "multimatch": "^4.0.0", - "typescript": "~4.0.2" - }, - "dependencies": { - "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "fast-glob": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", - "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", - "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.0.5" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - } - } - }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -528,11 +387,6 @@ "@types/node": "*" } }, - "@types/vscode": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.49.0.tgz", - "integrity": "sha512-wfNQmLmm1VdMBr6iuNdprWmC1YdrgZ9dQzadv+l2eSjJlElOdJw8OTm4RU4oGTBcfvG6RZI2jOcppkdSS18mZw==" - }, "@types/yaml": { "version": "1.9.7", "resolved": "https://registry.npmjs.org/@types/yaml/-/yaml-1.9.7.tgz", @@ -1106,11 +960,6 @@ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, - "author-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", - "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=" - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -1417,11 +1266,6 @@ "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, - "builtins": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", - "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=" - }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -1814,11 +1658,6 @@ } } }, - "code-block-writer": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-10.1.0.tgz", - "integrity": "sha512-RG9hpXtWFeUWhuUav1YuP/vGcyncW+t90yJLk9fNZs1De2OuHTHKAKThVCokt29PYq5RoJ0QSZaIZ+rvPO23hA==" - }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -1862,7 +1701,8 @@ "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true }, "comment-json": { "version": "3.0.3", @@ -3043,7 +2883,8 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true }, "esquery": { "version": "1.3.1", @@ -3349,6 +3190,7 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", + "dev": true, "requires": { "reusify": "^1.0.4" } @@ -3739,70 +3581,6 @@ "is-plain-obj": "^1.1.0" } }, - "git-remote-origin-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-3.1.0.tgz", - "integrity": "sha512-yVSfaTMO7Bqk6Xx3696ufNfjdrajX7Ig9GuAeO2V3Ji7stkDoBNFldnWIAsy0qviUd0Z+X2P6ziJENKztW7cBQ==", - "requires": { - "gitconfiglocal": "^2.1.0" - } - }, - "git-root-dir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/git-root-dir/-/git-root-dir-1.0.2.tgz", - "integrity": "sha512-VlhYYOIqHPL29sY6QcDYYCChuZ8jz3ecU0XexbtnmdOvCYimKMql8IQ/D/Aqqs7NJ4mZQOb2Oq0r43/mw5x0Eg==", - "requires": { - "find-up": "^2.1.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" - } - } - }, - "gitconfiglocal": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz", - "integrity": "sha512-qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg==", - "requires": { - "ini": "^1.3.2" - } - }, "github-username": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/github-username/-/github-username-3.0.0.tgz", @@ -4008,7 +3786,8 @@ "has-own-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz", - "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==" + "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==", + "dev": true }, "has-symbol-support-x": { "version": "1.4.2", @@ -4165,7 +3944,8 @@ "ini": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true }, "inquirer": { "version": "7.3.3", @@ -4428,15 +4208,6 @@ "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", "dev": true }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -4587,11 +4358,6 @@ "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", "dev": true }, - "is-negated-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", - "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=" - }, "is-npm": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", @@ -4670,14 +4436,6 @@ "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", "dev": true }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "requires": { - "is-unc-path": "^1.0.0" - } - }, "is-retry-allowed": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", @@ -4734,14 +4492,6 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "requires": { - "unc-path-regex": "^0.1.2" - } - }, "is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", @@ -5103,11 +4853,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" - }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -5120,11 +4865,6 @@ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, - "lodash.kebabcase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", - "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=" - }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -5830,14 +5570,6 @@ } } }, - "npm-path": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz", - "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==", - "requires": { - "which": "^1.2.10" - } - }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -5853,16 +5585,6 @@ } } }, - "npm-which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz", - "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=", - "requires": { - "commander": "^2.9.0", - "npm-path": "^2.0.2", - "which": "^1.2.10" - } - }, "npmlog": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz", @@ -6036,21 +5758,6 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, - "ow": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/ow/-/ow-0.15.1.tgz", - "integrity": "sha512-rwiuvCnk3Ug9T4s5oKzw3QXQSiTXlTUiQgHmZ9Ozw/37YzeX8LycosVKOtO3v5+fuARGmCgz9rVhaBJeGV+2bQ==", - "requires": { - "type-fest": "^0.8.1" - }, - "dependencies": { - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" - } - } - }, "p-any": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-any/-/p-any-2.1.0.tgz", @@ -6227,14 +5934,6 @@ "callsites": "^3.0.0" } }, - "parse-author": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", - "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=", - "requires": { - "author-regex": "^1.0.0" - } - }, "parse-help": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-help/-/parse-help-1.0.0.tgz", @@ -6255,20 +5954,6 @@ "lines-and-columns": "^1.1.6" } }, - "parse-package-name": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/parse-package-name/-/parse-package-name-0.1.0.tgz", - "integrity": "sha1-P0Tdg4/rTCvkvzGLrkR313BrreQ=" - }, - "parse-pkg-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-pkg-name/-/parse-pkg-name-2.0.0.tgz", - "integrity": "sha512-jlikWandLTJEXOhr55uSnHfvnMUSW9g5PxWpkRt6mmuhdH9CfeJfnjJB97j7p9b7gCsJP1y78BovTF8dLjvoog==", - "requires": { - "ow": "^0.15.1", - "parse-package-name": "^0.1.0" - } - }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -6389,7 +6074,8 @@ "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true }, "pify": { "version": "4.0.1", @@ -6671,11 +6357,6 @@ "picomatch": "^2.2.1" } }, - "readme-filename": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/readme-filename/-/readme-filename-1.0.0.tgz", - "integrity": "sha1-COwt2iZSDNFvPoNtAVU/ihCO/l4=" - }, "rechoir": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", @@ -6864,7 +6545,8 @@ "reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true }, "rimraf": { "version": "3.0.2", @@ -6914,7 +6596,8 @@ "run-parallel": { "version": "1.1.9", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", - "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==" + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "dev": true }, "rx": { "version": "4.1.0", @@ -7099,7 +6782,8 @@ "shusher": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/shusher/-/shusher-0.1.1.tgz", - "integrity": "sha512-MPROOr8E5ofK4ADGEmtnLixMYlmTHiXuemPXqtdYRD0F5zlCno+wa8EywDcUKnGi/0lueuehPt8vdVGrYSP8Cg==" + "integrity": "sha512-MPROOr8E5ofK4ADGEmtnLixMYlmTHiXuemPXqtdYRD0F5zlCno+wa8EywDcUKnGi/0lueuehPt8vdVGrYSP8Cg==", + "dev": true }, "signal-exit": { "version": "3.0.3", @@ -7497,11 +7181,6 @@ "safe-buffer": "~5.2.0" } }, - "stringify-author": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/stringify-author/-/stringify-author-0.1.3.tgz", - "integrity": "sha1-1YHgLOC1XNo8lT5irdIR+uSw72Y=" - }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -8083,16 +7762,6 @@ "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "dev": true }, - "ts-morph": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-8.1.1.tgz", - "integrity": "sha512-tjtRAzY4A3huKVlEnTJveLfvNmRICMOhvRJY6kwJ3Oo7bkshJa0zBdsmb/ciIWIn6L/eJsihHjoeqvNJCBbzUA==", - "requires": { - "@dsherret/to-absolute-glob": "^2.0.2", - "@ts-morph/common": "~0.6.0", - "code-block-writer": "^10.1.0" - } - }, "tsconfig-paths": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", @@ -8284,12 +7953,8 @@ "typescript": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", - "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==" - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", + "dev": true }, "union-value": { "version": "1.0.1", @@ -8365,7 +8030,8 @@ "upath": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "dev": true }, "update-notifier": { "version": "2.5.0", @@ -8503,14 +8169,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "validate-npm-package-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", - "requires": { - "builtins": "^1.0.3" - } - }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", From e21f93401b5c4ca6e3be01ecff0d650e8637b4a0 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 02:37:20 +0200 Subject: [PATCH 38/55] Update all packages --- package-lock.json | 6 +++--- package.json | 2 +- packages/generator-my-ts-project/package-lock.json | 6 +++--- packages/generator-my-ts-project/package.json | 2 +- packages/generator-ts-project/package-lock.json | 6 +++--- packages/generator-ts-project/package.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd9250bc..f0260d1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1358,9 +1358,9 @@ } }, "@manuth/eslint-plugin-typescript": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.2.tgz", - "integrity": "sha512-kKCaZLJ0aN+x/U011Let2keLF28qoJzcFUmurpHJQj09RnbxBKt22oIdpuQXu1rrEjx08jABKet6y4Rtog/vRw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.3.tgz", + "integrity": "sha512-aa1a6xqqJXCyrLShDEVYIw2GRkvNvf0vKaKMfHg/gchDC2BG4+aKp2y61Nxe2ChR4gc6ClLATJwaRE3uWJKmPw==", "dev": true, "requires": { "lodash.merge": "^4.6.2", diff --git a/package.json b/package.json index 8bcce32f..a3b9f4ee 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "prepare": "lerna bootstrap && npm run rebuild" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.2", + "@manuth/eslint-plugin-typescript": "^2.3.3", "@types/diff": "^4.0.2", "@types/fs-extra": "^9.0.1", "@types/git-branch": "^2.0.1", diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index 7bd644f5..80d68552 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -101,9 +101,9 @@ } }, "@manuth/eslint-plugin-typescript": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.2.tgz", - "integrity": "sha512-kKCaZLJ0aN+x/U011Let2keLF28qoJzcFUmurpHJQj09RnbxBKt22oIdpuQXu1rrEjx08jABKet6y4Rtog/vRw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.3.tgz", + "integrity": "sha512-aa1a6xqqJXCyrLShDEVYIw2GRkvNvf0vKaKMfHg/gchDC2BG4+aKp2y61Nxe2ChR4gc6ClLATJwaRE3uWJKmPw==", "dev": true, "requires": { "lodash.merge": "^4.6.2", diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index 72ee247c..b7f14319 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -52,7 +52,7 @@ "yosay": "^2.0.2" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.2", + "@manuth/eslint-plugin-typescript": "^2.3.3", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", "@types/dedent": "^0.7.0", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index a22fe17d..84314a5b 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -124,9 +124,9 @@ } }, "@manuth/eslint-plugin-typescript": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.2.tgz", - "integrity": "sha512-kKCaZLJ0aN+x/U011Let2keLF28qoJzcFUmurpHJQj09RnbxBKt22oIdpuQXu1rrEjx08jABKet6y4Rtog/vRw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@manuth/eslint-plugin-typescript/-/eslint-plugin-typescript-2.3.3.tgz", + "integrity": "sha512-aa1a6xqqJXCyrLShDEVYIw2GRkvNvf0vKaKMfHg/gchDC2BG4+aKp2y61Nxe2ChR4gc6ClLATJwaRE3uWJKmPw==", "dev": true, "requires": { "lodash.merge": "^4.6.2", diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index 52c4c099..241dd350 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -66,7 +66,7 @@ "yosay": "^2.0.2" }, "devDependencies": { - "@manuth/eslint-plugin-typescript": "^2.3.2", + "@manuth/eslint-plugin-typescript": "^2.3.3", "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.3", "@manuth/typescript-eslint-plugin": "^1.3.1", From edc4878d9590469d8677e692a5ab66236cdab9a0 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 03:00:29 +0200 Subject: [PATCH 39/55] Add `outFiles` to the `Launch Program` config --- .../module/VSCode/TSModuleLaunchSettingsProcessor.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/generator-ts-project/src/generators/module/VSCode/TSModuleLaunchSettingsProcessor.ts b/packages/generator-ts-project/src/generators/module/VSCode/TSModuleLaunchSettingsProcessor.ts index 63ee348d..6e8222e7 100644 --- a/packages/generator-ts-project/src/generators/module/VSCode/TSModuleLaunchSettingsProcessor.ts +++ b/packages/generator-ts-project/src/generators/module/VSCode/TSModuleLaunchSettingsProcessor.ts @@ -40,7 +40,11 @@ export class TSModuleLaunchSettingsProcessor Date: Fri, 2 Oct 2020 16:32:50 +0200 Subject: [PATCH 40/55] Update all packages --- .../generator-ts-project/package-lock.json | 57 +++++++++++-------- packages/generator-ts-project/package.json | 6 +- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index 84314a5b..d30229b9 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -186,10 +186,11 @@ } }, "@manuth/package-json-editor": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@manuth/package-json-editor/-/package-json-editor-1.4.1.tgz", - "integrity": "sha512-swyGZppW5uAI1fq/zSKjcZTibnSUXplsRd+/cEMcnhjA19PiwuDzZqC+Kq6SWg8DABaRUFbarUxhIpyi9h5Fpw==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@manuth/package-json-editor/-/package-json-editor-1.4.2.tgz", + "integrity": "sha512-Cny8J1NEtcnX99vVCY8CTXC5/4tIonYzTzz9sdU29d5mV0cKRhtyYOKhV02/7DBiOVQ5JQLij3hyBJ1D5RXNOw==", "requires": { + "fs-extra": "^9.0.1", "git-remote-origin-url": "^3.1.0", "git-root-dir": "^1.0.2", "normalize-package-data": "^2.5.0", @@ -1234,6 +1235,11 @@ "is-string": "^1.0.5" } }, + "array-timsort": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz", + "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==" + }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -2088,10 +2094,11 @@ } }, "comment-json": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.0.6.tgz", - "integrity": "sha512-zDy9tUDLaqbIHksqMlCg/gD6VUc5EIS7ei9CO0lasIrw1tU0qaXKctbtLVUCx4WNpmxg2CpJVEhSX4kCarcjhQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.1.0.tgz", + "integrity": "sha512-WEghmVYaNq9NlWbrkzQTSsya9ycLyxJxpTQfZEan6a5Jomnjw18zS3Podf8q1Zf9BvonvQd/+Z7Z39L7KKzzdQ==", "requires": { + "array-timsort": "^1.0.3", "core-util-is": "^1.0.2", "esprima": "^4.0.1", "has-own-prop": "^2.0.0", @@ -5302,9 +5309,9 @@ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, "linkify-it": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", - "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.2.tgz", + "integrity": "sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==", "dev": true, "requires": { "uc.micro": "^1.0.1" @@ -5567,31 +5574,31 @@ } }, "markdown-it": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz", - "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.0.tgz", + "integrity": "sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg==", "dev": true, "requires": { "argparse": "^1.0.7", "entities": "~2.0.0", - "linkify-it": "^2.0.0", + "linkify-it": "^3.0.1", "mdurl": "^1.0.1", "uc.micro": "^1.0.5" } }, "markdownlint": { - "version": "0.20.4", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.20.4.tgz", - "integrity": "sha512-jpfaPgjT0OpeBbemjYNZbzGG3hCLcAIvrm/pEY3+q/szDScG6ZonDacqySVRJAv9glbo8y4wBPJ0wgW17+9GGA==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.21.0.tgz", + "integrity": "sha512-rTxr0fbCFmS65oxXBD0HNy3/+PSukLS+b7Z6rGDWbjdRJp/e2dKj538r3KTn8oXrusx+ZtuYOozV2Knpnn0pkQ==", "dev": true, "requires": { - "markdown-it": "10.0.0" + "markdown-it": "11.0.0" } }, "markdownlint-cli": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.23.2.tgz", - "integrity": "sha512-OSl5OZ8xzGN6z355cqRkiq67zPi3reJimklaF72p0554q85Dng5ToOjjSB9tDKZebSt85jX8cp+ruoQlPqOsPA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.24.0.tgz", + "integrity": "sha512-AusUxaX4sFayUBFTCKeHc8+fq73KFqIUW+ZZZYyQ/BvY0MoGAnE2C/3xiawSE7WXmpmguaWzhrXRuY6IrOLX7A==", "dev": true, "requires": { "commander": "~2.9.0", @@ -5603,8 +5610,8 @@ "jsonc-parser": "~2.2.0", "lodash.differencewith": "~4.5.0", "lodash.flatten": "~4.4.0", - "markdownlint": "~0.20.4", - "markdownlint-rule-helpers": "~0.11.0", + "markdownlint": "~0.21.0", + "markdownlint-rule-helpers": "~0.12.0", "minimatch": "~3.0.4", "minimist": "~1.2.5", "rc": "~1.2.7" @@ -5641,9 +5648,9 @@ } }, "markdownlint-rule-helpers": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.11.0.tgz", - "integrity": "sha512-PhGii9dOiDJDXxiRMpK8N0FM9powprvRPsXALgkjlSPTwLh6ymH+iF3iUe3nq8KGu26tclFBlLL5xAGy/zb7FA==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.12.0.tgz", + "integrity": "sha512-Q7qfAk+AJvx82ZY52OByC4yjoQYryOZt6D8TKrZJIwCfhZvcj8vCQNuwDqILushtDBTvGFmUPq+uhOb1KIMi6A==", "dev": true }, "matcher": { diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index 241dd350..b1ae3b32 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -43,11 +43,11 @@ }, "dependencies": { "@manuth/extended-yo-generator": "^7.3.3", - "@manuth/package-json-editor": "^1.4.1", + "@manuth/package-json-editor": "^1.4.2", "@manuth/temp-files": "^2.0.0", "@types/vscode": "^1.49.0", "chalk": "^4.1.0", - "comment-json": "^4.0.6", + "comment-json": "^4.1.0", "dedent": "^0.7.0", "detect-newline": "^3.1.0", "diff": "^4.0.2", @@ -92,7 +92,7 @@ "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-jsdoc": "^30.6.2", - "markdownlint-cli": "^0.23.2", + "markdownlint-cli": "^0.24.0", "mocha": "^8.1.3", "npm-packlist": "^2.1.2", "random-js": "^2.1.0", From f3a0f2cc1f7a119762913eac3a5e7fb32a29197e Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 21:09:21 +0200 Subject: [PATCH 41/55] Update all packages --- package-lock.json | 6 +++--- package.json | 2 +- packages/generator-my-ts-project/package-lock.json | 6 +++--- packages/generator-my-ts-project/package.json | 2 +- packages/generator-ts-project/package-lock.json | 6 +++--- packages/generator-ts-project/package.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0260d1d..649cd6ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4587,9 +4587,9 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.6.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.2.tgz", - "integrity": "sha512-LlRdsSQBSPsI3MvhWoGc+Ev3PfFRBk41wwkmbOgC7KP7WQlbeWPpASF5Vdv17XEZ7J+xvPB3KCMyR//6Dbjnnw==", + "version": "30.6.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.3.tgz", + "integrity": "sha512-RnyM+a3SKRfPs/jqO2qOGAEZnOJT2dOhiwhBlYVp8/yRUUBNPlvkwZm0arrnyFKvfZX6WqSwlK5OcNnM5W1Etg==", "dev": true, "requires": { "comment-parser": "^0.7.6", diff --git a/package.json b/package.json index a3b9f4ee..6dbb7925 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "eslint": "^7.10.0", "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^30.6.2", + "eslint-plugin-jsdoc": "^30.6.3", "fs-extra": "^9.0.1", "git-branch": "^2.0.1", "glob": "^7.1.6", diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index 80d68552..aa40c908 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -2814,9 +2814,9 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.6.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.2.tgz", - "integrity": "sha512-LlRdsSQBSPsI3MvhWoGc+Ev3PfFRBk41wwkmbOgC7KP7WQlbeWPpASF5Vdv17XEZ7J+xvPB3KCMyR//6Dbjnnw==", + "version": "30.6.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.3.tgz", + "integrity": "sha512-RnyM+a3SKRfPs/jqO2qOGAEZnOJT2dOhiwhBlYVp8/yRUUBNPlvkwZm0arrnyFKvfZX6WqSwlK5OcNnM5W1Etg==", "dev": true, "requires": { "comment-parser": "^0.7.6", diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index b7f14319..b6c2d0d4 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -68,7 +68,7 @@ "eslint": "^7.10.0", "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^30.6.2", + "eslint-plugin-jsdoc": "^30.6.3", "mocha": "^8.1.3", "rimraf": "^3.0.2", "shusher": "^0.1.1", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index d30229b9..e20f2abb 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -3209,9 +3209,9 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.6.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.2.tgz", - "integrity": "sha512-LlRdsSQBSPsI3MvhWoGc+Ev3PfFRBk41wwkmbOgC7KP7WQlbeWPpASF5Vdv17XEZ7J+xvPB3KCMyR//6Dbjnnw==", + "version": "30.6.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.3.tgz", + "integrity": "sha512-RnyM+a3SKRfPs/jqO2qOGAEZnOJT2dOhiwhBlYVp8/yRUUBNPlvkwZm0arrnyFKvfZX6WqSwlK5OcNnM5W1Etg==", "dev": true, "requires": { "comment-parser": "^0.7.6", diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index b1ae3b32..5ece310d 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -91,7 +91,7 @@ "eslint": "^7.10.0", "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^30.6.2", + "eslint-plugin-jsdoc": "^30.6.3", "markdownlint-cli": "^0.24.0", "mocha": "^8.1.3", "npm-packlist": "^2.1.2", From 7286d9363e45dc67b22543269d4e4b5ee8d466ac Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 23:12:09 +0200 Subject: [PATCH 42/55] Add missing jsdoc --- gulp/ApplyPatch.ts | 17 +++++++++++++---- gulpfile.ts | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gulp/ApplyPatch.ts b/gulp/ApplyPatch.ts index 4151ff6f..30975921 100644 --- a/gulp/ApplyPatch.ts +++ b/gulp/ApplyPatch.ts @@ -1,12 +1,21 @@ import { applyPatch, parsePatch } from "diff"; import { readFile } from "fs-extra"; import { obj } from "through2"; -import Vinyl = require("vinyl"); +import File = require("vinyl"); -export = (patchPath: string): NodeJS.ReadWriteStream => +/** + * Applies a patch to the stream. + * + * @param patchPath + * The path to the patch to apply. + * + * @returns + * The resulting stream. + */ +export function ApplyPatch(patchPath: string): NodeJS.ReadWriteStream { return obj( - async (vinylFile: Vinyl, encoding, callback) => + async (vinylFile: File, encoding, callback) => { if (vinylFile.isBuffer()) { @@ -25,4 +34,4 @@ export = (patchPath: string): NodeJS.ReadWriteStream => callback(new Error("Only buffers are supported.")); } }); -}; +} diff --git a/gulpfile.ts b/gulpfile.ts index 4645278d..9816d70c 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -6,7 +6,7 @@ import replace = require("gulp-replace"); import merge = require("merge-stream"); import minimist = require("minimist"); import { basename, dirname, join, relative } from "upath"; -import ApplyPatch = require("./gulp/ApplyPatch"); +import { ApplyPatch } from "./gulp/ApplyPatch"; let projectGeneratorName = "generator-ts-project"; let customProjectGeneratorName = "generator-my-ts-project"; From 2ef3bf9cf6a06b6d48be347e89a6e8020f7c95f9 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 2 Oct 2020 23:12:26 +0200 Subject: [PATCH 43/55] Normalize imports --- .eslintrc.js | 6 ++-- gulpfile.ts | 2 +- packages/generator-my-ts-project/.eslintrc.js | 8 ++--- .../src/tests/DependabotFileMapping.test.ts | 8 ++--- .../src/tests/DroneFileMapping.test.ts | 10 +++---- .../src/tests/MarkdownFileProcessor.test.ts | 4 +-- packages/generator-ts-project/.eslintrc.js | 8 ++--- .../Inquiry/Prompts/SubGeneratorPrompt.ts | 14 ++++----- .../Transformation/JSONTransformMapping.ts | 6 ++-- .../src/Project/TSProjectGenerator.ts | 6 ++-- .../FileMappings/CodeWorkspaceProvider.ts | 4 +-- .../generator/TSGeneratorGenerator.ts | 10 +++---- .../tests/Components/FileMappingBase.test.ts | 6 ++-- .../Components/JSONCreatorMapping.test.ts | 4 +-- .../JSONTransformMapping.test.ts | 8 ++--- .../TransformFileMapping.test.ts | 10 +++---- .../TypeScriptTransformMapping.test.ts | 6 ++-- .../YAMLTransformMapping.test.ts | 12 ++++---- .../Components/YAMLCreatorMapping.test.ts | 6 ++-- .../tests/Generators/App/AppGenerator.test.ts | 12 ++++---- .../Components/TSGeneratorCategory.test.ts | 8 ++--- .../TSGeneratorComponentCollection.test.ts | 4 +-- .../TSGeneratorGeneralCategory.test.ts | 4 +-- .../TSGeneratorPackageFileMapping.test.ts | 6 ++-- .../TSGeneratorModuleNameQuestion.test.ts | 12 ++++---- .../Generator/TSGeneratorGenerator.test.ts | 12 ++++---- ...TSGeneratorLaunchSettingsProcessor.test.ts | 6 ++-- .../TSModuleComponentCollection.test.ts | 4 +-- .../TSModuleGeneralCategory.test.ts | 4 +-- .../TSModulePackageFileMapping.test.ts | 6 ++-- .../Module/TSModuleGenerator.test.ts | 10 +++---- .../TSModuleLaunchSettingsProcessor.test.ts | 4 +-- .../Components/LintingComponent.test.ts | 4 +-- .../FileMappings/ESLintRCFileMapping.test.ts | 8 ++--- .../PackageDependencyCollection.test.ts | 4 +-- .../FileMappings/PackageFileMapping.test.ts | 16 +++++----- .../FileMappings/PackageFileMappingTester.ts | 8 ++--- .../Scripts/ScriptMapping.test.ts | 14 ++++----- .../TSProjectComponentCollection.test.ts | 4 +-- .../TSProjectGeneralCategory.test.ts | 4 +-- .../FileMappings/NPMIgnoreFileMapping.test.ts | 4 +-- .../TSProjectPackageFileMapping.test.ts | 8 ++--- .../TSProjectDescriptionQuestion.test.ts | 4 +-- .../TSProjectDestinationQuestion.test.ts | 14 ++++----- .../TSProjectDisplayNameQuestion.test.ts | 4 +-- .../TSProjectModuleNameQuestion.test.ts | 4 +-- .../TSProjectQuestionCollection.test.ts | 4 +-- .../tests/Project/TSProjectGenerator.test.ts | 4 +-- .../TSProjectExtensionsProcessor.test.ts | 4 +-- .../TSProjectLaunchSettingsProcessor.test.ts | 6 ++-- .../VSCode/TSProjectSettingsProcessor.test.ts | 4 +-- .../VSCode/TSProjectTasksProcessor.test.ts | 30 +++++++++---------- .../Components/CodeWorkspaceComponent.test.ts | 12 ++++---- .../tests/VSCode/ExtensionsProcessor.test.ts | 6 ++-- .../CodeWorkspaceProvider.test.ts | 14 ++++----- .../FileMappings/WorkspaceFileCreator.test.ts | 24 +++++++-------- .../WorkspaceFolderCreator.test.ts | 14 ++++----- .../WorkspaceFolderLoader.test.ts | 10 +++---- .../VSCode/LaunchSettingsProcessor.test.ts | 10 +++---- .../tests/VSCode/SettingsProcessor.test.ts | 12 ++++---- .../src/tests/VSCode/TasksProcessor.test.ts | 12 ++++---- .../tests/VSCode/VSCodeJSONProcessor.test.ts | 8 ++--- .../tests/VSCode/WorkspaceProcessor.test.ts | 16 +++++----- scripts/bumpVersion.ts | 4 +-- 64 files changed, 261 insertions(+), 263 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index f7cc073b..ba2f9707 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,4 @@ -const path = require("path"); +const { join } = require("path"); module.exports = { extends: [ @@ -6,8 +6,8 @@ module.exports = { ], parserOptions: { project: [ - path.join(__dirname, "tsconfig.json"), - path.join(__dirname, "tsconfig.eslint.json") + join(__dirname, "tsconfig.json"), + join(__dirname, "tsconfig.eslint.json") ] } }; diff --git a/gulpfile.ts b/gulpfile.ts index 9816d70c..ad295b10 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -1,5 +1,5 @@ import { EOL } from "os"; -import glob = require("glob"); +import { glob } from "glob"; import { dest, parallel, series, src, watch } from "gulp"; import rename = require("gulp-rename"); import replace = require("gulp-replace"); diff --git a/packages/generator-my-ts-project/.eslintrc.js b/packages/generator-my-ts-project/.eslintrc.js index 73d943ec..2eafc067 100644 --- a/packages/generator-my-ts-project/.eslintrc.js +++ b/packages/generator-my-ts-project/.eslintrc.js @@ -1,11 +1,11 @@ -const path = require("path"); +const { join } = require("path"); module.exports = { parserOptions: { project: [ - path.join(__dirname, "tsconfig.json"), - path.join(__dirname, "tsconfig.eslint.json"), - path.join(__dirname, "src", "tests", "tsconfig.json") + join(__dirname, "tsconfig.json"), + join(__dirname, "tsconfig.eslint.json"), + join(__dirname, "src", "tests", "tsconfig.json") ] } }; diff --git a/packages/generator-my-ts-project/src/tests/DependabotFileMapping.test.ts b/packages/generator-my-ts-project/src/tests/DependabotFileMapping.test.ts index 93cfcf0e..4431203f 100644 --- a/packages/generator-my-ts-project/src/tests/DependabotFileMapping.test.ts +++ b/packages/generator-my-ts-project/src/tests/DependabotFileMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TestContext } from "@manuth/extended-yo-generator-test"; import { ITSProjectSettings } from "@manuth/generator-ts-project"; @@ -42,21 +42,21 @@ export function DependabotFileMappingTests(context: TestContext { - Assert.strictEqual(documents.length, 1); + strictEqual(documents.length, 1); }); test( "Checking whether only one dependabot-configuration is present…", () => { - Assert.strictEqual(documents[0].get(updateKey).toJSON().length, 1); + strictEqual(documents[0].get(updateKey).toJSON().length, 1); }); test( "Checking whether the dependabot-configuration directory points to the root of the project…", () => { - Assert.strictEqual(documents[0].getIn([updateKey, 0, directoryKey]), "/"); + strictEqual(documents[0].getIn([updateKey, 0, directoryKey]), "/"); }); }); } diff --git a/packages/generator-my-ts-project/src/tests/DroneFileMapping.test.ts b/packages/generator-my-ts-project/src/tests/DroneFileMapping.test.ts index 97e48099..36a6c4b1 100644 --- a/packages/generator-my-ts-project/src/tests/DroneFileMapping.test.ts +++ b/packages/generator-my-ts-project/src/tests/DroneFileMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TestContext } from "@manuth/extended-yo-generator-test"; import { ITSProjectSettings } from "@manuth/generator-ts-project"; @@ -72,8 +72,8 @@ export function DroneFileMappingTests(context: TestContext) async function() { this.timeout(20 * 1000); - Assert.ok(await AssertCommand((command) => command.startsWith("npm publish"))); - Assert.ok(await AssertCommand((command) => !command.startsWith("npx lerna publish"), true)); + ok(await AssertCommand((command) => command.startsWith("npm publish"))); + ok(await AssertCommand((command) => !command.startsWith("npx lerna publish"), true)); }); test( @@ -81,7 +81,7 @@ export function DroneFileMappingTests(context: TestContext) async function() { this.timeout(20 * 1000); - Assert.ok(await AssertCommand((command) => !command.startsWith("npx lerna exec"), true)); + ok(await AssertCommand((command) => !command.startsWith("npx lerna exec"), true)); }); test( @@ -90,7 +90,7 @@ export function DroneFileMappingTests(context: TestContext) { this.timeout(20 * 1000); - Assert.ok( + ok( (await fileMappingOptions.Transform(await fileMappingOptions.Metadata)).every( (document) => { diff --git a/packages/generator-my-ts-project/src/tests/MarkdownFileProcessor.test.ts b/packages/generator-my-ts-project/src/tests/MarkdownFileProcessor.test.ts index d0c1b5df..f1b03fd9 100644 --- a/packages/generator-my-ts-project/src/tests/MarkdownFileProcessor.test.ts +++ b/packages/generator-my-ts-project/src/tests/MarkdownFileProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestContext, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TempFile } from "@manuth/temp-files"; @@ -60,7 +60,7 @@ export function MarkdownFileProcessorTests(context: TestContext { await tester.Run(); - Assert.strictEqual(await tester.Content, expected); + strictEqual(await tester.Content, expected); }); }); } diff --git a/packages/generator-ts-project/.eslintrc.js b/packages/generator-ts-project/.eslintrc.js index 73e77124..f3b89ac9 100644 --- a/packages/generator-ts-project/.eslintrc.js +++ b/packages/generator-ts-project/.eslintrc.js @@ -1,4 +1,4 @@ -const path = require("path"); +const { join } = require("path"); module.exports = { extends: [ @@ -11,9 +11,9 @@ module.exports = { }, parserOptions: { project: [ - path.join(__dirname, "tsconfig.json"), - path.join(__dirname, "tsconfig.eslint.json"), - path.join(__dirname, "src", "tests", "tsconfig.json") + join(__dirname, "tsconfig.json"), + join(__dirname, "tsconfig.eslint.json"), + join(__dirname, "src", "tests", "tsconfig.json") ] } }; diff --git a/packages/generator-ts-project/src/Components/Inquiry/Prompts/SubGeneratorPrompt.ts b/packages/generator-ts-project/src/Components/Inquiry/Prompts/SubGeneratorPrompt.ts index 3bce8df1..947b2f36 100644 --- a/packages/generator-ts-project/src/Components/Inquiry/Prompts/SubGeneratorPrompt.ts +++ b/packages/generator-ts-project/src/Components/Inquiry/Prompts/SubGeneratorPrompt.ts @@ -1,14 +1,12 @@ import { EOL } from "os"; import { ReadLine } from "readline"; -import inquirer = require("inquirer"); -import Base = require("inquirer/lib/prompts/base"); +import { Answers, ConfirmQuestionOptions, DistinctQuestion, prompt } from "inquirer"; +import Prompt = require("inquirer/lib/prompts/base"); import kebabCase = require("lodash.kebabcase"); import { ISubGenerator } from "../../../generators/generator/Settings/ISubGenerator"; import { ITSGeneratorSettings } from "../../../generators/generator/Settings/ITSGeneratorSettings"; import { SubGeneratorSettingKey } from "../../../generators/generator/Settings/SubGeneratorSettingKey"; import { PromptCallback } from "./PromptCallback"; -import Answers = inquirer.Answers; -import DistinctQuestion = inquirer.DistinctQuestion; declare module "inquirer" { @@ -28,7 +26,7 @@ declare module "inquirer" /** * Provides options for the `SubGeneratorPrompt`. */ -interface ISubGeneratorQuestionOptions extends inquirer.ConfirmQuestionOptions +interface ISubGeneratorQuestionOptions extends ConfirmQuestionOptions { /** * @inheritdoc @@ -55,7 +53,7 @@ interface ISubGeneratorQuestion extends ISubGenerat /** * Provides a prompt for asking for sub-generators. */ -export class SubGeneratorPrompt extends Base> +export class SubGeneratorPrompt extends Prompt> { /** * The name of the prompt-type. @@ -159,7 +157,7 @@ export class SubGeneratorPrompt extends Base { - this.SubGeneratorSettings.push(await inquirer.prompt(this.Questions)); + this.SubGeneratorSettings.push(await prompt(this.Questions)); } /** @@ -181,7 +179,7 @@ export class SubGeneratorPrompt extends Base( + answerHash = await prompt( [ { type: "confirm", diff --git a/packages/generator-ts-project/src/Components/Transformation/JSONTransformMapping.ts b/packages/generator-ts-project/src/Components/Transformation/JSONTransformMapping.ts index 062c23bc..71f0c710 100644 --- a/packages/generator-ts-project/src/Components/Transformation/JSONTransformMapping.ts +++ b/packages/generator-ts-project/src/Components/Transformation/JSONTransformMapping.ts @@ -1,6 +1,6 @@ import { EOL } from "os"; import { GeneratorOptions, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; -import JSON = require("comment-json"); +import { parse, stringify } from "comment-json"; import { split } from "eol"; import { TransformFileMapping } from "./TransformFileMapping"; @@ -31,7 +31,7 @@ export abstract class JSONTransformMapping { - return JSON.parse(text); + return parse(text); } /** @@ -45,7 +45,7 @@ export abstract class JSONTransformMapping { - let text = split(JSON.stringify(data, null, 4)).join(EOL); + let text = split(stringify(data, null, 4)).join(EOL); return text + EOL; } } diff --git a/packages/generator-ts-project/src/Project/TSProjectGenerator.ts b/packages/generator-ts-project/src/Project/TSProjectGenerator.ts index fb396159..2a2bafbd 100644 --- a/packages/generator-ts-project/src/Project/TSProjectGenerator.ts +++ b/packages/generator-ts-project/src/Project/TSProjectGenerator.ts @@ -4,7 +4,7 @@ import { Generator, GeneratorOptions, GeneratorSettingKey, IComponentCollection, import { Package } from "@manuth/package-json-editor"; import { TempDirectory } from "@manuth/temp-files"; import chalk = require("chalk"); -import JSON = require("comment-json"); +import { parse } from "comment-json"; import dedent = require("dedent"); import { ESLint } from "eslint"; import { readFile, readJSON, writeFile, writeJSON } from "fs-extra"; @@ -106,7 +106,7 @@ export class TSProjectGenerator { - let tsConfig = JSON.parse((await readFile(fileMapping.Source)).toString()); + let tsConfig = parse((await readFile(fileMapping.Source)).toString()); delete tsConfig.compilerOptions.declarationMap; delete tsConfig.compilerOptions.typeRoots; @@ -118,7 +118,7 @@ export class TSProjectGenerator { - let tsConfig = JSON.parse((await readFile(target.Source)).toString()); + let tsConfig = parse((await readFile(target.Source)).toString()); if (!this.Settings[GeneratorSettingKey.Components].includes(TSProjectComponent.Linting)) { diff --git a/packages/generator-ts-project/src/VSCode/FileMappings/CodeWorkspaceProvider.ts b/packages/generator-ts-project/src/VSCode/FileMappings/CodeWorkspaceProvider.ts index cab7c3fa..56a5086e 100644 --- a/packages/generator-ts-project/src/VSCode/FileMappings/CodeWorkspaceProvider.ts +++ b/packages/generator-ts-project/src/VSCode/FileMappings/CodeWorkspaceProvider.ts @@ -1,5 +1,5 @@ import { GeneratorOptions, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; -import JSON = require("comment-json"); +import { parse } from "comment-json"; import { readFile } from "fs-extra"; import { CodeWorkspaceComponent } from "../Components/CodeWorkspaceComponent"; import { IExtensionSettings } from "../IExtensionSettings"; @@ -108,6 +108,6 @@ export abstract class CodeWorkspaceProvider { - return JSON.parse((await readFile(path)).toString()); + return parse((await readFile(path)).toString()); } } diff --git a/packages/generator-ts-project/src/generators/generator/TSGeneratorGenerator.ts b/packages/generator-ts-project/src/generators/generator/TSGeneratorGenerator.ts index fa7e2bf7..da0f8fa2 100644 --- a/packages/generator-ts-project/src/generators/generator/TSGeneratorGenerator.ts +++ b/packages/generator-ts-project/src/generators/generator/TSGeneratorGenerator.ts @@ -2,8 +2,8 @@ import Path = require("path"); import { GeneratorOptions, GeneratorSettingKey, IComponentCollection, IFileMapping, Question } from "@manuth/extended-yo-generator"; import chalk = require("chalk"); import dedent = require("dedent"); -import FileSystem = require("fs-extra"); -import YoSay = require("yosay"); +import { ensureDir } from "fs-extra"; +import yosay = require("yosay"); import { SubGeneratorPrompt } from "../../Components/Inquiry/Prompts/SubGeneratorPrompt"; import { TSProjectPackageFileMapping } from "../../Project/FileMappings/NPMPackagning/TSProjectPackageFileMapping"; import { TSProjectComponent } from "../../Project/Settings/TSProjectComponent"; @@ -152,14 +152,14 @@ export class TSGeneratorGenerator { - return FileSystem.ensureDir(target.Destination); + return ensureDir(target.Destination); } }, { Destination: "templates", Processor: (target) => { - return FileSystem.ensureDir(target.Destination); + return ensureDir(target.Destination); } } ]; @@ -170,7 +170,7 @@ export class TSGeneratorGenerator { - this.log(YoSay(`Welcome to the ${chalk.whiteBright.bold("TypeScript Generator")} generator!`)); + this.log(yosay(`Welcome to the ${chalk.whiteBright.bold("TypeScript Generator")} generator!`)); return super.prompting(); } diff --git a/packages/generator-ts-project/src/tests/Components/FileMappingBase.test.ts b/packages/generator-ts-project/src/tests/Components/FileMappingBase.test.ts index d1602f42..fbecdf8a 100644 --- a/packages/generator-ts-project/src/tests/Components/FileMappingBase.test.ts +++ b/packages/generator-ts-project/src/tests/Components/FileMappingBase.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TempFile } from "@manuth/temp-files"; @@ -102,7 +102,7 @@ export function FileMappingBaseTests(context: TestContext { await writeFile(tempSourceFile.FullName, randomValue); - Assert.strictEqual(await fileMappingOptions.Content, randomValue); + strictEqual(await fileMappingOptions.Content, randomValue); }); test( @@ -111,7 +111,7 @@ export function FileMappingBaseTests(context: TestContext { await tester.Run(); - Assert.deepStrictEqual(await tester.Metadata, randomObject); + deepStrictEqual(await tester.Metadata, randomObject); }); }); } diff --git a/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts b/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts index a731fe96..f0f0770c 100644 --- a/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Components/Transformation/JSONTransformMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { deepStrictEqual, ok } from "assert"; import { EOL } from "os"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; @@ -91,7 +91,7 @@ export function JSONTransformMappingTests(context: TestContext { - Assert.deepStrictEqual(await fileMappingOptions.Metadata, sourceData); + deepStrictEqual(await fileMappingOptions.Metadata, sourceData); }); test( @@ -99,7 +99,7 @@ export function JSONTransformMappingTests(context: TestContext { await tester.Run(); - Assert.deepStrictEqual(JSON.parse(await tester.Content), randomData); + deepStrictEqual(JSON.parse(await tester.Content), randomData); }); test( @@ -107,7 +107,7 @@ export function JSONTransformMappingTests(context: TestContext { await tester.Run(); - Assert.ok((await tester.Content).endsWith(EOL)); + ok((await tester.Content).endsWith(EOL)); }); }); } diff --git a/packages/generator-ts-project/src/tests/Components/Transformation/TransformFileMapping.test.ts b/packages/generator-ts-project/src/tests/Components/Transformation/TransformFileMapping.test.ts index ee6716e0..b157ab7e 100644 --- a/packages/generator-ts-project/src/tests/Components/Transformation/TransformFileMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Components/Transformation/TransformFileMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { deepStrictEqual, notDeepStrictEqual, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, JSONFileMappingTester, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TempFile } from "@manuth/temp-files"; @@ -112,7 +112,7 @@ export function TransformFileMappingTests(context: TestContext { - Assert.deepStrictEqual(await fileMappingOptions.Metadata, randomSource); + deepStrictEqual(await fileMappingOptions.Metadata, randomSource); }); test( @@ -120,7 +120,7 @@ export function TransformFileMappingTests(context: TestContext { - Assert.strictEqual((await fileMappingOptions.Metadata).getFullText(), sourceCode); + strictEqual((await fileMappingOptions.Metadata).getFullText(), sourceCode); }); test( @@ -105,7 +105,7 @@ export function TypeScriptTransformMappingTests(context: TestContext { await tester.Run(); - Assert.strictEqual((await readFile(destinationFile.FullName)).toString(), sourceCode.replace(/var/g, "const")); + strictEqual((await readFile(destinationFile.FullName)).toString(), sourceCode.replace(/var/g, "const")); }); }); } diff --git a/packages/generator-ts-project/src/tests/Components/Transformation/YAMLTransformMapping.test.ts b/packages/generator-ts-project/src/tests/Components/Transformation/YAMLTransformMapping.test.ts index 1434b014..9684e66c 100644 --- a/packages/generator-ts-project/src/tests/Components/Transformation/YAMLTransformMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Components/Transformation/YAMLTransformMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { deepStrictEqual, ok, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TempFile } from "@manuth/temp-files"; @@ -102,7 +102,7 @@ export function YAMLTransformMappingTests(context: TestContext { - Assert.deepStrictEqual( + deepStrictEqual( parse((await fileMappingOptions.Metadata).map( (document) => { @@ -136,11 +136,11 @@ export function YAMLTransformMappingTests(context: TestContext): void { this.timeout(0); this.slow(1.5 * 60 * 1000); - await Assert.doesNotReject(async () => context.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); + await doesNotReject(async () => context.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); }); test( @@ -44,7 +44,7 @@ export function AppGeneratorTests(context: TestContext): void this.timeout(0); this.slow(3 * 60 * 1000); - await Assert.doesNotReject( + await doesNotReject( () => { return context.ExecuteGenerator().withPrompts( @@ -73,7 +73,7 @@ export function AppGeneratorTests(context: TestContext): void cwd: tempDir.FullName }); - Assert.doesNotThrow( + doesNotThrow( () => { require(tempDir.FullName); @@ -88,7 +88,7 @@ export function AppGeneratorTests(context: TestContext): void this.slow(5 * 60 * 1000); let subGeneratorDir = new TempDirectory(); - await Assert.doesNotReject( + await doesNotReject( async () => { return context.ExecuteGenerator().withPrompts( @@ -117,7 +117,7 @@ export function AppGeneratorTests(context: TestContext): void cwd: tempDir.FullName }); - await Assert.doesNotReject( + await doesNotReject( async () => { return new GeneratorContext( diff --git a/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorCategory.test.ts b/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorCategory.test.ts index ce28f2d7..893a77ba 100644 --- a/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorCategory.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorCategory.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { doesNotReject, ok } from "assert"; import { spawnSync } from "child_process"; import { GeneratorOptions, GeneratorSettingKey } from "@manuth/extended-yo-generator"; import { IRunContext, TestContext as GeneratorContext } from "@manuth/extended-yo-generator-test"; @@ -91,7 +91,7 @@ export function TSGeneratorCategoryTests(context: TestContext component.ID === componentID)); + ok(collection.Components.some((component) => component.ID === componentID)); } }); @@ -102,7 +102,7 @@ export function TSGeneratorCategoryTests(context: TestContext testContext.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); + await doesNotReject(async () => testContext.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); }); test( @@ -116,7 +116,7 @@ export function TSGeneratorCategoryTests(context: TestContext testContext.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); + await doesNotReject(async () => testContext.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); } }); }); diff --git a/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorComponentCollection.test.ts b/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorComponentCollection.test.ts index f9d40260..4c2ef188 100644 --- a/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorComponentCollection.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorComponentCollection.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSGeneratorCategory } from "../../../../generators/generator/Components/TSGeneratorCategory"; import { TSGeneratorComponentCollection } from "../../../../generators/generator/Components/TSGeneratorComponentCollection"; @@ -33,7 +33,7 @@ export function TSGeneratorComponentCollectionTests(context: TestContext category instanceof categoryType)); + ok(collection.Categories.some((category) => category instanceof categoryType)); } }); }); diff --git a/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorGeneralCategory.test.ts b/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorGeneralCategory.test.ts index aed501b0..c8c2344d 100644 --- a/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorGeneralCategory.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Generator/Components/TSGeneratorGeneralCategory.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSGeneratorCodeWorkspace } from "../../../../generators/generator/Components/TSGeneratorCodeWorkspace"; import { TSGeneratorGeneralCategory } from "../../../../generators/generator/Components/TSGeneratorGeneralCategory"; @@ -33,7 +33,7 @@ export function TSGeneratorGeneralCategoryTests(context: TestContext component instanceof componentType)); + ok(collection.Components.some((component) => component instanceof componentType)); } }); }); diff --git a/packages/generator-ts-project/src/tests/Generators/Generator/FileMappings/NPMPackaging/TSGeneratorPackageFileMapping.test.ts b/packages/generator-ts-project/src/tests/Generators/Generator/FileMappings/NPMPackaging/TSGeneratorPackageFileMapping.test.ts index 3dee83d2..15d601ce 100644 --- a/packages/generator-ts-project/src/tests/Generators/Generator/FileMappings/NPMPackaging/TSGeneratorPackageFileMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Generator/FileMappings/NPMPackaging/TSGeneratorPackageFileMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok, strictEqual } from "assert"; import { GeneratorOptions, GeneratorSettingKey } from "@manuth/extended-yo-generator"; import { TSGeneratorDependencies } from "../../../../../generators/generator/Dependencies/TSGeneratorDependencies"; import { TSGeneratorExampleDependencies } from "../../../../../generators/generator/Dependencies/TSGeneratorExampleDependencies"; @@ -56,7 +56,7 @@ export function TSGeneratorPackageFileMappingTests(context: TestContext { diff --git a/packages/generator-ts-project/src/tests/Generators/Generator/Inquiry/TSGeneratorModuleNameQuestion.test.ts b/packages/generator-ts-project/src/tests/Generators/Generator/Inquiry/TSGeneratorModuleNameQuestion.test.ts index b7ae5112..8c77c43c 100644 --- a/packages/generator-ts-project/src/tests/Generators/Generator/Inquiry/TSGeneratorModuleNameQuestion.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Generator/Inquiry/TSGeneratorModuleNameQuestion.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { notStrictEqual, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSGeneratorModuleNameQuestion } from "../../../../generators/generator/Inquiry/TSGeneratorModuleNameQuestion"; import { ITSGeneratorSettings } from "../../../../generators/generator/Settings/ITSGeneratorSettings"; @@ -42,7 +42,7 @@ export function TSGeneratorModuleNameQuestionTests(context: TestContext { - Assert.strictEqual(await question.default(settings), "generator-this-is-a-test"); + strictEqual(await question.default(settings), "generator-this-is-a-test"); }); }); @@ -54,16 +54,16 @@ export function TSGeneratorModuleNameQuestionTests(context: TestContext { - Assert.notStrictEqual(await question.validate("lol", settings), true); - Assert.strictEqual(await question.validate("generator-lol", settings), true); + notStrictEqual(await question.validate("lol", settings), true); + strictEqual(await question.validate("generator-lol", settings), true); }); test( "Checking whether scoped module-names are only valid if they start with `generator-`…", async () => { - Assert.notStrictEqual(await question.validate("@me/lol", settings), true); - Assert.strictEqual(await question.validate("@me/generator-lol", settings), true); + notStrictEqual(await question.validate("@me/lol", settings), true); + strictEqual(await question.validate("@me/generator-lol", settings), true); }); }); }); diff --git a/packages/generator-ts-project/src/tests/Generators/Generator/TSGeneratorGenerator.test.ts b/packages/generator-ts-project/src/tests/Generators/Generator/TSGeneratorGenerator.test.ts index 02162526..5163a238 100644 --- a/packages/generator-ts-project/src/tests/Generators/Generator/TSGeneratorGenerator.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Generator/TSGeneratorGenerator.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { doesNotReject, strictEqual } from "assert"; import { spawnSync } from "child_process"; import { GeneratorSettingKey } from "@manuth/extended-yo-generator"; import { IRunContext, TestContext as GeneratorContext } from "@manuth/extended-yo-generator-test"; @@ -95,8 +95,8 @@ export function TSGeneratorGeneratorTests(context: TestContext testContext.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); + return doesNotReject(async () => testContext.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); }); test( @@ -119,7 +119,7 @@ export function TSGeneratorGeneratorTests(context: TestContext testContext.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); + await doesNotReject(async () => testContext.ExecuteGenerator().inDir(tempDir.FullName).toPromise()); } }); @@ -136,7 +136,7 @@ export function TSGeneratorGeneratorTests(context: TestContext { return debugConfig.name === "Launch Yeoman"; })); - Assert.ok( + ok( settings[TSGeneratorSettingKey.SubGenerators].every( (subGeneratorOptions) => { diff --git a/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleComponentCollection.test.ts b/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleComponentCollection.test.ts index 2d495ff5..8bb74d49 100644 --- a/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleComponentCollection.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleComponentCollection.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSModuleComponentCollection } from "../../../../generators/module/Components/TSModuleComponentCollection"; import { TSModuleGeneralCategory } from "../../../../generators/module/Components/TSModuleGeneralCategory"; @@ -33,7 +33,7 @@ export function TSModuleComponentCollectionTests(context: TestContext { diff --git a/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleGeneralCategory.test.ts b/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleGeneralCategory.test.ts index c67bad72..23a1ee53 100644 --- a/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleGeneralCategory.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleGeneralCategory.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import{ GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSModuleCodeWorkspace } from "../../../../generators/module/Components/TSModuleCodeWorkspace"; import { TSModuleGeneralCategory } from "../../../../generators/module/Components/TSModuleGeneralCategory"; @@ -33,7 +33,7 @@ export function TSModuleGeneralCategoryTests(context: TestContext { diff --git a/packages/generator-ts-project/src/tests/Generators/Module/FileMappings/NPMPackaging/TSModulePackageFileMapping.test.ts b/packages/generator-ts-project/src/tests/Generators/Module/FileMappings/NPMPackaging/TSModulePackageFileMapping.test.ts index 472d3f3c..d1b532f7 100644 --- a/packages/generator-ts-project/src/tests/Generators/Module/FileMappings/NPMPackaging/TSModulePackageFileMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Module/FileMappings/NPMPackaging/TSModulePackageFileMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { spawnSync } from "child_process"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { IRunContext } from "@manuth/extended-yo-generator-test"; @@ -68,7 +68,7 @@ export function TSModulePackageFileMappingTests(context: TestContext): cwd: runContext.generator.destinationPath() }); - Assert.strictEqual(installationResult.status, 0); - Assert.strictEqual(buildResult.status, 0); + strictEqual(installationResult.status, 0); + strictEqual(buildResult.status, 0); }); test( "Checking whether the generated module can be loaded…", () => { - Assert.doesNotThrow( + doesNotThrow( () => { require(runContext.generator.destinationPath()); @@ -88,7 +88,7 @@ export function TSModuleGeneratorTests(context: TestContext): cwd: runContext.generator.destinationPath() }); - Assert.strictEqual(result.status, 0); + strictEqual(result.status, 0); }); }); } diff --git a/packages/generator-ts-project/src/tests/Generators/Module/VSCode/TSModuleLaunchSettingsProcessor.test.ts b/packages/generator-ts-project/src/tests/Generators/Module/VSCode/TSModuleLaunchSettingsProcessor.test.ts index 08875bf6..ab993897 100644 --- a/packages/generator-ts-project/src/tests/Generators/Module/VSCode/TSModuleLaunchSettingsProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Module/VSCode/TSModuleLaunchSettingsProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSModuleCodeWorkspace } from "../../../../generators/module/Components/TSModuleCodeWorkspace"; import { TSModuleGenerator } from "../../../../generators/module/TSModuleGenerator"; @@ -36,7 +36,7 @@ export function TSModuleLaunchSettingsProcessorTests(context: TestContext { diff --git a/packages/generator-ts-project/src/tests/Linting/Components/LintingComponent.test.ts b/packages/generator-ts-project/src/tests/Linting/Components/LintingComponent.test.ts index 15fafb64..1cf0c76e 100644 --- a/packages/generator-ts-project/src/tests/Linting/Components/LintingComponent.test.ts +++ b/packages/generator-ts-project/src/tests/Linting/Components/LintingComponent.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { LintingComponent } from "../../../Linting/Components/LintingComponent"; import { ESLintRCFileMapping } from "../../../Linting/FileMappings/ESLintRCFileMapping"; @@ -29,7 +29,7 @@ export function LintingComponentTests(context: TestContext): { for (let fileMappingType of [ESLintRCFileMapping]) { - Assert.ok( + ok( component.FileMappings.some( (fileMapping) => { diff --git a/packages/generator-ts-project/src/tests/Linting/FileMappings/ESLintRCFileMapping.test.ts b/packages/generator-ts-project/src/tests/Linting/FileMappings/ESLintRCFileMapping.test.ts index 70369c0c..86d3dfc9 100644 --- a/packages/generator-ts-project/src/tests/Linting/FileMappings/ESLintRCFileMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Linting/FileMappings/ESLintRCFileMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { doesNotReject, ok } from "assert"; import { GeneratorOptions, GeneratorSettingKey } from "@manuth/extended-yo-generator"; import { JavaScriptFileMappingTester } from "@manuth/extended-yo-generator-test"; import { ESLintRCFileMapping } from "../../../Linting/FileMappings/ESLintRCFileMapping"; @@ -50,7 +50,7 @@ export function ESLintRCFileMappingTests(context: TestContext { await tester.Run(); - Assert.ok(!("root" in await tester.Require())); + ok(!("root" in await tester.Require())); }); test( @@ -64,7 +64,7 @@ export function ESLintRCFileMappingTests(context: TestContext eslintConfig = await tester.Require()); + await doesNotReject(async () => eslintConfig = await tester.Require()); baseConfigs = eslintConfig.extends; switch (ruleset) @@ -78,7 +78,7 @@ export function ESLintRCFileMappingTests(context: TestContext { diff --git a/packages/generator-ts-project/src/tests/NPMPackaging/Dependencies/PackageDependencyCollection.test.ts b/packages/generator-ts-project/src/tests/NPMPackaging/Dependencies/PackageDependencyCollection.test.ts index 3d5d7b3e..c627c3df 100644 --- a/packages/generator-ts-project/src/tests/NPMPackaging/Dependencies/PackageDependencyCollection.test.ts +++ b/packages/generator-ts-project/src/tests/NPMPackaging/Dependencies/PackageDependencyCollection.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { ITestGeneratorOptions, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { Constants } from "../../../Core/Constants"; import { PackageDependencyCollection } from "../../../NPMPackaging/Dependencies/PackageDependencyCollection"; @@ -22,7 +22,7 @@ export function PackageDependencyCollectionTests(context: TestContext { await tester.Run(); - Assert.strictEqual((await tester.Package).Version, "0.0.0"); + strictEqual((await tester.Package).Version, "0.0.0"); }); }); }); diff --git a/packages/generator-ts-project/src/tests/NPMPackaging/FileMappings/PackageFileMappingTester.ts b/packages/generator-ts-project/src/tests/NPMPackaging/FileMappings/PackageFileMappingTester.ts index c04c0ba1..d43c9591 100644 --- a/packages/generator-ts-project/src/tests/NPMPackaging/FileMappings/PackageFileMappingTester.ts +++ b/packages/generator-ts-project/src/tests/NPMPackaging/FileMappings/PackageFileMappingTester.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok, strictEqual } from "assert"; import { GeneratorOptions, IGenerator, IGeneratorSettings } from "@manuth/extended-yo-generator"; import { FileMappingTester } from "@manuth/extended-yo-generator-test"; import { DependencyCollection, IPackageJSON, Package } from "@manuth/package-json-editor"; @@ -71,16 +71,16 @@ export class PackageFileMappingTester { diff --git a/packages/generator-ts-project/src/tests/NPMPackaging/Scripts/ScriptMapping.test.ts b/packages/generator-ts-project/src/tests/NPMPackaging/Scripts/ScriptMapping.test.ts index fbf5ff74..e092eb15 100644 --- a/packages/generator-ts-project/src/tests/NPMPackaging/Scripts/ScriptMapping.test.ts +++ b/packages/generator-ts-project/src/tests/NPMPackaging/Scripts/ScriptMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { ScriptMapping } from "../../../NPMPackaging/Scripts/ScriptMapping"; @@ -43,23 +43,23 @@ export function ScriptMappingTests(context: TestContext { scriptMapping = new ScriptMapping(await context.Generator, randomSource); - Assert.strictEqual(scriptMapping.Destination, scriptMapping.Source); - Assert.strictEqual(scriptMapping.Source, randomSource); + strictEqual(scriptMapping.Destination, scriptMapping.Source); + strictEqual(scriptMapping.Source, randomSource); }); test( "Checking whether passing options constructs a proper script-mapping…", async () => { - Assert.strictEqual(scriptMapping.Source, randomSource); - Assert.strictEqual(scriptMapping.Destination, randomDestination); + strictEqual(scriptMapping.Source, randomSource); + strictEqual(scriptMapping.Destination, randomDestination); }); test( "Checking whether sciprts are not being transformed by default…", async () => { - Assert.strictEqual(await scriptMapping.Process(randomScript), randomScript); + strictEqual(await scriptMapping.Process(randomScript), randomScript); }); test( @@ -77,7 +77,7 @@ export function ScriptMappingTests(context: TestContext transformer(script) }); - Assert.strictEqual(await scriptMapping.Process(randomScript), transformer(randomScript)); + strictEqual(await scriptMapping.Process(randomScript), transformer(randomScript)); }); }); } diff --git a/packages/generator-ts-project/src/tests/Project/Components/TSProjectComponentCollection.test.ts b/packages/generator-ts-project/src/tests/Project/Components/TSProjectComponentCollection.test.ts index e7cfb843..632185e1 100644 --- a/packages/generator-ts-project/src/tests/Project/Components/TSProjectComponentCollection.test.ts +++ b/packages/generator-ts-project/src/tests/Project/Components/TSProjectComponentCollection.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSProjectComponentCollection } from "../../../Project/Components/TSProjectComponentCollection"; import { TSProjectGeneralCategory } from "../../../Project/Components/TSProjectGeneralCategory"; @@ -33,7 +33,7 @@ export function TSProjectComponentCollectionTests(context: TestContext category instanceof categoryType)); + ok(collection.Categories.some((category) => category instanceof categoryType)); } }); }); diff --git a/packages/generator-ts-project/src/tests/Project/Components/TSProjectGeneralCategory.test.ts b/packages/generator-ts-project/src/tests/Project/Components/TSProjectGeneralCategory.test.ts index 4a7ac6c7..6ef441cd 100644 --- a/packages/generator-ts-project/src/tests/Project/Components/TSProjectGeneralCategory.test.ts +++ b/packages/generator-ts-project/src/tests/Project/Components/TSProjectGeneralCategory.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSProjectWorkspaceFolder } from "../../../Project/Components/TSProjectCodeWorkspaceComponent"; import { TSProjectGeneralCategory } from "../../../Project/Components/TSProjectGeneralCategory"; @@ -33,7 +33,7 @@ export function TSProjectGeneralCategoryTests(context: TestContext { diff --git a/packages/generator-ts-project/src/tests/Project/FileMappings/NPMIgnoreFileMapping.test.ts b/packages/generator-ts-project/src/tests/Project/FileMappings/NPMIgnoreFileMapping.test.ts index ded6a038..df85599b 100644 --- a/packages/generator-ts-project/src/tests/Project/FileMappings/NPMIgnoreFileMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Project/FileMappings/NPMIgnoreFileMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { ensureDir, ensureFile, lstat, readdir } from "fs-extra"; import packlist = require("npm-packlist"); import { resolve } from "upath"; @@ -51,7 +51,7 @@ export function NPMIgnoreFileMappingTests(context: TestContext { - Assert.strictEqual(includedFiles.includes(await DestinationPath(path)), !ignored); + strictEqual(includedFiles.includes(await DestinationPath(path)), !ignored); } /** diff --git a/packages/generator-ts-project/src/tests/Project/FileMappings/NPMPackaging/TSProjectPackageFileMapping.test.ts b/packages/generator-ts-project/src/tests/Project/FileMappings/NPMPackaging/TSProjectPackageFileMapping.test.ts index e64f7b7f..9526ad55 100644 --- a/packages/generator-ts-project/src/tests/Project/FileMappings/NPMPackaging/TSProjectPackageFileMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Project/FileMappings/NPMPackaging/TSProjectPackageFileMapping.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { GeneratorOptions, GeneratorSettingKey } from "@manuth/extended-yo-generator"; import { Constants } from "../../../../Core/Constants"; import { CommonDependencies } from "../../../../NPMPackaging/Dependencies/CommonDependencies"; @@ -52,7 +52,7 @@ export function TSProjectPackageFileMappingTests(context: TestContext { - Assert.strictEqual((await tester.Package).Scripts.Get(name), content); + strictEqual((await tester.Package).Scripts.Get(name), content); } suiteSetup( @@ -82,8 +82,8 @@ export function TSProjectPackageFileMappingTests(context: TestContext { - Assert.strictEqual(await question.default(generator.Settings), "./"); + strictEqual(await question.default(generator.Settings), "./"); }); test( @@ -46,10 +46,10 @@ export function TSProjectDestinationQuestionTests(context: TestContext { - Assert.strictEqual( + strictEqual( await question.Default( { ...generator.Settings, diff --git a/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectModuleNameQuestion.test.ts b/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectModuleNameQuestion.test.ts index f436700e..9f280a10 100644 --- a/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectModuleNameQuestion.test.ts +++ b/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectModuleNameQuestion.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import kebabCase = require("lodash.kebabcase"); import { TSProjectModuleNameQuestion } from "../../../Project/Inquiry/TSProjectModuleNameQuestion"; @@ -36,7 +36,7 @@ export function TSProjectModuleNameQuestionTests(context: TestContext { - Assert.strictEqual( + strictEqual( await question.default( { ...generator.Settings, diff --git a/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectQuestionCollection.test.ts b/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectQuestionCollection.test.ts index 2301b483..87b93af7 100644 --- a/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectQuestionCollection.test.ts +++ b/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectQuestionCollection.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSProjectDescriptionQuestion } from "../../../Project/Inquiry/TSProjectDescriptionQuestion"; import { TSProjectDestinationQuestion } from "../../../Project/Inquiry/TSProjectDestinationQuestion"; @@ -43,7 +43,7 @@ export function TSProjectQuestionCollectionTests(context: TestContext question instanceof questionType)); } diff --git a/packages/generator-ts-project/src/tests/Project/TSProjectGenerator.test.ts b/packages/generator-ts-project/src/tests/Project/TSProjectGenerator.test.ts index 1db166d5..70fe145e 100644 --- a/packages/generator-ts-project/src/tests/Project/TSProjectGenerator.test.ts +++ b/packages/generator-ts-project/src/tests/Project/TSProjectGenerator.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import dedent = require("dedent"); import { readFile, writeFile } from "fs-extra"; import { TSProjectGenerator } from "../../Project/TSProjectGenerator"; @@ -39,7 +39,7 @@ export function TSProjectGeneratorTests(context: TestContext this.slow(45 * 1000); await writeFile(generator.destinationPath(fileName), testCode); await generator.cleanup(); - Assert.strictEqual((await readFile(generator.destinationPath(fileName))).toString(), testCode.replace(/'/g, '"')); + strictEqual((await readFile(generator.destinationPath(fileName))).toString(), testCode.replace(/'/g, '"')); }); }); } diff --git a/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectExtensionsProcessor.test.ts b/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectExtensionsProcessor.test.ts index 9fbfa3bf..e51b027f 100644 --- a/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectExtensionsProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectExtensionsProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TSProjectWorkspaceFolder } from "../../../Project/Components/TSProjectCodeWorkspaceComponent"; import { ITSProjectSettings } from "../../../Project/Settings/ITSProjectSettings"; @@ -34,7 +34,7 @@ export function TSProjectExtensionsProcessorTests(context: TestContext { - Assert.ok( + ok( !(await processor.Process( { recommendations: [excludedExtension] diff --git a/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectLaunchSettingsProcessor.test.ts b/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectLaunchSettingsProcessor.test.ts index f54edde5..e0ac3da6 100644 --- a/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectLaunchSettingsProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectLaunchSettingsProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { join, normalize } from "upath"; import { TSProjectWorkspaceFolder } from "../../../Project/Components/TSProjectCodeWorkspaceComponent"; @@ -37,7 +37,7 @@ export function TSProjectLaunchSettingsProcessorTests(context: TestContext !normalize(debugConfig.program ?? "").toLowerCase().endsWith("yo/lib/cli.js"))); }); @@ -99,7 +99,7 @@ export function TSProjectLaunchSettingsProcessorTests(context: TestContext { let settings = processor.Process(await component.Source.LaunchMetadata); - Assert.ok(!(excludedSetting in settings)); + ok(!(excludedSetting in settings)); }); }); } diff --git a/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectTasksProcessor.test.ts b/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectTasksProcessor.test.ts index 7ef6c3e9..e93b3960 100644 --- a/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectTasksProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/Project/VSCode/TSProjectTasksProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { deepStrictEqual, ok, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { TaskDefinition } from "vscode"; import { TSProjectWorkspaceFolder } from "../../../Project/Components/TSProjectCodeWorkspaceComponent"; @@ -54,7 +54,7 @@ export function TSProjectTasksProcessorTests(context: TestContext { - Assert.strictEqual( + strictEqual( await ProcessTask( { type: "", @@ -74,7 +74,7 @@ export function TSProjectTasksProcessorTests(context: TestContext { - Assert.deepStrictEqual( + deepStrictEqual( await ProcessTask( { type: "shell", @@ -111,7 +111,7 @@ export function TSProjectTasksProcessorTests(context: TestContext `${root}/src?`; - Assert.strictEqual( + strictEqual( (await ProcessTask( { type: "", @@ -187,7 +187,7 @@ export function TSProjectTasksProcessorTests(context: TestContext { - Assert.ok( + ok( !("cwd" in (await ProcessTask( { type: "", @@ -202,14 +202,14 @@ export function TSProjectTasksProcessorTests(context: TestContext { - Assert.ok( + ok( !("options" in (await ProcessTask( { type: "", options: {} })))); - Assert.ok( + ok( !("options" in (await ProcessTask( { type: "", @@ -223,7 +223,7 @@ export function TSProjectTasksProcessorTests(context: TestContext { - Assert.ok( + ok( !("fileLocation" in (await ProcessTask( { type: "", @@ -243,7 +243,7 @@ export function TSProjectTasksProcessorTests(context: TestContext { - Assert.strictEqual(await component.WorkspaceMetadata, randomWorkspace); + strictEqual(await component.WorkspaceMetadata, randomWorkspace); }); test( "Checking whether the workspace-object is read correctly…", async () => { - Assert.strictEqual(await component.ExtensionsMetadata, randomWorkspace.extensions); - Assert.strictEqual(await component.LaunchMetadata, randomWorkspace.launch); - Assert.strictEqual(await component.SettingsMetadata, randomWorkspace.settings); - Assert.strictEqual(await component.TasksMetadata, randomWorkspace.tasks); + strictEqual(await component.ExtensionsMetadata, randomWorkspace.extensions); + strictEqual(await component.LaunchMetadata, randomWorkspace.launch); + strictEqual(await component.SettingsMetadata, randomWorkspace.settings); + strictEqual(await component.TasksMetadata, randomWorkspace.tasks); }); }); } diff --git a/packages/generator-ts-project/src/tests/VSCode/ExtensionsProcessor.test.ts b/packages/generator-ts-project/src/tests/VSCode/ExtensionsProcessor.test.ts index c4d44dd5..3e819388 100644 --- a/packages/generator-ts-project/src/tests/VSCode/ExtensionsProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/ExtensionsProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { ExtensionsProcessor } from "../../VSCode/ExtensionsProcessor"; @@ -59,7 +59,7 @@ export function ExtensionsProcessorTests(context: TestContext { - Assert.ok(!( + ok(!( await processor.Process( { recommendations: [ @@ -73,7 +73,7 @@ export function ExtensionsProcessorTests(context: TestContext { - Assert.ok(!("recommendations" in await processor.Process({}))); + ok(!("recommendations" in await processor.Process({}))); }); }); } diff --git a/packages/generator-ts-project/src/tests/VSCode/FileMappings/CodeWorkspaceProvider.test.ts b/packages/generator-ts-project/src/tests/VSCode/FileMappings/CodeWorkspaceProvider.test.ts index fb06b002..68bf90dd 100644 --- a/packages/generator-ts-project/src/tests/VSCode/FileMappings/CodeWorkspaceProvider.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/FileMappings/CodeWorkspaceProvider.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { deepStrictEqual, strictEqual } from "assert"; import { GeneratorOptions, IFileMapping } from "@manuth/extended-yo-generator"; import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TempDirectory } from "@manuth/temp-files"; @@ -82,10 +82,10 @@ export function CodeWorkspaceProviderTests(context: TestContext { - Assert.deepStrictEqual(JSON.parse(await tester.Content, null, true), JSON.parse(JSON.stringify(workspace))); + deepStrictEqual(parse(await tester.Content, null, true), parse(stringify(workspace))); }); test( "Checking whether comments inside nested objects persist…", async () => { - Assert.ok( - JSON.stringify( - (JSON.parse(await tester.Content) as IWorkspaceMetadata).tasks, + ok( + stringify( + (parse(await tester.Content) as IWorkspaceMetadata).tasks, null, 4).includes(tasksComment)); }); @@ -101,7 +101,7 @@ export function WorkspaceFileCreatorTests(context: TestContext { - Assert.ok((await tester.Content).includes(rootComment)); + ok((await tester.Content).includes(rootComment)); }); }); } diff --git a/packages/generator-ts-project/src/tests/VSCode/FileMappings/WorkspaceFolderCreator.test.ts b/packages/generator-ts-project/src/tests/VSCode/FileMappings/WorkspaceFolderCreator.test.ts index 2ddd5eec..6f7e3292 100644 --- a/packages/generator-ts-project/src/tests/VSCode/FileMappings/WorkspaceFolderCreator.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/FileMappings/WorkspaceFolderCreator.test.ts @@ -1,7 +1,7 @@ -import Assert = require("assert"); +import { deepStrictEqual, ok } from "assert"; import { FileMapping, GeneratorOptions } from "@manuth/extended-yo-generator"; import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; -import JSON = require("comment-json"); +import { parse, stringify } from "comment-json"; import dedent = require("dedent"); import { join } from "upath"; import { WorkspaceFolderCreator } from "../../../VSCode/FileMappings/WorkspaceFolderCreator"; @@ -44,7 +44,7 @@ export function WorkspaceFolderCreatorTest(context: TestContext { - Assert.ok( - JSON.stringify( + ok( + stringify( await source.ReadJSON( new FileMapping( generator, diff --git a/packages/generator-ts-project/src/tests/VSCode/FileMappings/WorkspaceFolderLoader.test.ts b/packages/generator-ts-project/src/tests/VSCode/FileMappings/WorkspaceFolderLoader.test.ts index 44b2f659..db64087b 100644 --- a/packages/generator-ts-project/src/tests/VSCode/FileMappings/WorkspaceFolderLoader.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/FileMappings/WorkspaceFolderLoader.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { deepStrictEqual } from "assert"; import { FileMappingTester, ITestGeneratorOptions, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TempDirectory } from "@manuth/temp-files"; import { WorkspaceFolderLoader } from "../../../VSCode/FileMappings/WorkspaceFolderLoader"; @@ -74,10 +74,10 @@ export function WorkspaceFolderLoaderTests(context: TestContext { let folderLoader = new WorkspaceFolderLoader(new TestCodeWorkspaceComponent(generator)); - Assert.deepStrictEqual(await folderLoader.ExtensionsMetadata, randomExtensions); - Assert.deepStrictEqual(await folderLoader.LaunchMetadata, randomLaunchSettings); - Assert.deepStrictEqual(await folderLoader.SettingsMetadata, randomSettings); - Assert.deepStrictEqual(await folderLoader.TasksMetadata, randomTasks); + deepStrictEqual(await folderLoader.ExtensionsMetadata, randomExtensions); + deepStrictEqual(await folderLoader.LaunchMetadata, randomLaunchSettings); + deepStrictEqual(await folderLoader.SettingsMetadata, randomSettings); + deepStrictEqual(await folderLoader.TasksMetadata, randomTasks); }); }); } diff --git a/packages/generator-ts-project/src/tests/VSCode/LaunchSettingsProcessor.test.ts b/packages/generator-ts-project/src/tests/VSCode/LaunchSettingsProcessor.test.ts index 46c2ea20..3cb0bda3 100644 --- a/packages/generator-ts-project/src/tests/VSCode/LaunchSettingsProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/LaunchSettingsProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { DebugConfiguration } from "vscode"; @@ -113,7 +113,7 @@ export function LaunchSettingsProcessorTests(context: TestContext { - Assert.strictEqual( + strictEqual( (await processor.Process({ version: "", configurations: null })).configurations, null); }); @@ -127,8 +127,8 @@ export function LaunchSettingsProcessorTests(context: TestContext { - Assert.ok((await processor.Process(launchSettings)).configurations.includes(includedDebugConfig)); - Assert.ok(!(await processor.Process(launchSettings)).configurations.includes(excludedDebugConfig)); + ok((await processor.Process(launchSettings)).configurations.includes(includedDebugConfig)); + ok(!(await processor.Process(launchSettings)).configurations.includes(excludedDebugConfig)); }); }); @@ -140,7 +140,7 @@ export function LaunchSettingsProcessorTests(context: TestContext { - Assert.ok( + ok( (await processor.Process(launchSettings)).configurations.some( (configuration) => configuration.name === newName)); }); diff --git a/packages/generator-ts-project/src/tests/VSCode/SettingsProcessor.test.ts b/packages/generator-ts-project/src/tests/VSCode/SettingsProcessor.test.ts index 31582e1e..d9264393 100644 --- a/packages/generator-ts-project/src/tests/VSCode/SettingsProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/SettingsProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { deepStrictEqual, notDeepStrictEqual, ok } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { SettingsProcessor } from "../../VSCode/SettingsProcessor"; @@ -104,9 +104,9 @@ export function SettingsProcessorTest(context: TestContext { - Assert.ok(excludedSetting in settings); - Assert.ok(includedSetting in await processor.Process(settings)); - Assert.ok(!(excludedSetting in await processor.Process(settings))); + ok(excludedSetting in settings); + ok(includedSetting in await processor.Process(settings)); + ok(!(excludedSetting in await processor.Process(settings))); }); }); @@ -118,8 +118,8 @@ export function SettingsProcessorTest(context: TestContext { - Assert.notDeepStrictEqual(settings[mutatedSetting], newSetting); - Assert.deepStrictEqual((await processor.Process(settings))[mutatedSetting], newSetting); + notDeepStrictEqual(settings[mutatedSetting], newSetting); + deepStrictEqual((await processor.Process(settings))[mutatedSetting], newSetting); }); }); }); diff --git a/packages/generator-ts-project/src/tests/VSCode/TasksProcessor.test.ts b/packages/generator-ts-project/src/tests/VSCode/TasksProcessor.test.ts index 28c354c6..841ef54e 100644 --- a/packages/generator-ts-project/src/tests/VSCode/TasksProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/TasksProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { ok, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TaskDefinition } from "vscode"; @@ -111,7 +111,7 @@ export function TasksProcessorTests(context: TestContext { - Assert.strictEqual( + strictEqual( (await processor.Process({ version: "", tasks: null })).tasks, null); }); @@ -125,9 +125,9 @@ export function TasksProcessorTests(context: TestContext { - Assert.ok(taskMeta.tasks.includes(excludedTask)); - Assert.ok((await processor.Process(taskMeta)).tasks.includes(includedTask)); - Assert.ok(!(await processor.Process(taskMeta)).tasks.includes(excludedTask)); + ok(taskMeta.tasks.includes(excludedTask)); + ok((await processor.Process(taskMeta)).tasks.includes(includedTask)); + ok(!(await processor.Process(taskMeta)).tasks.includes(excludedTask)); }); }); @@ -150,7 +150,7 @@ export function TasksProcessorTests(context: TestContext task.type === newType), expected); } diff --git a/packages/generator-ts-project/src/tests/VSCode/VSCodeJSONProcessor.test.ts b/packages/generator-ts-project/src/tests/VSCode/VSCodeJSONProcessor.test.ts index b4b615d5..ad58a79e 100644 --- a/packages/generator-ts-project/src/tests/VSCode/VSCodeJSONProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/VSCodeJSONProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { VSCodeJSONProcessor } from "../../VSCode/VSCodeJSONProcessor"; @@ -36,7 +36,7 @@ export function VSCodeJSONProcessorTests(context: TestContext { - Assert.strictEqual( + strictEqual( processor.StripWorkspaceFolder(context.NamedWorkspaceFolderDirective), context.WorkspaceFolderDirective); }); @@ -59,7 +59,7 @@ export function VSCodeJSONProcessorTests(context: TestContext { - Assert.strictEqual( + strictEqual( processor.StripWorkspaceFolder(context.NamedWorkspaceFolderDirective), context.WorkspaceFolderDirective); }); diff --git a/packages/generator-ts-project/src/tests/VSCode/WorkspaceProcessor.test.ts b/packages/generator-ts-project/src/tests/VSCode/WorkspaceProcessor.test.ts index d8a782d4..9e4095df 100644 --- a/packages/generator-ts-project/src/tests/VSCode/WorkspaceProcessor.test.ts +++ b/packages/generator-ts-project/src/tests/VSCode/WorkspaceProcessor.test.ts @@ -1,4 +1,4 @@ -import Assert = require("assert"); +import { notStrictEqual, ok, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { IExtensionSettings } from "../../VSCode/IExtensionSettings"; @@ -69,20 +69,20 @@ export function WorkspaceProcessorTests(context: TestContext { - Assert.strictEqual(await component.ExtensionsMetadata, randomExtensions); - Assert.strictEqual(await component.LaunchMetadata, randomDebugSettings); - Assert.strictEqual(await component.SettingsMetadata, randomSettings); - Assert.strictEqual(await component.TasksMetadata, randomTasks); + strictEqual(await component.ExtensionsMetadata, randomExtensions); + strictEqual(await component.LaunchMetadata, randomDebugSettings); + strictEqual(await component.SettingsMetadata, randomSettings); + strictEqual(await component.TasksMetadata, randomTasks); }); test( "Checking whether processors are executed only if the corresponding property exists…", async () => { - Assert.strictEqual(await component.ExtensionsMetadata, randomExtensions); + strictEqual(await component.ExtensionsMetadata, randomExtensions); delete (await workspaceLoader.WorkspaceMetadata).extensions; - Assert.notStrictEqual(await component.ExtensionsMetadata, randomExtensions); - Assert.ok(!await component.ExtensionsMetadata); + notStrictEqual(await component.ExtensionsMetadata, randomExtensions); + ok(!await component.ExtensionsMetadata); }); }); } diff --git a/scripts/bumpVersion.ts b/scripts/bumpVersion.ts index 1e25e191..cd69464f 100644 --- a/scripts/bumpVersion.ts +++ b/scripts/bumpVersion.ts @@ -1,11 +1,11 @@ import { spawnSync } from "child_process"; -import branch = require("git-branch"); +import GitBranch = require("git-branch"); import npmWhich = require("npm-which"); ( async () => { - let branchName = await branch(__dirname); + let branchName = await GitBranch(__dirname); let releaseName = branchName.replace(/^release\/(.*)/, "$1"); if (releaseName.length > 0) From c6e7b8e3fa9439144311f8f1738e19473603625a Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 4 Oct 2020 16:36:39 +0200 Subject: [PATCH 44/55] Remove the `Launch Program` configuration --- .../Components/TSModuleCodeWorkspace.ts | 31 ----------- .../Components/TSModuleComponentCollection.ts | 31 ----------- .../Components/TSModuleGeneralCategory.ts | 29 ----------- .../generators/module/TSModuleGenerator.ts | 11 +--- .../VSCode/TSModuleLaunchSettingsProcessor.ts | 52 ------------------- .../VSCode/TSModuleWorkspaceProcessor.ts | 32 ------------ packages/generator-ts-project/src/index.ts | 5 -- .../TSModuleComponentCollection.test.ts | 45 ---------------- .../TSModuleGeneralCategory.test.ts | 45 ---------------- .../Generators/Module/Components/index.ts | 21 -------- .../TSModuleLaunchSettingsProcessor.test.ts | 47 ----------------- .../tests/Generators/Module/VSCode/index.ts | 19 ------- .../src/tests/Generators/Module/index.ts | 4 -- 13 files changed, 1 insertion(+), 371 deletions(-) delete mode 100644 packages/generator-ts-project/src/generators/module/Components/TSModuleCodeWorkspace.ts delete mode 100644 packages/generator-ts-project/src/generators/module/Components/TSModuleComponentCollection.ts delete mode 100644 packages/generator-ts-project/src/generators/module/Components/TSModuleGeneralCategory.ts delete mode 100644 packages/generator-ts-project/src/generators/module/VSCode/TSModuleLaunchSettingsProcessor.ts delete mode 100644 packages/generator-ts-project/src/generators/module/VSCode/TSModuleWorkspaceProcessor.ts delete mode 100644 packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleComponentCollection.test.ts delete mode 100644 packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleGeneralCategory.test.ts delete mode 100644 packages/generator-ts-project/src/tests/Generators/Module/Components/index.ts delete mode 100644 packages/generator-ts-project/src/tests/Generators/Module/VSCode/TSModuleLaunchSettingsProcessor.test.ts delete mode 100644 packages/generator-ts-project/src/tests/Generators/Module/VSCode/index.ts diff --git a/packages/generator-ts-project/src/generators/module/Components/TSModuleCodeWorkspace.ts b/packages/generator-ts-project/src/generators/module/Components/TSModuleCodeWorkspace.ts deleted file mode 100644 index 1bfe0129..00000000 --- a/packages/generator-ts-project/src/generators/module/Components/TSModuleCodeWorkspace.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { GeneratorOptions, IGenerator } from "@manuth/extended-yo-generator"; -import { JSONProcessor } from "../../../Components/JSONProcessor"; -import { TSProjectWorkspaceFolder } from "../../../Project/Components/TSProjectCodeWorkspaceComponent"; -import { ITSProjectSettings } from "../../../Project/Settings/ITSProjectSettings"; -import { IWorkspaceMetadata } from "../../../VSCode/IWorkspaceMetadata"; -import { TSModuleWorkspaceProcessor } from "../VSCode/TSModuleWorkspaceProcessor"; - -/** - * Provides a component for creating a vscode-workspace folder for `TSModule`s. - */ -export class TSModuleCodeWorkspace extends TSProjectWorkspaceFolder -{ - /** - * Initializes a new isntance of the `TSModuleWorkspaceFolder` class. - * - * @param generator - * The generator of the component. - */ - public constructor(generator: IGenerator) - { - super(generator); - } - - /** - * @inheritdoc - */ - protected get WorkspaceProcessor(): JSONProcessor - { - return new TSModuleWorkspaceProcessor(this); - } -} diff --git a/packages/generator-ts-project/src/generators/module/Components/TSModuleComponentCollection.ts b/packages/generator-ts-project/src/generators/module/Components/TSModuleComponentCollection.ts deleted file mode 100644 index 48924d72..00000000 --- a/packages/generator-ts-project/src/generators/module/Components/TSModuleComponentCollection.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { GeneratorOptions, IComponentCategory, IGenerator } from "@manuth/extended-yo-generator"; -import { TSProjectComponentCollection } from "../../../Project/Components/TSProjectComponentCollection"; -import { ITSProjectSettings } from "../../../Project/Settings/ITSProjectSettings"; -import { TSModuleGeneralCategory } from "./TSModuleGeneralCategory"; - -/** - * Provides components for `TSModule`s. - */ -export class TSModuleComponentCollection extends TSProjectComponentCollection -{ - /** - * Initializes a new instance of the `TSModuleComponentCollection` class. - * - * @param generator - * The generator of the collection. - */ - public constructor(generator: IGenerator) - { - super(generator); - } - - /** - * @inheritdoc - */ - public get Categories(): Array> - { - return [ - new TSModuleGeneralCategory(this.Generator) - ]; - } -} diff --git a/packages/generator-ts-project/src/generators/module/Components/TSModuleGeneralCategory.ts b/packages/generator-ts-project/src/generators/module/Components/TSModuleGeneralCategory.ts deleted file mode 100644 index c677dfbc..00000000 --- a/packages/generator-ts-project/src/generators/module/Components/TSModuleGeneralCategory.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { GeneratorOptions, IComponent, IGenerator } from "@manuth/extended-yo-generator"; -import { TSProjectGeneralCategory } from "../../../Project/Components/TSProjectGeneralCategory"; -import { ITSProjectSettings } from "../../../Project/Settings/ITSProjectSettings"; -import { TSModuleCodeWorkspace } from "./TSModuleCodeWorkspace"; - -/** - * Provides general components for `TSModule`s. - */ -export class TSModuleGeneralCategory extends TSProjectGeneralCategory -{ - /** - * Initializes a new instance of the `TSModuleGeneralCategory` class. - * - * @param generator - * The generator of the category. - */ - public constructor(generator: IGenerator) - { - super(generator); - } - - /** - * @inheritdoc - */ - protected get WorkspaceComponent(): IComponent - { - return new TSModuleCodeWorkspace(this.Generator); - } -} diff --git a/packages/generator-ts-project/src/generators/module/TSModuleGenerator.ts b/packages/generator-ts-project/src/generators/module/TSModuleGenerator.ts index d50c6cdf..a2ab988e 100644 --- a/packages/generator-ts-project/src/generators/module/TSModuleGenerator.ts +++ b/packages/generator-ts-project/src/generators/module/TSModuleGenerator.ts @@ -1,5 +1,5 @@ import { join } from "path"; -import { GeneratorOptions, IComponentCollection, IFileMapping } from "@manuth/extended-yo-generator"; +import { GeneratorOptions, IFileMapping } from "@manuth/extended-yo-generator"; import chalk = require("chalk"); import dedent = require("dedent"); import yosay = require("yosay"); @@ -7,7 +7,6 @@ import { TSProjectPackageFileMapping } from "../../Project/FileMappings/NPMPacka import { ITSProjectSettings } from "../../Project/Settings/ITSProjectSettings"; import { TSProjectSettingKey } from "../../Project/Settings/TSProjectSettingKey"; import { TSProjectGenerator } from "../../Project/TSProjectGenerator"; -import { TSModuleComponentCollection } from "./Components/TSModuleComponentCollection"; import { TSModulePackageFileMapping } from "./FileMappings/NPMPackaging/TSModulePackageFileMapping"; /** @@ -37,14 +36,6 @@ export class TSModuleGenerator - { - return new TSModuleComponentCollection(this); - } - /** * @inheritdoc */ diff --git a/packages/generator-ts-project/src/generators/module/VSCode/TSModuleLaunchSettingsProcessor.ts b/packages/generator-ts-project/src/generators/module/VSCode/TSModuleLaunchSettingsProcessor.ts deleted file mode 100644 index 6e8222e7..00000000 --- a/packages/generator-ts-project/src/generators/module/VSCode/TSModuleLaunchSettingsProcessor.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { GeneratorOptions } from "@manuth/extended-yo-generator"; -import { ITSProjectSettings } from "../../../Project/Settings/ITSProjectSettings"; -import { TSProjectLaunchSettingsProcessor } from "../../../Project/VSCode/TSProjectLaunchSettingsProcessor"; -import { CodeWorkspaceComponent } from "../../../VSCode/Components/CodeWorkspaceComponent"; -import { ILaunchSettings } from "../../../VSCode/ILaunchSettings"; - -/** - * Provides the functionality to process debug-configurations for `TSModule`s. - */ -export class TSModuleLaunchSettingsProcessor extends TSProjectLaunchSettingsProcessor -{ - /** - * Initializes a new instance of the `TSModuleLaunchSettingsProcessor` class. - * - * @param component - * The component of the processor. - */ - public constructor(component: CodeWorkspaceComponent) - { - super(component); - } - - /** - * @inheritdoc - * - * @param data - * The data to process. - * - * @returns - * The processed data. - */ - public async Process(data: ILaunchSettings): Promise - { - let result = await super.Process(data); - - result.configurations.unshift( - { - type: "pwa-node", - request: "launch", - name: "Launch Program", - program: "${workspaceFolder}/lib/index.js", - preLaunchTask: "Build", - sourceMaps: true, - outFiles: [ - "${workspaceFolder}/**/*.js", - "!**/node_modules/**" - ] - }); - - return result; - } -} diff --git a/packages/generator-ts-project/src/generators/module/VSCode/TSModuleWorkspaceProcessor.ts b/packages/generator-ts-project/src/generators/module/VSCode/TSModuleWorkspaceProcessor.ts deleted file mode 100644 index 21c31828..00000000 --- a/packages/generator-ts-project/src/generators/module/VSCode/TSModuleWorkspaceProcessor.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { GeneratorOptions } from "@manuth/extended-yo-generator"; -import { JSONProcessor } from "../../../Components/JSONProcessor"; -import { ITSProjectSettings } from "../../../Project/Settings/ITSProjectSettings"; -import { TSProjectWorkspaceProcessor } from "../../../Project/VSCode/TSProjectWorkspaceProcessor"; -import { CodeWorkspaceComponent } from "../../../VSCode/Components/CodeWorkspaceComponent"; -import { ILaunchSettings } from "../../../VSCode/ILaunchSettings"; -import { TSModuleLaunchSettingsProcessor } from "./TSModuleLaunchSettingsProcessor"; - -/** - * Provides the functionality to process workspaces for `TSModule`s. - */ -export class TSModuleWorkspaceProcessor extends TSProjectWorkspaceProcessor -{ - /** - * Initializes a new instance of the `TSModuleWorkspaceProcessor` class. - * - * @param component - * The component of the processor. - */ - public constructor(component: CodeWorkspaceComponent) - { - super(component); - } - - /** - * @inheritdoc - */ - protected get LaunchSettingsProcessor(): JSONProcessor - { - return new TSModuleLaunchSettingsProcessor(this.Component); - } -} diff --git a/packages/generator-ts-project/src/index.ts b/packages/generator-ts-project/src/index.ts index 1071cf9e..c0b8708e 100644 --- a/packages/generator-ts-project/src/index.ts +++ b/packages/generator-ts-project/src/index.ts @@ -35,13 +35,8 @@ export { TSGeneratorSettingKey } from "./generators/generator/Settings/TSGenerat export { TSGeneratorGenerator } from "./generators/generator/TSGeneratorGenerator"; export { TSGeneratorLaunchSettingsProcessor } from "./generators/generator/VSCode/TSGeneratorLaunchSettingsProcessor"; export { TSGeneratorWorkspaceProcessor } from "./generators/generator/VSCode/TSGeneratorWorkspaceProcessor"; -export { TSModuleCodeWorkspace } from "./generators/module/Components/TSModuleCodeWorkspace"; -export { TSModuleComponentCollection } from "./generators/module/Components/TSModuleComponentCollection"; -export { TSModuleGeneralCategory } from "./generators/module/Components/TSModuleGeneralCategory"; export { TSModulePackageFileMapping } from "./generators/module/FileMappings/NPMPackaging/TSModulePackageFileMapping"; export { TSModuleGenerator } from "./generators/module/TSModuleGenerator"; -export { TSModuleLaunchSettingsProcessor } from "./generators/module/VSCode/TSModuleLaunchSettingsProcessor"; -export { TSModuleWorkspaceProcessor } from "./generators/module/VSCode/TSModuleWorkspaceProcessor"; export { LintingComponent } from "./Linting/Components/LintingComponent"; export { ESLintRCFileMapping } from "./Linting/FileMappings/ESLintRCFileMapping"; export { LintingQuestion } from "./Linting/Inquiry/LintingQuestion"; diff --git a/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleComponentCollection.test.ts b/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleComponentCollection.test.ts deleted file mode 100644 index 8bb74d49..00000000 --- a/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleComponentCollection.test.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { ok } from "assert"; -import { GeneratorOptions } from "@manuth/extended-yo-generator"; -import { TSModuleComponentCollection } from "../../../../generators/module/Components/TSModuleComponentCollection"; -import { TSModuleGeneralCategory } from "../../../../generators/module/Components/TSModuleGeneralCategory"; -import { TSModuleGenerator } from "../../../../generators/module/TSModuleGenerator"; -import { ITSProjectSettings } from "../../../../Project/Settings/ITSProjectSettings"; -import { TestContext } from "../../../TestContext"; - -/** - * Registers tests for the `TSModuleComponentCollection` class. - * - * @param context - * The test-context. - */ -export function TSModuleComponentCollectionTests(context: TestContext): void -{ - suite( - "TSModuleComponentCollection", - () => - { - let collection: TSModuleComponentCollection; - - suiteSetup( - async function() - { - this.timeout(0); - collection = new TSModuleComponentCollection(await context.Generator); - }); - - test( - "Checking whether all necessary component-categories are present…", - () => - { - for (let categoryType of [TSModuleGeneralCategory]) - { - ok( - collection.Categories.some( - (category) => - { - return category instanceof categoryType; - })); - } - }); - }); -} diff --git a/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleGeneralCategory.test.ts b/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleGeneralCategory.test.ts deleted file mode 100644 index 23a1ee53..00000000 --- a/packages/generator-ts-project/src/tests/Generators/Module/Components/TSModuleGeneralCategory.test.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { ok } from "assert"; -import{ GeneratorOptions } from "@manuth/extended-yo-generator"; -import { TSModuleCodeWorkspace } from "../../../../generators/module/Components/TSModuleCodeWorkspace"; -import { TSModuleGeneralCategory } from "../../../../generators/module/Components/TSModuleGeneralCategory"; -import { TSModuleGenerator } from "../../../../generators/module/TSModuleGenerator"; -import { ITSProjectSettings } from "../../../../Project/Settings/ITSProjectSettings"; -import { TestContext } from "../../../TestContext"; - -/** - * Registers tests for the `TSModuleGeneralCategory` class. - * - * @param context - * The test-context. - */ -export function TSModuleGeneralCategoryTests(context: TestContext): void -{ - suite( - "TSModuleGeneralCategory", - () => - { - let category: TSModuleGeneralCategory; - - suiteSetup( - async function() - { - this.timeout(0); - category = new TSModuleGeneralCategory(await context.Generator); - }); - - test( - "Checking whether all necessary components are present…", - () => - { - for (let componentType of [TSModuleCodeWorkspace]) - { - ok( - category.Components.some( - (component) => - { - return component instanceof componentType; - })); - } - }); - }); -} diff --git a/packages/generator-ts-project/src/tests/Generators/Module/Components/index.ts b/packages/generator-ts-project/src/tests/Generators/Module/Components/index.ts deleted file mode 100644 index 2e104054..00000000 --- a/packages/generator-ts-project/src/tests/Generators/Module/Components/index.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { TSModuleGenerator } from "../../../../generators/module/TSModuleGenerator"; -import { TestContext } from "../../../TestContext"; -import { TSModuleComponentCollectionTests } from "./TSModuleComponentCollection.test"; -import { TSModuleGeneralCategoryTests } from "./TSModuleGeneralCategory.test"; - -/** - * Registers tests for the `TSModuleGenerator` components. - * - * @param context - * The test-context. - */ -export function ComponentTests(context: TestContext): void -{ - suite( - "Components", - () => - { - TSModuleGeneralCategoryTests(context); - TSModuleComponentCollectionTests(context); - }); -} diff --git a/packages/generator-ts-project/src/tests/Generators/Module/VSCode/TSModuleLaunchSettingsProcessor.test.ts b/packages/generator-ts-project/src/tests/Generators/Module/VSCode/TSModuleLaunchSettingsProcessor.test.ts deleted file mode 100644 index ab993897..00000000 --- a/packages/generator-ts-project/src/tests/Generators/Module/VSCode/TSModuleLaunchSettingsProcessor.test.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { ok } from "assert"; -import { GeneratorOptions } from "@manuth/extended-yo-generator"; -import { TSModuleCodeWorkspace } from "../../../../generators/module/Components/TSModuleCodeWorkspace"; -import { TSModuleGenerator } from "../../../../generators/module/TSModuleGenerator"; -import { TSModuleLaunchSettingsProcessor } from "../../../../generators/module/VSCode/TSModuleLaunchSettingsProcessor"; -import { ITSProjectSettings } from "../../../../Project/Settings/ITSProjectSettings"; -import { TestContext } from "../../../TestContext"; - -/** - * Registers tests for the `TSModuleLaunchSettingsProcessor` class. - * - * @param context - * The test-context. - */ -export function TSModuleLaunchSettingsProcessorTests(context: TestContext): void -{ - suite( - "TSModuleLaunchSettingsProcessor", - () => - { - let component: TSModuleCodeWorkspace; - let processor: TSModuleLaunchSettingsProcessor; - - suiteSetup( - async function() - { - this.timeout(0); - component = new TSModuleCodeWorkspace(await context.Generator); - processor = new TSModuleLaunchSettingsProcessor(component); - }); - - test( - "Checking whether a configuration for launching the program is present…", - async () => - { - let launchConfig = await processor.Process(await component.Source.LaunchMetadata); - let debugConfigs = launchConfig.configurations ?? []; - - ok( - debugConfigs.some( - (debugConfig) => - { - return debugConfig.name === "Launch Program"; - })); - }); - }); -} diff --git a/packages/generator-ts-project/src/tests/Generators/Module/VSCode/index.ts b/packages/generator-ts-project/src/tests/Generators/Module/VSCode/index.ts deleted file mode 100644 index d0fef0d4..00000000 --- a/packages/generator-ts-project/src/tests/Generators/Module/VSCode/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { TSModuleGenerator } from "../../../../generators/module/TSModuleGenerator"; -import { TestContext } from "../../../TestContext"; -import { TSModuleLaunchSettingsProcessorTests } from "./TSModuleLaunchSettingsProcessor.test"; - -/** - * Registers tests for vscode components for `TSModule`s. - * - * @param context - * The test-context. - */ -export function VSCodeTests(context: TestContext): void -{ - suite( - "VSCode", - () => - { - TSModuleLaunchSettingsProcessorTests(context); - }); -} diff --git a/packages/generator-ts-project/src/tests/Generators/Module/index.ts b/packages/generator-ts-project/src/tests/Generators/Module/index.ts index c32e028c..d88fcce0 100644 --- a/packages/generator-ts-project/src/tests/Generators/Module/index.ts +++ b/packages/generator-ts-project/src/tests/Generators/Module/index.ts @@ -1,9 +1,7 @@ import { TSModuleGenerator } from "../../../generators/module/TSModuleGenerator"; import { TestContext } from "../../TestContext"; -import { ComponentTests } from "./Components"; import { FileMappingTests } from "./FileMappings"; import { TSModuleGeneratorTests } from "./TSModuleGenerator.test"; -import { VSCodeTests } from "./VSCode"; /** * Registers tests for the `TSModuleGenerator`. @@ -18,8 +16,6 @@ export function ModuleTests(context: TestContext): void () => { FileMappingTests(context); - VSCodeTests(context); - ComponentTests(context); TSModuleGeneratorTests(context); }); } From cd00939859fed764285f5840831e851d6b1c3d92 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sun, 4 Oct 2020 16:41:12 +0200 Subject: [PATCH 45/55] Update all packages --- packages/generator-my-ts-project/package-lock.json | 6 +++--- packages/generator-my-ts-project/package.json | 2 +- packages/generator-ts-project/package-lock.json | 6 +++--- packages/generator-ts-project/package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index aa40c908..ac40d8ef 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -149,9 +149,9 @@ } }, "@manuth/tsconfig": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@manuth/tsconfig/-/tsconfig-1.2.3.tgz", - "integrity": "sha512-TtkZlaXTcOQA73Kbqjw0haxqAtPiHHxXgrlMzMJlpisWpmcWV0yCe37RVJuAzom9xqeGeNHLsN41KIFy0/t72g==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@manuth/tsconfig/-/tsconfig-1.2.4.tgz", + "integrity": "sha512-fbNaxm6YOTIsgQr+o8kWvhhSymKjFUM7kwLOSLSUbgXuEB83pX2DYsh3Bf0ZgBi6Ivs4GmiRt90UlPu6PELaog==", "dev": true }, "@mrmlnc/readdir-enhanced": { diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index b6c2d0d4..32851397 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -54,7 +54,7 @@ "devDependencies": { "@manuth/eslint-plugin-typescript": "^2.3.3", "@manuth/extended-yo-generator-test": "^7.3.3", - "@manuth/tsconfig": "^1.2.3", + "@manuth/tsconfig": "^1.2.4", "@types/dedent": "^0.7.0", "@types/fs-extra": "^9.0.1", "@types/mocha": "^8.0.3", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index e20f2abb..863bc953 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -210,9 +210,9 @@ } }, "@manuth/tsconfig": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@manuth/tsconfig/-/tsconfig-1.2.3.tgz", - "integrity": "sha512-TtkZlaXTcOQA73Kbqjw0haxqAtPiHHxXgrlMzMJlpisWpmcWV0yCe37RVJuAzom9xqeGeNHLsN41KIFy0/t72g==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@manuth/tsconfig/-/tsconfig-1.2.4.tgz", + "integrity": "sha512-fbNaxm6YOTIsgQr+o8kWvhhSymKjFUM7kwLOSLSUbgXuEB83pX2DYsh3Bf0ZgBi6Ivs4GmiRt90UlPu6PELaog==", "dev": true }, "@manuth/typescript-eslint-plugin": { diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index 5ece310d..7a07b3e6 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -68,7 +68,7 @@ "devDependencies": { "@manuth/eslint-plugin-typescript": "^2.3.3", "@manuth/extended-yo-generator-test": "^7.3.3", - "@manuth/tsconfig": "^1.2.3", + "@manuth/tsconfig": "^1.2.4", "@manuth/typescript-eslint-plugin": "^1.3.1", "@types/comment-json": "^1.1.1", "@types/dedent": "^0.7.0", From 53891b080f91915d06893a2f6bf6f51eebc4342c Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 14:15:35 +0200 Subject: [PATCH 46/55] Refactor the look and feel of the vscode-settings --- .../TSProjectGenerator.code-workspace | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/generator-ts-project/TSProjectGenerator.code-workspace b/packages/generator-ts-project/TSProjectGenerator.code-workspace index 56e3d451..bae38e5b 100644 --- a/packages/generator-ts-project/TSProjectGenerator.code-workspace +++ b/packages/generator-ts-project/TSProjectGenerator.code-workspace @@ -33,10 +33,10 @@ "args": [ "${workspaceFolder:TSProjectGenerator}/lib/generators/app" ], + "cwd": "${workspaceFolder:Solution Items}/..", "console": "integratedTerminal", "internalConsoleOptions": "neverOpen", "preLaunchTask": "Build", - "cwd": "${workspaceFolder:Solution Items}/..", "sourceMaps": true, "autoAttachChildProcesses": false, "presentation": { @@ -48,9 +48,9 @@ "request": "launch", "name": "Launch TSProjectGenerator Tests", "program": "${workspaceFolder:TSProjectGenerator}/node_modules/mocha/bin/mocha", + "cwd": "${workspaceFolder:TSProjectGenerator}", "internalConsoleOptions": "openOnSessionStart", "preLaunchTask": "Build", - "cwd": "${workspaceFolder:TSProjectGenerator}", "sourceMaps": true, "autoAttachChildProcesses": false, "outFiles": [ @@ -69,10 +69,10 @@ "args": [ "${workspaceFolder:MyTSProjectGenerator}/lib/generators/app" ], + "cwd": "${workspaceFolder:Solution Items}/..", "console": "integratedTerminal", "internalConsoleOptions": "neverOpen", "preLaunchTask": "Build", - "cwd": "${workspaceFolder:Solution Items}/..", "sourceMaps": true, "autoAttachChildProcesses": false, "outFiles": [ @@ -88,9 +88,9 @@ "request": "launch", "name": "Launch MyTSProjectGenerator Tests", "program": "${workspaceFolder:MyTSProjectGenerator}/node_modules/mocha/bin/mocha", + "cwd": "${workspaceFolder:MyTSProjectGenerator}", "internalConsoleOptions": "openOnSessionStart", "preLaunchTask": "Build", - "cwd": "${workspaceFolder:MyTSProjectGenerator}", "sourceMaps": true, "autoAttachChildProcesses": false, "outFiles": [ From 30c80e94fa5daeb1d6b2fde1606350002f7364ef Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 14:15:48 +0200 Subject: [PATCH 47/55] Ensure the package isn't modified during builds --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3bcfc3d1..e34c9bcc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,7 +50,7 @@ steps: image: node commands: - npx lerna exec --no-private -- npm pack - - npm install escape-string-regexp + - npm install escape-string-regexp --no-save - node -e "console.log(require('escape-string-regexp')('${DRONE_TAG}'))" > TagName.txt when: event: From 7748328e7ac127304ff581dc27a4c95b32b44b62 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 14:17:04 +0200 Subject: [PATCH 48/55] Fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcd2800c..f7704ecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated - The development environment - The format of transformed JSON and YAML files - - Al dependencies + - All dependencies - The typescript-configuration for tests [Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.1.4...dev) From a3cdca5c323d75848f8d2e17c7a6894207e474e8 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 15:53:09 +0200 Subject: [PATCH 49/55] Prevent tests from skipping --- .../src/tests/Components/YAMLCreatorMapping.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/generator-ts-project/src/tests/Components/YAMLCreatorMapping.test.ts b/packages/generator-ts-project/src/tests/Components/YAMLCreatorMapping.test.ts index dac5f8bf..48d12f5d 100644 --- a/packages/generator-ts-project/src/tests/Components/YAMLCreatorMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Components/YAMLCreatorMapping.test.ts @@ -15,7 +15,7 @@ import { TestContext } from "../TestContext"; */ export function YAMLCreatorMappingTests(context: TestContext>): void { - suite.only( + suite( "YAMLCreatorMapping", () => { From 539677bf469590776f5965504d195c9e9e028708 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 16:04:20 +0200 Subject: [PATCH 50/55] Ensure the module-name is preserved correctly --- .../Inquiry/TSProjectModuleNameQuestion.ts | 16 ++++++++++- .../Inquiry/TSGeneratorModuleNameQuestion.ts | 28 +++++++++---------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/packages/generator-ts-project/src/Project/Inquiry/TSProjectModuleNameQuestion.ts b/packages/generator-ts-project/src/Project/Inquiry/TSProjectModuleNameQuestion.ts index 64dcfd44..2831e556 100644 --- a/packages/generator-ts-project/src/Project/Inquiry/TSProjectModuleNameQuestion.ts +++ b/packages/generator-ts-project/src/Project/Inquiry/TSProjectModuleNameQuestion.ts @@ -68,7 +68,7 @@ export class TSProjectModuleNameQuestion + { + return kebabCase(answers[TSProjectSettingKey.DisplayName]); + } } diff --git a/packages/generator-ts-project/src/generators/generator/Inquiry/TSGeneratorModuleNameQuestion.ts b/packages/generator-ts-project/src/generators/generator/Inquiry/TSGeneratorModuleNameQuestion.ts index bcd01285..4bc13aa2 100644 --- a/packages/generator-ts-project/src/generators/generator/Inquiry/TSGeneratorModuleNameQuestion.ts +++ b/packages/generator-ts-project/src/generators/generator/Inquiry/TSGeneratorModuleNameQuestion.ts @@ -19,20 +19,6 @@ export class TSGeneratorModuleNameQuestion - { - return `generator-${(await super.Default(answers)).replace(/(generator-)?(.*?)(-generator)?$/i, "$2")}`; - } - /** * @inheritdoc * @@ -59,4 +45,18 @@ export class TSGeneratorModuleNameQuestion + { + return `generator-${(await super.CreateModuleName(answers)).replace(/(generator-)?(.*?)(-generator)?$/i, "$2")}`; + } } From ced07ba483c4fe66fbca376fb850ef958b5fc96d Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 16:46:34 +0200 Subject: [PATCH 51/55] Fix YAMLTranformation tests --- .../Components/Transformation/YAMLTransformMapping.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/generator-ts-project/src/tests/Components/Transformation/YAMLTransformMapping.test.ts b/packages/generator-ts-project/src/tests/Components/Transformation/YAMLTransformMapping.test.ts index 9684e66c..aac6fbf7 100644 --- a/packages/generator-ts-project/src/tests/Components/Transformation/YAMLTransformMapping.test.ts +++ b/packages/generator-ts-project/src/tests/Components/Transformation/YAMLTransformMapping.test.ts @@ -1,8 +1,10 @@ import { deepStrictEqual, ok, strictEqual } from "assert"; +import { EOL } from "os"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; import { FileMappingTester, ITestGeneratorOptions, ITestGeneratorSettings, ITestOptions, TestGenerator } from "@manuth/extended-yo-generator-test"; import { TempFile } from "@manuth/temp-files"; import dedent = require("dedent"); +import { split } from "eol"; import { writeFile } from "fs-extra"; import { Document, parse, parseAllDocuments, stringify } from "yaml"; import { YAMLTransformMapping } from "../../../Components/Transformation/YAMLTransformMapping"; @@ -116,7 +118,7 @@ export function YAMLTransformMappingTests(context: TestContext { await tester.Run(); - await tester.AssertContent(stringify(randomData)); + await tester.AssertContent(split(stringify(randomData)).join(EOL)); }); }); From e06db8dbd702fc10eea9368d55a6da2f927b84bc Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 16:47:16 +0200 Subject: [PATCH 52/55] Fix tests for module-names --- .../TSGeneratorModuleNameQuestion.test.ts | 15 +++++++++++ .../TSProjectModuleNameQuestion.test.ts | 25 ++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/packages/generator-ts-project/src/tests/Generators/Generator/Inquiry/TSGeneratorModuleNameQuestion.test.ts b/packages/generator-ts-project/src/tests/Generators/Generator/Inquiry/TSGeneratorModuleNameQuestion.test.ts index 8c77c43c..b20f8aa6 100644 --- a/packages/generator-ts-project/src/tests/Generators/Generator/Inquiry/TSGeneratorModuleNameQuestion.test.ts +++ b/packages/generator-ts-project/src/tests/Generators/Generator/Inquiry/TSGeneratorModuleNameQuestion.test.ts @@ -1,5 +1,8 @@ import { notStrictEqual, strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; +import { Package } from "@manuth/package-json-editor"; +import { TempDirectory } from "@manuth/temp-files"; +import { writeJSON } from "fs-extra"; import { TSGeneratorModuleNameQuestion } from "../../../../generators/generator/Inquiry/TSGeneratorModuleNameQuestion"; import { ITSGeneratorSettings } from "../../../../generators/generator/Settings/ITSGeneratorSettings"; import { TSGeneratorGenerator } from "../../../../generators/generator/TSGeneratorGenerator"; @@ -18,6 +21,7 @@ export function TSGeneratorModuleNameQuestionTests(context: TestContext { + let tempDir: TempDirectory; let settings: ITSGeneratorSettings; let question: TSGeneratorModuleNameQuestion; @@ -25,9 +29,11 @@ export function TSGeneratorModuleNameQuestionTests(context: TestContext + { + let npmPackage = new Package(tempDir.MakePath("package.json"), { name: "this-is-a-test" }); + await writeJSON(npmPackage.FileName, npmPackage.ToJSON()); + strictEqual(await question.default(settings), npmPackage.Name); + }); }); suite( diff --git a/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectModuleNameQuestion.test.ts b/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectModuleNameQuestion.test.ts index 9f280a10..bf7ad754 100644 --- a/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectModuleNameQuestion.test.ts +++ b/packages/generator-ts-project/src/tests/Project/Inquiry/TSProjectModuleNameQuestion.test.ts @@ -1,5 +1,8 @@ import { strictEqual } from "assert"; import { GeneratorOptions } from "@manuth/extended-yo-generator"; +import { Package } from "@manuth/package-json-editor"; +import { TempDirectory } from "@manuth/temp-files"; +import { writeJSON } from "fs-extra"; import kebabCase = require("lodash.kebabcase"); import { TSProjectModuleNameQuestion } from "../../../Project/Inquiry/TSProjectModuleNameQuestion"; import { ITSProjectSettings } from "../../../Project/Settings/ITSProjectSettings"; @@ -19,15 +22,22 @@ export function TSProjectModuleNameQuestionTests(context: TestContext { + let tempDir: TempDirectory; + let settings: ITSProjectSettings; let testName: string; - let generator: TSProjectGenerator; let question: TSProjectModuleNameQuestion; suiteSetup( async function() { this.timeout(0); - generator = await context.Generator; + tempDir = new TempDirectory(); + + settings = { + ...(await context.Generator).Settings, + [TSProjectSettingKey.Destination]: tempDir.FullName + }; + testName = "ThisIsATest"; question = new TSProjectModuleNameQuestion(await context.Generator); }); @@ -39,10 +49,19 @@ export function TSProjectModuleNameQuestionTests(context: TestContext + { + let npmPackage = new Package(tempDir.MakePath("package.json"), { name: "this is a test" }); + await writeJSON(npmPackage.FileName, npmPackage.ToJSON()); + strictEqual(await question.default(settings), npmPackage.Name); + }); }); } From 83b80acb03b00b9b97e51b7ffcf631d409964016 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 16:57:06 +0200 Subject: [PATCH 53/55] Add changelog entries --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7704ecc..560900f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - A feature for creating `CHANGELOG` files for new projects - A feature to set the default package-name to the name of the existing package + - New unit-tests ### Updated - The development environment - The format of transformed JSON and YAML files - All dependencies - The typescript-configuration for tests + - The `.npmignore` file to exclude the `.github` directory + - `.json` and `.yml`-filemappings to include new lines at the end of files [Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.1.4...dev) From f39b3a57611cf43760fa6f9e65266e6b367a6b2c Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 16:57:22 +0200 Subject: [PATCH 54/55] Update all packages --- package-lock.json | 163 +++--- package.json | 16 +- .../generator-my-ts-project/package-lock.json | 412 ++++++---------- packages/generator-my-ts-project/package.json | 18 +- .../generator-ts-project/package-lock.json | 466 +++++++----------- packages/generator-ts-project/package.json | 26 +- 6 files changed, 445 insertions(+), 656 deletions(-) diff --git a/package-lock.json b/package-lock.json index 649cd6ae..beccb641 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,9 +48,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.5", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", - "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -1006,6 +1006,12 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true + }, + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "dev": true } } }, @@ -1365,6 +1371,14 @@ "requires": { "lodash.merge": "^4.6.2", "upath": "^1.2.0" + }, + "dependencies": { + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "dev": true + } } }, "@mrmlnc/readdir-enhanced": { @@ -1594,12 +1608,6 @@ "@types/node": ">= 8" } }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true - }, "@types/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/diff/-/diff-4.0.2.tgz", @@ -1613,9 +1621,9 @@ "dev": true }, "@types/fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.2.tgz", + "integrity": "sha512-jp0RI6xfZpi5JL8v7WQwpBEQTq63RqW2kxwTZt+m27LcJqQdPVU1yGnT1ZI4EtCDynQQJtIGyQahkiCGCS7e+A==", "dev": true, "requires": { "@types/node": "*" @@ -1710,9 +1718,9 @@ "dev": true }, "@types/node": { - "version": "14.11.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", - "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==", + "version": "14.11.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz", + "integrity": "sha512-yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA==", "dev": true }, "@types/normalize-package-data": { @@ -1777,13 +1785,13 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz", - "integrity": "sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.4.1.tgz", + "integrity": "sha512-O+8Utz8pb4OmcA+Nfi5THQnQpHSD2sDUNw9AxNHpuYOo326HZTtG8gsfT+EAYuVrFNaLyNb2QnUNkmTRDskuRA==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.3.0", - "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/experimental-utils": "4.4.1", + "@typescript-eslint/scope-manager": "4.4.1", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -1809,38 +1817,38 @@ } }, "@typescript-eslint/eslint-plugin-tslint": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.3.0.tgz", - "integrity": "sha512-LMGvtNfR92Ms8OHFnPKrKlViqUelcXpPG5RdR/n1p9xCCWZFHdwjguwVVsL0hcDJLvHHX1tJAU75noC564Zhrg==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.4.1.tgz", + "integrity": "sha512-5IVPQjhS2NzWjRpP18SuPnip5ep7zChPZLkPJr1onHg0TADDBolg35hCk9/55FedjBin8LIjzTbyMn24XXr+QQ==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.3.0", + "@typescript-eslint/experimental-utils": "4.4.1", "lodash": "^4.17.15" } }, "@typescript-eslint/experimental-utils": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz", - "integrity": "sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.4.1.tgz", + "integrity": "sha512-Nt4EVlb1mqExW9cWhpV6pd1a3DkUbX9DeyYsdoeziKOpIJ04S2KMVDO+SEidsXRH/XHDpbzXykKcMTLdTXH6cQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.3.0", - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/typescript-estree": "4.3.0", + "@typescript-eslint/scope-manager": "4.4.1", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/typescript-estree": "4.4.1", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.3.0.tgz", - "integrity": "sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.4.1.tgz", + "integrity": "sha512-S0fuX5lDku28Au9REYUsV+hdJpW/rNW0gWlc4SXzF/kdrRaAVX9YCxKpziH7djeWT/HFAjLZcnY7NJD8xTeUEg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.3.0", - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/typescript-estree": "4.3.0", + "@typescript-eslint/scope-manager": "4.4.1", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/typescript-estree": "4.4.1", "debug": "^4.1.1" }, "dependencies": { @@ -1856,29 +1864,29 @@ } }, "@typescript-eslint/scope-manager": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz", - "integrity": "sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.4.1.tgz", + "integrity": "sha512-2oD/ZqD4Gj41UdFeWZxegH3cVEEH/Z6Bhr/XvwTtGv66737XkR4C9IqEkebCuqArqBJQSj4AgNHHiN1okzD/wQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/visitor-keys": "4.3.0" + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/visitor-keys": "4.4.1" } }, "@typescript-eslint/types": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.3.0.tgz", - "integrity": "sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.4.1.tgz", + "integrity": "sha512-KNDfH2bCyax5db+KKIZT4rfA8rEk5N0EJ8P0T5AJjo5xrV26UAzaiqoJCxeaibqc0c/IvZxp7v2g3difn2Pn3w==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz", - "integrity": "sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.4.1.tgz", + "integrity": "sha512-wP/V7ScKzgSdtcY1a0pZYBoCxrCstLrgRQ2O9MmCUZDtmgxCO/TCqOTGRVwpP4/2hVfqMz/Vw1ZYrG8cVxvN3g==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/visitor-keys": "4.3.0", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/visitor-keys": "4.4.1", "debug": "^4.1.1", "globby": "^11.0.1", "is-glob": "^4.0.1", @@ -2015,12 +2023,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz", - "integrity": "sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.4.1.tgz", + "integrity": "sha512-H2JMWhLaJNeaylSnMSQFEhT/S/FsJbebQALmoJxMPMxLtlVAMy2uJP/Z543n9IizhjRayLSqoInehCeNW9rWcw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/types": "4.4.1", "eslint-visitor-keys": "^2.0.0" } }, @@ -2052,9 +2060,9 @@ "dev": true }, "acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, "acorn-jsx": { @@ -4071,9 +4079,9 @@ "dev": true }, "eslint": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", - "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz", + "integrity": "sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -4086,7 +4094,7 @@ "enquirer": "^2.3.5", "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^1.3.0", + "eslint-visitor-keys": "^2.0.0", "espree": "^7.3.0", "esquery": "^1.2.0", "esutils": "^2.0.2", @@ -4122,12 +4130,11 @@ "dev": true }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, @@ -4176,12 +4183,6 @@ "ms": "2.1.2" } }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -4587,13 +4588,13 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.6.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.3.tgz", - "integrity": "sha512-RnyM+a3SKRfPs/jqO2qOGAEZnOJT2dOhiwhBlYVp8/yRUUBNPlvkwZm0arrnyFKvfZX6WqSwlK5OcNnM5W1Etg==", + "version": "30.6.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.5.tgz", + "integrity": "sha512-obC3wi1/b5hsPLXa3ZDs571QXGqkVsphndMsIsVQzWRdZOaRbxdvGiKhLzzZytbRZAL1M1Bkdc/3Af7eNxJ/Hg==", "dev": true, "requires": { "comment-parser": "^0.7.6", - "debug": "^4.1.1", + "debug": "^4.2.0", "jsdoctypeparser": "^9.0.0", "lodash": "^4.17.20", "regextras": "^0.7.1", @@ -5949,6 +5950,14 @@ "path-is-absolute": "^1.0.0", "readdirp": "^2.2.1", "upath": "^1.1.1" + }, + "dependencies": { + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "dev": true + } } }, "fsevents": { @@ -10473,9 +10482,9 @@ } }, "upath": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.0.tgz", + "integrity": "sha512-ghi1XxsVYPOZPDsOZrfOJIwQU5I3JVYB3Q6IbBGn1KFeOa89i0nUy5tCEkY9pVm83U83qZ1QG40RQKGknllV4w==", "dev": true }, "uri-js": { diff --git a/package.json b/package.json index 6dbb7925..e4779474 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@manuth/eslint-plugin-typescript": "^2.3.3", "@types/diff": "^4.0.2", - "@types/fs-extra": "^9.0.1", + "@types/fs-extra": "^9.0.2", "@types/git-branch": "^2.0.1", "@types/glob": "^7.1.3", "@types/gulp": "^4.0.7", @@ -28,20 +28,20 @@ "@types/gulp-replace": "0.0.31", "@types/merge-stream": "^1.1.2", "@types/minimist": "^1.2.0", - "@types/node": "^14.11.2", + "@types/node": "^14.11.10", "@types/npm-which": "^3.0.0", "@types/through2": "^2.0.36", "@types/vinyl": "^2.0.4", - "@typescript-eslint/eslint-plugin": "^4.3.0", - "@typescript-eslint/eslint-plugin-tslint": "^4.3.0", - "@typescript-eslint/parser": "^4.3.0", + "@typescript-eslint/eslint-plugin": "^4.4.1", + "@typescript-eslint/eslint-plugin-tslint": "^4.4.1", + "@typescript-eslint/parser": "^4.4.1", "concurrently": "^5.3.0", "copy-and-watch": "^0.1.5", "diff": "^4.0.2", - "eslint": "^7.10.0", + "eslint": "^7.11.0", "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^30.6.3", + "eslint-plugin-jsdoc": "^30.6.5", "fs-extra": "^9.0.1", "git-branch": "^2.0.1", "glob": "^7.1.6", @@ -59,7 +59,7 @@ "ts-node": "^9.0.0", "tslint": "^6.1.3", "typescript": "^4.0.3", - "upath": "^1.2.0", + "upath": "^2.0.0", "vinyl": "^2.2.1" } } diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index ac40d8ef..7a38315f 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -140,9 +140,9 @@ } }, "@manuth/temp-files": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@manuth/temp-files/-/temp-files-2.0.0.tgz", - "integrity": "sha512-pZw2B1WXtEaYgdoSw4HgsoqzUxL04sWns4cIMTKGNoHlgkOyHqwrQt5UiL8hUCJgYAcBXLJ2BLlZ1JNA3mvvpw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@manuth/temp-files/-/temp-files-2.0.1.tgz", + "integrity": "sha512-eHumkOnZIosDsW+k08MHcm7aG6oVj4AvVB7k3karj4LqypsR9AyWth3OL30MKQ1RYlOTQep4JmXG3Q3SuWG9ZQ==", "requires": { "fs-extra": "^9.0.1", "randexp": "^0.5.3" @@ -279,9 +279,9 @@ "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==" }, "@types/fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.2.tgz", + "integrity": "sha512-jp0RI6xfZpi5JL8v7WQwpBEQTq63RqW2kxwTZt+m27LcJqQdPVU1yGnT1ZI4EtCDynQQJtIGyQahkiCGCS7e+A==", "dev": true, "requires": { "@types/node": "*" @@ -350,9 +350,9 @@ "dev": true }, "@types/node": { - "version": "14.11.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", - "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==" + "version": "14.11.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz", + "integrity": "sha512-yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -439,13 +439,13 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz", - "integrity": "sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.4.1.tgz", + "integrity": "sha512-O+8Utz8pb4OmcA+Nfi5THQnQpHSD2sDUNw9AxNHpuYOo326HZTtG8gsfT+EAYuVrFNaLyNb2QnUNkmTRDskuRA==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.3.0", - "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/experimental-utils": "4.4.1", + "@typescript-eslint/scope-manager": "4.4.1", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -454,65 +454,65 @@ } }, "@typescript-eslint/eslint-plugin-tslint": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.3.0.tgz", - "integrity": "sha512-LMGvtNfR92Ms8OHFnPKrKlViqUelcXpPG5RdR/n1p9xCCWZFHdwjguwVVsL0hcDJLvHHX1tJAU75noC564Zhrg==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.4.1.tgz", + "integrity": "sha512-5IVPQjhS2NzWjRpP18SuPnip5ep7zChPZLkPJr1onHg0TADDBolg35hCk9/55FedjBin8LIjzTbyMn24XXr+QQ==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.3.0", + "@typescript-eslint/experimental-utils": "4.4.1", "lodash": "^4.17.15" } }, "@typescript-eslint/experimental-utils": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz", - "integrity": "sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.4.1.tgz", + "integrity": "sha512-Nt4EVlb1mqExW9cWhpV6pd1a3DkUbX9DeyYsdoeziKOpIJ04S2KMVDO+SEidsXRH/XHDpbzXykKcMTLdTXH6cQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.3.0", - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/typescript-estree": "4.3.0", + "@typescript-eslint/scope-manager": "4.4.1", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/typescript-estree": "4.4.1", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.3.0.tgz", - "integrity": "sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.4.1.tgz", + "integrity": "sha512-S0fuX5lDku28Au9REYUsV+hdJpW/rNW0gWlc4SXzF/kdrRaAVX9YCxKpziH7djeWT/HFAjLZcnY7NJD8xTeUEg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.3.0", - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/typescript-estree": "4.3.0", + "@typescript-eslint/scope-manager": "4.4.1", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/typescript-estree": "4.4.1", "debug": "^4.1.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz", - "integrity": "sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.4.1.tgz", + "integrity": "sha512-2oD/ZqD4Gj41UdFeWZxegH3cVEEH/Z6Bhr/XvwTtGv66737XkR4C9IqEkebCuqArqBJQSj4AgNHHiN1okzD/wQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/visitor-keys": "4.3.0" + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/visitor-keys": "4.4.1" } }, "@typescript-eslint/types": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.3.0.tgz", - "integrity": "sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.4.1.tgz", + "integrity": "sha512-KNDfH2bCyax5db+KKIZT4rfA8rEk5N0EJ8P0T5AJjo5xrV26UAzaiqoJCxeaibqc0c/IvZxp7v2g3difn2Pn3w==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz", - "integrity": "sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.4.1.tgz", + "integrity": "sha512-wP/V7ScKzgSdtcY1a0pZYBoCxrCstLrgRQ2O9MmCUZDtmgxCO/TCqOTGRVwpP4/2hVfqMz/Vw1ZYrG8cVxvN3g==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/visitor-keys": "4.3.0", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/visitor-keys": "4.4.1", "debug": "^4.1.1", "globby": "^11.0.1", "is-glob": "^4.0.1", @@ -643,15 +643,21 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz", - "integrity": "sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.4.1.tgz", + "integrity": "sha512-H2JMWhLaJNeaylSnMSQFEhT/S/FsJbebQALmoJxMPMxLtlVAMy2uJP/Z543n9IizhjRayLSqoInehCeNW9rWcw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/types": "4.4.1", "eslint-visitor-keys": "^2.0.0" } }, + "@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, "JSONStream": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", @@ -662,9 +668,9 @@ } }, "acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, "acorn-jsx": { @@ -896,18 +902,6 @@ "es-abstract": "^1.17.0-next.1" } }, - "array.prototype.map": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz", - "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "es-array-method-boxes-properly": "^1.0.0", - "is-string": "^1.0.4" - } - }, "arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -1365,9 +1359,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "chokidar": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", - "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -1377,7 +1371,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.5.0" }, "dependencies": { "braces": { @@ -2409,35 +2403,6 @@ "string.prototype.trimstart": "^1.0.1" } }, - "es-array-method-boxes-properly": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", - "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", - "dev": true - }, - "es-get-iterator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz", - "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==", - "dev": true, - "requires": { - "es-abstract": "^1.17.4", - "has-symbols": "^1.0.1", - "is-arguments": "^1.0.4", - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-string": "^1.0.5", - "isarray": "^2.0.5" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - } - } - }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -2467,9 +2432,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", - "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz", + "integrity": "sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -2482,7 +2447,7 @@ "enquirer": "^2.3.5", "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^1.3.0", + "eslint-visitor-keys": "^2.0.0", "espree": "^7.3.0", "esquery": "^1.2.0", "esutils": "^2.0.2", @@ -2522,12 +2487,6 @@ "which": "^2.0.1" } }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - }, "glob-parent": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", @@ -2814,18 +2773,29 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.6.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.3.tgz", - "integrity": "sha512-RnyM+a3SKRfPs/jqO2qOGAEZnOJT2dOhiwhBlYVp8/yRUUBNPlvkwZm0arrnyFKvfZX6WqSwlK5OcNnM5W1Etg==", + "version": "30.6.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.5.tgz", + "integrity": "sha512-obC3wi1/b5hsPLXa3ZDs571QXGqkVsphndMsIsVQzWRdZOaRbxdvGiKhLzzZytbRZAL1M1Bkdc/3Af7eNxJ/Hg==", "dev": true, "requires": { "comment-parser": "^0.7.6", - "debug": "^4.1.1", + "debug": "^4.2.0", "jsdoctypeparser": "^9.0.0", "lodash": "^4.17.20", "regextras": "^0.7.1", "semver": "^7.3.2", "spdx-expression-parse": "^3.0.1" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + } } }, "eslint-scope": { @@ -3303,21 +3273,10 @@ } }, "flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", - "dev": true, - "requires": { - "is-buffer": "~2.0.3" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", - "dev": true - } - } + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true }, "flat-cache": { "version": "2.0.1", @@ -4226,12 +4185,6 @@ } } }, - "is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true - }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -4352,12 +4305,6 @@ "is-path-inside": "^1.0.0" } }, - "is-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz", - "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", - "dev": true - }, "is-npm": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", @@ -4455,12 +4402,6 @@ "scoped-regex": "^1.0.0" } }, - "is-set": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz", - "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==", - "dev": true - }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -4553,22 +4494,6 @@ "is-object": "^1.0.1" } }, - "iterate-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz", - "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==", - "dev": true - }, - "iterate-value": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz", - "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==", - "dev": true, - "requires": { - "es-get-iterator": "^1.0.2", - "iterate-iterator": "^1.0.1" - } - }, "jake": { "version": "10.8.2", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", @@ -5264,15 +5189,16 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" }, "mocha": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz", - "integrity": "sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz", + "integrity": "sha512-lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw==", "dev": true, "requires": { + "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.4.2", - "debug": "4.1.1", + "chokidar": "3.4.3", + "debug": "4.2.0", "diff": "4.0.2", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", @@ -5283,19 +5209,27 @@ "log-symbols": "4.0.0", "minimatch": "3.0.4", "ms": "2.1.2", - "object.assign": "4.1.0", - "promise.allsettled": "1.0.2", - "serialize-javascript": "4.0.0", - "strip-json-comments": "3.0.1", - "supports-color": "7.1.0", + "nanoid": "3.1.12", + "serialize-javascript": "5.0.1", + "strip-json-comments": "3.1.1", + "supports-color": "7.2.0", "which": "2.0.2", "wide-align": "1.1.3", - "workerpool": "6.0.0", + "workerpool": "6.0.2", "yargs": "13.3.2", "yargs-parser": "13.1.2", - "yargs-unparser": "1.6.1" + "yargs-unparser": "2.0.0" }, "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -5354,11 +5288,14 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, - "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", - "dev": true + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } }, "which": { "version": "2.0.2", @@ -5405,6 +5342,12 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, + "nanoid": { + "version": "3.1.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", + "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==", + "dev": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -6191,19 +6134,6 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, - "promise.allsettled": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz", - "integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==", - "dev": true, - "requires": { - "array.prototype.map": "^1.0.1", - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "iterate-value": "^1.0.0" - } - }, "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -6349,9 +6279,9 @@ } }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -6705,9 +6635,9 @@ } }, "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -8379,9 +8309,9 @@ "dev": true }, "workerpool": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz", - "integrity": "sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz", + "integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==", "dev": true }, "wrap-ansi": { @@ -8554,84 +8484,34 @@ } }, "yargs-unparser": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz", - "integrity": "sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, "requires": { - "camelcase": "^5.3.1", - "decamelize": "^1.2.0", - "flat": "^4.1.0", - "is-plain-obj": "^1.1.0", - "yargs": "^14.2.3" + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "camelcase": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz", + "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==", "dev": true }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "yargs": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", - "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^15.0.1" - } - }, - "yargs-parser": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", - "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index 32851397..1961ce11 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -42,7 +42,7 @@ "dependencies": { "@manuth/extended-yo-generator": "^7.3.3", "@manuth/generator-ts-project": "^1.1.4", - "@manuth/temp-files": "^2.0.0", + "@manuth/temp-files": "^2.0.1", "chalk": "^4.1.0", "dedent": "^0.7.0", "detect-newline": "^3.1.0", @@ -56,20 +56,20 @@ "@manuth/extended-yo-generator-test": "^7.3.3", "@manuth/tsconfig": "^1.2.4", "@types/dedent": "^0.7.0", - "@types/fs-extra": "^9.0.1", + "@types/fs-extra": "^9.0.2", "@types/mocha": "^8.0.3", - "@types/node": "^14.11.2", + "@types/node": "^14.11.10", "@types/yaml": "^1.9.7", "@types/yosay": "0.0.29", - "@typescript-eslint/eslint-plugin": "^4.3.0", - "@typescript-eslint/eslint-plugin-tslint": "^4.3.0", - "@typescript-eslint/parser": "^4.3.0", + "@typescript-eslint/eslint-plugin": "^4.4.1", + "@typescript-eslint/eslint-plugin-tslint": "^4.4.1", + "@typescript-eslint/parser": "^4.4.1", "concurrently": "^5.3.0", - "eslint": "^7.10.0", + "eslint": "^7.11.0", "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^30.6.3", - "mocha": "^8.1.3", + "eslint-plugin-jsdoc": "^30.6.5", + "mocha": "^8.2.0", "rimraf": "^3.0.2", "shusher": "^0.1.1", "tslint": "^6.1.3", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index 863bc953..a2e2b0d6 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -110,9 +110,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.5", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", - "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -131,6 +131,14 @@ "requires": { "lodash.merge": "^4.6.2", "upath": "^1.2.0" + }, + "dependencies": { + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "dev": true + } } }, "@manuth/extended-yo-generator": { @@ -173,6 +181,12 @@ "has-own-prop": "^2.0.0", "repeat-string": "^1.6.1" } + }, + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "dev": true } } }, @@ -196,14 +210,13 @@ "normalize-package-data": "^2.5.0", "parse-author": "^2.0.0", "readme-filename": "^1.0.0", - "stringify-author": "^0.1.3", - "upath": "^1.2.0" + "stringify-author": "^0.1.3" } }, "@manuth/temp-files": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@manuth/temp-files/-/temp-files-2.0.0.tgz", - "integrity": "sha512-pZw2B1WXtEaYgdoSw4HgsoqzUxL04sWns4cIMTKGNoHlgkOyHqwrQt5UiL8hUCJgYAcBXLJ2BLlZ1JNA3mvvpw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@manuth/temp-files/-/temp-files-2.0.1.tgz", + "integrity": "sha512-eHumkOnZIosDsW+k08MHcm7aG6oVj4AvVB7k3karj4LqypsR9AyWth3OL30MKQ1RYlOTQep4JmXG3Q3SuWG9ZQ==", "requires": { "fs-extra": "^9.0.1", "randexp": "^0.5.3" @@ -229,6 +242,14 @@ "lodash.pick": "^4.4.0", "upath": "^1.2.0", "vscode-languageserver": "^6.1.1" + }, + "dependencies": { + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "dev": true + } } }, "@mrmlnc/readdir-enhanced": { @@ -584,9 +605,9 @@ "integrity": "sha512-ZxnwyBGO4KX/82AsFHTX82eMw0PsoBcIngEat+zx0y+3yxoNDJucAihg9nAcrc+g4Cwiv/4WcWsX4oiy0ySrRQ==" }, "@types/eslint": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.3.tgz", - "integrity": "sha512-SPBkpC+awgFfyAn4sjt0JBZ3vzACoSp2zhGBJkkrs09EzPqLbxkzaE8kJs3EsRRgkZwWk9zyXT/swvhnJYX8pQ==", + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.4.tgz", + "integrity": "sha512-YCY4kzHMsHoyKspQH+nwSe+70Kep7Vjt2X+dZe5Vs2vkRudqtoFoUIv1RlJmZB8Hbp7McneupoZij4PadxsK5Q==", "dev": true, "requires": { "@types/estree": "*", @@ -605,9 +626,9 @@ "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==" }, "@types/fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.2.tgz", + "integrity": "sha512-jp0RI6xfZpi5JL8v7WQwpBEQTq63RqW2kxwTZt+m27LcJqQdPVU1yGnT1ZI4EtCDynQQJtIGyQahkiCGCS7e+A==", "dev": true, "requires": { "@types/node": "*" @@ -700,9 +721,9 @@ "dev": true }, "@types/node": { - "version": "14.11.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", - "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==" + "version": "14.11.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz", + "integrity": "sha512-yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -759,9 +780,9 @@ } }, "@types/vscode": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.49.0.tgz", - "integrity": "sha512-wfNQmLmm1VdMBr6iuNdprWmC1YdrgZ9dQzadv+l2eSjJlElOdJw8OTm4RU4oGTBcfvG6RZI2jOcppkdSS18mZw==" + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz", + "integrity": "sha512-QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg==" }, "@types/yeoman-environment": { "version": "2.10.1", @@ -806,13 +827,13 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz", - "integrity": "sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.4.1.tgz", + "integrity": "sha512-O+8Utz8pb4OmcA+Nfi5THQnQpHSD2sDUNw9AxNHpuYOo326HZTtG8gsfT+EAYuVrFNaLyNb2QnUNkmTRDskuRA==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.3.0", - "@typescript-eslint/scope-manager": "4.3.0", + "@typescript-eslint/experimental-utils": "4.4.1", + "@typescript-eslint/scope-manager": "4.4.1", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -821,65 +842,65 @@ } }, "@typescript-eslint/eslint-plugin-tslint": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.3.0.tgz", - "integrity": "sha512-LMGvtNfR92Ms8OHFnPKrKlViqUelcXpPG5RdR/n1p9xCCWZFHdwjguwVVsL0hcDJLvHHX1tJAU75noC564Zhrg==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.4.1.tgz", + "integrity": "sha512-5IVPQjhS2NzWjRpP18SuPnip5ep7zChPZLkPJr1onHg0TADDBolg35hCk9/55FedjBin8LIjzTbyMn24XXr+QQ==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.3.0", + "@typescript-eslint/experimental-utils": "4.4.1", "lodash": "^4.17.15" } }, "@typescript-eslint/experimental-utils": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz", - "integrity": "sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.4.1.tgz", + "integrity": "sha512-Nt4EVlb1mqExW9cWhpV6pd1a3DkUbX9DeyYsdoeziKOpIJ04S2KMVDO+SEidsXRH/XHDpbzXykKcMTLdTXH6cQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.3.0", - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/typescript-estree": "4.3.0", + "@typescript-eslint/scope-manager": "4.4.1", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/typescript-estree": "4.4.1", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.3.0.tgz", - "integrity": "sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.4.1.tgz", + "integrity": "sha512-S0fuX5lDku28Au9REYUsV+hdJpW/rNW0gWlc4SXzF/kdrRaAVX9YCxKpziH7djeWT/HFAjLZcnY7NJD8xTeUEg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.3.0", - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/typescript-estree": "4.3.0", + "@typescript-eslint/scope-manager": "4.4.1", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/typescript-estree": "4.4.1", "debug": "^4.1.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz", - "integrity": "sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.4.1.tgz", + "integrity": "sha512-2oD/ZqD4Gj41UdFeWZxegH3cVEEH/Z6Bhr/XvwTtGv66737XkR4C9IqEkebCuqArqBJQSj4AgNHHiN1okzD/wQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/visitor-keys": "4.3.0" + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/visitor-keys": "4.4.1" } }, "@typescript-eslint/types": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.3.0.tgz", - "integrity": "sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.4.1.tgz", + "integrity": "sha512-KNDfH2bCyax5db+KKIZT4rfA8rEk5N0EJ8P0T5AJjo5xrV26UAzaiqoJCxeaibqc0c/IvZxp7v2g3difn2Pn3w==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz", - "integrity": "sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.4.1.tgz", + "integrity": "sha512-wP/V7ScKzgSdtcY1a0pZYBoCxrCstLrgRQ2O9MmCUZDtmgxCO/TCqOTGRVwpP4/2hVfqMz/Vw1ZYrG8cVxvN3g==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", - "@typescript-eslint/visitor-keys": "4.3.0", + "@typescript-eslint/types": "4.4.1", + "@typescript-eslint/visitor-keys": "4.4.1", "debug": "^4.1.1", "globby": "^11.0.1", "is-glob": "^4.0.1", @@ -1010,15 +1031,21 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz", - "integrity": "sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.4.1.tgz", + "integrity": "sha512-H2JMWhLaJNeaylSnMSQFEhT/S/FsJbebQALmoJxMPMxLtlVAMy2uJP/Z543n9IizhjRayLSqoInehCeNW9rWcw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.3.0", + "@typescript-eslint/types": "4.4.1", "eslint-visitor-keys": "^2.0.0" } }, + "@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, "JSONStream": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", @@ -1029,9 +1056,9 @@ } }, "acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, "acorn-jsx": { @@ -1268,18 +1295,6 @@ "es-abstract": "^1.17.0-next.1" } }, - "array.prototype.map": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz", - "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "es-array-method-boxes-properly": "^1.0.0", - "is-string": "^1.0.4" - } - }, "arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -1747,9 +1762,9 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "chokidar": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", - "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -1759,7 +1774,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.5.0" }, "dependencies": { "braces": { @@ -2804,35 +2819,6 @@ "string.prototype.trimstart": "^1.0.1" } }, - "es-array-method-boxes-properly": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", - "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", - "dev": true - }, - "es-get-iterator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz", - "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==", - "dev": true, - "requires": { - "es-abstract": "^1.17.4", - "has-symbols": "^1.0.1", - "is-arguments": "^1.0.4", - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-string": "^1.0.5", - "isarray": "^2.0.5" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - } - } - }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -2862,9 +2848,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz", - "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz", + "integrity": "sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -2877,7 +2863,7 @@ "enquirer": "^2.3.5", "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^1.3.0", + "eslint-visitor-keys": "^2.0.0", "espree": "^7.3.0", "esquery": "^1.2.0", "esutils": "^2.0.2", @@ -2917,12 +2903,6 @@ "which": "^2.0.1" } }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - }, "glob-parent": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", @@ -3209,13 +3189,13 @@ } }, "eslint-plugin-jsdoc": { - "version": "30.6.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.3.tgz", - "integrity": "sha512-RnyM+a3SKRfPs/jqO2qOGAEZnOJT2dOhiwhBlYVp8/yRUUBNPlvkwZm0arrnyFKvfZX6WqSwlK5OcNnM5W1Etg==", + "version": "30.6.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.6.5.tgz", + "integrity": "sha512-obC3wi1/b5hsPLXa3ZDs571QXGqkVsphndMsIsVQzWRdZOaRbxdvGiKhLzzZytbRZAL1M1Bkdc/3Af7eNxJ/Hg==", "dev": true, "requires": { "comment-parser": "^0.7.6", - "debug": "^4.1.1", + "debug": "^4.2.0", "jsdoctypeparser": "^9.0.0", "lodash": "^4.17.20", "regextras": "^0.7.1", @@ -3223,6 +3203,15 @@ "spdx-expression-parse": "^3.0.1" }, "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, "lodash": { "version": "4.17.20", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", @@ -3704,21 +3693,10 @@ } }, "flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", - "dev": true, - "requires": { - "is-buffer": "~2.0.3" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", - "dev": true - } - } + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true }, "flat-cache": { "version": "2.0.1", @@ -4712,12 +4690,6 @@ } } }, - "is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true - }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -4838,12 +4810,6 @@ "is-path-inside": "^1.0.0" } }, - "is-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz", - "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", - "dev": true - }, "is-negated-glob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", @@ -4954,12 +4920,6 @@ "scoped-regex": "^1.0.0" } }, - "is-set": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz", - "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==", - "dev": true - }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -5060,22 +5020,6 @@ "is-object": "^1.0.1" } }, - "iterate-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz", - "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==", - "dev": true - }, - "iterate-value": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz", - "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==", - "dev": true, - "requires": { - "es-get-iterator": "^1.0.2", - "iterate-iterator": "^1.0.1" - } - }, "jake": { "version": "10.8.2", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", @@ -5906,15 +5850,16 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" }, "mocha": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz", - "integrity": "sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz", + "integrity": "sha512-lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw==", "dev": true, "requires": { + "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.4.2", - "debug": "4.1.1", + "chokidar": "3.4.3", + "debug": "4.2.0", "diff": "4.0.2", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", @@ -5925,19 +5870,27 @@ "log-symbols": "4.0.0", "minimatch": "3.0.4", "ms": "2.1.2", - "object.assign": "4.1.0", - "promise.allsettled": "1.0.2", - "serialize-javascript": "4.0.0", - "strip-json-comments": "3.0.1", - "supports-color": "7.1.0", + "nanoid": "3.1.12", + "serialize-javascript": "5.0.1", + "strip-json-comments": "3.1.1", + "supports-color": "7.2.0", "which": "2.0.2", "wide-align": "1.1.3", - "workerpool": "6.0.0", + "workerpool": "6.0.2", "yargs": "13.3.2", "yargs-parser": "13.1.2", - "yargs-unparser": "1.6.1" + "yargs-unparser": "2.0.0" }, "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -5996,11 +5949,14 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, - "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", - "dev": true + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } }, "which": { "version": "2.0.2", @@ -6047,6 +6003,12 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, + "nanoid": { + "version": "3.1.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", + "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==", + "dev": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -6914,19 +6876,6 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, - "promise.allsettled": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz", - "integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==", - "dev": true, - "requires": { - "array.prototype.map": "^1.0.1", - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "iterate-value": "^1.0.0" - } - }, "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -7072,9 +7021,9 @@ } }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -7431,9 +7380,9 @@ } }, "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -8493,9 +8442,9 @@ "dev": true }, "ts-morph": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-8.1.1.tgz", - "integrity": "sha512-tjtRAzY4A3huKVlEnTJveLfvNmRICMOhvRJY6kwJ3Oo7bkshJa0zBdsmb/ciIWIn6L/eJsihHjoeqvNJCBbzUA==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-8.1.2.tgz", + "integrity": "sha512-5w4TzmMzECrBunIku1T6/Y0Y2IJ9sHT6hAlfF59WugXnsq1dv6DSioA+s6LgUiswxjgaJgZndOKgu8BrLcYjKw==", "requires": { "@dsherret/to-absolute-glob": "^2.0.2", "@ts-morph/common": "~0.6.0", @@ -8784,9 +8733,10 @@ "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=" }, "upath": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.0.tgz", + "integrity": "sha512-ghi1XxsVYPOZPDsOZrfOJIwQU5I3JVYB3Q6IbBGn1KFeOa89i0nUy5tCEkY9pVm83U83qZ1QG40RQKGknllV4w==", + "dev": true }, "update-notifier": { "version": "2.5.0", @@ -9210,9 +9160,9 @@ "dev": true }, "workerpool": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz", - "integrity": "sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz", + "integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==", "dev": true }, "wrap-ansi": { @@ -9385,84 +9335,34 @@ } }, "yargs-unparser": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz", - "integrity": "sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, "requires": { - "camelcase": "^5.3.1", - "decamelize": "^1.2.0", - "flat": "^4.1.0", - "is-plain-obj": "^1.1.0", - "yargs": "^14.2.3" + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "camelcase": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz", + "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==", "dev": true }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "yargs": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", - "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^15.0.1" - } - }, - "yargs-parser": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", - "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index 7a07b3e6..6df604e9 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -44,8 +44,8 @@ "dependencies": { "@manuth/extended-yo-generator": "^7.3.3", "@manuth/package-json-editor": "^1.4.2", - "@manuth/temp-files": "^2.0.0", - "@types/vscode": "^1.49.0", + "@manuth/temp-files": "^2.0.1", + "@types/vscode": "^1.50.0", "chalk": "^4.1.0", "comment-json": "^4.1.0", "dedent": "^0.7.0", @@ -59,7 +59,7 @@ "npm-which": "^3.0.1", "parse-pkg-name": "^2.0.0", "shusher": "^0.1.1", - "ts-morph": "^8.1.1", + "ts-morph": "^8.1.2", "typescript": "^4.0.3", "validate-npm-package-name": "^3.0.0", "yaml": "^1.10.0", @@ -73,32 +73,32 @@ "@types/comment-json": "^1.1.1", "@types/dedent": "^0.7.0", "@types/diff": "^4.0.2", - "@types/eslint": "^7.2.3", - "@types/fs-extra": "^9.0.1", + "@types/eslint": "^7.2.4", + "@types/fs-extra": "^9.0.2", "@types/inquirer": "^7.3.1", "@types/lodash.camelcase": "^4.3.6", "@types/lodash.kebabcase": "^4.1.6", "@types/mocha": "^8.0.3", - "@types/node": "^14.11.2", + "@types/node": "^14.11.10", "@types/npm-packlist": "^1.1.1", "@types/npm-which": "^3.0.0", "@types/validate-npm-package-name": "^3.0.0", "@types/yosay": "0.0.29", - "@typescript-eslint/eslint-plugin": "^4.3.0", - "@typescript-eslint/eslint-plugin-tslint": "^4.3.0", - "@typescript-eslint/parser": "^4.3.0", + "@typescript-eslint/eslint-plugin": "^4.4.1", + "@typescript-eslint/eslint-plugin-tslint": "^4.4.1", + "@typescript-eslint/parser": "^4.4.1", "concurrently": "^5.3.0", - "eslint": "^7.10.0", + "eslint": "^7.11.0", "eslint-plugin-deprecation": "^1.1.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^30.6.3", + "eslint-plugin-jsdoc": "^30.6.5", "markdownlint-cli": "^0.24.0", - "mocha": "^8.1.3", + "mocha": "^8.2.0", "npm-packlist": "^2.1.2", "random-js": "^2.1.0", "rimraf": "^3.0.2", "tslint": "^6.1.3", - "upath": "^1.2.0", + "upath": "^2.0.0", "util.chdir": "0.0.43", "yeoman-test": "^3.0.0", "yo": "^3.1.1" From d316fdf282308aedd01ce6de042525f79d686a99 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 17 Oct 2020 16:57:56 +0200 Subject: [PATCH 55/55] Bump the version number to v1.2.0 --- lerna.json | 2 +- packages/generator-my-ts-project/package-lock.json | 2 +- packages/generator-my-ts-project/package.json | 4 ++-- packages/generator-ts-project/package-lock.json | 2 +- packages/generator-ts-project/package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lerna.json b/lerna.json index 1006d639..7abc8ed0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.4", + "version": "1.2.0", "packages": [ "./packages/*" ], diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json index 7a38315f..421bed17 100644 --- a/packages/generator-my-ts-project/package-lock.json +++ b/packages/generator-my-ts-project/package-lock.json @@ -1,6 +1,6 @@ { "name": "@manuth/generator-my-ts-project", - "version": "1.1.4", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json index 1961ce11..087d6005 100644 --- a/packages/generator-my-ts-project/package.json +++ b/packages/generator-my-ts-project/package.json @@ -1,6 +1,6 @@ { "name": "@manuth/generator-my-ts-project", - "version": "1.1.4", + "version": "1.2.0", "description": "Generates TypeScript-Projects with custom additions", "author": "Manuel Thalmann ", "keywords": [ @@ -41,7 +41,7 @@ }, "dependencies": { "@manuth/extended-yo-generator": "^7.3.3", - "@manuth/generator-ts-project": "^1.1.4", + "@manuth/generator-ts-project": "^1.2.0", "@manuth/temp-files": "^2.0.1", "chalk": "^4.1.0", "dedent": "^0.7.0", diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json index a2e2b0d6..218c25a3 100644 --- a/packages/generator-ts-project/package-lock.json +++ b/packages/generator-ts-project/package-lock.json @@ -1,6 +1,6 @@ { "name": "@manuth/generator-ts-project", - "version": "1.1.4", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json index 6df604e9..5babd8d8 100644 --- a/packages/generator-ts-project/package.json +++ b/packages/generator-ts-project/package.json @@ -1,6 +1,6 @@ { "name": "@manuth/generator-ts-project", - "version": "1.1.4", + "version": "1.2.0", "description": "A Set of Generators for Creating Projects Written in TypeScript", "author": "Manuel Thalmann ", "license": "MIT",