@vxrn/vite-plugin-metro 2.0.0-beta.51.1 → 2.0.0-beta.56.1

package/dist/cjs/transformer/metroNativeWorker.cjs

@@ -61,6 +61,8 @@ var import_magic_string = __toESM(require("magic-string"), 1);
 var import_remapping = __toESM(require("@jridgewell/remapping"), 1);
 var import_trace_mapping = require("@jridgewell/trace-mapping");
 var import_compiler = require("@vxrn/compiler");
+var import_publicEnv = require("@vxrn/utils/publicEnv");
+var import_expoVirtualEnv = require("./expoVirtualEnv.cjs");
 var import_platformEnv = require("../env/platformEnv.cjs");
 function collectModuleLiteralBindings(program) {
 	const reassigned = /* @__PURE__ */ new Set();
@@ -293,6 +295,11 @@ function applyInlineEnvVars(code, filename, isProduction, env = {}) {
 		throw new Error(`[vxrn/metro] Failed to parse ${filename} for env inlining: ${parsed.errors[0].message}`);
 	}
 	if (!parsed?.program) return code;
+	const processPublicEnv = Object.fromEntries(Object.entries(process.env).filter(([key]) => key.startsWith("ONE_PUBLIC_") || key.startsWith("EXPO_PUBLIC_")));
+	const effectiveEnv = (0, import_publicEnv.withExpoPublicEnvAliases)({
+		...processPublicEnv,
+		...env
+	});
 	const ms = new import_magic_string.default(code);
 	const edits = [];
 	const known = /* @__PURE__ */ new Map();
@@ -325,27 +332,24 @@ function applyInlineEnvVars(code, filename, isProduction, env = {}) {
 				replace(node, process.env.ONE_SERVER_URL || "");
 				return;
 			}
-			if (isProcessEnv && !isAssignmentTarget && key?.startsWith("EXPO_PUBLIC_")) {
-				throw new Error(`[vxrn/metro] ${key} uses the removed expo prefix. rename it to ONE_PUBLIC_*`);
-			}
-			if (isProcessEnv && !isAssignmentTarget && key?.startsWith("ONE_PUBLIC_")) {
-				replace(node, env[key] ?? process.env[key] ?? void 0);
+			if (isProcessEnv && !isAssignmentTarget && (key?.startsWith("ONE_PUBLIC_") || key?.startsWith("EXPO_PUBLIC_"))) {
+				replace(node, effectiveEnv[key] ?? void 0);
 				return;
 			}
 			if (!isAssignmentTarget && isMember && isImportMeta(obj.object) && keyOf(obj.property, obj.computed) === "env" && key !== void 0) {
-				replace(node, env[key]);
+				replace(node, effectiveEnv[key]);
 				return;
 			}
 			if (!isAssignmentTarget && isImportMeta(obj) && key === "env") {
 				edits.push({
 					start: node.start,
 					end: node.end,
-					text: JSON.stringify(env)
+					text: JSON.stringify(effectiveEnv)
 				});
 				return;
 			}
-			if (isProcessEnv && !isAssignmentTarget && key !== void 0 && key in env) {
-				replace(node, env[key]);
+			if (isProcessEnv && !isAssignmentTarget && key !== void 0 && key in effectiveEnv) {
+				replace(node, effectiveEnv[key]);
 				return;
 			}
 		}
@@ -1131,26 +1135,13 @@ async function configureWorkletsForWorker(projectRoot) {
 async function transform(config, projectRoot, filename, data, options) {
 	assertNoUnportedBabelPlugins(options);
 	let sourceCode = typeof data === "string" ? data : data.toString("utf8");
-	const environment = options.customTransformOptions?.environment;
-	const isClientEnvironment = environment !== "node" && environment !== "react-server";
-	if (isClientEnvironment && /[\\/]expo[\\/]virtual[\\/]env\.js$/.test(filename)) {
-		if (options.dev) {
-			const rel = import_node_path.default.relative(import_node_path.default.dirname(filename), projectRoot).split(import_node_path.default.sep).join("/");
-			sourceCode = `const dotEnvModules = require.context(${JSON.stringify(rel)},false,/^\\.\\/\\.env/);
-export const env = !dotEnvModules.keys().length ? process.env : { ...process.env, ...['.env', '.env.development', '.env.local', '.env.development.local'].reduce((acc, file) => {
-  return { ...acc, ...(dotEnvModules(file)?.default ?? {}) };
-}, {}) };`;
-		} else {
-			sourceCode = `export const env = new Proxy({}, {
-  get(target, key) {
-    throw new Error(\`Attempting to access internal environment variable "\${String(key)}" is not supported in production bundles.\`);
-  },
-});`;
-		}
-	} else if (/(^|[\\/])\.env(\.(local|(development|production)(\.local)?))?$/.test(filename)) {
-		const { parseEnvFile } = await import("@expo/metro-config/build/transform-worker/dot-env-development");
-		sourceCode = `export default ${JSON.stringify(parseEnvFile(sourceCode, isClientEnvironment))};`;
-	}
+	sourceCode = (0, import_expoVirtualEnv.substituteExpoVirtualEnvSource)({
+		filename,
+		src: sourceCode,
+		projectRoot,
+		dev: options.dev,
+		environment: options.customTransformOptions?.environment
+	});
 	checkReservedStrings(sourceCode, config, options);
 	if (filename.endsWith(".json")) {
 		try {

package/dist/cjs/transformer/metroNativeWorker.native.cjs

@@ -63,6 +63,8 @@ var import_magic_string = __toESM(require("magic-string"), 1);
 var import_remapping = __toESM(require("@jridgewell/remapping"), 1);
 var import_trace_mapping = require("@jridgewell/trace-mapping");
 var import_compiler = require("@vxrn/compiler");
+var import_publicEnv = require("@vxrn/utils/publicEnv");
+var import_expoVirtualEnv = require("./expoVirtualEnv.native.js");
 var import_platformEnv = require("../env/platformEnv.native.js");
 function _class_call_check(instance, Constructor) {
 	if (!(instance instanceof Constructor)) {
@@ -580,6 +582,14 @@ function applyInlineEnvVars(code, filename, isProduction) {
 		throw new Error(`[vxrn/metro] Failed to parse ${filename} for env inlining: ${parsed.errors[0].message}`);
 	}
 	if (!(parsed === null || parsed === void 0 ? void 0 : parsed.program)) return code;
+	var processPublicEnv = Object.fromEntries(Object.entries(process.env).filter(function(param) {
+		var [key] = param;
+		return key.startsWith("ONE_PUBLIC_") || key.startsWith("EXPO_PUBLIC_");
+	}));
+	var effectiveEnv = (0, import_publicEnv.withExpoPublicEnvAliases)({
+		...processPublicEnv,
+		...env
+	});
 	var ms = new import_magic_string.default(code);
 	var edits = [];
 	var known = /* @__PURE__ */ new Map();
@@ -614,28 +624,25 @@ function applyInlineEnvVars(code, filename, isProduction) {
 				replace(node, process.env.ONE_SERVER_URL || "");
 				return;
 			}
-			if (isProcessEnv && !isAssignmentTarget && (key === null || key === void 0 ? void 0 : key.startsWith("EXPO_PUBLIC_"))) {
-				throw new Error(`[vxrn/metro] ${key} uses the removed expo prefix. rename it to ONE_PUBLIC_*`);
-			}
-			if (isProcessEnv && !isAssignmentTarget && (key === null || key === void 0 ? void 0 : key.startsWith("ONE_PUBLIC_"))) {
-				var _ref, _env_key;
-				replace(node, (_ref = (_env_key = env[key]) !== null && _env_key !== void 0 ? _env_key : process.env[key]) !== null && _ref !== void 0 ? _ref : void 0);
+			if (isProcessEnv && !isAssignmentTarget && ((key === null || key === void 0 ? void 0 : key.startsWith("ONE_PUBLIC_")) || (key === null || key === void 0 ? void 0 : key.startsWith("EXPO_PUBLIC_")))) {
+				var _effectiveEnv_key;
+				replace(node, (_effectiveEnv_key = effectiveEnv[key]) !== null && _effectiveEnv_key !== void 0 ? _effectiveEnv_key : void 0);
 				return;
 			}
 			if (!isAssignmentTarget && isMember && isImportMeta(obj.object) && keyOf(obj.property, obj.computed) === "env" && key !== void 0) {
-				replace(node, env[key]);
+				replace(node, effectiveEnv[key]);
 				return;
 			}
 			if (!isAssignmentTarget && isImportMeta(obj) && key === "env") {
 				edits.push({
 					start: node.start,
 					end: node.end,
-					text: JSON.stringify(env)
+					text: JSON.stringify(effectiveEnv)
 				});
 				return;
 			}
-			if (isProcessEnv && !isAssignmentTarget && key !== void 0 && key in env) {
-				replace(node, env[key]);
+			if (isProcessEnv && !isAssignmentTarget && key !== void 0 && key in effectiveEnv) {
+				replace(node, effectiveEnv[key]);
 				return;
 			}
 		}
@@ -2034,26 +2041,13 @@ async function transform(config, projectRoot, filename, data, options) {
 	var _options_customTransformOptions, _options_customTransformOptions1, _options_customTransformOptions2, _oxcRes_errors;
 	assertNoUnportedBabelPlugins(options);
 	var sourceCode = typeof data === "string" ? data : data.toString("utf8");
-	var environment = (_options_customTransformOptions = options.customTransformOptions) === null || _options_customTransformOptions === void 0 ? void 0 : _options_customTransformOptions.environment;
-	var isClientEnvironment = environment !== "node" && environment !== "react-server";
-	if (isClientEnvironment && /[\\/]expo[\\/]virtual[\\/]env\.js$/.test(filename)) {
-		if (options.dev) {
-			var rel = import_path.default.relative(import_path.default.dirname(filename), projectRoot).split(import_path.default.sep).join("/");
-			sourceCode = `const dotEnvModules = require.context(${JSON.stringify(rel)},false,/^\\.\\/\\.env/);
-export const env = !dotEnvModules.keys().length ? process.env : { ...process.env, ...['.env', '.env.development', '.env.local', '.env.development.local'].reduce((acc, file) => {
-  return { ...acc, ...(dotEnvModules(file)?.default ?? {}) };
-}, {}) };`;
-		} else {
-			sourceCode = `export const env = new Proxy({}, {
-  get(target, key) {
-    throw new Error(\`Attempting to access internal environment variable "\${String(key)}" is not supported in production bundles.\`);
-  },
-});`;
-		}
-	} else if (/(^|[\\/])\.env(\.(local|(development|production)(\.local)?))?$/.test(filename)) {
-		var { parseEnvFile } = await import("@expo/metro-config/build/transform-worker/dot-env-development");
-		sourceCode = `export default ${JSON.stringify(parseEnvFile(sourceCode, isClientEnvironment))};`;
-	}
+	sourceCode = (0, import_expoVirtualEnv.substituteExpoVirtualEnvSource)({
+		filename,
+		src: sourceCode,
+		projectRoot,
+		dev: options.dev,
+		environment: (_options_customTransformOptions = options.customTransformOptions) === null || _options_customTransformOptions === void 0 ? void 0 : _options_customTransformOptions.environment
+	});
 	checkReservedStrings(sourceCode, config, options);
 	if (filename.endsWith(".json")) {
 		try {

package/dist/cjs/transformer/metroNativeWorker.native.js

@@ -63,6 +63,8 @@ var import_magic_string = __toESM(require("magic-string"), 1);
 var import_remapping = __toESM(require("@jridgewell/remapping"), 1);
 var import_trace_mapping = require("@jridgewell/trace-mapping");
 var import_compiler = require("@vxrn/compiler");
+var import_publicEnv = require("@vxrn/utils/publicEnv");
+var import_expoVirtualEnv = require("./expoVirtualEnv.native.js");
 var import_platformEnv = require("../env/platformEnv.native.js");
 function _class_call_check(instance, Constructor) {
 	if (!(instance instanceof Constructor)) {
@@ -580,6 +582,14 @@ function applyInlineEnvVars(code, filename, isProduction) {
 		throw new Error(`[vxrn/metro] Failed to parse ${filename} for env inlining: ${parsed.errors[0].message}`);
 	}
 	if (!(parsed === null || parsed === void 0 ? void 0 : parsed.program)) return code;
+	var processPublicEnv = Object.fromEntries(Object.entries(process.env).filter(function(param) {
+		var [key] = param;
+		return key.startsWith("ONE_PUBLIC_") || key.startsWith("EXPO_PUBLIC_");
+	}));
+	var effectiveEnv = (0, import_publicEnv.withExpoPublicEnvAliases)({
+		...processPublicEnv,
+		...env
+	});
 	var ms = new import_magic_string.default(code);
 	var edits = [];
 	var known = /* @__PURE__ */ new Map();
@@ -614,28 +624,25 @@ function applyInlineEnvVars(code, filename, isProduction) {
 				replace(node, process.env.ONE_SERVER_URL || "");
 				return;
 			}
-			if (isProcessEnv && !isAssignmentTarget && (key === null || key === void 0 ? void 0 : key.startsWith("EXPO_PUBLIC_"))) {
-				throw new Error(`[vxrn/metro] ${key} uses the removed expo prefix. rename it to ONE_PUBLIC_*`);
-			}
-			if (isProcessEnv && !isAssignmentTarget && (key === null || key === void 0 ? void 0 : key.startsWith("ONE_PUBLIC_"))) {
-				var _ref, _env_key;
-				replace(node, (_ref = (_env_key = env[key]) !== null && _env_key !== void 0 ? _env_key : process.env[key]) !== null && _ref !== void 0 ? _ref : void 0);
+			if (isProcessEnv && !isAssignmentTarget && ((key === null || key === void 0 ? void 0 : key.startsWith("ONE_PUBLIC_")) || (key === null || key === void 0 ? void 0 : key.startsWith("EXPO_PUBLIC_")))) {
+				var _effectiveEnv_key;
+				replace(node, (_effectiveEnv_key = effectiveEnv[key]) !== null && _effectiveEnv_key !== void 0 ? _effectiveEnv_key : void 0);
 				return;
 			}
 			if (!isAssignmentTarget && isMember && isImportMeta(obj.object) && keyOf(obj.property, obj.computed) === "env" && key !== void 0) {
-				replace(node, env[key]);
+				replace(node, effectiveEnv[key]);
 				return;
 			}
 			if (!isAssignmentTarget && isImportMeta(obj) && key === "env") {
 				edits.push({
 					start: node.start,
 					end: node.end,
-					text: JSON.stringify(env)
+					text: JSON.stringify(effectiveEnv)
 				});
 				return;
 			}
-			if (isProcessEnv && !isAssignmentTarget && key !== void 0 && key in env) {
-				replace(node, env[key]);
+			if (isProcessEnv && !isAssignmentTarget && key !== void 0 && key in effectiveEnv) {
+				replace(node, effectiveEnv[key]);
 				return;
 			}
 		}
@@ -2034,26 +2041,13 @@ async function transform(config, projectRoot, filename, data, options) {
 	var _options_customTransformOptions, _options_customTransformOptions1, _options_customTransformOptions2, _oxcRes_errors;
 	assertNoUnportedBabelPlugins(options);
 	var sourceCode = typeof data === "string" ? data : data.toString("utf8");
-	var environment = (_options_customTransformOptions = options.customTransformOptions) === null || _options_customTransformOptions === void 0 ? void 0 : _options_customTransformOptions.environment;
-	var isClientEnvironment = environment !== "node" && environment !== "react-server";
-	if (isClientEnvironment && /[\\/]expo[\\/]virtual[\\/]env\.js$/.test(filename)) {
-		if (options.dev) {
-			var rel = import_path.default.relative(import_path.default.dirname(filename), projectRoot).split(import_path.default.sep).join("/");
-			sourceCode = `const dotEnvModules = require.context(${JSON.stringify(rel)},false,/^\\.\\/\\.env/);
-export const env = !dotEnvModules.keys().length ? process.env : { ...process.env, ...['.env', '.env.development', '.env.local', '.env.development.local'].reduce((acc, file) => {
-  return { ...acc, ...(dotEnvModules(file)?.default ?? {}) };
-}, {}) };`;
-		} else {
-			sourceCode = `export const env = new Proxy({}, {
-  get(target, key) {
-    throw new Error(\`Attempting to access internal environment variable "\${String(key)}" is not supported in production bundles.\`);
-  },
-});`;
-		}
-	} else if (/(^|[\\/])\.env(\.(local|(development|production)(\.local)?))?$/.test(filename)) {
-		var { parseEnvFile } = await import("@expo/metro-config/build/transform-worker/dot-env-development");
-		sourceCode = `export default ${JSON.stringify(parseEnvFile(sourceCode, isClientEnvironment))};`;
-	}
+	sourceCode = (0, import_expoVirtualEnv.substituteExpoVirtualEnvSource)({
+		filename,
+		src: sourceCode,
+		projectRoot,
+		dev: options.dev,
+		environment: (_options_customTransformOptions = options.customTransformOptions) === null || _options_customTransformOptions === void 0 ? void 0 : _options_customTransformOptions.environment
+	});
 	checkReservedStrings(sourceCode, config, options);
 	if (filename.endsWith(".json")) {
 		try {