@mono-labs/cli 0.0.238 → 0.0.243

package/src/expo-files/filterUnwantedEnvVars.ts

@@ -1,158 +1,155 @@
-import { getMonoConfig } from '../loadFromRoot';
+import { getMonoConfig } from '../loadFromRoot'
 
 export function filterUnwantedEnvVars(env: Record<string, string>) {
-	const unwantedPrefixes = [
-		// 'EFC_',
-		// 'FPS_',
-		// 'GIT_',
-		// 'NVM_',
-		// 'VSCODE_',
-		// 'LOGONSERVER',
-		// 'NUMBER_OF_PROCESSORS',
-		// 'OS',
-		// 'COREPACK',
-		// 'PROCESSOR',
-		// 'USERDOMAIN',
-		// 'USERDOMAIN_ROAMINGPROFILE',
-		// 'USERNAME',
-		// 'CUDA',
-		// 'SESSIONNAME',
-		// 'ZES',
-		// '3DVPATH',
-		// 'APP_NAME',
-		// 'asl.log',
-		// 'BERRY_BIN_FOLDER',
-		// 'CHROME_CRASHPAD_PIPE_NAME',
-		// 'COLORTERM',
-		// 'COMPUTERNAME',
-		// 'CUDNN',
-		// 'EAS_BUILD_PROFILE',
-		// 'EAS_PROJECT_ID',
-		// 'EXPO_UNSTABLE_ATLAS',
-		// 'INIT_CWD',
-		// 'JAVA_HOME',
-		// 'LANG',
-		// 'OneDrive',
-		// 'ORIGINAL_XDG_CURRENT_DESKTOP',
-		// 'PROJECT_CWD',
-		// 'PROMPT',
-		// 'PWD',
-		// 'TERM_PROGRAM',
-		// 'TERM_PROGRAM_VERSION',
-		// '__PSLockDownPolicy',
-		'npm_config_force',
-	];
-	return Object.keys(env).reduce(
-		(obj, key) => {
-			if (!unwantedPrefixes.some((prefix) => key.startsWith(prefix))) {
-				obj[key] = env[key];
-			}
-			return obj;
-		},
-		{} as Record<string, string>
-	);
+  const unwantedPrefixes = [
+    // 'EFC_',
+    // 'FPS_',
+    // 'GIT_',
+    // 'NVM_',
+    // 'VSCODE_',
+    // 'LOGONSERVER',
+    // 'NUMBER_OF_PROCESSORS',
+    // 'OS',
+    // 'COREPACK',
+    // 'PROCESSOR',
+    // 'USERDOMAIN',
+    // 'USERDOMAIN_ROAMINGPROFILE',
+    // 'USERNAME',
+    // 'CUDA',
+    // 'SESSIONNAME',
+    // 'ZES',
+    // '3DVPATH',
+    // 'APP_NAME',
+    // 'asl.log',
+    // 'BERRY_BIN_FOLDER',
+    // 'CHROME_CRASHPAD_PIPE_NAME',
+    // 'COLORTERM',
+    // 'COMPUTERNAME',
+    // 'CUDNN',
+    // 'EAS_BUILD_PROFILE',
+    // 'EAS_PROJECT_ID',
+    // 'EXPO_UNSTABLE_ATLAS',
+    // 'INIT_CWD',
+    // 'JAVA_HOME',
+    // 'LANG',
+    // 'OneDrive',
+    // 'ORIGINAL_XDG_CURRENT_DESKTOP',
+    // 'PROJECT_CWD',
+    // 'PROMPT',
+    // 'PWD',
+    // 'TERM_PROGRAM',
+    // 'TERM_PROGRAM_VERSION',
+    // '__PSLockDownPolicy',
+    'npm_config_force',
+  ]
+  return Object.keys(env).reduce(
+    (obj, key) => {
+      if (!unwantedPrefixes.some((prefix) => key.startsWith(prefix))) {
+        obj[key] = env[key]
+      }
+      return obj
+    },
+    {} as Record<string, string>
+  )
 }
 
 export function filterUnwantedEnvVarsEAS(env: Record<string, string>) {
-	const unwantedPrefixes = [
-		'ProgramData',
-		'ProgramFiles',
-		'ProgramFiles(x86)',
-		'ProgramW6432',
-		'PSModulePath',
-		'PUBLIC',
-		'TEMP',
-		'TMP',
-		'EFC_',
-		'FPS_',
-		'GIT_',
-		'NVM_',
-		'VSCODE_',
-		'windir',
-		'Chocolatey',
-		'ALLUSERSPROFILE',
-		'APPDATA',
-		'CommonProgramFiles',
-		'CommonProgramW6432',
-		'ComSpec',
-		'Driver',
-		'HOME',
-		'npm',
-		'HOME',
-		'LOCALAPPDATA',
-		'LOGONSERVER',
-		'NUMBER_OF_PROCESSORS',
-		'OS',
-		'COREPACK',
-		'PROCESSOR',
-		'USERDOMAIN',
-		'USERDOMAIN_ROAMINGPROFILE',
-		'USERNAME',
-		'USERPROFILE',
-		'CUDA',
-		'SESSIONNAME',
-		'ZES',
-		'3DVPATH',
-		'APP_NAME',
-		'asl.log',
-		'BERRY_BIN_FOLDER',
-		'CHROME_CRASHPAD_PIPE_NAME',
-		'COLORTERM',
-		'COMPUTERNAME',
-		'CUDNN',
-		'EAS_BUILD_PROFILE',
-		'EAS_PROJECT_ID',
-		'EXPO_UNSTABLE_ATLAS',
-		'INIT_CWD',
-		'JAVA_HOME',
-		'LANG',
-		'OneDrive',
-		'ORIGINAL_XDG_CURRENT_DESKTOP',
-		'PROJECT_CWD',
-		'PROMPT',
-		'PWD',
-		'TERM_PROGRAM',
-		'TERM_PROGRAM_VERSION',
-		'__PSLockDownPolicy',
-		'PATH',
-		'SystemRoot',
-		'SystemDrive',
-		'npm_',
-	];
-	return Object.keys(env).reduce(
-		(obj: Record<string, string>, key) => {
-			if (!unwantedPrefixes.some((prefix) => key.startsWith(prefix))) {
-				obj[key] = env[key];
-			}
-			return obj;
-		},
-		{} as Record<string, string>
-	);
+  const unwantedPrefixes = [
+    'ProgramData',
+    'ProgramFiles',
+    'ProgramFiles(x86)',
+    'ProgramW6432',
+    'PSModulePath',
+    'PUBLIC',
+    'TEMP',
+    'TMP',
+    'EFC_',
+    'FPS_',
+    'GIT_',
+    'NVM_',
+    'VSCODE_',
+    'windir',
+    'Chocolatey',
+    'ALLUSERSPROFILE',
+    'APPDATA',
+    'CommonProgramFiles',
+    'CommonProgramW6432',
+    'ComSpec',
+    'Driver',
+    'HOME',
+    'npm',
+    'HOME',
+    'LOCALAPPDATA',
+    'LOGONSERVER',
+    'NUMBER_OF_PROCESSORS',
+    'OS',
+    'COREPACK',
+    'PROCESSOR',
+    'USERDOMAIN',
+    'USERDOMAIN_ROAMINGPROFILE',
+    'USERNAME',
+    'USERPROFILE',
+    'CUDA',
+    'SESSIONNAME',
+    'ZES',
+    '3DVPATH',
+    'APP_NAME',
+    'asl.log',
+    'BERRY_BIN_FOLDER',
+    'CHROME_CRASHPAD_PIPE_NAME',
+    'COLORTERM',
+    'COMPUTERNAME',
+    'CUDNN',
+    'EAS_BUILD_PROFILE',
+    'EAS_PROJECT_ID',
+    'EXPO_UNSTABLE_ATLAS',
+    'INIT_CWD',
+    'JAVA_HOME',
+    'LANG',
+    'OneDrive',
+    'ORIGINAL_XDG_CURRENT_DESKTOP',
+    'PROJECT_CWD',
+    'PROMPT',
+    'PWD',
+    'TERM_PROGRAM',
+    'TERM_PROGRAM_VERSION',
+    '__PSLockDownPolicy',
+    'PATH',
+    'SystemRoot',
+    'SystemDrive',
+    'npm_',
+  ]
+  return Object.keys(env).reduce(
+    (obj: Record<string, string>, key) => {
+      if (!unwantedPrefixes.some((prefix) => key.startsWith(prefix))) {
+        obj[key] = env[key]
+      }
+      return obj
+    },
+    {} as Record<string, string>
+  )
 }
 
