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

package/dist/cjs/metro-config/getMetroConfigFromViteConfig.cjs

@@ -30,14 +30,20 @@ __export(getMetroConfigFromViteConfig_exports, {
 	getMetroConfigFromViteConfig: () => getMetroConfigFromViteConfig
 });
 module.exports = __toCommonJS(getMetroConfigFromViteConfig_exports);
+var import_vite = require("vite");
 var import_node_child_process = require("node:child_process");
 var import_node_path = require("node:path");
 var import_micromatch = __toESM(require("micromatch"), 1);
+var import_metro_config = require("@react-native/metro-config");
 var import_compiler = require("@vxrn/compiler");
 var import_projectImport = require("../utils/projectImport.cjs");
 var import_getTerminalReporter = require("../utils/getTerminalReporter.cjs");
-var import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName = require("../utils/patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.cjs");
 const WATCHMAN_PROBE_TIMEOUT_MS = 2e3;
+const expoEnvAdditionalExts = [
+	"env",
+	"local",
+	"development"
+];
 const watchmanResponsivePromises = /* @__PURE__ */ new Map();
 let didWarnAboutWatchmanFallback = false;
 const rootIndexBundleRequestPattern = /^(https?:\/\/[^/]+)?\/index\.bundle(?=$|[?#])/;
@@ -48,17 +54,56 @@ const metroWatchExclusions = [
 	/[/\\]\.vite(?:[/\\]|$)/,
 	/[/\\]node_modules[/\\]\.vxrn(?:[/\\]|$)/
 ];
+function enforceWorkspaceVisibility(config, projectRoot) {
+	const workspaceRoot = (0, import_vite.searchForWorkspaceRoot)(projectRoot);
+	if (workspaceRoot === projectRoot) return config;
+	return {
+		...config,
+		watchFolders: [.../* @__PURE__ */ new Set([...config.watchFolders ?? [], workspaceRoot])],
+		resolver: {
+			...config.resolver,
+			nodeModulesPaths: [.../* @__PURE__ */ new Set([
+				...config.resolver?.nodeModulesPaths ?? [],
+				(0, import_node_path.resolve)(projectRoot, "node_modules"),
+				(0, import_node_path.resolve)(workspaceRoot, "node_modules")
+			])]
+		}
+	};
+}
+function getReactNativeDefaultConfig(projectRoot) {
+	return enforceWorkspaceVisibility((0, import_metro_config.getDefaultConfig)(projectRoot), projectRoot);
+}
 function getPlatformFromBundleUrl(url) {
 	const platform = url.match(/[?&]platform=(ios|android)(?:&|$)/)?.[1];
 	return platform === "android" ? "android" : "ios";
 }
 function rewriteMainModuleBundleUrl(url, resolveMainModuleName) {
 	const resolvedMainModulePath = resolveMainModuleName({ platform: getPlatformFromBundleUrl(url) });
-	if (url.includes("/.expo/.virtual-metro-entry.bundle?")) {
-		return url.replace(".expo/.virtual-metro-entry", resolvedMainModulePath);
-	}
 	return url.replace(rootIndexBundleRequestPattern, `$1/${resolvedMainModulePath}.bundle`);
 }
+function isBareSpecifier(name) {
+	return name !== "" && !name.startsWith(".") && !name.startsWith("/");
+}
+function bareMainModuleForRequest(moduleName, mainModuleName) {
+	if (!mainModuleName || !isBareSpecifier(mainModuleName)) return void 0;
+	if (moduleName === `./${mainModuleName}`) return mainModuleName;
+	return void 0;
+}
+function enforceBareMainModuleEntry(config, mainModuleName) {
+	if (!mainModuleName || !isBareSpecifier(mainModuleName)) return config;
+	const innerResolveRequest = config?.resolver?.resolveRequest;
+	return {
+		...config,
+		resolver: {
+			...config?.resolver,
+			resolveRequest: (context, moduleName, platform) => {
+				const bareMain = bareMainModuleForRequest(moduleName, mainModuleName);
+				const resolveRequest = innerResolveRequest || context.resolveRequest;
+				return resolveRequest(context, bareMain ?? moduleName, platform);
+			}
+		}
+	};
+}
 async function isWatchmanResponsive(projectRoot) {
 	let probe = watchmanResponsivePromises.get(projectRoot);
 	if (probe) {
@@ -108,27 +153,16 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		didWarnAboutWatchmanFallback = true;
 		console.warn("[vxrn/metro] Watchman is unavailable or unresponsive; falling back to Node file watching.");
 	}
-	const { getDefaultConfig } = await (0, import_projectImport.projectImport)(projectRoot, "@expo/metro-config");
-	const _defaultConfig = getDefaultConfig(projectRoot);
+	const _defaultConfig = getReactNativeDefaultConfig(projectRoot);
 	if (mainModuleName) {
-		const origRewriteRequestUrl = _defaultConfig.server.rewriteRequestUrl;
-		const resolveMainModuleName = await (async () => {
-			const ExpoGoManifestHandlerMiddleware = (await (0, import_projectImport.projectImport)(projectRoot, "@expo/cli/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js")).default.ExpoGoManifestHandlerMiddleware;
-			const manifestHandlerMiddleware = new ExpoGoManifestHandlerMiddleware(projectRoot, {});
-			(0, import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName)(manifestHandlerMiddleware, mainModuleName);
-			return (p) => {
-				return manifestHandlerMiddleware.resolveMainModuleName({
-					pkg: { main: mainModuleName },
-					platform: p.platform
-				});
-			};
-		})();
+		const origRewriteRequestUrl = _defaultConfig.server?.rewriteRequestUrl;
+		const resolveMainModuleName = () => mainModuleName;
 		extraConfig.getResolveMainModuleName = resolveMainModuleName;
 		_defaultConfig.server.rewriteRequestUrl = (url) => {
-			if (url.includes("/.expo/.virtual-metro-entry.bundle?") || rootIndexBundleRequestPattern.test(url)) {
+			if (rootIndexBundleRequestPattern.test(url)) {
 				return rewriteMainModuleBundleUrl(url, resolveMainModuleName);
 			}
-			return origRewriteRequestUrl(url);
+			return origRewriteRequestUrl?.(url) ?? url;
 		};
 	}
 	const existingBlockList = _defaultConfig?.resolver?.blockList;
@@ -140,6 +174,10 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 	}
 	const defaultConfig = {
 		..._defaultConfig,
+		watcher: {
+			..._defaultConfig?.watcher,
+			additionalExts: [.../* @__PURE__ */ new Set([..._defaultConfig?.watcher?.additionalExts ?? [], ...expoEnvAdditionalExts])]
+		},
 		resolver: {
 			..._defaultConfig?.resolver,
 			useWatchman,
@@ -172,6 +210,7 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		},
 		transformer: {
 			..._defaultConfig?.transformer,
+			unstable_allowRequireContext: true,
 			babelTransformerPath: (0, import_projectImport.projectResolve)(projectRoot, "@vxrn/vite-plugin-metro/babel-transformer")
 		},
 		...nativeWorkerPath ? { transformerPath: nativeWorkerPath } : {},
@@ -182,7 +221,7 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	};
 	return {
-		defaultConfig: merged,
+		defaultConfig: enforceBareMainModuleEntry(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName),
 		projectRoot,
 		extraConfig
 	};
@@ -197,27 +236,16 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		console.warn("[vxrn/metro] Watchman is unavailable or unresponsive; falling back to Node file watching.");
 	}
 	const { loadConfig } = await (0, import_projectImport.projectImport)(projectRoot, "metro");
-	const { getDefaultConfig } = await (0, import_projectImport.projectImport)(projectRoot, "@expo/metro-config");
-	const _defaultConfig = getDefaultConfig(projectRoot);
+	const _defaultConfig = getReactNativeDefaultConfig(projectRoot);
 	if (mainModuleName) {
-		const origRewriteRequestUrl = _defaultConfig.server.rewriteRequestUrl;
-		const resolveMainModuleName = await (async () => {
-			const ExpoGoManifestHandlerMiddleware = (await (0, import_projectImport.projectImport)(projectRoot, "@expo/cli/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js")).default.ExpoGoManifestHandlerMiddleware;
-			const manifestHandlerMiddleware = new ExpoGoManifestHandlerMiddleware(projectRoot, {});
-			(0, import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName)(manifestHandlerMiddleware, mainModuleName);
-			return (p) => {
-				return manifestHandlerMiddleware.resolveMainModuleName({
-					pkg: { main: mainModuleName },
-					platform: p.platform
-				});
-			};
-		})();
+		const origRewriteRequestUrl = _defaultConfig.server?.rewriteRequestUrl;
+		const resolveMainModuleName = () => mainModuleName;
 		extraConfig.getResolveMainModuleName = resolveMainModuleName;
 		_defaultConfig.server.rewriteRequestUrl = (url) => {
-			if (url.includes("/.expo/.virtual-metro-entry.bundle?") || rootIndexBundleRequestPattern.test(url)) {
+			if (rootIndexBundleRequestPattern.test(url)) {
 				return rewriteMainModuleBundleUrl(url, resolveMainModuleName);
 			}
-			return origRewriteRequestUrl(url);
+			return origRewriteRequestUrl?.(url) ?? url;
 		};
 	}
 	const existingBlockList = _defaultConfig?.resolver?.blockList;
@@ -229,6 +257,10 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 	}
 	const defaultConfig = {
 		..._defaultConfig,
+		watcher: {
+			..._defaultConfig?.watcher,
+			additionalExts: [.../* @__PURE__ */ new Set([..._defaultConfig?.watcher?.additionalExts ?? [], ...expoEnvAdditionalExts])]
+		},
 		resolver: {
 			..._defaultConfig?.resolver,
 			useWatchman,
@@ -261,6 +293,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		},
 		transformer: {
 			..._defaultConfig?.transformer,
+			unstable_allowRequireContext: true,
 			babelTransformerPath: (0, import_projectImport.projectResolve)(projectRoot, "@vxrn/vite-plugin-metro/babel-transformer")
 		},
 		...nativeWorkerPath ? { transformerPath: nativeWorkerPath } : {},
@@ -276,7 +309,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	});
 	return {
-		...metroConfig,
+		...enforceBareMainModuleEntry(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName),
 		...extraConfig
 	};
 }

