@take-out/scripts 0.0.91 → 0.0.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.0.91",
+  "version": "0.0.92",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,

package/src/helpers/env-load.ts

@@ -1,3 +1,4 @@
+import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 
 import { loadEnv as vxrnLoadEnv } from 'vxrn/loadEnv'
@@ -9,9 +10,9 @@ export async function loadEnv(
   // loads env into process.env
   await vxrnLoadEnv(environment)
 
-  const Environment = await import(
-    options?.envPath || join(process.cwd(), 'src/server/env-server.ts')
-  )
+  const envPath = options?.envPath || resolveEnvServerPath()
+
+  const Environment = await import(envPath)
 
   // validate
   for (const key in Environment) {
@@ -25,3 +26,15 @@ export async function loadEnv(
 
   return Environment
 }
+
+function resolveEnvServerPath(): string {
+  const candidates = ['src/constants/env-server.ts', 'src/server/env-server.ts']
+  for (const candidate of candidates) {
+    const full = join(process.cwd(), candidate)
+    if (existsSync(full)) {
+      return full
+    }
+  }
+  // fall back to first candidate for error message
+  return join(process.cwd(), 'src/constants/env-server.ts')
+}

package/src/helpers/get-test-env.ts

@@ -1,3 +1,4 @@
+import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 
 import { loadEnv } from './env-load'
@@ -8,7 +9,10 @@ export async function getTestEnv() {
   const zeroVersion = getZeroVersion()
   const dockerHost = getDockerHost()
   const devEnv = await loadEnv('development')
-  const serverEnvFallback = await import(join(process.cwd(), 'src/server/env-server'))
+  const envPath = ['src/constants/env-server', 'src/server/env-server']
+    .map((p) => join(process.cwd(), p))
+    .find((p) => existsSync(p + '.ts')) || join(process.cwd(), 'src/constants/env-server')
+  const serverEnvFallback = await import(envPath)
 
   // ports come from VITE_PORT_* in .env.development (loaded by loadEnv)
   const dbPort = process.env.VITE_PORT_POSTGRES || '5433'