-export function generateNewEnvList(
-	processEnv: Record<string, string>
-): Record<string, string> {
-	const { config } = getMonoConfig();
+export function generateNewEnvList(processEnv: Record<string, string>): Record<string, string> {
+  const { config } = getMonoConfig()
 
-	const envPrefixes: string[] =
-		Array.isArray(config.envMap) ? config.envMap : [];
+  const envPrefixes: string[] = Array.isArray(config.envMap) ? config.envMap : []
 
-	const result: Record<string, string> = { ...processEnv };
+  const result: Record<string, string> = { ...processEnv }
 
-	for (const [key, value] of Object.entries(processEnv)) {
-		// Only clone MONO_ variables
-		if (!key.startsWith('MONO_')) continue;
+  for (const [key, value] of Object.entries(processEnv)) {
+    // Only clone MONO_ variables
+    if (!key.startsWith('MONO_')) continue
 
-		// Skip secrets
-		if (key.includes('SECRET')) continue;
+    // Skip secrets
+    if (key.includes('SECRET')) continue
 
-		const suffix = key.slice('MONO_'.length);
+    const suffix = key.slice('MONO_'.length)
 
-		for (const prefix of envPrefixes) {
-			const mappedKey = `${prefix}_${suffix}`;
-			result[mappedKey] = value;
-		}
-	}
-	return result;
+    for (const prefix of envPrefixes) {
+      const mappedKey = `${prefix}_${suffix}`
+      result[mappedKey] = value
+    }
+  }
+  return result
 }

package/src/expo.ts

@@ -0,0 +1,116 @@
+import type { AppJSONConfig, ExpoConfig } from 'expo/config'
+
+export function replaceTokens(input: string, tokens: Record<string, string>): string {
+  return input.replace(/\$\{([^}]+)\}|\$([A-Z0-9_]+)/g, (_m, k1, k2) => {
+    const key = (k1 || k2) as string
+    const val = tokens[key]
+    return val == null ? '' : String(val)
+  })
+}
+
+function filterEnvByPrefix(env: NodeJS.ProcessEnv, prefix: string): Record<string, string> {
+  const filtered: Record<string, string> = {}
+  for (const [key, value] of Object.entries(env)) {
+    if (key.startsWith(prefix) && typeof value === 'string') {
+      filtered[key] = value
+    }
+  }
+  return filtered
+}
+
+export function setUpConfig(config: AppJSONConfig): ExpoConfig {
+  const { extra = {}, ...other } = (config.expo ?? {}) as any
+
+  const router = extra['router'] ? { origin: false, ...extra['router'] } : { origin: false }
+
+  return {
+    ...(config as any),
+    expo: {
+      ...other,
+      extra: {
+        ...filterEnvByPrefix(process.env, 'NEXT_PUBLIC_'),
+        eas: {
+          projectId: process.env.EAS_PROJECT_ID,
+        },
+        router,
+        ...extra,
+      },
+    },
+  } as ExpoConfig
+}
+
+export function filterUnwantedEnvVarsEAS(envVars: Record<string, string>): Record<string, string> {
+  // Keep in sync with lib/filterUnwantedEnvVars.ts
+  const unwantedPrefixes = [
+    'ProgramData',
+    'ProgramFiles',
+    'ProgramFiles(x86)',
+    'ProgramW6432',
+    'PSModulePath',
+    'PUBLIC',
+    'TEMP',
+    'TMP',
+    'EFC_',
+    'FPS_',
+    'GIT_',
+    'NVM_',
+    'VSCODE_',
+    'windir',
+    'Chocolatey',
+    'ALLUSERSPROFILE',
+    'APPDATA',
+    'CommonProgramFiles',
+    'CommonProgramW6432',
+    'ComSpec',
+    'Driver',
+    'HOME',
+    'npm',
+    'LOCALAPPDATA',
+    'LOGONSERVER',
+    'NUMBER_OF_PROCESSORS',
+    'OS',
+    'COREPACK',
+    'PROCESSOR',
+    'USERDOMAIN',
+    'USERDOMAIN_ROAMINGPROFILE',
+    'USERNAME',
+    'USERPROFILE',
+    'CUDA',
+    'SESSIONNAME',
+    'ZES',
+    '3DVPATH',
+    'APP_NAME',
+    'asl.log',
+    'BERRY_BIN_FOLDER',
+    'CHROME_CRASHPAD_PIPE_NAME',
+    'COLORTERM',
+    'COMPUTERNAME',
+    'CUDNN',
+    'EAS_BUILD_PROFILE',
+    'EAS_PROJECT_ID',
+    'EXPO_UNSTABLE_ATLAS',
+    'INIT_CWD',
+    'JAVA_HOME',
+    'LANG',
+    'OneDrive',
+    'ORIGINAL_XDG_CURRENT_DESKTOP',
+    'PROJECT_CWD',
+    'PROMPT',
+    'PWD',
+    'TERM_PROGRAM',
+    'TERM_PROGRAM_VERSION',
+    '__PSLockDownPolicy',
+    'PATH',
+    'SystemRoot',
+    'SystemDrive',
+    'npm_',
+  ]
+
+  const out: Record<string, string> = {}
+  for (const [key, value] of Object.entries(envVars)) {
+    if (!unwantedPrefixes.some((prefix) => key.startsWith(prefix))) {
+      out[key] = value
+    }
+  }
+  return out
+}

