@mono-labs/cli 0.0.191 → 0.0.194

package/lib/index.js

@@ -1,4 +1,5 @@
-import 'dotenv/config';
+import { loadMergedEnv } from '../src/merge-env.js';
+loadMergedEnv();
 import spawn from 'cross-spawn';
 
 import { program } from './app.js';

package/package.json

@@ -1,34 +1,34 @@
 {
     "name": "@mono-labs/cli",
-    "version": "0.0.191",
+    "version": "0.0.194",
     "description": "A CLI tool for building and deploying projects",
     "type": "module",
-    "main": "index.js",
-    "types": "types.d.ts",
+    "main": "dist/index.js",
+    "types": "dist/types.d.ts",
     "exports": {
         ".": {
-            "types": "./types.d.ts",
-            "import": "./index.js"
+            "types": "./dist/types.d.ts",
+            "import": "./dist/index.js"
         },
         "./expo": {
-            "types": "./src/expo.d.ts",
-            "default": "./src/expo.js"
+            "types": "./dist/types/expo.d.ts",
+            "default": "./dist/expo.js"
         },
         "./tools": {
-            "types": "./src/tools.d.ts",
-            "default": "./src/tools.js"
+            "types": "./dist/types/tools.d.ts",
+            "default": "./dist/tools.js"
         },
         "./cdk": {
-            "types": "./src/cdk/cdk.d.ts",
-            "default": "./src/cdk/index.js"
+            "types": "./dist/types/cdk/cdk.d.ts",
+            "default": "./dist/cdk/index.js"
         },
         "./stack": {
-            "types": "./src/stack.ts",
-            "default": "./src/stack.ts"
+            "types": "./dist/types/stack.d.ts",
+            "default": "./dist/stack.js"
         },
         "./project": {
-            "types": "./src/project/index.ts",
-            "default": "./src/project/index.ts"
+            "types": "./dist/types/project/index.d.ts",
+            "default": "./dist/project/index.js"
         }
     },
     "repository": {
@@ -43,6 +43,7 @@
         "mono": "./bin/mono.js"
     },
     "scripts": {
+        "build": "tsc",
         "start": "node bin/mono.js",
         "dev": "node bin/mono.js",
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -77,7 +78,8 @@
     },
     "devDependencies": {
         "eslint": "^8.57.0",
-        "expo": "^54.0.31"
+        "expo": "^54.0.31",
+        "typescript": "^5.9.3"
     },
     "files": [
         "bin/",

package/src/merge-env.js

@@ -0,0 +1,32 @@
+import fs from 'fs';
+import path from 'path';
+import dotenv from 'dotenv';
+
+export function loadMergedEnv() {
+	const ENV_PATH = path.resolve(process.cwd(), '.env');
+	const ENV_LOCAL_PATH = path.resolve(process.cwd(), '.env.local');
+
+	// Load base .env
+	const base =
+		fs.existsSync(ENV_PATH) ? dotenv.parse(fs.readFileSync(ENV_PATH)) : {};
+
+	// Load overrides .env.local
+	const local =
+		fs.existsSync(ENV_LOCAL_PATH) ?
+			dotenv.parse(fs.readFileSync(ENV_LOCAL_PATH))
+		:	{};
+
+	// Merge: local overrides base
+	const merged = {
+		...base,
+		...local,
+	};
+
+	// Inject into process.env (do NOT overwrite existing real env vars)
+	for (const [key, value] of Object.entries(merged)) {
+		if (process.env[key] === undefined) {
+			process.env[key] = value;
+		}
+	}
+	return process.env;
+}

package/src/stack.ts

@@ -1,8 +1,8 @@
 import * as cdk from 'aws-cdk-lib';
 import { Construct } from 'constructs';
-import dotenv from 'dotenv';
+import { loadMergedEnv } from './project/merge-env.js';
 
-dotenv.config();
+loadMergedEnv();
 //cdk deploy --context owner=cody --context region=us-west-1
 
 const dev = 'dev';

package/index.js

@@ -1,14 +0,0 @@
-// Main entry point for @mono-labs/cli package
-import { generateNewEnvList } from './lib/generateNewEnvList.js';
-import {
-	filterUnwantedEnvVars,
-	filterUnwantedEnvVarsEAS,
-} from './lib/filterUnwantedEnvVars.js';
-import { replaceTokens } from './lib/commands/build-process/dataLayer.js';
-// Default export for convenience
-export default {
-	replaceTokens,
-	generateNewEnvList,
-	filterUnwantedEnvVars,
-	filterUnwantedEnvVarsEAS,
-};