@take-out/scripts 0.4.3-1775767446169 → 0.4.3-1775848829010

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.4.3-1775767446169",
+  "version": "0.4.3-1775848829010",
   "type": "module",
   "main": "./src/cmd.ts",
   "sideEffects": false,
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.8.2",
-    "@take-out/helpers": "0.4.3-1775767446169",
-    "@take-out/run": "0.4.3-1775767446169",
+    "@take-out/helpers": "0.4.3-1775848829010",
+    "@take-out/run": "0.4.3-1775848829010",
     "picocolors": "^1.1.1"
   }
 }

package/src/build-initial.ts

@@ -16,17 +16,13 @@ await cmd`bootstrap project workspace and build initial packages`.run(
 
     // check if critical packages are built
     if (hasPackages) {
-      const needsBuild =
-        !fs.existsSync(`./packages/helpers/dist`) ||
-        !fs.existsSync(`./packages/cli/dist/esm`)
-
-      if (needsBuild) {
+      if (!fs.existsSync(`./packages/helpers/dist`)) {
         // build helpers first as other packages depend on it
         await $`cd packages/helpers && bun run build`
-
-        // then build all other packages in parallel
-        await $`bun ./packages/run/src/run.ts build --no-root`
       }
+
+      // then build all other packages in parallel
+      await $`bun ./packages/run/src/run.ts build --no-root`
     }
 
     // show welcome message if not onboarded

package/src/ensure-zero-sqlite.ts

@@ -0,0 +1,22 @@
+import { cmd } from './cmd'
+
+const SQLITE_NODE_PATH =
+  'node_modules/@rocicorp/zero-sqlite3/build/Release/better_sqlite3.node'
+
+await cmd`ensure zero-sqlite3 native module is built`.run(async ({ $, fs }) => {
+  if (fs.existsSync(SQLITE_NODE_PATH)) {
+    return
+  }
+
+  // bun trustedDependencies doesn't reliably build native modules
+  const result = await $`cd node_modules/@rocicorp/zero-sqlite3 && npm run build-release`
+    .quiet()
+    .nothrow()
+
+  if (result.exitCode !== 0) {
+    console.error(
+      'zero-sqlite3 build failed, will fall back to wasm:',
+      result.stderr.toString()
+    )
+  }
+})

package/src/helpers/deploy-lock.ts

@@ -103,7 +103,7 @@ fi
 
   // log any stale cleanup so the next deploy's logs show who left it
   const staleMatch = acquireOut.match(/STALE_META_START\n([\s\S]*?)\nSTALE_META_END/)
-  if (staleMatch) {
+  if (staleMatch?.[1]) {
     console.warn(`deploy-lock: cleared stale lock (older than ${maxAge}m) left by:`)
     for (const line of staleMatch[1].split('\n')) {
       console.warn(`  ${line}`)