vela 0.11.4 → 0.11.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vela",
-	"version": "0.11.4",
+	"version": "0.11.6",
 	"type": "module",
 	"description": "A CLI for creating and updating SvelteKit projects",
 	"license": "MIT",
@@ -36,7 +36,7 @@
 	"dependencies": {
 		"@clack/prompts": "^1.7.0",
 		"@faker-js/faker": "^10.6.0",
-		"@velastack/patterns": "^0.2.3",
+		"@velastack/patterns": "^0.2.5",
 		"@velastack/pocketbase-codegen": "^0.1.0",
 		"annotate-json-schema": "^0.1.0",
 		"commander": "^13.1.0",
@@ -45,7 +45,7 @@
 		"dotenv": "^17.4.2",
 		"fetch-cookie": "^3.2.0",
 		"json-schema-faker": "^0.6.3",
-		"magic-string": "^0.30.21",
+		"magic-string": "^1.2.3",
 		"package-manager-detector": "^1.8.0",
 		"picocolors": "^1.1.1",
 		"pocketbase": "^0.28.0",
@@ -62,10 +62,10 @@
 		"@types/node": "^22.0.0",
 		"esbuild": "^0.28.2",
 		"prettier": "^3.9.6",
+		"shellcheck": "^4.1.0",
 		"typescript": "^5.6.0",
 		"vite": "^8.2.2",
-		"vitest": "^4.1.11",
-		"shellcheck": "^4.1.0"
+		"vitest": "^4.1.11"
 	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^2.57.1",
@@ -79,6 +79,18 @@
 			"optional": true
 		}
 	},
+	"overrides": {
+		"global-agent": "^4.1.3",
+		"@xhmikosr/decompress-unzip": {
+			"file-type": "^21.3.1"
+		},
+		"@xhmikosr/decompress-tar": {
+			"file-type": "^21.3.1"
+		},
+		"@felipecrs/decompress-tarxz": {
+			"file-type": "^21.3.1"
+		}
+	},
 	"keywords": [
 		"svelte",
 		"sveltekit",

package/templates/minimal/package.template.json

@@ -16,7 +16,7 @@
 	},
 	"devDependencies": {
 		"@lucide/svelte": "^1.40.0",
-		"@sveltejs/adapter-auto": "^7.0.1",
+		"@sveltejs/adapter-node": "^5.5.7",
 		"@sveltejs/kit": "^2.70.3",
 		"@sveltejs/vite-plugin-svelte": "^7.3.0",
 		"@tailwindcss/forms": "^0.5.11",

package/templates/minimal/vite.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig } from 'vite';
 import tailwindcss from '@tailwindcss/vite';
 import { sveltekit } from '@sveltejs/kit/vite';
