@sanity/cli 3.69.0 → 3.70.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.69.0",
+  "version": "3.70.0",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -57,17 +57,17 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.23.5",
-    "@sanity/client": "^6.24.1",
-    "@sanity/codegen": "3.69.0",
+    "@sanity/client": "^6.24.3",
+    "@sanity/codegen": "3.70.0",
     "@sanity/telemetry": "^0.7.7",
-    "@sanity/template-validator": "^2.0.0",
-    "@sanity/util": "3.69.0",
+    "@sanity/template-validator": "^2.3.2",
+    "@sanity/util": "3.70.0",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
     "esbuild": "0.21.5",
     "esbuild-register": "^3.5.0",
-    "get-it": "^8.6.5",
+    "get-it": "^8.6.6",
     "groq-js": "^1.14.2",
     "pkg-dir": "^5.0.0",
     "prettier": "^3.3.0",
@@ -75,13 +75,13 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@repo/package.config": "3.69.0",
-    "@repo/test-config": "3.69.0",
+    "@repo/package.config": "3.70.0",
+    "@repo/test-config": "3.70.0",
     "@rexxars/gitconfiglocal": "^3.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.69.0",
+    "@sanity/types": "3.70.0",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -133,5 +133,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "55aff5d4304c8dd5f32aadd54d86718afe2fc63b"
+  "gitHead": "53767836c1ed9cd28169f582bba4b958e99f6285"
 }

package/src/util/remoteTemplate.ts

@@ -217,9 +217,11 @@ export async function applyEnvVariables(
       await access(join(root, file))
       return file
     }),
-  ).catch(() => {
-    throw new Error('Could not find .env.template, .env.example or .env.local.example file')
-  })
+  ).catch(() => undefined)
+
+  if (!templatePath) {
+    return // No template .env file found, skip
+  }
 
   try {
     const templateContent = await readFile(join(root, templatePath), 'utf8')
@@ -231,15 +233,17 @@ export async function applyEnvVariables(
       value: string,
       useQuotes: boolean,
     ) => {
-      const pattern = varRegex instanceof RegExp ? varRegex : new RegExp(`${varRegex}=.*$`, 'm')
-      const match = content.match(pattern)
-      if (!match) return content
-
-      const varName = match[0].split('=')[0]
-      return content.replace(
-        new RegExp(`${varName}=.*$`, 'm'),
-        `${varName}=${useQuotes ? `"${value}"` : value}`,
-      )
+      const varPattern = typeof varRegex === 'string' ? varRegex : varRegex.source
+      const pattern = new RegExp(`.*${varPattern}=.*$`, 'gm')
+      const matches = content.matchAll(pattern)
+      return Array.from(matches).reduce((updatedContent, match) => {
+        if (!match[0]) return updatedContent
+        const varName = match[0].split('=')[0].trim()
+        return updatedContent.replace(
+          new RegExp(`${varName}=.*$`, 'gm'),
+          `${varName}=${useQuotes ? `"${value}"` : value}`,
+        )
+      }, content)
     }
 
     let envContent = templateContent