From 81bb1dc0b47802ac613fe34f774524553535ca5d Mon Sep 17 00:00:00 2001 From: svc-cli-bot <113140650+svc-cli-bot@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:59:48 -0500 Subject: [PATCH] fix: more flag conflicts (#861) * chore: updates from devScripts * fix: remove duplicate char alias * fix: remove duplicate apiversion, add char to main apiVersion flag * chore: snapshot * chore: remove unused prop --------- Co-authored-by: mshanemc --- command-snapshot.json | 53 +++++++++++---- package.json | 8 +-- src/commands/force/source/retrieve.ts | 12 ++-- src/deployCommand.ts | 2 +- yarn.lock | 96 +++++++++------------------ 5 files changed, 78 insertions(+), 93 deletions(-) diff --git a/command-snapshot.json b/command-snapshot.json index 2b8071214..5d0b366eb 100644 --- a/command-snapshot.json +++ b/command-snapshot.json @@ -3,7 +3,9 @@ "command": "force", "plugin": "@salesforce/plugin-source", "flags": ["json"], - "alias": [] + "alias": [], + "flagChars": [], + "flagAliases": [] }, { "command": "force:mdapi:deploy", @@ -31,13 +33,17 @@ "wait", "zipfile" ], - "alias": [] + "alias": [], + "flagChars": ["c", "d", "f", "g", "l", "o", "q", "r", "s", "u", "w"], + "flagAliases": ["apiversion", "targetusername"] }, { "command": "force:mdapi:deploy:cancel", "plugin": "@salesforce/plugin-source", "flags": ["api-version", "jobid", "json", "loglevel", "target-org", "wait"], - "alias": [] + "alias": [], + "flagChars": ["i", "o", "w"], + "flagAliases": ["apiversion", "targetusername", "u"] }, { "command": "force:mdapi:deploy:report", @@ -55,7 +61,9 @@ "verbose", "wait" ], - "alias": [] + "alias": [], + "flagChars": ["i", "o", "w"], + "flagAliases": ["apiversion", "targetusername", "u"] }, { "command": "force:mdapi:retrieve", @@ -75,7 +83,9 @@ "wait", "zipfilename" ], - "alias": [] + "alias": [], + "flagChars": ["a", "d", "k", "n", "o", "p", "r", "s", "w", "z"], + "flagAliases": ["targetusername", "u"] }, { "command": "force:mdapi:retrieve:report", @@ -92,7 +102,9 @@ "wait", "zipfilename" ], - "alias": [] + "alias": [], + "flagChars": ["i", "n", "o", "r", "w", "z"], + "flagAliases": ["apiversion", "targetusername", "u"] }, { "command": "force:source:deploy", @@ -123,13 +135,17 @@ "verbose", "wait" ], - "alias": [] + "alias": [], + "flagChars": ["c", "f", "g", "l", "m", "o", "p", "q", "r", "t", "u", "w", "x"], + "flagAliases": ["apiversion", "targetusername"] }, { "command": "force:source:deploy:cancel", "plugin": "@salesforce/plugin-source", "flags": ["api-version", "jobid", "json", "loglevel", "target-org", "wait"], - "alias": [] + "alias": [], + "flagChars": ["i", "o", "w"], + "flagAliases": ["apiversion", "targetusername", "u"] }, { "command": "force:source:deploy:report", @@ -146,26 +162,31 @@ "verbose", "wait" ], - "alias": [] + "alias": [], + "flagChars": ["i", "o", "w"], + "flagAliases": ["apiversion", "targetusername", "u"] }, { "command": "force:source:pull", "plugin": "@salesforce/plugin-source", "flags": ["api-version", "forceoverwrite", "json", "loglevel", "target-org", "verbose", "wait"], - "alias": [] + "alias": [], + "flagChars": ["f", "o", "w"], + "flagAliases": ["apiversion", "targetusername", "u"] }, { "command": "force:source:push", "plugin": "@salesforce/plugin-source", "flags": ["api-version", "forceoverwrite", "ignorewarnings", "json", "loglevel", "quiet", "target-org", "wait"], - "alias": [] + "alias": [], + "flagChars": ["f", "g", "o", "w"], + "flagAliases": ["apiversion", "targetusername", "u"] }, { "command": "force:source:retrieve", "plugin": "@salesforce/plugin-source", "flags": [ "api-version", - "apiversion", "forceoverwrite", "json", "loglevel", @@ -179,12 +200,16 @@ "verbose", "wait" ], - "alias": [] + "alias": [], + "flagChars": ["a", "f", "m", "n", "o", "p", "r", "t", "w", "x"], + "flagAliases": ["apiversion", "targetusername", "u"] }, { "command": "force:source:status", "plugin": "@salesforce/plugin-source", "flags": ["api-version", "concise", "json", "local", "loglevel", "remote", "target-org"], - "alias": [] + "alias": [], + "flagChars": ["l", "o", "r"], + "flagAliases": ["apiversion", "targetusername", "u"] } ] diff --git a/package.json b/package.json index 9894962a6..2c0ad65c8 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,11 @@ "tslib": "^2" }, "devDependencies": { - "@oclif/plugin-command-snapshot": "^3.3.13", + "@oclif/plugin-command-snapshot": "^4.0.2", "@oclif/plugin-help": "^5.2.6", "@salesforce/cli-plugins-testkit": "^4.0.1", "@salesforce/dev-config": "^4.0.1", - "@salesforce/dev-scripts": "^5.4.1", + "@salesforce/dev-scripts": "^5.4.2", "@salesforce/plugin-command-reference": "^3.0.2", "@salesforce/plugin-deploy-retrieve": "^1.11.1", "@salesforce/plugin-info": "^2.6.16", @@ -54,7 +54,7 @@ "eslint-plugin-header": "^3.1.1", "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsdoc": "^43.0.5", - "eslint-plugin-sf-plugin": "^1.15.5", + "eslint-plugin-sf-plugin": "^1.15.6", "fast-glob": "^3.2.12", "husky": "^7.0.4", "mocha": "^9.1.3", @@ -283,4 +283,4 @@ "output": [] } } -} \ No newline at end of file +} diff --git a/src/commands/force/source/retrieve.ts b/src/commands/force/source/retrieve.ts index d5f2517ee..45b97784b 100644 --- a/src/commands/force/source/retrieve.ts +++ b/src/commands/force/source/retrieve.ts @@ -28,6 +28,7 @@ import { requiredOrgFlagWithDeprecations, Ux, } from '@salesforce/sf-plugins-core'; +import { AlphabetLowercase } from '@oclif/core/lib/interfaces'; import { SourceCommand } from '../../../sourceCommand'; import { PackageRetrieval, @@ -49,14 +50,14 @@ export class Retrieve extends SourceCommand { public static readonly description = messages.getMessage('description'); public static readonly examples = messages.getMessages('examples'); public static readonly requiresProject = true; - public static readonly requiresUsername = true; public static readonly state = 'deprecated'; public static readonly deprecationOptions = { to: replacement, message: messages.getMessage('deprecation', [replacement]), }; public static readonly flags = { - 'api-version': orgApiVersionFlagWithDeprecations, + // I have no idea why 'a' isn't matching the type AlphabetLowercase automatically + 'api-version': { ...orgApiVersionFlagWithDeprecations, char: 'a' as AlphabetLowercase }, loglevel, 'target-org': requiredOrgFlagWithDeprecations, retrievetargetdir: Flags.directory({ @@ -65,11 +66,6 @@ export class Retrieve extends SourceCommand { summary: messages.getMessage('flags.retrievetargetdir.summary'), exclusive: ['packagenames', 'sourcepath'], }), - apiversion: Flags.string({ - /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ - // @ts-ignore force char override for backward compat - char: 'a', - }), sourcepath: arrayWithDeprecation({ char: 'p', description: messages.getMessage('flags.sourcePath.description'), @@ -167,7 +163,7 @@ export class Retrieve extends SourceCommand { }); this.spinner.start(spinnerMessages.getMessage('retrieve.componentSetBuild')); this.componentSet = await ComponentSetBuilder.build({ - apiversion: this.flags.apiversion, + apiversion: this.flags['api-version'], sourceapiversion: await this.getSourceApiVersion(), packagenames: this.flags.packagenames, sourcepath: this.flags.sourcepath, diff --git a/src/deployCommand.ts b/src/deployCommand.ts index 0982717fb..4646ec1a1 100644 --- a/src/deployCommand.ts +++ b/src/deployCommand.ts @@ -274,7 +274,7 @@ export const targetUsernameFlag = Flags.string({ char: 'u', deprecateAliases: true, // DO NOT alias to 'o', it will conflict with '--ignoreerrors' - aliases: ['targetusername', 'u'], + aliases: ['targetusername'], summary: messages.getMessage('flags.targetusername.summary'), parse: async (input: string | undefined) => resolveUsername(input), default: async () => resolveUsername(), diff --git a/yarn.lock b/yarn.lock index 2b0ff0f65..11769c814 100644 --- a/yarn.lock +++ b/yarn.lock @@ -837,10 +837,10 @@ resolved "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz#aedcb64b479d4db7be24196384897b5000901d91" integrity sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw== -"@oclif/plugin-command-snapshot@^3.3.13": - version "3.3.15" - resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-3.3.15.tgz#2b1f35b75d9bdd15d06386382bb5a53577bdf45a" - integrity sha512-DJ+R8Ega5tq3RTbI6TZ0gI29lEldcSf909VUfsP2zY1tPqkn8IKhs/bFLcS2OkjQgLl/1FpeejFoc4rY44YbRg== +"@oclif/plugin-command-snapshot@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-4.0.2.tgz#236fa8a402db63ffc9ed437aa6d2555026de4040" + integrity sha512-pYjiZifZIRpnpm+vdmyItkAcjFDGkP2XuV+i+5H8midzSawomJxphi/p00cjEauQTn5MnaMcAFIuVTDbI0ZiDQ== dependencies: "@oclif/core" "^2.8.5" chalk "^4.1.2" @@ -848,7 +848,7 @@ lodash "^4.17.21" semver "^7.5.1" ts-json-schema-generator "^1.2.0" - tslib "^2.5.0" + tslib "^2.5.2" "@oclif/plugin-help@^5.1.19", "@oclif/plugin-help@^5.2.6": version "5.2.6" @@ -1081,10 +1081,10 @@ resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.0.1.tgz#662ffaa4409713553aaf68eed93e7d2429c3ff0e" integrity sha512-0zMjXG4Vjlu/mB7zbuKSXfXiP7CEZBwsPtYqNgburk/wZIU9KcMspLwVBDUxmUj9ltRksD9o1ubRUblN5M3Z0g== -"@salesforce/dev-scripts@^5.4.1": - version "5.4.1" - resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-5.4.1.tgz#dedd5fcfb9da3d5401d421eac86ea7d6694ba6d4" - integrity sha512-jBKcuDAjFKY7lNyvmHDwuiw1vs4eeOWlfpfnJxTYabuatDtPzNA7Mm5LBrJ7I5u9cyEJ0VlAn0mGpHTIgzKYMQ== +"@salesforce/dev-scripts@^5.4.2": + version "5.4.2" + resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-5.4.2.tgz#77aacf9a4743fe951d9de9cbc9524a70bb46054e" + integrity sha512-D54yF+NDDa+50A28YyvG8aO5t3tIMIIZ7Q+ewWmUXdpFhqUfwq1k6/Y2tZy+rE9Z8fwWB2DQSD9dhaZavxOgrw== dependencies: "@commitlint/cli" "^17.1.2" "@commitlint/config-conventional" "^17.1.0" @@ -1098,12 +1098,12 @@ chalk "^4.0.0" cosmiconfig "^7.0.0" eslint "^8.41.0" - eslint-config-prettier "^8.5.0" + eslint-config-prettier "^8.8.0" eslint-config-salesforce "^2.0.1" - eslint-config-salesforce-license "^0.1.6" + eslint-config-salesforce-license "^0.2.0" eslint-config-salesforce-typescript "^1.1.1" - eslint-plugin-header "^3.0.0" - eslint-plugin-import "2.26.0" + eslint-plugin-header "^3.1.1" + eslint-plugin-import "^2.27.5" eslint-plugin-jsdoc "^43.0.5" eslint-plugin-prefer-arrow "^1.2.1" husky "^7.0.4" @@ -1117,7 +1117,7 @@ ts-node "^10.0.0" typedoc "0.23.16" typedoc-plugin-missing-exports "0.23.0" - typescript "^4.1.3" + typescript "^4.9.5" wireit "^0.9.5" "@salesforce/kit@^1.7.1", "@salesforce/kit@^1.9.0", "@salesforce/kit@^1.9.2": @@ -1840,7 +1840,7 @@ eslint-utils "^3.0.0" semver "^7.3.7" -"@typescript-eslint/utils@^5.59.7": +"@typescript-eslint/utils@^5.59.8": version "5.59.8" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.8.tgz#34d129f35a2134c67fdaf024941e8f96050dca2b" integrity sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg== @@ -2127,7 +2127,7 @@ array-ify@^1.0.0: resolved "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng== -array-includes@^3.1.4, array-includes@^3.1.6: +array-includes@^3.1.6: version "3.1.6" resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== @@ -2143,7 +2143,7 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array.prototype.flat@^1.2.5, array.prototype.flat@^1.3.1: +array.prototype.flat@^1.3.1: version "1.3.1" resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== @@ -3115,13 +3115,6 @@ debug@4.3.3: dependencies: ms "2.1.2" -debug@^2.6.9: - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -3474,16 +3467,11 @@ escodegen@^1.8.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^8.5.0, eslint-config-prettier@^8.8.0: +eslint-config-prettier@^8.8.0: version "8.8.0" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== -eslint-config-salesforce-license@^0.1.6: - version "0.1.6" - resolved "https://registry.npmjs.org/eslint-config-salesforce-license/-/eslint-config-salesforce-license-0.1.6.tgz#75b475cf90f92e1dcb4340124466288915fed3f8" - integrity sha512-PH1nkm6MaouON4Ac4fgJh29oQiHlpU/G2xS45FAYeAWkh1up88j1UpjXt2ISNniQVvU4uqfVAOOaEb5X5hDqYw== - eslint-config-salesforce-license@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/eslint-config-salesforce-license/-/eslint-config-salesforce-license-0.2.0.tgz#323193f1aa15dd33fbf108d25fc1210afc11065e" @@ -3499,7 +3487,7 @@ eslint-config-salesforce@^2.0.1: resolved "https://registry.yarnpkg.com/eslint-config-salesforce/-/eslint-config-salesforce-2.0.1.tgz#02893c79f304761d766f9bab8947ab3ff0e5019c" integrity sha512-Lrk6PAWOKJoC7OwcZj26IMGVJuqYTgJWYqQaJUTLfaBl9UOTmxCqLflttVGEpfBcleDBQb7uw5vvR/8E8Quv5A== -eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7: +eslint-import-resolver-node@^0.3.7: version "0.3.7" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== @@ -3508,37 +3496,18 @@ eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7: is-core-module "^2.11.0" resolve "^1.22.1" -eslint-module-utils@^2.7.3, eslint-module-utils@^2.7.4: +eslint-module-utils@^2.7.4: version "2.7.4" resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974" integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== dependencies: debug "^3.2.7" -eslint-plugin-header@^3.0.0, eslint-plugin-header@^3.1.1: +eslint-plugin-header@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz#6ce512432d57675265fac47292b50d1eff11acd6" integrity sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg== -eslint-plugin-import@2.26.0: - version "2.26.0" - resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" - integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== - dependencies: - array-includes "^3.1.4" - array.prototype.flat "^1.2.5" - debug "^2.6.9" - doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.3" - has "^1.0.3" - is-core-module "^2.8.1" - is-glob "^4.0.3" - minimatch "^3.1.2" - object.values "^1.1.5" - resolve "^1.22.0" - tsconfig-paths "^3.14.1" - eslint-plugin-import@^2.27.5: version "2.27.5" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" @@ -3579,13 +3548,13 @@ eslint-plugin-prefer-arrow@^1.2.1: resolved "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz#e7fbb3fa4cd84ff1015b9c51ad86550e55041041" integrity sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ== -eslint-plugin-sf-plugin@^1.15.5: - version "1.15.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.15.5.tgz#219c05c9432048a06a232e62ff47f84e918d50ab" - integrity sha512-JBziy6jX9FSYBTXs8eNk8I37DFFqooAL51SjlVKrVBwHvRBsRdiXtnLfXV8SeqcZqm4zxu50rrHXQdvHwlEwkw== +eslint-plugin-sf-plugin@^1.15.6: + version "1.15.8" + resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.15.8.tgz#6926244f8f8ea7015b8109283abf44736e59aa76" + integrity sha512-78toJayNZinG0NFKPBVeRzGoYwUViQcrvCMQq/h/7D3f0XKZ6NRHEt1V+Dt3j0GOZ+A/UqWbrLuvMPl4sPMo2Q== dependencies: - "@salesforce/core" "^3.36.2" - "@typescript-eslint/utils" "^5.59.7" + "@salesforce/core" "^4.1.0" + "@typescript-eslint/utils" "^5.59.8" eslint-scope@^5.1.1: version "5.1.1" @@ -5904,11 +5873,6 @@ mri@^1.1.5: resolved "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== -ms@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -6385,7 +6349,7 @@ object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" -object.values@^1.1.5, object.values@^1.1.6: +object.values@^1.1.6: version "1.1.6" resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== @@ -7201,7 +7165,7 @@ resolve-global@1.0.0, resolve-global@^1.0.0: dependencies: global-dirs "^0.1.1" -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.22.0, resolve@^1.22.1: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.22.1: version "1.22.1" resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -8157,7 +8121,7 @@ typedoc@0.23.16: minimatch "^5.1.0" shiki "^0.11.1" -typescript@^4.1.3, typescript@^4.6.4, typescript@^4.9.5, typescript@~4.9.3: +typescript@^4.6.4, typescript@^4.9.5, typescript@~4.9.3: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==