feat: handle envs

sanity-io · Nov 26, 2024 · ce43f61 · ce43f61
1 parent 578e50b
commit ce43f61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/@sanity/cli/src/actions/init-project/bootstrapRemoteTemplate.ts b/packages/@sanity/cli/src/actions/init-project/bootstrapRemoteTemplate.ts
@@ -1,11 +1,13 @@
-import fs from 'node:fs/promises'
+import {mkdir} from 'node:fs/promises'
+import {join} from 'node:path'
 
 import {debug} from '../../debug'
 import {type CliCommandContext} from '../../types'
 import {
   applyEnvVariables,
   applyPackageName,
   downloadAndExtractRepo,
+  getMonoRepo,
   isNextJsTemplate,
   type RepoInfo,
   validateRemoteTemplate,
@@ -31,10 +33,11 @@ export async function bootstrapRemoteTemplate(
   const {apiClient} = context
 
   debug('Validating remote template')
-  await validateRemoteTemplate(repoInfo, bearerToken)
+  const packages = await getMonoRepo(repoInfo, bearerToken)
+  await validateRemoteTemplate(repoInfo, packages, bearerToken)
 
   debug('Create new directory "%s"', outputPath)
-  await fs.mkdir(outputPath, {recursive: true})
+  await mkdir(outputPath, {recursive: true})
 
   debug('Downloading and extracting repo to %s', outputPath)
   await downloadAndExtractRepo(outputPath, repoInfo, bearerToken)
@@ -44,7 +47,9 @@ export async function bootstrapRemoteTemplate(
   const envName = isNext ? '.env.local' : '.env'
 
   debug('Applying environment variables to %s', envName)
-  await applyEnvVariables(outputPath, variables, envName)
+  for (const folder of packages ?? ['']) {
+    await applyEnvVariables(join(outputPath, folder), variables, envName)
+  }
 
   debug('Setting package name to %s', packageName)
   await applyPackageName(outputPath, packageName)

diff --git a/packages/@sanity/cli/src/util/remoteTemplate.ts b/packages/@sanity/cli/src/util/remoteTemplate.ts
@@ -373,6 +373,7 @@ async function validatePackage(
  */
 export async function validateRemoteTemplate(
   repoInfo: RepoInfo,
+  packages: string[] = [''],
   bearerToken?: string,
 ): Promise<void> {
   const {username, name, branch, filePath} = repoInfo
@@ -383,9 +384,6 @@ export async function validateRemoteTemplate(
     headers.Authorization = `Bearer ${bearerToken}`
   }
 
-  const monorepoPackages = await getMonoRepo(repoInfo, bearerToken)
-  const packages = monorepoPackages || ['']
-
   const validations = await Promise.all(
     packages.map((pkg) => validatePackage(baseUrl, pkg, headers, pkg === '')),
   )