diff --git a/package.json b/package.json index 55df9ceeb13..7c412768154 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "tmp": "^0.2.1", "ts-node": "^10.7.0", "tslib": "^2.3.1", - "typescript": "4.8.4" + "typescript": "4.6.4" }, "workspaces": { "packages": [ @@ -104,6 +104,6 @@ "resolutions": { "@types/react": "16.14.0", "vite": "2.9.12", - "@oclif/core": "1.16.4" + "@oclif/core": "1.9.2" } } diff --git a/packages/app/package.json b/packages/app/package.json index 55883a6e58b..03a8dfe0056 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -58,7 +58,7 @@ }, "dependencies": { "@luckycatfactory/esbuild-graphql-loader": "3.7.0", - "@oclif/core": "1.16.4", + "@oclif/core": "1.9.2", "@shopify/cli-kit": "3.19.0", "@shopify/shopify-cli-extensions": "3.19.0", "abort-controller": "^3.0.0", diff --git a/packages/cli-hydrogen/package.json b/packages/cli-hydrogen/package.json index 9a6b9f4db91..2a48771b803 100644 --- a/packages/cli-hydrogen/package.json +++ b/packages/cli-hydrogen/package.json @@ -38,7 +38,7 @@ ] }, "dependencies": { - "@oclif/core": "1.16.4", + "@oclif/core": "1.9.2", "@shopify/hydrogen": "^0.26.0", "@shopify/mini-oxygen": "^0.2.0", "@types/prettier": "^2.6.3", diff --git a/packages/cli-kit/package.json b/packages/cli-kit/package.json index 83677223659..c7afea24b82 100644 --- a/packages/cli-kit/package.json +++ b/packages/cli-kit/package.json @@ -85,7 +85,7 @@ "dependencies": { "@bugsnag/js": "^7.16.7", "@iarna/toml": "^2.2.5", - "@oclif/core": "1.16.4", + "@oclif/core": "1.9.2", "@types/archiver": "^5.3.1", "abort-controller": "^3.0.0", "archiver": "^5.3.1", diff --git a/packages/cli-kit/src/node/base-command.ts b/packages/cli-kit/src/node/base-command.ts index 7e4444c7d6d..d618dd97f75 100644 --- a/packages/cli-kit/src/node/base-command.ts +++ b/packages/cli-kit/src/node/base-command.ts @@ -33,27 +33,25 @@ abstract class BaseCommand extends Command { protected async parse< TFlags extends Interfaces.FlagOutput & {path?: string; verbose?: boolean}, - TGlobalFlags extends Interfaces.FlagOutput, TArgs extends Interfaces.OutputArgs, >( - options?: Interfaces.Input | undefined, + options?: Interfaces.Input | undefined, argv?: string[] | undefined, - ): Promise> { - let result = await super.parse(options, argv) - result = await this.resultWithPreset(options, argv, result) + ): Promise> { + let result = await super.parse(options, argv) + result = await this.resultWithPreset(options, argv, result) await addFromParsedFlags(result.flags) return result } protected async resultWithPreset< TFlags extends Interfaces.FlagOutput & {path?: string; verbose?: boolean}, - TGlobalFlags extends Interfaces.FlagOutput, TArgs extends Interfaces.OutputArgs, >( - options: Interfaces.Input | undefined, + options: Interfaces.Input | undefined, argv: string[] | undefined, - originalResult: Interfaces.ParserOutput, - ): Promise> { + originalResult: Interfaces.ParserOutput, + ): Promise> { // If no preset is specified, don't modify the results const flags = originalResult.flags as PresettableFlags if (!flags.preset) return originalResult @@ -65,19 +63,19 @@ abstract class BaseCommand extends Command { // Parse using noDefaultsOptions to derive a list of flags specified as // command-line arguments. - const noDefaultsResult = await super.parse(noDefaultsOptions(options), argv) + const noDefaultsResult = await super.parse(noDefaultsOptions(options), argv) // Add the preset's settings to argv and pass them to `super.parse`. This // invokes oclif's validation system without breaking the oclif black box. // Replace the original result with this one. - const result = await super.parse(options, [ + const result = await super.parse(options, [ // Need to specify argv default because we're merging with argsFromPreset. ...(argv || this.argv), - ...argsFromPreset(preset, options, noDefaultsResult), + ...argsFromPreset(preset, options, noDefaultsResult), ]) // Report successful application of the preset. - reportPresetApplication(noDefaultsResult.flags, result.flags, flags.preset, preset) + reportPresetApplication(noDefaultsResult.flags, result.flags, flags.preset, preset) return result } @@ -113,11 +111,10 @@ export async function addFromParsedFlags(flags: {path?: string; verbose?: boolea */ function reportPresetApplication< TFlags extends Interfaces.FlagOutput, - TGlobalFlags extends Interfaces.FlagOutput, TArgs extends Interfaces.OutputArgs, >( - noDefaultsFlags: Interfaces.ParserOutput['flags'], - flagsWithPresets: Interfaces.ParserOutput['flags'], + noDefaultsFlags: Interfaces.ParserOutput['flags'], + flagsWithPresets: Interfaces.ParserOutput['flags'], presetName: string, preset: JsonMap, ): void { @@ -157,9 +154,9 @@ ${Object.entries(changes) * the user actually passed on the command line. */ -function noDefaultsOptions( - options: Interfaces.Input | undefined, -): Interfaces.Input | undefined { +function noDefaultsOptions( + options: Interfaces.Input | undefined, +): Interfaces.Input | undefined { if (!options?.flags) return options return { ...options, @@ -179,12 +176,11 @@ function noDefaultsOptions( preset: JsonMap, - options: Interfaces.Input | undefined, - noDefaultsResult: Interfaces.ParserOutput, + options: Interfaces.Input | undefined, + noDefaultsResult: Interfaces.ParserOutput, ): string[] { const args: string[] = [] for (const [label, value] of Object.entries(preset)) { diff --git a/packages/cli-main/package.json b/packages/cli-main/package.json index c83c3f5acc7..00f65945278 100644 --- a/packages/cli-main/package.json +++ b/packages/cli-main/package.json @@ -51,7 +51,7 @@ ] }, "dependencies": { - "@oclif/core": "1.16.4", + "@oclif/core": "1.9.2", "@oclif/plugin-commands": "^2.2.0", "@oclif/plugin-help": "^5.1.14", "@oclif/plugin-plugins": "^2.1.1", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 52ee8c2ff0b..600951a5c6c 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -46,7 +46,7 @@ ] }, "dependencies": { - "@oclif/core": "1.16.4", + "@oclif/core": "1.9.2", "@shopify/cli-kit": "3.19.0" }, "devDependencies": { diff --git a/packages/create-hydrogen/package.json b/packages/create-hydrogen/package.json index f6c9be8cee9..4186b585de9 100644 --- a/packages/create-hydrogen/package.json +++ b/packages/create-hydrogen/package.json @@ -50,7 +50,7 @@ } }, "dependencies": { - "@oclif/core": "1.16.4", + "@oclif/core": "1.9.2", "@shopify/cli-kit": "3.19.0", "download": "8.0.0" }, diff --git a/packages/plugin-ngrok/package.json b/packages/plugin-ngrok/package.json index 2bd0c23d0da..dde6f223366 100644 --- a/packages/plugin-ngrok/package.json +++ b/packages/plugin-ngrok/package.json @@ -33,7 +33,7 @@ "type-check": "nx type-check" }, "dependencies": { - "@oclif/core": "1.16.4", + "@oclif/core": "1.9.2", "@shopify/cli-kit": "3.19.0", "@shopify/ngrok": "^4.3.2" }, diff --git a/packages/theme/package.json b/packages/theme/package.json index ddef1021c3c..6bbf8761473 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -32,7 +32,7 @@ ] }, "dependencies": { - "@oclif/core": "1.16.4", + "@oclif/core": "1.9.2", "@shopify/cli-kit": "3.19.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 05d9afc877c..ce2c5a76635 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1700,10 +1700,10 @@ supports-color "^8.1.1" tslib "^2" -"@oclif/core@1.16.4", "@oclif/core@^1.16.4": - version "1.16.4" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.16.4.tgz#fafa338ada0624d7f1adac036302b05a37cd96d0" - integrity sha512-l+xHtVMteJWeTZZ+f2yLyNjf69X0mhAH8GILXnmoAGAemXbc1DVstvloxOouarvm9xyHHhquzO1Qg5l6xa1VIw== +"@oclif/core@1.9.2", "@oclif/core@^1.16.4", "@oclif/core@^1.2.0": + version "1.9.2" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.9.2.tgz#19005ee1fbde16ed2b1926dfeb00e55fd7b45b4d" + integrity sha512-+qhfvDHn+tR4UN/Vk3UYIeM0Dm0XKsHrM4igJrUpJj/ZXXdaGbZEB+cMIRDZHGqBw+pcwP4+9zQFmxotMDIWcw== dependencies: "@oclif/linewrap" "^1.0.0" "@oclif/screen" "^3.0.2" @@ -12517,16 +12517,21 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@4.8.4, typescript@^4.8.4: - version "4.8.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" - integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== +typescript@4.6.4: + version "4.6.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" + integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== typescript@^4.7.2: version "4.8.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== +typescript@^4.8.4: + version "4.8.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" + integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== + typical@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"