diff --git a/package.json b/package.json index 2422e0c11..cde1ca6a4 100644 --- a/package.json +++ b/package.json @@ -47,10 +47,10 @@ "dependencies": { "@samverschueren/stream-to-observable": "0.3.1", "@tsed/components-scan": ">=7.14.2", - "@tsed/normalize-path": ">=7.14.2", "@tsed/core": ">=7.14.2", "@tsed/di": ">=7.14.2", "@tsed/logger": ">=6.2.1", + "@tsed/normalize-path": ">=7.14.2", "any-observable": "0.5.1", "axios": "0.26.1", "chalk": "4.1.0", @@ -78,6 +78,9 @@ "devDependencies": { "@commitlint/cli": "^17.0.3", "@commitlint/config-conventional": "^17.0.3", + "@swc/core": "^1.3.61", + "@swc/helpers": "^0.5.1", + "@swc/jest": "^0.2.26", "@tsed/markdown-it-symbols": "3.20.4", "@tsed/monorepo-utils": "1.23.0", "@tsed/ts-doc": "^4.1.0", @@ -85,12 +88,10 @@ "@types/node": "18.7.8", "@typescript-eslint/eslint-plugin": "^5.33.1", "@typescript-eslint/parser": "^5.33.1", - "@swc/core": "^1.3.61", - "@swc/helpers": "^0.5.1", - "@swc/jest": "^0.2.26", "concurrently": "7.6.0", "coveralls": "3.1.1", "cross-env": "7.0.3", + "entities": "1.1.2", "eslint": "8.22.0", "eslint-config-prettier": "8.5.0", "eslint-plugin-jest": "27.1.6", @@ -115,7 +116,6 @@ "typescript": "4.9.5", "vue-analytics": "5.22.1", "vuepress": "1.9.7", - "entities": "1.1.2", "vuepress-theme-tsed": "3.19.5" }, "directories": { diff --git a/packages/cli-core/jest.config.js b/packages/cli-core/jest.config.js index 8b82f5014..eead22303 100644 --- a/packages/cli-core/jest.config.js +++ b/packages/cli-core/jest.config.js @@ -9,10 +9,10 @@ module.exports = { }, coverageThreshold: { global: { - statements: 71.23, - branches: 72.81, + statements: 71.15, + branches: 72.9, functions: 48.9, - lines: 71.23 + lines: 71.15 } }, }; diff --git a/packages/cli-core/src/decorators/command.ts b/packages/cli-core/src/decorators/command.ts index 4afb38fcb..2ba238aef 100644 --- a/packages/cli-core/src/decorators/command.ts +++ b/packages/cli-core/src/decorators/command.ts @@ -1,8 +1,8 @@ -import {useDecorators, StoreSet} from "@tsed/core"; +import {StoreSet, useDecorators} from "@tsed/core"; +import {Injectable} from "@tsed/di"; import {CommandStoreKeys} from "../domains/CommandStoreKeys"; import {CommandParameters} from "../interfaces/CommandParameters"; -import {registerCommand} from "../registries/CommandRegistry"; export function Command(options: CommandParameters): ClassDecorator { - return useDecorators(registerCommand, StoreSet(CommandStoreKeys.COMMAND, options)) as any; + return useDecorators(Injectable({type: "command"}), StoreSet(CommandStoreKeys.COMMAND, options)) as any; } diff --git a/packages/cli-core/src/registries/CommandRegistry.ts b/packages/cli-core/src/registries/CommandRegistry.ts deleted file mode 100644 index 1c4dc9844..000000000 --- a/packages/cli-core/src/registries/CommandRegistry.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {GlobalProviders, Provider} from "@tsed/di"; - -export const PROVIDER_TYPE_COMMAND = "command"; -/** - * - * @type {Registry, IProvider>} - */ -// tslint:disable-next-line: variable-name -export const CommandRegistry = GlobalProviders.createRegistry(PROVIDER_TYPE_COMMAND, Provider); - -export const registerCommand = GlobalProviders.createRegisterFn(PROVIDER_TYPE_COMMAND); diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index ee34deb9e..1890352c3 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -6,7 +6,6 @@ import {v4} from "uuid"; import {CommandStoreKeys} from "../domains/CommandStoreKeys"; import {CommandProvider} from "../interfaces/CommandProvider"; import {CommandArg, CommandOptions} from "../interfaces/CommandParameters"; -import {PROVIDER_TYPE_COMMAND} from "../registries/CommandRegistry"; import {createSubTasks, createTasksRunner} from "../utils/createTasksRunner"; import {getCommandMetadata} from "../utils/getCommandMetadata"; import {mapCommanderArgs} from "../utils/mapCommanderArgs"; @@ -238,7 +237,7 @@ export class CliService { } private load() { - this.injector.getProviders(PROVIDER_TYPE_COMMAND).forEach((provider) => this.build(provider)); + this.injector.getProviders("command").forEach((provider) => this.build(provider)); } private mapData(cmdName: string, data: any, $ctx: DIContext) { diff --git a/yarn.lock b/yarn.lock index e6f4ad5f7..5db62f263 100644 --- a/yarn.lock +++ b/yarn.lock @@ -636,8 +636,6 @@ version "7.17.12" resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz" integrity sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-syntax-jsx@^7.7.2": version "7.21.4" @@ -2376,7 +2374,7 @@ "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: "@nodelib/fs.stat" "2.0.5" @@ -2384,7 +2382,7 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.stat@^1.1.2": @@ -2394,7 +2392,7 @@ "@nodelib/fs.walk@^1.2.3": version "1.2.8" - resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: "@nodelib/fs.scandir" "2.1.5" @@ -3177,26 +3175,26 @@ integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== "@tsed/components-scan@>=7.14.2": - version "7.14.2" - resolved "https://registry.npmjs.org/@tsed/components-scan/-/components-scan-7.14.2.tgz" - integrity sha512-Sv+2YxkgP2VxQxkf9Gbw2/UI++IEaqjacCpxIPf/Uhqmpfp0CiYS5ZA1LZy1Hq+mu+V9hnvbTmfIosuZE1cUHg== + version "7.31.0" + resolved "https://registry.yarnpkg.com/@tsed/components-scan/-/components-scan-7.31.0.tgz#09de3f7267c83a4bd2b49a0a3bbaa06bd912cd57" + integrity sha512-YIno7/ZPDuZ0d/lDWXDKv2D2YbnnilG+lYEK8gfdVnv2UA5CGhQ9k3loNFPYFF80jc4Zxiyy7f9VIOihQAgBcA== dependencies: - "@tsed/normalize-path" "7.14.2" + "@tsed/normalize-path" "7.31.0" globby "11.0.3" - tslib "2.4.0" + tslib "2.5.0" "@tsed/core@>=7.14.2": - version "7.30.0" - resolved "https://registry.npmjs.org/@tsed/core/-/core-7.30.0.tgz" - integrity sha512-GOhgRX9z9wo00j7GyDoDc8TJ831dTW5GF4MkE60jbAiXT8rwVUALTf8IvlnKoTDSFXUnFlJVPZT3JDMHiKG1Ig== + version "7.31.0" + resolved "https://registry.yarnpkg.com/@tsed/core/-/core-7.31.0.tgz#221be3b2e3e80c7cc926ef10a590a5bb8bb1c419" + integrity sha512-1/Mro5ASeeCK3bjUDBtv8ZyLke7NYEEmC1p4Ns0k9yZMTmHoI6j0lwSuhEaGLWr4xyBIqvhOkd+mThfiCB3ZwQ== dependencies: reflect-metadata "^0.1.13" tslib "2.5.0" "@tsed/di@>=7.14.2": - version "7.30.0" - resolved "https://registry.npmjs.org/@tsed/di/-/di-7.30.0.tgz" - integrity sha512-QdwTmFmLMEkc8C9p43Ud6np54MeH5Gk4sIhP25Wz3JYQId8EcobVC3KCEkgN/jxZZR8SxunAeiQrRaLiD9TqCw== + version "7.31.0" + resolved "https://registry.yarnpkg.com/@tsed/di/-/di-7.31.0.tgz#cd4e51139b730c7b8740564078941ac058bd1919" + integrity sha512-APvKQaveCGGTRzZyC5mN9BoH68eL0jSzAXtdkaBqXRZwPGXe3lJamlIYRF6ueuGsYw0Ae0hV32ezCX3GZZrHgQ== dependencies: tslib "2.5.0" @@ -3241,25 +3239,25 @@ normalize-path "3.0.0" semver "7.3.7" -"@tsed/normalize-path@7.14.2", "@tsed/normalize-path@>=7.14.2": - version "7.14.2" - resolved "https://registry.npmjs.org/@tsed/normalize-path/-/normalize-path-7.14.2.tgz" - integrity sha512-DYeC+CxHJaISOEfGbgcRwMhszev30tEhh+mRN051UgLllAUiGz/7eXyH4gY6BNwZPNuoPVvhIrUz+L5VpDp99g== +"@tsed/normalize-path@7.31.0", "@tsed/normalize-path@>=7.14.2": + version "7.31.0" + resolved "https://registry.yarnpkg.com/@tsed/normalize-path/-/normalize-path-7.31.0.tgz#cb82369a44f6c78005f1f5ca90fda36496088360" + integrity sha512-y7FAcbpnOuJFAol5HyNbMkLvLXEBoxxIuwMU70xoIwFhcBWoCzUwu8Kc6+aw0dwflSZCH7HPfnTHt4+V7okvGQ== dependencies: normalize-path "3.0.0" - tslib "2.4.0" + tslib "2.5.0" -"@tsed/openspec@7.30.0", "@tsed/openspec@>=7.14.2": - version "7.30.0" - resolved "https://registry.npmjs.org/@tsed/openspec/-/openspec-7.30.0.tgz" - integrity sha512-CEKKzhPlbYMi2V+f3Edy/ApMOwhU11PkOFeM158QYZBI2hjPyOqWGQU7NpVMhtDtp3F10Sw6AtHwolkzApZmVA== +"@tsed/openspec@7.31.0", "@tsed/openspec@>=7.14.2": + version "7.31.0" + resolved "https://registry.yarnpkg.com/@tsed/openspec/-/openspec-7.31.0.tgz#f7446c04b03de0e6ecfc3a009a71ff3e303cff40" + integrity sha512-W/2FAz1tfpbqC9K+sjZlklv1j/693ZfyXIpzagSLfcCv6wrdZYRnEWgVoSuZJh/NIgnuE1X4ISOROTkZ1q5/vA== "@tsed/schema@>=7.14.2": - version "7.30.0" - resolved "https://registry.npmjs.org/@tsed/schema/-/schema-7.30.0.tgz" - integrity sha512-P4qBkdgmH/qMeyhqvbn0upjT6h1a4gZWUW3vJg/kClyklSE2c+IgUaPjiazWUzqTrCcDlEuNEXBAbnBRtXVT4w== + version "7.31.0" + resolved "https://registry.yarnpkg.com/@tsed/schema/-/schema-7.31.0.tgz#b58cb36997b71e339bd03b0879eeb646c2838d8d" + integrity sha512-awwUIlUITUncTkdbmaBOP6iCFDnhMD0GKqaUDxp5Sl4BGh4pnyb+UVJpUQeYWnpuA2kOq4OHWU8ZH97JTotPXA== dependencies: - "@tsed/openspec" "7.30.0" + "@tsed/openspec" "7.31.0" change-case "^4.1.2" fs-extra "^10.0.1" json-schema "0.4.0" @@ -4975,7 +4973,7 @@ array-union@^1.0.1, array-union@^1.0.2: array-union@^2.1.0: version "2.1.0" - resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== array-uniq@^1.0.1: @@ -5806,7 +5804,7 @@ camel-case@3.0.x: camel-case@^4.1.2: version "4.1.2" - resolved "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== dependencies: pascal-case "^3.1.2" @@ -5853,7 +5851,7 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001358: capital-case@^1.0.4: version "1.0.4" - resolved "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" integrity sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A== dependencies: no-case "^3.0.4" @@ -6516,7 +6514,7 @@ consolidate@^0.15.1: constant-case@^3.0.4: version "3.0.4" - resolved "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz" + resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1" integrity sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ== dependencies: no-case "^3.0.4" @@ -7440,7 +7438,7 @@ dir-glob@^2.0.0, dir-glob@^2.2.2: dir-glob@^3.0.0, dir-glob@^3.0.1: version "3.0.1" - resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== dependencies: path-type "^4.0.0" @@ -7555,7 +7553,7 @@ domutils@^2.5.2, domutils@^2.8.0: dot-case@^3.0.4: version "3.0.4" - resolved "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== dependencies: no-case "^3.0.4" @@ -8479,7 +8477,7 @@ fast-glob@^2.0.2, fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.9: +fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.9: version "3.2.11" resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== @@ -8490,6 +8488,17 @@ fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.9: merge2 "^1.3.0" micromatch "^4.0.4" +fast-glob@^3.1.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0" + integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-glob@^3.2.12: version "3.2.12" resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz" @@ -8522,9 +8531,9 @@ fastest-levenshtein@^1.0.12: integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -8616,7 +8625,7 @@ fill-range@^4.0.0: fill-range@^7.0.1: version "7.0.1" - resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== dependencies: to-regex-range "^5.0.1" @@ -8686,9 +8695,6 @@ find-up@^6.3.0: version "6.3.0" resolved "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz" integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw== - dependencies: - locate-path "^7.1.0" - path-exists "^5.0.0" find-versions@^4.0.0: version "4.0.0" @@ -9260,7 +9266,7 @@ globby@*: globby@11.0.3: version "11.0.3" - resolved "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== dependencies: array-union "^2.1.0" @@ -9363,11 +9369,16 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.10, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + grapheme-splitter@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz" @@ -9605,7 +9616,7 @@ he@1.2.x, he@^1.1.0: header-case@^2.0.4: version "2.0.4" - resolved "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz" + resolved "https://registry.yarnpkg.com/header-case/-/header-case-2.0.4.tgz#5a42e63b55177349cf405beb8d775acabb92c063" integrity sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q== dependencies: capital-case "^1.0.4" @@ -9959,11 +9970,16 @@ ignore@^4.0.3: resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0: +ignore@^5.0.4, ignore@^5.1.1, ignore@^5.2.0: version "5.2.0" resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== +ignore@^5.1.4: + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== + immediate@^3.2.3: version "3.3.0" resolved "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz" @@ -10426,8 +10442,8 @@ is-extendable@^1.0.1: is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^1.0.0: version "1.0.0" @@ -10557,7 +10573,7 @@ is-number@^4.0.0: is-number@^7.0.0: version "7.0.0" - resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== is-obj@^1.0.0: @@ -11370,7 +11386,7 @@ json-schema-traverse@^1.0.0: json-schema@0.4.0: version "0.4.0" - resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== json-stable-stringify-without-jsonify@^1.0.1: @@ -11424,7 +11440,7 @@ jsonfile@^4.0.0: jsonfile@^6.0.1: version "6.1.0" - resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== dependencies: universalify "^2.0.0" @@ -12056,7 +12072,7 @@ lower-case@^1.1.1: lower-case@^2.0.2: version "2.0.2" - resolved "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== dependencies: tslib "^2.0.3" @@ -12545,7 +12561,7 @@ micromatch@^3.1.10, micromatch@^3.1.4: micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" - resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: braces "^3.0.2" @@ -12953,7 +12969,7 @@ no-case@^2.2.0: no-case@^3.0.4: version "3.0.4" - resolved "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== dependencies: lower-case "^2.0.2" @@ -13972,7 +13988,7 @@ param-case@2.1.x: param-case@^3.0.4: version "3.0.4" - resolved "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== dependencies: dot-case "^3.0.4" @@ -14064,7 +14080,7 @@ parseurl@~1.3.2, parseurl@~1.3.3: pascal-case@^3.1.2: version "3.1.2" - resolved "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== dependencies: no-case "^3.0.4" @@ -14082,7 +14098,7 @@ path-browserify@0.0.1: path-case@^3.0.4: version "3.0.4" - resolved "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz" + resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f" integrity sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg== dependencies: dot-case "^3.0.4" @@ -14154,7 +14170,7 @@ path-type@^3.0.0: path-type@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pbkdf2@^3.0.3: @@ -14667,8 +14683,6 @@ postcss-simple-vars@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-2.0.0.tgz" integrity sha512-HllLaKKCBOdKudyzqrw/ve5rWouM9cDL+WHaSF9q4CkBEPjdTdiKNw1xF2dAz5rUKrxVmnUmOYxamwy37dnq2Q== - dependencies: - postcss "^5.0.21" postcss-simple-vars@^4.0.0: version "4.1.0" @@ -15035,7 +15049,7 @@ querystringify@^2.1.1: queue-microtask@^1.2.2: version "1.2.3" - resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== quick-lru@^4.0.1: @@ -15283,7 +15297,7 @@ reduce@^1.0.1: reflect-metadata@^0.1.13: version "0.1.13" - resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== reftools@^1.1.9: @@ -15584,7 +15598,7 @@ retry@^0.13.1: reusify@^1.0.4: version "1.0.4" - resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== rfdc@^1.3.0: @@ -15631,7 +15645,7 @@ run-async@^2.4.0, run-async@^2.4.1: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== dependencies: queue-microtask "^1.2.2" @@ -15863,7 +15877,7 @@ send@0.18.0: sentence-case@^3.0.4: version "3.0.4" - resolved "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz" + resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f" integrity sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg== dependencies: no-case "^3.0.4" @@ -16109,7 +16123,7 @@ slash@^2.0.0: slash@^3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== slash@^4.0.0: @@ -16160,7 +16174,7 @@ smoothscroll-polyfill@^0.4.3, smoothscroll-polyfill@^0.4.4: snake-case@^3.0.4: version "3.0.4" - resolved "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz" + resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c" integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg== dependencies: dot-case "^3.0.4" @@ -17141,7 +17155,7 @@ to-regex-range@^2.1.0: to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== dependencies: is-number "^7.0.0" @@ -17273,14 +17287,9 @@ tslib@2.3.1: resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tslib@2.4.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0: - version "2.4.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - tslib@2.5.0: version "2.5.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== tslib@^1.8.1, tslib@^1.9.0: @@ -17288,6 +17297,16 @@ tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.0.3: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" + integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== + +tslib@^2.1.0, tslib@^2.3.0: + version "2.4.0" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + tslib@^2.4.0: version "2.5.3" resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz" @@ -17590,7 +17609,7 @@ universalify@^0.1.0: universalify@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== unpipe@1.0.0, unpipe@~1.0.0: @@ -17688,7 +17707,7 @@ update-notifier@^4.0.0: upper-case-first@^2.0.2: version "2.0.2" - resolved "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz" + resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324" integrity sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg== dependencies: tslib "^2.0.3" @@ -17700,7 +17719,7 @@ upper-case@^1.1.1: upper-case@^2.0.2: version "2.0.2" - resolved "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz" + resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz#d89810823faab1df1549b7d97a76f8662bae6f7a" integrity sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg== dependencies: tslib "^2.0.3"