@stacksjs/defaults 0.70.60 → 0.70.61

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/defaults",
   "type": "module",
-  "version": "0.70.60",
+  "version": "0.70.61",
   "description": "Default Stacks scaffold resources (views, layouts, components, preloader) — shipped so apps consuming the framework from node_modules get the same fallback resources a vendored checkout provides. Source of truth: storage/framework/defaults.",
   "author": "Chris Breuer",
   "license": "MIT",

package/resources/plugins/preloader.ts

@@ -44,11 +44,20 @@ if (!skipPreloader) {
   const productionCommands = ['cloud:remove', 'cloud:rm', 'cloud:destroy', 'cloud:cleanup', 'cloud:clean-up', 'undeploy']
   const isProductionCommand = productionCommands.includes(args[0])
 
-  // Handle deploy command which can have an optional env argument: `deploy [env]`
+  // Handle deploy command: the env may be positional (`deploy staging`) or a
+  // flag (`deploy --staging`). CI deploys use the flag form, so detecting only
+  // the positional arg left APP_ENV wrong and loaded the wrong .env file.
   const isDeployCommand = args[0] === 'deploy'
   if (isDeployCommand) {
-    // Check if second arg is an environment (not a flag starting with -)
-    const deployEnv = args[1] && !args[1].startsWith('-') ? args[1] : 'production'
+    const flagEnv = args.includes('--production') || args.includes('--prod')
+      ? 'production'
+      : args.includes('--staging')
+        ? 'staging'
+        : args.includes('--development') || args.includes('--dev')
+          ? 'development'
+          : undefined
+    const positionalEnv = args[1] && !args[1].startsWith('-') ? args[1] : undefined
+    const deployEnv = flagEnv ?? positionalEnv ?? 'production'
     process.env.APP_ENV = deployEnv
     process.env.NODE_ENV = deployEnv
   }
@@ -71,7 +80,12 @@ if (!skipPreloader) {
   // process.env.SOME_SECRET directly (e.g. deploy-time credentials like
   // HCLOUD_TOKEN/PORKBUN_API_KEY) with no error — it just looks like a
   // bogus/expired credential downstream.
-  autoLoadEnv({ quiet: true, keysFile: '.env.keys' })
+  // Pass the resolved env so autoLoadEnv reads `.env.<env>` with the matching
+  // `DOTENV_PRIVATE_KEY_<ENV>` (it defaults to `development` otherwise), and
+  // overload so this decrypted pass overrides the still-encrypted values the
+  // earlier `@stacksjs/env/plugin.js` bunfig preload seeds into process.env
+  // (loadEnv won't overwrite already-set vars without it).
+  autoLoadEnv({ quiet: true, keysFile: '.env.keys', env: process.env.APP_ENV, overload: true })
 }
 
 // stx template engine plugin