@vxrn/vite-plugin-metro 2.0.0-beta.53.1 → 2.0.0-beta.57.1

package/dist/cjs/index.cjs

@@ -22,7 +22,6 @@ var index_exports = {};
 __export(index_exports, {
 	buildMetroConfigInputFromViteConfig: () => import_getMetroConfigFromViteConfig.buildMetroConfigInputFromViteConfig,
 	checkAndClearMetroCacheFromVite: () => import_metroCacheManager.checkAndClearMetroCacheFromVite,
-	expoManifestRequestHandlerPlugin: () => import_expoManifestRequestHandlerPlugin.expoManifestRequestHandlerPlugin,
 	getMetroConfigFromViteConfig: () => import_getMetroConfigFromViteConfig.getMetroConfigFromViteConfig,
 	getPlatformEnv: () => import_platformEnv.getPlatformEnv,
 	getPlatformEnvDefine: () => import_platformEnv.getPlatformEnvDefine,
@@ -32,7 +31,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_metroPlugin = require("./plugins/metroPlugin.cjs");
-var import_expoManifestRequestHandlerPlugin = require("./plugins/expoManifestRequestHandlerPlugin.cjs");
 var import_platformEnv = require("./env/platformEnv.cjs");
 var import_metroCacheManager = require("./utils/metroCacheManager.cjs");
 var import_getMetroConfigFromViteConfig = require("./metro-config/getMetroConfigFromViteConfig.cjs");

package/dist/cjs/index.native.cjs

@@ -24,7 +24,6 @@ var index_exports = {};
 __export(index_exports, {
 	buildMetroConfigInputFromViteConfig: () => import_getMetroConfigFromViteConfig.buildMetroConfigInputFromViteConfig,
 	checkAndClearMetroCacheFromVite: () => import_metroCacheManager.checkAndClearMetroCacheFromVite,
-	expoManifestRequestHandlerPlugin: () => import_expoManifestRequestHandlerPlugin.expoManifestRequestHandlerPlugin,
 	getMetroConfigFromViteConfig: () => import_getMetroConfigFromViteConfig.getMetroConfigFromViteConfig,
 	getPlatformEnv: () => import_platformEnv.getPlatformEnv,
 	getPlatformEnvDefine: () => import_platformEnv.getPlatformEnvDefine,
@@ -34,7 +33,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_metroPlugin = require("./plugins/metroPlugin.native.js");
-var import_expoManifestRequestHandlerPlugin = require("./plugins/expoManifestRequestHandlerPlugin.native.js");
 var import_platformEnv = require("./env/platformEnv.native.js");
 var import_metroCacheManager = require("./utils/metroCacheManager.native.js");
 var import_getMetroConfigFromViteConfig = require("./metro-config/getMetroConfigFromViteConfig.native.js");

package/dist/cjs/index.native.js

@@ -24,7 +24,6 @@ var index_exports = {};
 __export(index_exports, {
 	buildMetroConfigInputFromViteConfig: () => import_getMetroConfigFromViteConfig.buildMetroConfigInputFromViteConfig,
 	checkAndClearMetroCacheFromVite: () => import_metroCacheManager.checkAndClearMetroCacheFromVite,
-	expoManifestRequestHandlerPlugin: () => import_expoManifestRequestHandlerPlugin.expoManifestRequestHandlerPlugin,
 	getMetroConfigFromViteConfig: () => import_getMetroConfigFromViteConfig.getMetroConfigFromViteConfig,
 	getPlatformEnv: () => import_platformEnv.getPlatformEnv,
 	getPlatformEnvDefine: () => import_platformEnv.getPlatformEnvDefine,
@@ -34,7 +33,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_metroPlugin = require("./plugins/metroPlugin.native.js");
-var import_expoManifestRequestHandlerPlugin = require("./plugins/expoManifestRequestHandlerPlugin.native.js");
 var import_platformEnv = require("./env/platformEnv.native.js");
 var import_metroCacheManager = require("./utils/metroCacheManager.native.js");
 var import_getMetroConfigFromViteConfig = require("./metro-config/getMetroConfigFromViteConfig.native.js");

package/dist/cjs/index.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.js","names":[],"sources":["cjs/index.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\n__export(index_exports, {\n  buildMetroConfigInputFromViteConfig: () => import_getMetroConfigFromViteConfig.buildMetroConfigInputFromViteConfig,\n  checkAndClearMetroCacheFromVite: () => import_metroCacheManager.checkAndClearMetroCacheFromVite,\n  expoManifestRequestHandlerPlugin: () => import_expoManifestRequestHandlerPlugin.expoManifestRequestHandlerPlugin,\n  getMetroConfigFromViteConfig: () => import_getMetroConfigFromViteConfig.getMetroConfigFromViteConfig,\n  getPlatformEnv: () => import_platformEnv.getPlatformEnv,\n  getPlatformEnvDefine: () => import_platformEnv.getPlatformEnvDefine,\n  metroPlatformToViteEnvironment: () => import_platformEnv.metroPlatformToViteEnvironment,\n  metroPlugin: () => import_metroPlugin.metroPlugin,\n  patchMetroServerWithViteConfigAndMetroPluginOptions: () => import_patchMetroServerWithViteConfigAndMetroPluginOptions.patchMetroServerWithViteConfigAndMetroPluginOptions\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_metroPlugin = require(\"./plugins/metroPlugin\");\nvar import_expoManifestRequestHandlerPlugin = require(\"./plugins/expoManifestRequestHandlerPlugin\");\nvar import_platformEnv = require(\"./env/platformEnv\");\nvar import_metroCacheManager = require(\"./utils/metroCacheManager\");\nvar import_getMetroConfigFromViteConfig = require(\"./metro-config/getMetroConfigFromViteConfig\");\nvar import_patchMetroServerWithViteConfigAndMetroPluginOptions = require(\"./metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions\");\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,gBAAgB,CAAC;AACrB,SAAS,eAAe;CACtB,2CAA2C,oCAAoC;CAC/E,uCAAuC,yBAAyB;CAChE,wCAAwC,wCAAwC;CAChF,oCAAoC,oCAAoC;CACxE,sBAAsB,mBAAmB;CACzC,4BAA4B,mBAAmB;CAC/C,sCAAsC,mBAAmB;CACzD,mBAAmB,mBAAmB;CACtC,2DAA2D,2DAA2D;AACxH,CAAC;AACD,OAAO,UAAU,aAAa,aAAa;AAC3C,IAAI,qBAAqB,QAAQ,iCAAuB;AACxD,IAAI,0CAA0C,QAAQ,sDAA4C;AAClG,IAAI,qBAAqB,QAAQ,6BAAmB;AACpD,IAAI,2BAA2B,QAAQ,qCAA2B;AAClE,IAAI,sCAAsC,QAAQ,uDAA6C;AAC/F,IAAI,6DAA6D,QAAQ,8EAAoE"}
+{"version":3,"file":"index.native.js","names":[],"sources":["cjs/index.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\n__export(index_exports, {\n  buildMetroConfigInputFromViteConfig: () => import_getMetroConfigFromViteConfig.buildMetroConfigInputFromViteConfig,\n  checkAndClearMetroCacheFromVite: () => import_metroCacheManager.checkAndClearMetroCacheFromVite,\n  getMetroConfigFromViteConfig: () => import_getMetroConfigFromViteConfig.getMetroConfigFromViteConfig,\n  getPlatformEnv: () => import_platformEnv.getPlatformEnv,\n  getPlatformEnvDefine: () => import_platformEnv.getPlatformEnvDefine,\n  metroPlatformToViteEnvironment: () => import_platformEnv.metroPlatformToViteEnvironment,\n  metroPlugin: () => import_metroPlugin.metroPlugin,\n  patchMetroServerWithViteConfigAndMetroPluginOptions: () => import_patchMetroServerWithViteConfigAndMetroPluginOptions.patchMetroServerWithViteConfigAndMetroPluginOptions\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_metroPlugin = require(\"./plugins/metroPlugin\");\nvar import_platformEnv = require(\"./env/platformEnv\");\nvar import_metroCacheManager = require(\"./utils/metroCacheManager\");\nvar import_getMetroConfigFromViteConfig = require(\"./metro-config/getMetroConfigFromViteConfig\");\nvar import_patchMetroServerWithViteConfigAndMetroPluginOptions = require(\"./metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions\");\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,gBAAgB,CAAC;AACrB,SAAS,eAAe;CACtB,2CAA2C,oCAAoC;CAC/E,uCAAuC,yBAAyB;CAChE,oCAAoC,oCAAoC;CACxE,sBAAsB,mBAAmB;CACzC,4BAA4B,mBAAmB;CAC/C,sCAAsC,mBAAmB;CACzD,mBAAmB,mBAAmB;CACtC,2DAA2D,2DAA2D;AACxH,CAAC;AACD,OAAO,UAAU,aAAa,aAAa;AAC3C,IAAI,qBAAqB,QAAQ,iCAAuB;AACxD,IAAI,qBAAqB,QAAQ,6BAAmB;AACpD,IAAI,2BAA2B,QAAQ,qCAA2B;AAClE,IAAI,sCAAsC,QAAQ,uDAA6C;AAC/F,IAAI,6DAA6D,QAAQ,8EAAoE"}

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,15 +54,31 @@ 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) {
@@ -131,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;
@@ -163,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,
@@ -195,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 } : {},
@@ -205,7 +221,7 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	};
 	return {
-		defaultConfig: enforceBareMainModuleEntry(merged, mainModuleName),
+		defaultConfig: enforceBareMainModuleEntry(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName),
 		projectRoot,
 		extraConfig
 	};
@@ -220,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;
@@ -252,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,
@@ -284,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 } : {},
@@ -299,7 +309,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	});
 	return {
-		...enforceBareMainModuleEntry(metroConfig, mainModuleName),
+		...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,9 +84,6 @@ 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) {
@@ -127,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;
@@ -137,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;
@@ -169,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,
@@ -204,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 } : {},
@@ -214,14 +236,14 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	};
 	return {
-		defaultConfig: enforceBareMainModuleEntry(merged, mainModuleName),
+		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;
@@ -231,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;
@@ -263,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,
@@ -298,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 } : {},
@@ -313,7 +333,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	});
 	return {
-		...enforceBareMainModuleEntry(metroConfig, mainModuleName),
+		...enforceBareMainModuleEntry(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName),
 		...extraConfig
 	};
 }