@take-out/scripts 0.0.91 → 0.0.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.0.91",
+  "version": "0.0.93",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@take-out/helpers": "0.0.79"
+    "@take-out/helpers": "0.0.93"
   },
   "peerDependencies": {
     "vxrn": "^1.4.15"

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'

package/src/release.ts

@@ -179,11 +179,8 @@ async function mainRelease() {
             const nextDeps = next[field]
             if (!nextDeps) continue
             for (const depName in nextDeps) {
-              // only update non-workspace internal dependencies
-              if (!nextDeps[depName].startsWith('workspace:')) {
-                if (allPackageJsons.some((p) => p.name === depName)) {
-                  nextDeps[depName] = nextVersion
-                }
+              if (allPackageJsons.some((p) => p.name === depName)) {
+                nextDeps[depName] = nextVersion
               }
             }
           }
@@ -241,6 +238,31 @@ async function mainRelease() {
 
       console.info(`✅ ${dryRun ? '[dry-run] ' : ''}Published\n`)
 
+      // restore workspace:* protocols after publishing
+      if (!dryRun) {
+        await Promise.all(
+          allPackageJsons.map(async ({ json, path }) => {
+            const current = await fs.readJSON(path)
+            for (const field of [
+              'dependencies',
+              'devDependencies',
+              'optionalDependencies',
+              'peerDependencies',
+            ]) {
+              const origDeps = json[field]
+              const currentDeps = current[field]
+              if (!origDeps || !currentDeps) continue
+              for (const depName in origDeps) {
+                if (origDeps[depName].startsWith('workspace:') && currentDeps[depName]) {
+                  currentDeps[depName] = origDeps[depName]
+                }
+              }
+            }
+            await writeJSON(path, current, { spaces: 2 })
+          })
+        )
+      }
+
       // revert version changes after dry-run
       if (dryRun) {
         await run(`git checkout -- packages/*/package.json`, { silent: true })