-import adapter from '@sveltejs/adapter-auto';
+import adapter from '@sveltejs/adapter-node';
 
 export default defineConfig({
 	plugins: [

package/templates/server/apply.sh

@@ -84,28 +84,68 @@ if [ -n "$ACTIVE" ] && [ -L "$APP/current" ] && ! [[ "$RELEASE" > "$ACTIVE" ]];
 	die "release $RELEASE is not newer than the active release $ACTIVE on $INSTANCE - a newer deploy went live first, so this one was dropped"
 fi
 
-mkdir -p "$APP"/{releases,shared,bin,deps} "$APP/shared/pb_data"
+# Whether the release this one replaces had a PocketBase backend. The CLI
+# detects the backend from the project on every deploy, so an instance can gain
+# one (`vela bless` between two deploys) or lose one; both are handled below.
+# Empty on a first deploy.
+PREVIOUS_BACKEND=""
+if [ -f "$(state_file "$INSTANCE")" ]; then
+	PREVIOUS_BACKEND=$(instance_backend "$INSTANCE")
+fi
+
+# Where this app keeps state that has to outlive a release.
+#
+# An app that works this out from its own working directory puts it inside the
+# release, which is the one place it cannot survive: `current` moves on the next
+# deploy and the pruner deletes what it left behind. An instance with a database
+# shares PocketBase's directory, so anything the app writes there is inside the
+# archives `vela backup` takes and inside the directory `vela restore` swaps. An
+# instance without one gets a directory of its own, which nothing backs up -
+# there is no database to back it up alongside.
+if [ "$BACKEND" = "1" ]; then
+	APP_DATA_DIR="$APP/shared/pb_data"
+else
+	APP_DATA_DIR="$APP/shared/data"
+fi
+
+mkdir -p "$APP"/{releases,shared,bin,deps} "$APP_DATA_DIR"
 mkdir -p "$ETC"
 chmod 0700 "$ETC"
 
 # Only the directories just created need their ownership set, and only at the
-# top level: everything below pb_data is written by PocketBase as $VELA_USER
-# already. Recursing here would walk every uploaded file on every deploy, which
-# makes deploy time grow with the size of the app's storage forever.
+# top level: everything below the data directory is written by PocketBase (or
+# the app) as $VELA_USER already. Recursing here would walk every uploaded file
+# on every deploy, which makes deploy time grow with the size of the app's
+# storage forever.
 chown "$VELA_USER:$VELA_USER" \
-	"$APP" "$APP/releases" "$APP/shared" "$APP/shared/pb_data" "$APP/bin" "$APP/deps"
+	"$APP" "$APP/releases" "$APP/shared" "$APP_DATA_DIR" "$APP/bin" "$APP/deps"
 # The release is the exception - rsync uploaded it as whoever we ssh'd in as.
 chown -R "$VELA_USER:$VELA_USER" "$RELEASE_DIR"
 
-# A pb_data the app cannot write is a dead instance, and it fails as an opaque
-# 500 rather than anything that names a cause. This is what the blanket recurse
-# above used to paper over; checking costs one stat, repairing costs a walk that
-# now happens only when something is actually wrong.
-if ! runuser -u "$VELA_USER" -- test -w "$APP/shared/pb_data"; then
+# A data directory the app cannot write is a dead instance, and it fails as an
+# opaque 500 rather than anything that names a cause. This is what the blanket
+# recurse above used to paper over; checking costs one stat, repairing costs a
+# walk that now happens only when something is actually wrong.
+if ! runuser -u "$VELA_USER" -- test -w "$APP_DATA_DIR"; then
 	log "repairing ownership under shared/"
 	chown -R "$VELA_USER:$VELA_USER" "$APP/shared"
 fi
 
+# An instance gaining a backend moves its data directory: VELA_DATA_DIR was
+# shared/data and is now shared/pb_data, which is what `vela backup` archives.
+# Whatever the app kept follows it, into a pb_data that PocketBase has not yet
+# written - once there is a database in there, nothing is moved over it.
+if [ "$PREVIOUS_BACKEND" = "false" ] && [ "$BACKEND" = "1" ] \
+	&& [ -d "$APP/shared/data" ] && [ -n "$(ls -A "$APP/shared/data")" ]; then
+	if [ ! -e "$APP/shared/pb_data/data.db" ]; then
+		log "adding a backend - moving shared/data into shared/pb_data"
+		find "$APP/shared/data" -mindepth 1 -maxdepth 1 -exec mv -t "$APP/shared/pb_data" {} +
+	else
+		log "warning: this instance now has a backend, and its data directory is $APP/shared/pb_data"
+		log "warning: what the app kept in $APP/shared/data was left there"
+	fi
+fi
+
 # ---------------------------------------------------------------- ports & env
 
 PORTS=$(allocate_ports "$INSTANCE")
@@ -126,23 +166,6 @@ fi
 # Nothing here reads or rewrites that file.
 [ -f "$ETC/env" ] || { : > "$ETC/env"; chmod 0600 "$ETC/env"; chown root:root "$ETC/env"; }
 
-# Where this app keeps state that has to outlive a release.
-#
-# An app that works this out from its own working directory puts it inside the
-# release, which is the one place it cannot survive: `current` moves on the next
-# deploy and the pruner deletes what it left behind. An instance with a database
-# shares PocketBase's directory, so anything the app writes there is inside the
-# archives `vela backup` takes and inside the directory `vela restore` swaps. An
-# instance without one gets a directory of its own, which nothing backs up -
-# there is no database to back it up alongside.
-if [ "$BACKEND" = "1" ]; then
-	APP_DATA_DIR="$APP/shared/pb_data"
-else
-	APP_DATA_DIR="$APP/shared/data"
-	mkdir -p "$APP_DATA_DIR"
-	chown "$VELA_USER:$VELA_USER" "$APP_DATA_DIR"
-fi
-
 runtime_tmp=$(mktemp "$ETC/.runtime.XXXXXX")
 {
 	printf '# Generated by vela on each deploy. Edit /etc/vela/apps/%s/env instead.\n' "$INSTANCE"
@@ -150,8 +173,14 @@ runtime_tmp=$(mktemp "$ETC/.runtime.XXXXXX")
 	printf 'HOST=127.0.0.1\n'
 	printf 'PORT=%s\n' "$WEB_PORT"
 	printf 'ORIGIN=%s\n' "$ORIGIN"
-	printf 'PB_PORT=%s\n' "$PB_PORT"
-	printf 'POCKETBASE_URL=http://127.0.0.1:%s\n' "$PB_PORT"
+	# Only an instance with a PocketBase gets pointed at one: a URL to a port
+	# nothing listens on is not a setting, it is a trap. Kept for one more
+	# deploy when the backend is being removed, so that a failed deploy can put
+	# the previous release - which still needs it - back.
+	if [ "$BACKEND" = "1" ] || [ "$PREVIOUS_BACKEND" = "true" ]; then
+		printf 'PB_PORT=%s\n' "$PB_PORT"
+		printf 'POCKETBASE_URL=http://127.0.0.1:%s\n' "$PB_PORT"
+	fi
 	printf 'VELA_DATA_DIR=%s\n' "$APP_DATA_DIR"
 	printf 'VELA_APP_ID=%s\n' "$APP_ID"
 	printf 'VELA_APP_NAME=%s\n' "$APP_NAME"
@@ -253,7 +282,10 @@ restore() {
 		# runtime.env was already written for the release that failed; the
 		# services about to restart must read the one they will actually run.
 		set_runtime_release "$ETC" "$PREVIOUS"
-		if [ "$BACKEND" = "1" ]; then systemctl restart "$PB_UNIT" >/dev/null 2>&1 || true; fi
+		# The previous release needs its PocketBase whether or not this one did.
+		if [ "$BACKEND" = "1" ] || [ "$PREVIOUS_BACKEND" = "true" ]; then
+			systemctl restart "$PB_UNIT" >/dev/null 2>&1 || true
+		fi
 		systemctl restart "$WEB_UNIT" >/dev/null 2>&1 || true
 	else
 		systemctl stop "$WEB_UNIT" >/dev/null 2>&1 || true
@@ -365,6 +397,15 @@ wait_for_http "http://127.0.0.1:$WEB_PORT$HEALTH_PATH" 60 0.5 \
 
 ACTIVATED=1
 
+# An instance that no longer has a backend keeps its database on disk - only
+# `vela destroy deployment --purge` removes data - but the unit serving it is
+# retired, or `vela status` would keep reporting a PocketBase and every restart
+# would bring it back up.
+if [ "$PREVIOUS_BACKEND" = "true" ] && [ "$BACKEND" = "0" ]; then
+	log "removing the backend - stopping PocketBase; $APP/shared/pb_data is kept"
+	systemctl disable --now "$PB_UNIT" >/dev/null 2>&1 || true
+fi
+
 # --------------------------------------------------------------------- state
 
 state_merge "$INSTANCE" "$(jq -c -n \

package/templates/server/lib.sh

@@ -58,11 +58,20 @@ require_provisioned() {
 	[ -f "$VELA_ETC/provisioned" ] || die "server is not provisioned - run 'vela provision' first"
 }
 
-# Refuse on a frontend-only instance. Absent state is treated as having one, so
-# this only ever fires on an instance that was deployed with --backend 0.
+# Whether an instance was last deployed with a PocketBase backend: `true` or
+# `false`. Absent state, or state from before the flag existed, is treated as
+# having one, so this only ever answers `false` for an instance that was
+# deployed with --backend 0.
+instance_backend() {
+	local instance=$1 value
+	value=$(state_get "$instance" backend 2>/dev/null || echo true)
+	[ "$value" = "false" ] && printf 'false' || printf 'true'
+}
+
+# Refuse on a frontend-only instance.
 require_backend() {
 	local instance=$1
-	[ "$(state_get "$instance" backend 2>/dev/null || echo true)" = "true" ] \
+	[ "$(instance_backend "$instance")" = "true" ] \
 		|| die "$instance has no database - there is nothing to back up or restore"
 }
 
@@ -71,8 +80,10 @@ state_get() {
 	local instance=$1 key=$2 file
 	file=$(state_file "$instance")
 	[ -f "$file" ] || return 1
-	# `// empty` would swallow a legitimate `false`, so test for the key itself.
-	jq -er --arg k "$key" 'if has($k) and .[$k] != null then .[$k] else empty end' "$file" 2>/dev/null
+	# Presence is checked on its own: `// empty` would swallow a legitimate
+	# `false`, and so would `-e` on the read, which exits non-zero for one.
+	jq -e --arg k "$key" 'has($k) and .[$k] != null' "$file" >/dev/null 2>&1 || return 1
+	jq -r --arg k "$key" '.[$k]' "$file" 2>/dev/null
 }
 
 # Merge a JSON object into an instance's state file, atomically.

package/templates/server/rollback.sh

@@ -41,10 +41,10 @@ CURRENT=$(state_get "$INSTANCE" activeRelease || echo "")
 [ -d "$APP/releases/$TARGET" ] || die "release $TARGET is no longer on disk"
 [ "$TARGET" != "$CURRENT" ] || die "$TARGET is already the active release"
 
-BACKEND=$(state_get "$INSTANCE" backend 2>/dev/null || echo "true")
+BACKEND=$(instance_backend "$INSTANCE")
 HEALTH_PATH=$(state_get "$INSTANCE" healthCheckPath 2>/dev/null || echo "/")
 WEB_PORT=$(state_get "$INSTANCE" webPort)
-PB_PORT=$(state_get "$INSTANCE" pbPort)
+PB_PORT=$(state_get "$INSTANCE" pbPort 2>/dev/null || echo "")
 WEB_UNIT=$(unit_web "$INSTANCE")
 PB_UNIT=$(unit_pb "$INSTANCE")