appstage 0.2.26 → 0.2.28

package/dist/bin.js

@@ -29,49 +29,102 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var require_dist = __commonJS({
   "node_modules/args-json/dist/index.cjs"(exports) {
     Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+    function getDefaultInput() {
+      return typeof process === "undefined" ? [] : process.argv;
+    }
+    var offValues = /* @__PURE__ */ new Set([
+      "0",
+      "false",
+      "null",
+      "undefined",
+      "off"
+    ]);
+    function isOff(x) {
+      return offValues.has(String(x));
+    }
+    function isExplicitlyOff(x) {
+      return isOff(x) && String(x) !== "undefined";
+    }
     function isKey2(x) {
       return x.startsWith("-") && x.length === 2 && x !== "--" || x.startsWith("--") && x.length > 2;
     }
+    var onValues = /* @__PURE__ */ new Set([
+      "1",
+      "true",
+      "on"
+    ]);
+    function isOn(x) {
+      return onValues.has(String(x));
+    }
+    function normalizeInput(input) {
+      let source = input ?? getDefaultInput();
+      let result = [];
+      for (let s of source) {
+        if (s.startsWith("-") && s.includes("=")) {
+          let key = s.slice(0, s.indexOf("="));
+          if (isKey2(key)) {
+            result.push(key, s.slice(key.length + 1));
+            continue;
+          }
+        }
+        result.push(s);
+      }
+      return result;
+    }
     var Args2 = class {
-      _values;
-      constructor(values) {
-        this._values = values ?? process.argv.slice(2);
+      _input;
+      constructor(input) {
+        this._input = normalizeInput(input);
       }
       hasKey(x) {
-        return isKey2(x) && this._values.includes(x);
+        return isKey2(x) && this._input.includes(x);
+      }
+      isOn(key) {
+        let args2 = this._input;
+        let k = args2.indexOf(key);
+        return k !== -1 && (k === args2.length - 1 || isKey2(args2[k + 1]) || isOn(args2[k + 1]));
+      }
+      isOff(key) {
+        let args2 = this._input;
+        let k = args2.indexOf(key);
+        return k === -1 || isOff(args2[k + 1]);
+      }
+      isExplicitlyOff(key) {
+        let args2 = this._input;
+        let k = args2.indexOf(key);
+        return k !== -1 && isExplicitlyOff(args2[k + 1]);
       }
       getValue(key, fallback) {
-        let args = this._values;
+        let args2 = this._input;
         let keys = Array.isArray(key) ? key : [key];
         for (let k of keys) {
-          let i = args.indexOf(k);
-          if (i !== -1 && args[i + 1] && !isKey2(args[i + 1])) return args[i + 1];
+          let i = args2.indexOf(k);
+          if (i !== -1 && args2[i + 1] && !isKey2(args2[i + 1])) return args2[i + 1];
         }
         return fallback;
       }
       getValues(key, fallback) {
-        let args = this._values;
+        let args2 = this._input;
         let keys = Array.isArray(key) ? key : [key];
         let values = [];
         for (let k of keys) {
-          let i = args.indexOf(k);
-          while (i !== -1 && args[i + 1] && !isKey2(args[i + 1])) values.push(args[++i]);
+          let i = args2.indexOf(k);
+          while (i !== -1 && args2[i + 1] && !isKey2(args2[i + 1])) values.push(args2[++i]);
         }
         return values.length === 0 ? fallback : values;
       }
     };
+    var args = new Args2();
     function getValue(key, fallback) {
-      let args = new Args2();
       if (fallback === void 0) return args.getValue(key);
       return args.getValue(key, fallback);
     }
     function getValues(key, fallback) {
-      let args = new Args2();
       if (fallback === void 0) return args.getValues(key);
       return args.getValues(key, fallback);
     }
     function hasKey2(x) {
-      return new Args2().hasKey(x);
+      return args.hasKey(x);
     }
     function split(x) {
       let words = [], word = "";
@@ -101,9 +154,6 @@ var require_dist = __commonJS({
       if (x.startsWith("-") && x.length === 2) return toCamelCase(x.slice(1));
       if (x.startsWith("--") && x.length > 2) return toCamelCase(x.slice(2));
     }
-    function getDefaultInput() {
-      return typeof process === "undefined" ? [] : process.argv;
-    }
     function parseArgs(input, map) {
       let normalizedInput;
       let normalizedMap;
@@ -155,10 +205,14 @@ var require_dist = __commonJS({
       return parsedArgs;
     }
     exports.Args = Args2;
+    exports.args = args;
     exports.getValue = getValue;
     exports.getValues = getValues;
     exports.hasKey = hasKey2;
+    exports.isExplicitlyOff = isExplicitlyOff;
     exports.isKey = isKey2;
+    exports.isOff = isOff;
+    exports.isOn = isOn;
     exports.parseArgs = parseArgs;
   }
 });
@@ -363,6 +417,7 @@ import { rm as rm2 } from "node:fs/promises";
 // src/scripts/build.ts
 var import_dateshape = __toESM(require_dist2(), 1);
 import { spawn } from "node:child_process";
+import { access as access2 } from "node:fs/promises";
 
 // src/scripts/utils/buildClient.ts
 import esbuild from "esbuild";
@@ -609,6 +664,24 @@ function createPostbuildPlugins({ serverDir, clientDir }, onServerRebuild) {
 }
 
 // src/scripts/build.ts
+var envFileNames = {
+  development: [".env.development", ".env.dev"],
+  production: [".env.production", ".env.prod"]
+};
+async function getEnvFiles() {
+  let { NODE_ENV } = process.env;
+  let names = [".env"];
+  if (NODE_ENV !== void 0 && NODE_ENV in envFileNames)
+    names.push(...envFileNames[NODE_ENV]);
+  for (let i = names.length - 1; i >= 0; i--) {
+    try {
+      await access2(names[i]);
+    } catch {
+      names.splice(i, 1);
+    }
+  }
+  return names;
+}
 async function build(params) {
   let startTime = Date.now();
   let log = params.silent ? () => {
@@ -616,6 +689,12 @@ async function build(params) {
   log("Build started");
   let serverProcess = null;
   let inited = false;
+  let nodeArgs = [`${params.serverDir}/server/index.js`];
+  if (params.useEnvFiles !== false) {
+    let envFiles = await getEnvFiles();
+    for (let envFile of envFiles) log(`Using ${envFile}`);
+    nodeArgs.unshift(...envFiles.map((file) => `--env-file=${file}`));
+  }
   function handleServerRebuild() {
     if (serverProcess) {
       serverProcess.kill();
@@ -626,9 +705,7 @@ async function build(params) {
       inited = true;
     }
     if (params.start)
-      serverProcess = spawn("node", [`${params.serverDir}/server/index.js`], {
-        stdio: "inherit"
-      });
+      serverProcess = spawn("node", nodeArgs, { stdio: "inherit" });
   }
   let { serverPlugins, serverCSSPlugins } = createPostbuildPlugins(
     params,
@@ -660,7 +737,8 @@ async function cli(input = []) {
     watch: args.hasKey("--watch"),
     watchServer: args.hasKey("--watch-server"),
     watchClient: args.hasKey("--watch-client"),
-    start: args.hasKey("--start")
+    start: args.hasKey("--start"),
+    useEnvFiles: !args.isExplicitlyOff("--use-env-files")
   };
   if (args.hasKey("--no-auto-entries")) params.entriesPath = null;
   if (args.hasKey("--clean-only")) {

package/dist/index.cjs

@@ -590,12 +590,33 @@ function createPostbuildPlugins({ serverDir, clientDir }, onServerRebuild) {
   };
 }
 
+const envFileNames = {
+  development: [".env.development", ".env.dev"],
+  production: [".env.production", ".env.prod"]
+};
+async function getEnvFiles() {
+  let { NODE_ENV } = process.env;
+  let names = [".env"];
+  if (NODE_ENV !== void 0 && NODE_ENV in envFileNames) names.push(...envFileNames[NODE_ENV]);
+  for (let i = names.length - 1; i >= 0; i--) try {
+    await (0, node_fs_promises.access)(names[i]);
+  } catch {
+    names.splice(i, 1);
+  }
+  return names;
+}
 async function build(params) {
   let startTime = Date.now();
   let log = params.silent ? () => {} : console.log;
   log("Build started");
   let serverProcess = null;
   let inited = false;
+  let nodeArgs = [`${params.serverDir}/server/index.js`];
+  if (params.useEnvFiles !== false) {
+    let envFiles = await getEnvFiles();
+    for (let envFile of envFiles) log(`Using ${envFile}`);
+    nodeArgs.unshift(...envFiles.map((file) => `--env-file=${file}`));
+  }
   function handleServerRebuild() {
     if (serverProcess) {
       serverProcess.kill();
@@ -605,7 +626,7 @@ async function build(params) {
       log(`Build completed +${(0, dateshape.formatDuration)(Date.now() - startTime)}`);
       inited = true;
     }
-    if (params.start) serverProcess = (0, node_child_process.spawn)("node", [`${params.serverDir}/server/index.js`], { stdio: "inherit" });
+    if (params.start) serverProcess = (0, node_child_process.spawn)("node", nodeArgs, { stdio: "inherit" });
   }
   let { serverPlugins, serverCSSPlugins } = createPostbuildPlugins(params, handleServerRebuild);
   await Promise.all([
@@ -638,7 +659,8 @@ async function cli(input = []) {
     watch: args.hasKey("--watch"),
     watchServer: args.hasKey("--watch-server"),
     watchClient: args.hasKey("--watch-client"),
-    start: args.hasKey("--start")
+    start: args.hasKey("--start"),
+    useEnvFiles: !args.isExplicitlyOff("--use-env-files")
   };
   if (args.hasKey("--no-auto-entries")) params.entriesPath = null;
   if (args.hasKey("--clean-only")) {

package/dist/index.d.ts

@@ -119,6 +119,10 @@ type BuildParams = {
    * @default "src/server/entries.ts"
    */
   entriesPath?: string | null;
+  /**
+   * @default true
+   */
+  useEnvFiles?: boolean;
 };
 
 declare function build(params: BuildParams): Promise<void>;

package/dist/index.mjs

@@ -564,12 +564,33 @@ function createPostbuildPlugins({ serverDir, clientDir }, onServerRebuild) {
   };
 }
 
+const envFileNames = {
+  development: [".env.development", ".env.dev"],
+  production: [".env.production", ".env.prod"]
+};
+async function getEnvFiles() {
+  let { NODE_ENV } = process.env;
+  let names = [".env"];
+  if (NODE_ENV !== void 0 && NODE_ENV in envFileNames) names.push(...envFileNames[NODE_ENV]);
+  for (let i = names.length - 1; i >= 0; i--) try {
+    await access(names[i]);
+  } catch {
+    names.splice(i, 1);
+  }
+  return names;
+}
 async function build(params) {
   let startTime = Date.now();
   let log = params.silent ? () => {} : console.log;
   log("Build started");
   let serverProcess = null;
   let inited = false;
+  let nodeArgs = [`${params.serverDir}/server/index.js`];
+  if (params.useEnvFiles !== false) {
+    let envFiles = await getEnvFiles();
+    for (let envFile of envFiles) log(`Using ${envFile}`);
+    nodeArgs.unshift(...envFiles.map((file) => `--env-file=${file}`));
+  }
   function handleServerRebuild() {
     if (serverProcess) {
       serverProcess.kill();
@@ -579,7 +600,7 @@ async function build(params) {
       log(`Build completed +${formatDuration(Date.now() - startTime)}`);
       inited = true;
     }
-    if (params.start) serverProcess = spawn("node", [`${params.serverDir}/server/index.js`], { stdio: "inherit" });
+    if (params.start) serverProcess = spawn("node", nodeArgs, { stdio: "inherit" });
   }
   let { serverPlugins, serverCSSPlugins } = createPostbuildPlugins(params, handleServerRebuild);
   await Promise.all([
@@ -612,7 +633,8 @@ async function cli(input = []) {
     watch: args.hasKey("--watch"),
     watchServer: args.hasKey("--watch-server"),
     watchClient: args.hasKey("--watch-client"),
-    start: args.hasKey("--start")
+    start: args.hasKey("--start"),
+    useEnvFiles: !args.isExplicitlyOff("--use-env-files")
   };
   if (args.hasKey("--no-auto-entries")) params.entriesPath = null;
   if (args.hasKey("--clean-only")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appstage",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -29,8 +29,8 @@
     "@types/node": "^25.4.0"
   },
   "dependencies": {
-    "args-json": "^1.3.3",
+    "args-json": "^1.4.3",
     "dateshape": "^1.1.2",
-    "esbuild": "^0.27.4"
+    "esbuild": "^0.28.0"
   }
 }

package/src/scripts/build.ts

@@ -1,4 +1,5 @@
 import { type ChildProcess, spawn } from "node:child_process";
+import { access } from "node:fs/promises";
 import { formatDuration } from "dateshape";
 import type { BuildParams } from "./types/BuildParams.ts";
 import { buildClient } from "./utils/buildClient.ts";
@@ -6,6 +7,29 @@ import { buildServer } from "./utils/buildServer.ts";
 import { buildServerCSS } from "./utils/buildServerCSS.ts";
 import { createPostbuildPlugins } from "./utils/createPostbuildPlugins.ts";
 
+const envFileNames: Record<string, string[]> = {
+  development: [".env.development", ".env.dev"],
+  production: [".env.production", ".env.prod"],
+};
+
+async function getEnvFiles() {
+  let { NODE_ENV } = process.env;
+  let names = [".env"];
+
+  if (NODE_ENV !== undefined && NODE_ENV in envFileNames)
+    names.push(...envFileNames[NODE_ENV]);
+
+  for (let i = names.length - 1; i >= 0; i--) {
+    try {
+      await access(names[i]);
+    } catch {
+      names.splice(i, 1);
+    }
+  }
+
+  return names;
+}
+
 export async function build(params: BuildParams) {
   let startTime = Date.now();
   let log = params.silent ? () => {} : console.log;
@@ -14,6 +38,15 @@ export async function build(params: BuildParams) {
 
   let serverProcess: ChildProcess | null = null;
   let inited = false;
+  let nodeArgs = [`${params.serverDir}/server/index.js`];
+
+  if (params.useEnvFiles !== false) {
+    let envFiles = await getEnvFiles();
+
+    for (let envFile of envFiles) log(`Using ${envFile}`);
+
+    nodeArgs.unshift(...envFiles.map((file) => `--env-file=${file}`));
+  }
 
   function handleServerRebuild() {
     if (serverProcess) {
@@ -27,9 +60,7 @@ export async function build(params: BuildParams) {
     }
 
     if (params.start)
-      serverProcess = spawn("node", [`${params.serverDir}/server/index.js`], {
-        stdio: "inherit",
-      });
+      serverProcess = spawn("node", nodeArgs, { stdio: "inherit" });
   }
 
   let { serverPlugins, serverCSSPlugins } = createPostbuildPlugins(

package/src/scripts/cli.ts

@@ -27,6 +27,7 @@ export async function cli(input: string[] = []) {
     watchServer: args.hasKey("--watch-server"),
     watchClient: args.hasKey("--watch-client"),
     start: args.hasKey("--start"),
+    useEnvFiles: !args.isExplicitlyOff("--use-env-files"),
   };
 
   if (args.hasKey("--no-auto-entries")) params.entriesPath = null;

package/src/scripts/types/BuildParams.ts

@@ -15,4 +15,8 @@ export type BuildParams = {
    * @default "src/server/entries.ts"
    */
   entriesPath?: string | null;
+  /**
+   * @default true
+   */
+  useEnvFiles?: boolean;
 };

package/src/scripts/utils/createPostbuildPlugins.ts

@@ -4,7 +4,7 @@ import type { BuildParams } from "../types/BuildParams.ts";
 
 export function createPostbuildPlugins(
   { serverDir, clientDir }: BuildParams,
-  onServerRebuild: () => void,
+  onServerRebuild: (() => void) | (() => Promise<void>),
 ) {
   let serverPlugins: Plugin[] = [
     {