From f4775a7741482ca13d59d305c403fc86d7cf6270 Mon Sep 17 00:00:00 2001 From: Ariel Caplan Date: Mon, 24 Oct 2022 11:13:47 +0300 Subject: [PATCH] Temporarily disable env var arguments for boolean default-true/exclusive flags Apparently these never worked anyway for boolean flags before oclif 1.16.1. Then they started working, but only to specify true; otherwise, they essentially force a false as though it were specified. More details: https://github.com/oclif/core/pull/536 --- packages/app/src/cli/commands/app/dev.ts | 6 ++++-- packages/cli-hydrogen/src/cli/commands/hydrogen/build.ts | 3 ++- packages/cli-hydrogen/src/cli/commands/hydrogen/deploy.ts | 3 ++- packages/cli-hydrogen/src/cli/flags.ts | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/app/src/cli/commands/app/dev.ts b/packages/app/src/cli/commands/app/dev.ts index 6d0a879f0c5..14d9d1331db 100644 --- a/packages/app/src/cli/commands/app/dev.ts +++ b/packages/app/src/cli/commands/app/dev.ts @@ -58,17 +58,19 @@ export default class Dev extends Command { env: 'SHOPIFY_FLAG_TUNNEL_URL', exclusive: ['no-tunnel', 'tunnel'], }), + // eslint-disable-next-line rulesdir/command-flags-with-env 'no-tunnel': Flags.boolean({ hidden: true, description: 'Automatic creation of a tunnel is disabled. Service entry point will listen to localhost instead', - env: 'SHOPIFY_FLAG_NO_TUNNEL', + // env: 'SHOPIFY_FLAG_NO_TUNNEL', default: false, exclusive: ['tunnel-url', 'tunnel'], }), + // eslint-disable-next-line rulesdir/command-flags-with-env tunnel: Flags.boolean({ hidden: false, description: 'Use ngrok to create a tunnel to your service entry point', - env: 'SHOPIFY_FLAG_TUNNEL', + // env: 'SHOPIFY_FLAG_TUNNEL', default: true, exclusive: ['tunnel-url', 'no-tunnel'], }), diff --git a/packages/cli-hydrogen/src/cli/commands/hydrogen/build.ts b/packages/cli-hydrogen/src/cli/commands/hydrogen/build.ts index d7dbc02ddfd..b255b13fd29 100644 --- a/packages/cli-hydrogen/src/cli/commands/hydrogen/build.ts +++ b/packages/cli-hydrogen/src/cli/commands/hydrogen/build.ts @@ -18,9 +18,10 @@ export default class Build extends Command { description: ' the public path when served in production', env: 'SHOPIFY_FLAG_BUILD_BASE', }), + // eslint-disable-next-line rulesdir/command-flags-with-env client: Flags.boolean({ description: 'build the client code', - env: 'SHOPIFY_FLAG_BUILD_CLIENT', + // env: 'SHOPIFY_FLAG_BUILD_CLIENT', allowNo: true, default: true, }), diff --git a/packages/cli-hydrogen/src/cli/commands/hydrogen/deploy.ts b/packages/cli-hydrogen/src/cli/commands/hydrogen/deploy.ts index 1c67138c8bb..a9f71d84922 100644 --- a/packages/cli-hydrogen/src/cli/commands/hydrogen/deploy.ts +++ b/packages/cli-hydrogen/src/cli/commands/hydrogen/deploy.ts @@ -29,8 +29,9 @@ export default class Deploy extends Command { env: 'SHOPIFY_HYDROGEN_FLAG_PATH_TO_BUILD', description: 'Skip build process and use provided value as build', }), + // eslint-disable-next-line rulesdir/command-flags-with-env healthCheck: Flags.boolean({ - env: 'SHOPIFY_HYDROGEN_FLAG_HEALTH_CHECK', + // env: 'SHOPIFY_HYDROGEN_FLAG_HEALTH_CHECK', default: true, description: 'Require a health check before the deployment succeeds.', }), diff --git a/packages/cli-hydrogen/src/cli/flags.ts b/packages/cli-hydrogen/src/cli/flags.ts index a6ee3a272b7..b0b746b554b 100644 --- a/packages/cli-hydrogen/src/cli/flags.ts +++ b/packages/cli-hydrogen/src/cli/flags.ts @@ -10,7 +10,7 @@ export const hydrogenFlags = { hidden: true, default: true, description: 'should install packages', - env: 'SHOPIFY_HYDROGEN_FLAG_INSTALL', + // env: 'SHOPIFY_HYDROGEN_FLAG_INSTALL', allowNo: true, }), }