package/src/index.ts

@@ -1,76 +1,73 @@
 // Main entry point for @mono-labs/cli package
 
 import {
-	filterUnwantedEnvVars,
-	filterUnwantedEnvVarsEAS,
-	generateNewEnvList,
-} from './expo-files/filterUnwantedEnvVars.js';
+  filterUnwantedEnvVars,
+  filterUnwantedEnvVarsEAS,
+  generateNewEnvList,
+} from './expo-files/filterUnwantedEnvVars'
 
 /* ------------------------------------------------------------------
  * Internal data layer
  * ------------------------------------------------------------------ */
 
-type DataLayer = Record<string, unknown>;
+type DataLayer = Record<string, unknown>
 
-const dataLayer: DataLayer = Object.create(null);
+const dataLayer: DataLayer = Object.create(null)
 
 export function setData(key: string, value: unknown): void {
-	if (value !== undefined) {
-		dataLayer[key] = value;
-	}
+  if (value !== undefined) {
+    dataLayer[key] = value
+  }
 }
 
 export function mergeData(obj: Record<string, unknown> = {}): DataLayer {
-	Object.entries(obj).forEach(([k, v]) => setData(k, v));
-	return dataLayer;
+  Object.entries(obj).forEach(([k, v]) => setData(k, v))
+  return dataLayer
 }
 
 export function getData(key?: string): unknown {
-	return key ? dataLayer[key] : dataLayer;
+  return key ? dataLayer[key] : dataLayer
 }
 
 export function hasData(key: string): boolean {
-	return Object.prototype.hasOwnProperty.call(dataLayer, key);
+  return Object.prototype.hasOwnProperty.call(dataLayer, key)
 }
 
 /* ------------------------------------------------------------------
  * Token replacement
  * ------------------------------------------------------------------ */
 