package/dist/cjs/metro-config/getMetroConfigFromViteConfig.native.cjs

@@ -32,14 +32,20 @@ __export(getMetroConfigFromViteConfig_exports, {
 	getMetroConfigFromViteConfig: () => getMetroConfigFromViteConfig
 });
 module.exports = __toCommonJS(getMetroConfigFromViteConfig_exports);
+var import_vite = require("vite");
 var import_child_process = require("child_process");
 var import_path = require("path");
 var import_micromatch = __toESM(require("micromatch"), 1);
+var import_metro_config = require("@react-native/metro-config");
 var import_compiler = require("@vxrn/compiler");
 var import_projectImport = require("../utils/projectImport.native.js");
 var import_getTerminalReporter = require("../utils/getTerminalReporter.native.js");
-var import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName = require("../utils/patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.native.js");
 var WATCHMAN_PROBE_TIMEOUT_MS = 2e3;
+var expoEnvAdditionalExts = [
+	"env",
+	"local",
+	"development"
+];
 var watchmanResponsivePromises = /* @__PURE__ */ new Map();
 var didWarnAboutWatchmanFallback = false;
 var rootIndexBundleRequestPattern = /^(https?:\/\/[^/]+)?\/index\.bundle(?=$|[?#])/;
@@ -50,6 +56,27 @@ var metroWatchExclusions = [
 	/[/\\]\.vite(?:[/\\]|$)/,
 	/[/\\]node_modules[/\\]\.vxrn(?:[/\\]|$)/
 ];
+function enforceWorkspaceVisibility(config, projectRoot) {
+	var _config_watchFolders, _ref;
+	var _config_resolver;
+	var workspaceRoot = (0, import_vite.searchForWorkspaceRoot)(projectRoot);
+	if (workspaceRoot === projectRoot) return config;
+	return {
+		...config,
+		watchFolders: [.../* @__PURE__ */ new Set([...(_config_watchFolders = config.watchFolders) !== null && _config_watchFolders !== void 0 ? _config_watchFolders : [], workspaceRoot])],
+		resolver: {
+			...config.resolver,
+			nodeModulesPaths: [.../* @__PURE__ */ new Set([
+				...(_ref = (_config_resolver = config.resolver) === null || _config_resolver === void 0 ? void 0 : _config_resolver.nodeModulesPaths) !== null && _ref !== void 0 ? _ref : [],
+				(0, import_path.resolve)(projectRoot, "node_modules"),
+				(0, import_path.resolve)(workspaceRoot, "node_modules")
+			])]
+		}
+	};
+}
+function getReactNativeDefaultConfig(projectRoot) {
+	return enforceWorkspaceVisibility((0, import_metro_config.getDefaultConfig)(projectRoot), projectRoot);
+}
 function getPlatformFromBundleUrl(url) {
 	var _url_match;
 	var platform = (_url_match = url.match(/[?&]platform=(ios|android)(?:&|$)/)) === null || _url_match === void 0 ? void 0 : _url_match[1];
@@ -57,11 +84,32 @@ function getPlatformFromBundleUrl(url) {
 }
 function rewriteMainModuleBundleUrl(url, resolveMainModuleName) {
 	var resolvedMainModulePath = resolveMainModuleName({ platform: getPlatformFromBundleUrl(url) });
-	if (url.includes("/.expo/.virtual-metro-entry.bundle?")) {
-		return url.replace(".expo/.virtual-metro-entry", resolvedMainModulePath);
-	}
 	return url.replace(rootIndexBundleRequestPattern, `$1/${resolvedMainModulePath}.bundle`);
 }
+function isBareSpecifier(name) {
+	return name !== "" && !name.startsWith(".") && !name.startsWith("/");
+}
+function bareMainModuleForRequest(moduleName, mainModuleName) {
+	if (!mainModuleName || !isBareSpecifier(mainModuleName)) return void 0;
+	if (moduleName === `./${mainModuleName}`) return mainModuleName;
+	return void 0;
+}
+function enforceBareMainModuleEntry(config, mainModuleName) {
+	var _config_resolver;
+	if (!mainModuleName || !isBareSpecifier(mainModuleName)) return config;
+	var innerResolveRequest = config === null || config === void 0 ? void 0 : (_config_resolver = config.resolver) === null || _config_resolver === void 0 ? void 0 : _config_resolver.resolveRequest;
+	return {
+		...config,
+		resolver: {
+			...config === null || config === void 0 ? void 0 : config.resolver,
+			resolveRequest: function(context, moduleName, platform) {
+				var bareMain = bareMainModuleForRequest(moduleName, mainModuleName);
+				var resolveRequest = innerResolveRequest || context.resolveRequest;
+				return resolveRequest(context, bareMain !== null && bareMain !== void 0 ? bareMain : moduleName, platform);
+			}
+		}
+	};
+}
 async function isWatchmanResponsive(projectRoot) {
 	var probe = watchmanResponsivePromises.get(projectRoot);
 	if (probe) {
@@ -103,8 +151,8 @@ function resolveNativeTransforms(projectRoot, metroPluginOptions) {
 	};
 }
 async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
-	var _ref;
-	var _metroPluginOptions_argv, _defaultConfig_resolver;
+	var _ref, _ref1;
+	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher;
 	var extraConfig = {};
 	var projectRoot = (0, import_path.resolve)((_ref = (_metroPluginOptions_argv = metroPluginOptions.argv) === null || _metroPluginOptions_argv === void 0 ? void 0 : _metroPluginOptions_argv.projectRoot) !== null && _ref !== void 0 ? _ref : config.root);
 	var { mainModuleName, defaultConfigOverrides, watchman, excludeModules } = metroPluginOptions;
@@ -113,27 +161,20 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		didWarnAboutWatchmanFallback = true;
 		console.warn("[vxrn/metro] Watchman is unavailable or unresponsive; falling back to Node file watching.");
 	}
-	var { getDefaultConfig } = await (0, import_projectImport.projectImport)(projectRoot, "@expo/metro-config");
-	var _defaultConfig = getDefaultConfig(projectRoot);
+	var _defaultConfig = getReactNativeDefaultConfig(projectRoot);
 	if (mainModuleName) {
-		var origRewriteRequestUrl = _defaultConfig.server.rewriteRequestUrl;
-		var resolveMainModuleName = await (async function() {
-			var ExpoGoManifestHandlerMiddleware = (await (0, import_projectImport.projectImport)(projectRoot, "@expo/cli/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js")).default.ExpoGoManifestHandlerMiddleware;
-			var manifestHandlerMiddleware = new ExpoGoManifestHandlerMiddleware(projectRoot, {});
-			(0, import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName)(manifestHandlerMiddleware, mainModuleName);
-			return function(p) {
-				return manifestHandlerMiddleware.resolveMainModuleName({
-					pkg: { main: mainModuleName },
-					platform: p.platform
-				});
-			};
-		})();
+		var _defaultConfig_server;
+		var origRewriteRequestUrl = (_defaultConfig_server = _defaultConfig.server) === null || _defaultConfig_server === void 0 ? void 0 : _defaultConfig_server.rewriteRequestUrl;
+		var resolveMainModuleName = function() {
+			return mainModuleName;
+		};
 		extraConfig.getResolveMainModuleName = resolveMainModuleName;
 		_defaultConfig.server.rewriteRequestUrl = function(url) {
-			if (url.includes("/.expo/.virtual-metro-entry.bundle?") || rootIndexBundleRequestPattern.test(url)) {
+			var _ref2;
+			if (rootIndexBundleRequestPattern.test(url)) {
 				return rewriteMainModuleBundleUrl(url, resolveMainModuleName);
 			}
-			return origRewriteRequestUrl(url);
+			return (_ref2 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref2 !== void 0 ? _ref2 : url;
 		};
 	}
 	var existingBlockList = _defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.blockList;
@@ -145,6 +186,10 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 	}
 	var defaultConfig = {
 		..._defaultConfig,
+		watcher: {
+			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.watcher,
+			additionalExts: [.../* @__PURE__ */ new Set([...(_ref1 = _defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_watcher = _defaultConfig.watcher) === null || _defaultConfig_watcher === void 0 ? void 0 : _defaultConfig_watcher.additionalExts) !== null && _ref1 !== void 0 ? _ref1 : [], ...expoEnvAdditionalExts])]
+		},
 		resolver: {
 			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.resolver,
 			useWatchman,
@@ -180,6 +225,7 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		},
 		transformer: {
 			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.transformer,
+			unstable_allowRequireContext: true,
 			babelTransformerPath: (0, import_projectImport.projectResolve)(projectRoot, "@vxrn/vite-plugin-metro/babel-transformer")
 		},
 		...nativeWorkerPath ? { transformerPath: nativeWorkerPath } : {},
@@ -190,14 +236,14 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	};
 	return {
-		defaultConfig: merged,
+		defaultConfig: enforceBareMainModuleEntry(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName),
 		projectRoot,
 		extraConfig
 	};
 }
 async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
-	var _ref;
-	var _metroPluginOptions_argv, _defaultConfig_resolver;
+	var _ref, _ref1;
+	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher;
 	var extraConfig = {};
 	var projectRoot = (0, import_path.resolve)((_ref = (_metroPluginOptions_argv = metroPluginOptions.argv) === null || _metroPluginOptions_argv === void 0 ? void 0 : _metroPluginOptions_argv.projectRoot) !== null && _ref !== void 0 ? _ref : config.root);
 	var { mainModuleName, argv, defaultConfigOverrides, watchman, excludeModules } = metroPluginOptions;
@@ -207,27 +253,20 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		console.warn("[vxrn/metro] Watchman is unavailable or unresponsive; falling back to Node file watching.");
 	}
 	var { loadConfig } = await (0, import_projectImport.projectImport)(projectRoot, "metro");
-	var { getDefaultConfig } = await (0, import_projectImport.projectImport)(projectRoot, "@expo/metro-config");
-	var _defaultConfig = getDefaultConfig(projectRoot);
+	var _defaultConfig = getReactNativeDefaultConfig(projectRoot);
 	if (mainModuleName) {
-		var origRewriteRequestUrl = _defaultConfig.server.rewriteRequestUrl;
-		var resolveMainModuleName = await (async function() {
-			var ExpoGoManifestHandlerMiddleware = (await (0, import_projectImport.projectImport)(projectRoot, "@expo/cli/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js")).default.ExpoGoManifestHandlerMiddleware;
-			var manifestHandlerMiddleware = new ExpoGoManifestHandlerMiddleware(projectRoot, {});
-			(0, import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName)(manifestHandlerMiddleware, mainModuleName);
-			return function(p) {
-				return manifestHandlerMiddleware.resolveMainModuleName({
-					pkg: { main: mainModuleName },
-					platform: p.platform
-				});
-			};
-		})();
+		var _defaultConfig_server;
+		var origRewriteRequestUrl = (_defaultConfig_server = _defaultConfig.server) === null || _defaultConfig_server === void 0 ? void 0 : _defaultConfig_server.rewriteRequestUrl;
+		var resolveMainModuleName = function() {
+			return mainModuleName;
+		};
 		extraConfig.getResolveMainModuleName = resolveMainModuleName;
 		_defaultConfig.server.rewriteRequestUrl = function(url) {
-			if (url.includes("/.expo/.virtual-metro-entry.bundle?") || rootIndexBundleRequestPattern.test(url)) {
+			var _ref2;
+			if (rootIndexBundleRequestPattern.test(url)) {
 				return rewriteMainModuleBundleUrl(url, resolveMainModuleName);
 			}
-			return origRewriteRequestUrl(url);
+			return (_ref2 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref2 !== void 0 ? _ref2 : url;
 		};
 	}
 	var existingBlockList = _defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.blockList;
@@ -239,6 +278,10 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 	}
 	var defaultConfig = {
 		..._defaultConfig,
+		watcher: {
+			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.watcher,
+			additionalExts: [.../* @__PURE__ */ new Set([...(_ref1 = _defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_watcher = _defaultConfig.watcher) === null || _defaultConfig_watcher === void 0 ? void 0 : _defaultConfig_watcher.additionalExts) !== null && _ref1 !== void 0 ? _ref1 : [], ...expoEnvAdditionalExts])]
+		},
 		resolver: {
 			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.resolver,
 			useWatchman,
@@ -274,6 +317,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		},
 		transformer: {
 			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.transformer,
+			unstable_allowRequireContext: true,
 			babelTransformerPath: (0, import_projectImport.projectResolve)(projectRoot, "@vxrn/vite-plugin-metro/babel-transformer")
 		},
 		...nativeWorkerPath ? { transformerPath: nativeWorkerPath } : {},
@@ -289,7 +333,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	});
 	return {
-		...metroConfig,
+		...enforceBareMainModuleEntry(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName),
 		...extraConfig
 	};
 }