@vxrn/vite-plugin-metro 2.0.0-beta.99.1 → 2.6.0

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

@@ -44,12 +44,23 @@ const expoEnvAdditionalExts = [
 	"local",
 	"development"
 ];
+const metroSourceExts = [
+	"js",
+	"jsx",
+	"json",
+	"ts",
+	"tsx",
+	"mjs",
+	"cjs",
+	"swift",
+	"kt"
+];
 const watchmanResponsivePromises = /* @__PURE__ */ new Map();
 let didWarnAboutWatchmanFallback = false;
 const rootIndexBundleRequestPattern = /^(https?:\/\/[^/]+)?\/index\.bundle(?=$|[?#])/;
 const expoVirtualEntryBundleRequestPattern = /^(https?:\/\/[^/]+)?\/\.expo\/\.virtual-metro-entry\.bundle(?=$|[?#])/;
 const metroWatchExclusions = [
-	/[/\\]dist[/\\](?:static|server)(?:[/\\]|$)/,
+	/^(?!.*[/\\]node_modules[/\\]).*[/\\]dist[/\\](?:static|server)(?:[/\\]|$)/,
 	/[/\\]tests[/\\][^/\\]+[/\\]dist(?:[/\\]|$)/,
 	/[/\\]\.docker(?:[/\\]|$)/,
 	/[/\\]\.vite(?:[/\\]|$)/,
@@ -72,7 +83,14 @@ function enforceWorkspaceVisibility(config, projectRoot) {
 	};
 }
 function getReactNativeDefaultConfig(projectRoot) {
-	return enforceWorkspaceVisibility((0, import_metro_config.getDefaultConfig)(projectRoot), projectRoot);
+	const config = enforceWorkspaceVisibility((0, import_metro_config.getDefaultConfig)(projectRoot), projectRoot);
+	return {
+		...config,
+		resolver: {
+			...config.resolver,
+			assetExts: [.../* @__PURE__ */ new Set([...config.resolver?.assetExts ?? [], "glb"])]
+		}
+	};
 }
 function getPlatformFromBundleUrl(url) {
 	const platform = url.match(/[?&]platform=(ios|android)(?:&|$)/)?.[1];
@@ -96,17 +114,28 @@ function bareMainModuleForRequest(moduleName, mainModuleName) {
 	if (moduleName === `./${mainModuleName}`) return mainModuleName;
 	return void 0;
 }
-function enforceBareMainModuleEntry(config, mainModuleName) {
-	if (!mainModuleName || !isBareSpecifier(mainModuleName)) return config;
-	const innerResolveRequest = config?.resolver?.resolveRequest;
+function enforcePackageResolution(config, mainModuleName, dedupe, projectRoot) {
+	const dedupedPackages = new Set(dedupe);
+	if ((!mainModuleName || !isBareSpecifier(mainModuleName)) && !dedupedPackages.size) {
+		return config;
+	}
+	const rootOrigin = (0, import_node_path.resolve)(projectRoot, "package.json");
+	const innerResolveRequest = config.resolver?.resolveRequest;
 	return {
 		...config,
 		resolver: {
-			...config?.resolver,
+			...config.resolver,
 			resolveRequest: (context, moduleName, platform) => {
 				const bareMain = bareMainModuleForRequest(moduleName, mainModuleName);
+				const request = bareMain ?? moduleName;
+				const packageEnd = request.indexOf("/", request.startsWith("@") ? request.indexOf("/") + 1 : 0);
+				const packageName = packageEnd === -1 ? request : request.slice(0, packageEnd);
+				const resolutionContext = isBareSpecifier(request) && dedupedPackages.has(packageName) ? {
+					...context,
+					originModulePath: rootOrigin
+				} : context;
 				const resolveRequest = innerResolveRequest || context.resolveRequest;
-				return resolveRequest(context, bareMain ?? moduleName, platform);
+				return resolveRequest(resolutionContext, request, platform);
 			}
 		}
 	};
@@ -189,15 +218,7 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 			..._defaultConfig?.resolver,
 			useWatchman,
 			blockList,
-			sourceExts: [
-				"js",
-				"jsx",
-				"json",
-				"ts",
-				"tsx",
-				"mjs",
-				"cjs"
-			],
+			sourceExts: metroSourceExts,
 			resolveRequest: (context, moduleName, platform) => {
 				const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
 				if (excludeModules && excludeModules.length > 0) {
@@ -228,7 +249,7 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	};
 	return {
-		defaultConfig: enforceBareMainModuleEntry(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName),
+		defaultConfig: enforcePackageResolution(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName, config.resolve?.dedupe ?? [], projectRoot),
 		projectRoot,
 		extraConfig
 	};
@@ -272,15 +293,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 			..._defaultConfig?.resolver,
 			useWatchman,
 			blockList,
-			sourceExts: [
-				"js",
-				"jsx",
-				"json",
-				"ts",
-				"tsx",
-				"mjs",
-				"cjs"
-			],
+			sourceExts: metroSourceExts,
 			resolveRequest: (context, moduleName, platform) => {
 				const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
 				if (excludeModules && excludeModules.length > 0) {
@@ -316,7 +329,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	});
 	return {
-		...enforceBareMainModuleEntry(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName),
+		...enforcePackageResolution(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName, config.resolve?.dedupe ?? [], projectRoot),
 		...extraConfig
 	};
 }

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

@@ -46,12 +46,23 @@ var expoEnvAdditionalExts = [
 	"local",
 	"development"
 ];
+var metroSourceExts = [
+	"js",
+	"jsx",
+	"json",
+	"ts",
+	"tsx",
+	"mjs",
+	"cjs",
+	"swift",
+	"kt"
+];
 var watchmanResponsivePromises = /* @__PURE__ */ new Map();
 var didWarnAboutWatchmanFallback = false;
 var rootIndexBundleRequestPattern = /^(https?:\/\/[^/]+)?\/index\.bundle(?=$|[?#])/;
 var expoVirtualEntryBundleRequestPattern = /^(https?:\/\/[^/]+)?\/\.expo\/\.virtual-metro-entry\.bundle(?=$|[?#])/;
 var metroWatchExclusions = [
-	/[/\\]dist[/\\](?:static|server)(?:[/\\]|$)/,
+	/^(?!.*[/\\]node_modules[/\\]).*[/\\]dist[/\\](?:static|server)(?:[/\\]|$)/,
 	/[/\\]tests[/\\][^/\\]+[/\\]dist(?:[/\\]|$)/,
 	/[/\\]\.docker(?:[/\\]|$)/,
 	/[/\\]\.vite(?:[/\\]|$)/,
@@ -76,7 +87,16 @@ function enforceWorkspaceVisibility(config, projectRoot) {
 	};
 }
 function getReactNativeDefaultConfig(projectRoot) {
-	return enforceWorkspaceVisibility((0, import_metro_config.getDefaultConfig)(projectRoot), projectRoot);
+	var _ref;
+	var _config_resolver;
+	var config = enforceWorkspaceVisibility((0, import_metro_config.getDefaultConfig)(projectRoot), projectRoot);
+	return {
+		...config,
+		resolver: {
+			...config.resolver,
+			assetExts: [.../* @__PURE__ */ new Set([...(_ref = (_config_resolver = config.resolver) === null || _config_resolver === void 0 ? void 0 : _config_resolver.assetExts) !== null && _ref !== void 0 ? _ref : [], "glb"])]
+		}
+	};
 }
 function getPlatformFromBundleUrl(url) {
 	var _url_match;
@@ -101,18 +121,29 @@ function bareMainModuleForRequest(moduleName, mainModuleName) {
 	if (moduleName === `./${mainModuleName}`) return mainModuleName;
 	return void 0;
 }
-function enforceBareMainModuleEntry(config, mainModuleName) {
+function enforcePackageResolution(config, mainModuleName, dedupe, projectRoot) {
 	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;
+	var dedupedPackages = new Set(dedupe);
+	if ((!mainModuleName || !isBareSpecifier(mainModuleName)) && !dedupedPackages.size) {
+		return config;
+	}
+	var rootOrigin = (0, import_path.resolve)(projectRoot, "package.json");
+	var innerResolveRequest = (_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) {
+			...config.resolver,
+			resolveRequest: function resolveRequest(context, moduleName, platform) {
 				var bareMain = bareMainModuleForRequest(moduleName, mainModuleName);
-				var resolveRequest = innerResolveRequest || context.resolveRequest;
-				return resolveRequest(context, bareMain !== null && bareMain !== void 0 ? bareMain : moduleName, platform);
+				var request = bareMain !== null && bareMain !== void 0 ? bareMain : moduleName;
+				var packageEnd = request.indexOf("/", request.startsWith("@") ? request.indexOf("/") + 1 : 0);
+				var packageName = packageEnd === -1 ? request : request.slice(0, packageEnd);
+				var resolutionContext = isBareSpecifier(request) && dedupedPackages.has(packageName) ? {
+					...context,
+					originModulePath: rootOrigin
+				} : context;
+				var resolveRequest2 = innerResolveRequest || context.resolveRequest;
+				return resolveRequest2(resolutionContext, request, platform);
 			}
 		}
 	};
@@ -124,7 +155,7 @@ async function isWatchmanResponsive(projectRoot) {
 	}
 	probe = new Promise(function(resolve2) {
 		var settled = false;
-		var finish = function(value) {
+		var finish = function finish2(value) {
 			if (settled) return;
 			settled = true;
 			clearTimeout(timeout);
@@ -158,8 +189,8 @@ function resolveNativeTransforms(projectRoot, metroPluginOptions) {
 	};
 }
 async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
-	var _ref, _ref1;
-	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher;
+	var _ref, _ref1, _ref2;
+	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher, _config_resolve;
 	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;
@@ -172,16 +203,16 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 	if (mainModuleName) {
 		var _defaultConfig_server;
 		var origRewriteRequestUrl = (_defaultConfig_server = _defaultConfig.server) === null || _defaultConfig_server === void 0 ? void 0 : _defaultConfig_server.rewriteRequestUrl;
-		var resolveMainModuleName = function() {
+		var resolveMainModuleName = function resolveMainModuleName2() {
 			return mainModuleName;
 		};
 		extraConfig.getResolveMainModuleName = resolveMainModuleName;
 		_defaultConfig.server.rewriteRequestUrl = function(url) {
-			var _ref2;
+			var _ref3;
 			if (isMainModuleBundleRequest(url)) {
 				return rewriteMainModuleBundleUrl(url, resolveMainModuleName);
 			}
-			return (_ref2 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref2 !== void 0 ? _ref2 : url;
+			return (_ref3 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref3 !== void 0 ? _ref3 : url;
 		};
 	}
 	var existingBlockList = _defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.blockList;
@@ -201,16 +232,8 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.resolver,
 			useWatchman,
 			blockList,
-			sourceExts: [
-				"js",
-				"jsx",
-				"json",
-				"ts",
-				"tsx",
-				"mjs",
-				"cjs"
-			],
-			resolveRequest: function(context, moduleName, platform) {
+			sourceExts: metroSourceExts,
+			resolveRequest: function resolveRequest(context, moduleName, platform) {
 				var _defaultConfig_resolver2;
 				var origResolveRequestFn = (_defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver2 = _defaultConfig.resolver) === null || _defaultConfig_resolver2 === void 0 ? void 0 : _defaultConfig_resolver2.resolveRequest) || context.resolveRequest;
 				if (excludeModules && excludeModules.length > 0) {
@@ -243,14 +266,14 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	};
 	return {
-		defaultConfig: enforceBareMainModuleEntry(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName),
+		defaultConfig: enforcePackageResolution(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName, (_ref2 = (_config_resolve = config.resolve) === null || _config_resolve === void 0 ? void 0 : _config_resolve.dedupe) !== null && _ref2 !== void 0 ? _ref2 : [], projectRoot),
 		projectRoot,
 		extraConfig
 	};
 }
 async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
-	var _ref, _ref1;
-	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher;
+	var _ref, _ref1, _ref2;
+	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher, _config_resolve;
 	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;
@@ -264,16 +287,16 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 	if (mainModuleName) {
 		var _defaultConfig_server;
 		var origRewriteRequestUrl = (_defaultConfig_server = _defaultConfig.server) === null || _defaultConfig_server === void 0 ? void 0 : _defaultConfig_server.rewriteRequestUrl;
-		var resolveMainModuleName = function() {
+		var resolveMainModuleName = function resolveMainModuleName2() {
 			return mainModuleName;
 		};
 		extraConfig.getResolveMainModuleName = resolveMainModuleName;
 		_defaultConfig.server.rewriteRequestUrl = function(url) {
-			var _ref2;
+			var _ref3;
 			if (isMainModuleBundleRequest(url)) {
 				return rewriteMainModuleBundleUrl(url, resolveMainModuleName);
 			}
-			return (_ref2 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref2 !== void 0 ? _ref2 : url;
+			return (_ref3 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref3 !== void 0 ? _ref3 : url;
 		};
 	}
 	var existingBlockList = _defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.blockList;
@@ -293,16 +316,8 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.resolver,
 			useWatchman,
 			blockList,
-			sourceExts: [
-				"js",
-				"jsx",
-				"json",
-				"ts",
-				"tsx",
-				"mjs",
-				"cjs"
-			],
-			resolveRequest: function(context, moduleName, platform) {
+			sourceExts: metroSourceExts,
+			resolveRequest: function resolveRequest(context, moduleName, platform) {
 				var _defaultConfig_resolver2;
 				var origResolveRequestFn = (_defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver2 = _defaultConfig.resolver) === null || _defaultConfig_resolver2 === void 0 ? void 0 : _defaultConfig_resolver2.resolveRequest) || context.resolveRequest;
 				if (excludeModules && excludeModules.length > 0) {
@@ -340,7 +355,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	});
 	return {
-		...enforceBareMainModuleEntry(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName),
+		...enforcePackageResolution(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName, (_ref2 = (_config_resolve = config.resolve) === null || _config_resolve === void 0 ? void 0 : _config_resolve.dedupe) !== null && _ref2 !== void 0 ? _ref2 : [], projectRoot),
 		...extraConfig
 	};
 }

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

@@ -46,12 +46,23 @@ var expoEnvAdditionalExts = [
 	"local",
 	"development"
 ];
+var metroSourceExts = [
+	"js",
+	"jsx",
+	"json",
+	"ts",
+	"tsx",
+	"mjs",
+	"cjs",
+	"swift",
+	"kt"
+];
 var watchmanResponsivePromises = /* @__PURE__ */ new Map();
 var didWarnAboutWatchmanFallback = false;
 var rootIndexBundleRequestPattern = /^(https?:\/\/[^/]+)?\/index\.bundle(?=$|[?#])/;
 var expoVirtualEntryBundleRequestPattern = /^(https?:\/\/[^/]+)?\/\.expo\/\.virtual-metro-entry\.bundle(?=$|[?#])/;
 var metroWatchExclusions = [
-	/[/\\]dist[/\\](?:static|server)(?:[/\\]|$)/,
+	/^(?!.*[/\\]node_modules[/\\]).*[/\\]dist[/\\](?:static|server)(?:[/\\]|$)/,
 	/[/\\]tests[/\\][^/\\]+[/\\]dist(?:[/\\]|$)/,
 	/[/\\]\.docker(?:[/\\]|$)/,
 	/[/\\]\.vite(?:[/\\]|$)/,
@@ -76,7 +87,16 @@ function enforceWorkspaceVisibility(config, projectRoot) {
 	};
 }
 function getReactNativeDefaultConfig(projectRoot) {
-	return enforceWorkspaceVisibility((0, import_metro_config.getDefaultConfig)(projectRoot), projectRoot);
+	var _ref;
+	var _config_resolver;
+	var config = enforceWorkspaceVisibility((0, import_metro_config.getDefaultConfig)(projectRoot), projectRoot);
+	return {
+		...config,
+		resolver: {
+			...config.resolver,
+			assetExts: [.../* @__PURE__ */ new Set([...(_ref = (_config_resolver = config.resolver) === null || _config_resolver === void 0 ? void 0 : _config_resolver.assetExts) !== null && _ref !== void 0 ? _ref : [], "glb"])]
+		}
+	};
 }
 function getPlatformFromBundleUrl(url) {
 	var _url_match;
@@ -101,18 +121,29 @@ function bareMainModuleForRequest(moduleName, mainModuleName) {
 	if (moduleName === `./${mainModuleName}`) return mainModuleName;
 	return void 0;
 }
-function enforceBareMainModuleEntry(config, mainModuleName) {
+function enforcePackageResolution(config, mainModuleName, dedupe, projectRoot) {
 	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;
+	var dedupedPackages = new Set(dedupe);
+	if ((!mainModuleName || !isBareSpecifier(mainModuleName)) && !dedupedPackages.size) {
+		return config;
+	}
+	var rootOrigin = (0, import_path.resolve)(projectRoot, "package.json");
+	var innerResolveRequest = (_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) {
+			...config.resolver,
+			resolveRequest: function resolveRequest(context, moduleName, platform) {
 				var bareMain = bareMainModuleForRequest(moduleName, mainModuleName);
-				var resolveRequest = innerResolveRequest || context.resolveRequest;
-				return resolveRequest(context, bareMain !== null && bareMain !== void 0 ? bareMain : moduleName, platform);
+				var request = bareMain !== null && bareMain !== void 0 ? bareMain : moduleName;
+				var packageEnd = request.indexOf("/", request.startsWith("@") ? request.indexOf("/") + 1 : 0);
+				var packageName = packageEnd === -1 ? request : request.slice(0, packageEnd);
+				var resolutionContext = isBareSpecifier(request) && dedupedPackages.has(packageName) ? {
+					...context,
+					originModulePath: rootOrigin
+				} : context;
+				var resolveRequest2 = innerResolveRequest || context.resolveRequest;
+				return resolveRequest2(resolutionContext, request, platform);
 			}
 		}
 	};
@@ -124,7 +155,7 @@ async function isWatchmanResponsive(projectRoot) {
 	}
 	probe = new Promise(function(resolve2) {
 		var settled = false;
-		var finish = function(value) {
+		var finish = function finish2(value) {
 			if (settled) return;
 			settled = true;
 			clearTimeout(timeout);
@@ -158,8 +189,8 @@ function resolveNativeTransforms(projectRoot, metroPluginOptions) {
 	};
 }
 async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
-	var _ref, _ref1;
-	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher;
+	var _ref, _ref1, _ref2;
+	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher, _config_resolve;
 	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;
@@ -172,16 +203,16 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 	if (mainModuleName) {
 		var _defaultConfig_server;
 		var origRewriteRequestUrl = (_defaultConfig_server = _defaultConfig.server) === null || _defaultConfig_server === void 0 ? void 0 : _defaultConfig_server.rewriteRequestUrl;
-		var resolveMainModuleName = function() {
+		var resolveMainModuleName = function resolveMainModuleName2() {
 			return mainModuleName;
 		};
 		extraConfig.getResolveMainModuleName = resolveMainModuleName;
 		_defaultConfig.server.rewriteRequestUrl = function(url) {
-			var _ref2;
+			var _ref3;
 			if (isMainModuleBundleRequest(url)) {
 				return rewriteMainModuleBundleUrl(url, resolveMainModuleName);
 			}
-			return (_ref2 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref2 !== void 0 ? _ref2 : url;
+			return (_ref3 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref3 !== void 0 ? _ref3 : url;
 		};
 	}
 	var existingBlockList = _defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.blockList;
@@ -201,16 +232,8 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.resolver,
 			useWatchman,
 			blockList,
-			sourceExts: [
-				"js",
-				"jsx",
-				"json",
-				"ts",
-				"tsx",
-				"mjs",
-				"cjs"
-			],
-			resolveRequest: function(context, moduleName, platform) {
+			sourceExts: metroSourceExts,
+			resolveRequest: function resolveRequest(context, moduleName, platform) {
 				var _defaultConfig_resolver2;
 				var origResolveRequestFn = (_defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver2 = _defaultConfig.resolver) === null || _defaultConfig_resolver2 === void 0 ? void 0 : _defaultConfig_resolver2.resolveRequest) || context.resolveRequest;
 				if (excludeModules && excludeModules.length > 0) {
@@ -243,14 +266,14 @@ async function buildMetroConfigInputFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	};
 	return {
-		defaultConfig: enforceBareMainModuleEntry(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName),
+		defaultConfig: enforcePackageResolution(enforceWorkspaceVisibility(merged, projectRoot), mainModuleName, (_ref2 = (_config_resolve = config.resolve) === null || _config_resolve === void 0 ? void 0 : _config_resolve.dedupe) !== null && _ref2 !== void 0 ? _ref2 : [], projectRoot),
 		projectRoot,
 		extraConfig
 	};
 }
 async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
-	var _ref, _ref1;
-	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher;
+	var _ref, _ref1, _ref2;
+	var _metroPluginOptions_argv, _defaultConfig_resolver, _defaultConfig_watcher, _config_resolve;
 	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;
@@ -264,16 +287,16 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 	if (mainModuleName) {
 		var _defaultConfig_server;
 		var origRewriteRequestUrl = (_defaultConfig_server = _defaultConfig.server) === null || _defaultConfig_server === void 0 ? void 0 : _defaultConfig_server.rewriteRequestUrl;
-		var resolveMainModuleName = function() {
+		var resolveMainModuleName = function resolveMainModuleName2() {
 			return mainModuleName;
 		};
 		extraConfig.getResolveMainModuleName = resolveMainModuleName;
 		_defaultConfig.server.rewriteRequestUrl = function(url) {
-			var _ref2;
+			var _ref3;
 			if (isMainModuleBundleRequest(url)) {
 				return rewriteMainModuleBundleUrl(url, resolveMainModuleName);
 			}
-			return (_ref2 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref2 !== void 0 ? _ref2 : url;
+			return (_ref3 = origRewriteRequestUrl === null || origRewriteRequestUrl === void 0 ? void 0 : origRewriteRequestUrl(url)) !== null && _ref3 !== void 0 ? _ref3 : url;
 		};
 	}
 	var existingBlockList = _defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.blockList;
@@ -293,16 +316,8 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 			..._defaultConfig === null || _defaultConfig === void 0 ? void 0 : _defaultConfig.resolver,
 			useWatchman,
 			blockList,
-			sourceExts: [
-				"js",
-				"jsx",
-				"json",
-				"ts",
-				"tsx",
-				"mjs",
-				"cjs"
-			],
-			resolveRequest: function(context, moduleName, platform) {
+			sourceExts: metroSourceExts,
+			resolveRequest: function resolveRequest(context, moduleName, platform) {
 				var _defaultConfig_resolver2;
 				var origResolveRequestFn = (_defaultConfig === null || _defaultConfig === void 0 ? void 0 : (_defaultConfig_resolver2 = _defaultConfig.resolver) === null || _defaultConfig_resolver2 === void 0 ? void 0 : _defaultConfig_resolver2.resolveRequest) || context.resolveRequest;
 				if (excludeModules && excludeModules.length > 0) {
@@ -340,7 +355,7 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
 		...typeof defaultConfigOverrides === "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
 	});
 	return {
-		...enforceBareMainModuleEntry(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName),
+		...enforcePackageResolution(enforceWorkspaceVisibility(metroConfig, projectRoot), mainModuleName, (_ref2 = (_config_resolve = config.resolve) === null || _config_resolve === void 0 ? void 0 : _config_resolve.dedupe) !== null && _ref2 !== void 0 ? _ref2 : [], projectRoot),
 		...extraConfig
 	};
 }