@take-out/scripts 0.1.8 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -29,11 +29,11 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.8.2",
-    "@take-out/helpers": "0.1.6",
+    "@take-out/helpers": "0.1.10",
     "picocolors": "^1.1.1"
   },
   "peerDependencies": {
-    "vxrn": "^1.6.1"
+    "vxrn": "^1.6.9"
   },
   "peerDependenciesMeta": {
     "vxrn": {
@@ -41,6 +41,6 @@
     }
   },
   "devDependencies": {
-    "vxrn": "1.6.1"
+    "vxrn": "1.6.9"
   }
 }

package/src/build-initial.ts

@@ -4,7 +4,8 @@ import { cmd } from './cmd'
 
 await cmd`bootstrap project workspace and build initial packages`.run(
   async ({ $, fs, path }) => {
-    const hasPackages = fs.existsSync(`./packages`)
+    // use our own file because we know its takeout-like packages if it exists
+    const hasPackages = fs.existsSync(`./packages/scripts/src/build-initial.ts`)
 
     // only run once
     if (!fs.existsSync(`./node_modules/.bin/tko`)) {
@@ -15,23 +16,16 @@ await cmd`bootstrap project workspace and build initial packages`.run(
 
     // check if critical packages are built
     if (hasPackages) {
-      const hasHelpers = fs.existsSync(`./packages/helpers`)
-      const hasCli = fs.existsSync(`./packages/cli`)
-
       const needsBuild =
-        (hasHelpers && !fs.existsSync(`./packages/helpers/dist`)) ||
-        (hasCli && !fs.existsSync(`./packages/cli/dist/esm`))
+        !fs.existsSync(`./packages/helpers/dist`) ||
+        !fs.existsSync(`./packages/cli/dist/esm`)
 
       if (needsBuild) {
-        if (hasHelpers) {
-          // build helpers first as other packages depend on it
-          await $`cd packages/helpers && bun run build`
-        }
+        // build helpers first as other packages depend on it
+        await $`cd packages/helpers && bun run build`
 
         // then build all other packages in parallel
-        if (fs.existsSync(`./packages/scripts/src/run.ts`)) {
-          await $`bun ./packages/scripts/src/run.ts build --no-root`
-        }
+        await $`bun ./packages/scripts/src/run.ts build --no-root`
       }
     }
 

package/src/env-update.ts

@@ -130,10 +130,14 @@ await cmd`sync environment variables from package.json to CI and server configs`
       const beforeMarker = dockerCompose.slice(0, dockerCompose.indexOf(yamlStartMarker))
       const isMap = /x-[\w-]+:.*&[\w-]+/s.test(beforeMarker)
 
-      const envLines = Object.keys(envVars)
-        .map((key) =>
-          isMap ? `${indent}${key}: \${${key}:-}` : `${indent}- ${key}=\${${key}:-}`
-        )
+      const envLines = Object.entries(envVars)
+        .map(([key, value]) => {
+          const resolved = resolveDepVersion(value, packageJson.dependencies)
+          const defaultVal = resolved || (typeof value === 'string' ? value : '')
+          return isMap
+            ? `${indent}${key}: \${${key}:-${defaultVal}}`
+            : `${indent}- ${key}=\${${key}:-${defaultVal}}`
+        })
         .join('\n')
 
       const newDockerCompose = replaceYamlSection(dockerCompose, envLines, { indent })