-export function replaceTokens(
-	str: unknown,
-	env?: Record<string, string | undefined>
-): unknown {
-	if (typeof str !== 'string') return str;
-
-	return str.replace(/\$\{([^}]+)\}|\$([A-Z0-9_]+)/g, (_match, k1, k2) => {
-		const key = k1 || k2;
-
-		// data layer takes priority
-		if (hasData(key)) {
-			const val = getData(key);
-			return val == null ? '' : String(val);
-		}
-
-		// environment variables
-		if (env && Object.prototype.hasOwnProperty.call(env, key)) {
-			const val = env[key];
-			return val == null ? '' : String(val);
-		}
-
-		return '';
-	});
+export function replaceTokens(str: unknown, env?: Record<string, string | undefined>): unknown {
+  if (typeof str !== 'string') return str
+
+  return str.replace(/\$\{([^}]+)\}|\$([A-Z0-9_]+)/g, (_match, k1, k2) => {
+    const key = k1 || k2
+
+    // data layer takes priority
+    if (hasData(key)) {
+      const val = getData(key)
+      return val == null ? '' : String(val)
+    }
+
+    // environment variables
+    if (env && Object.prototype.hasOwnProperty.call(env, key)) {
+      const val = env[key]
+      return val == null ? '' : String(val)
+    }
+
+    return ''
+  })
 }
 
 /* ------------------------------------------------------------------
  * Exports
  * ------------------------------------------------------------------ */
 
-export { generateNewEnvList, filterUnwantedEnvVars, filterUnwantedEnvVarsEAS };
+export { generateNewEnvList, filterUnwantedEnvVars, filterUnwantedEnvVarsEAS }
 
 export default {
-	generateNewEnvList,
-	replaceTokens,
-	filterUnwantedEnvVars,
-	filterUnwantedEnvVarsEAS,
-};
+  generateNewEnvList,
+  replaceTokens,
+  filterUnwantedEnvVars,
+  filterUnwantedEnvVarsEAS,
+}

package/src/merge-env.ts

@@ -0,0 +1,24 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import dotenv from 'dotenv'
+
+export function loadMergedEnv(): NodeJS.ProcessEnv {
+  const ENV_PATH = path.resolve(process.cwd(), '.env')
+  const ENV_LOCAL_PATH = path.resolve(process.cwd(), '.env.local')
+
+  const base = fs.existsSync(ENV_PATH) ? dotenv.parse(fs.readFileSync(ENV_PATH)) : {}
+  const local = fs.existsSync(ENV_LOCAL_PATH) ? dotenv.parse(fs.readFileSync(ENV_LOCAL_PATH)) : {}
+
+  const merged = {
+    ...base,
+    ...local,
+  }
+
+  for (const [key, value] of Object.entries(merged)) {
+    if (process.env[key] === undefined) {
+      process.env[key] = value
+    }
+  }
+
+  return process.env
+}