From f103b8e0fd017b1e52e066ca1e326b378b12c067 Mon Sep 17 00:00:00 2001 From: Ash Date: Fri, 2 Feb 2024 16:28:07 +0000 Subject: [PATCH 1/2] fix(cli): respect unattended mode --- .../src/actions/init-project/initProject.ts | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/@sanity/cli/src/actions/init-project/initProject.ts b/packages/@sanity/cli/src/actions/init-project/initProject.ts index 82d27b98255..fa29fc1da4e 100644 --- a/packages/@sanity/cli/src/actions/init-project/initProject.ts +++ b/packages/@sanity/cli/src/actions/init-project/initProject.ts @@ -167,11 +167,13 @@ export default async function initSanity( print(`Coupon "${intendedCoupon}" validated!\n`) } catch (err) { if (err.statusCode == '404') { - const useDefaultPlan = await prompt.single({ - type: 'confirm', - message: `Coupon "${intendedCoupon}" is not available, use default plan instead?`, - default: true, - }) + const useDefaultPlan = + unattended ?? + (await prompt.single({ + type: 'confirm', + message: `Coupon "${intendedCoupon}" is not available, use default plan instead?`, + default: true, + })) trace.log({ step: 'useDefaultPlanCoupon', selectedOption: useDefaultPlan ? 'yes' : 'no', @@ -191,11 +193,13 @@ export default async function initSanity( selectedPlan = await getPlanFromId(apiClient, intendedPlan) } catch (err) { if (err.statusCode == '404') { - const useDefaultPlan = await prompt.single({ - type: 'confirm', - message: `Project plan "${intendedPlan}" does not exist, use default plan instead?`, - default: true, - }) + const useDefaultPlan = + unattended ?? + (await prompt.single({ + type: 'confirm', + message: `Project plan "${intendedPlan}" does not exist, use default plan instead?`, + default: true, + })) trace.log({ step: 'useDefaultPlanId', selectedOption: useDefaultPlan ? 'yes' : 'no', From 362e3421ec9a93db536a3d13f304196dddc7d152 Mon Sep 17 00:00:00 2001 From: Ash Date: Mon, 5 Feb 2024 09:24:46 +0000 Subject: [PATCH 2/2] feat(cli): print warning when attempting to use nonexistent coupon or project plan in unattended mode --- .../@sanity/cli/src/actions/init-project/initProject.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/@sanity/cli/src/actions/init-project/initProject.ts b/packages/@sanity/cli/src/actions/init-project/initProject.ts index fa29fc1da4e..595e3df4693 100644 --- a/packages/@sanity/cli/src/actions/init-project/initProject.ts +++ b/packages/@sanity/cli/src/actions/init-project/initProject.ts @@ -174,6 +174,9 @@ export default async function initSanity( message: `Coupon "${intendedCoupon}" is not available, use default plan instead?`, default: true, })) + if (unattended) { + output.warn(`Coupon "${intendedCoupon}" is not available - using default plan`) + } trace.log({ step: 'useDefaultPlanCoupon', selectedOption: useDefaultPlan ? 'yes' : 'no', @@ -200,6 +203,9 @@ export default async function initSanity( message: `Project plan "${intendedPlan}" does not exist, use default plan instead?`, default: true, })) + if (unattended) { + output.warn(`Project plan "${intendedPlan}" does not exist - using default plan`) + } trace.log({ step: 'useDefaultPlanId', selectedOption: useDefaultPlan ? 'yes' : 'no',