@vxrn/vite-plugin-metro 1.2.8 → 1.2.10

package/src/metro-config/getMetroConfigFromViteConfig.ts

@@ -1,5 +1,4 @@
 import type { ResolvedConfig } from 'vite'
-import micromatch from 'micromatch'
 
 // For Metro and Expo, we only import types here.
 // We use `projectImport` to dynamically import the actual modules
@@ -21,8 +20,7 @@ export async function getMetroConfigFromViteConfig(
 ): Promise<MetroConfigExtended> {
   const extraConfig: ExtraConfig = {}
   const { root: projectRoot } = config
-  const { mainModuleName, argv, defaultConfigOverrides, watchman, excludeModules } =
-    metroPluginOptions
+  const { mainModuleName, argv, defaultConfigOverrides } = metroPluginOptions
 
   const { loadConfig } = await projectImport<{
     loadConfig: typeof loadConfigT
@@ -85,19 +83,11 @@ export async function getMetroConfigFromViteConfig(
     ..._defaultConfig,
     resolver: {
       ..._defaultConfig?.resolver,
-      ...(watchman !== undefined ? { useWatchman: watchman } : {}),
       sourceExts: ['js', 'jsx', 'json', 'ts', 'tsx', 'mjs', 'cjs'], // `one` related packages are using `.mjs` extensions. This somehow fixes `.native` files not being resolved correctly when `.mjs` files are present.
       resolveRequest: (context, moduleName, platform) => {
         const origResolveRequestFn =
           _defaultConfig?.resolver?.resolveRequest || context.resolveRequest
 
-        // Handle excludeModules - resolve excluded modules to empty module using glob patterns
-        if (excludeModules && excludeModules.length > 0) {
-          if (micromatch.isMatch(moduleName, excludeModules)) {
-            return origResolveRequestFn(context, '@vxrn/vite-plugin-metro/empty', platform)
-          }
-        }
-
         // HACK: Do not assert the "import" condition for `@babel/runtime`. This
         // is a workaround for ESM <-> CJS interop, as we need the CJS versions of
         // `@babel/runtime` helpers.
@@ -132,45 +122,6 @@ export async function getMetroConfigFromViteConfig(
     reporter: await getTerminalReporter(projectRoot),
   }
 
-  // Apply user's defaultConfigOverrides to get the final config with user's custom resolveRequest
-  const userConfig =
-    typeof defaultConfigOverrides === 'function'
-      ? defaultConfigOverrides(defaultConfig)
-      : defaultConfigOverrides
-
-  // Get the user's custom resolveRequest if they provided one
-  const userResolveRequest = userConfig?.resolver?.resolveRequest
-
-  // Build the final config, wrapping resolveRequest to handle excludeModules
-  const finalConfig: MetroInputConfig = {
-    ...defaultConfig,
-    ...userConfig,
-    resolver: {
-      ...defaultConfig.resolver,
-      ...userConfig?.resolver,
-      resolveRequest: (context, moduleName, platform) => {
-        const origResolveRequestFn =
-          _defaultConfig?.resolver?.resolveRequest || context.resolveRequest
-
-        // Handle excludeModules first - resolve excluded modules to empty module using glob patterns
-        if (excludeModules && excludeModules.length > 0) {
-          if (micromatch.isMatch(moduleName, excludeModules)) {
-            return origResolveRequestFn(context, '@vxrn/vite-plugin-metro/empty', platform)
-          }
-        }
-
-        // If user provided their own resolveRequest, use it
-        if (userResolveRequest) {
-          return userResolveRequest(context, moduleName, platform)
-        }
-
-        // Otherwise use the default logic
-        const defaultResolveRequestFn = defaultConfig.resolver!.resolveRequest!
-        return defaultResolveRequestFn(context, moduleName, platform)
-      },
-    },
-  }
-
   const metroConfig = await loadConfig(
     {
       cwd: projectRoot,
@@ -178,7 +129,12 @@ export async function getMetroConfigFromViteConfig(
       'reset-cache': !!process.env.METRO_RESET_CACHE, // TODO: `--clean`
       ...argv,
     },
-    finalConfig
+    {
+      ...defaultConfig,
+      ...(typeof defaultConfigOverrides === 'function'
+        ? defaultConfigOverrides(defaultConfig)
+        : defaultConfigOverrides),
+    }
   )
 
   // @ts-expect-error TODO

package/src/metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions.ts

@@ -5,68 +5,6 @@ import type { MetroPluginOptions } from '../plugins/metroPlugin'
 import type { ViteCustomTransformOptions } from '../transformer/types'
 import { getMetroBabelConfigFromViteConfig } from './getMetroBabelConfigFromViteConfig'
 
-/**
- * Deep merges babel configs, properly handling arrays like plugins and presets
- */
-function deepMergeBabelConfig(
-  base: TransformOptions,
-  override: TransformOptions | undefined
-): TransformOptions {
-  if (!override) return base
-
-  const merged: TransformOptions = {
-    ...base,
-    ...override,
-  }
-
-  // Deep merge plugins - concatenate arrays
-  if (base.plugins || override.plugins) {
-    merged.plugins = [...(base.plugins || []), ...(override.plugins || [])]
-  }
-
-  // Deep merge presets - concatenate arrays
-  if (base.presets || override.presets) {
-    merged.presets = [...(base.presets || []), ...(override.presets || [])]
-  }
-
-  // Deep merge env if both exist
-  if (base.env && override.env) {
-    merged.env = { ...base.env }
-    for (const [key, value] of Object.entries(override.env)) {
-      if (value) {
-        merged.env[key] = deepMergeBabelConfig(base.env[key] || {}, value)
-      }
-    }
-  }
-
-  // Deep merge parserOpts if both exist
-  if (base.parserOpts && override.parserOpts) {
-    merged.parserOpts = {
-      ...base.parserOpts,
-      ...override.parserOpts,
-      // Merge plugins arrays if both exist
-      ...(base.parserOpts.plugins || override.parserOpts.plugins
-        ? {
-            plugins: [
-              ...(base.parserOpts.plugins || []),
-              ...(override.parserOpts.plugins || []),
-            ],
-          }
-        : {}),
-    }
-  }
-
-  // Deep merge generatorOpts if both exist
-  if (base.generatorOpts && override.generatorOpts) {
-    merged.generatorOpts = {
-      ...base.generatorOpts,
-      ...override.generatorOpts,
-    }
-  }
-
-  return merged
-}
-
 export function patchMetroServerWithViteConfigAndMetroPluginOptions(
   metroServer: Server,
   config: ResolvedConfig,
@@ -85,10 +23,12 @@ export function patchMetroServerWithViteConfigAndMetroPluginOptions(
     transformOptions: Parameters<typeof originalTransformFile>[1],
     fileBuffer?: Parameters<typeof originalTransformFile>[2]
   ) => {
-    // Deep merge babelConfig if provided
-    let babelConfig: TransformOptions = deepMergeBabelConfig(defaultBabelConfig, options.babelConfig)
+    let babelConfig: TransformOptions = {
+      ...defaultBabelConfig,
+      ...options.babelConfig,
+      plugins: [...(defaultBabelConfig.plugins || []), ...(options.babelConfig?.plugins || [])],
+    }
 
-    // Apply babelConfigOverrides for full control
     if (options.babelConfigOverrides) {
       babelConfig = options.babelConfigOverrides(babelConfig)
     }

package/src/plugins/metroPlugin.ts

@@ -26,29 +26,8 @@ export type MetroPluginOptions = {
   defaultConfigOverrides?:
     | MetroInputConfig
     | ((defaultConfig: MetroInputConfig) => MetroInputConfig)
-  /**
-   * Shorthand for setting `useWatchman` in Metro's resolver config.
-   * When true, enables Watchman for file watching. When false, disables it.
-   */
-  watchman?: boolean
-  /**
-   * Array of module names or glob patterns that should be resolved to an empty module.
-   * This is useful for excluding modules that break the React Native build.
-   *
-   * Supports glob patterns via micromatch:
-   * - Exact match: `'jsonwebtoken'`
-   * - Wildcard: `'@aws-sdk/*'`
-   * - Multiple wildcards: `'@aws-sdk/**'`
-   *
-   * Example: `['node:http2', 'jsonwebtoken', '@aws-sdk/*']`
-   */
-  excludeModules?: string[]
-  /**
-   * Babel configuration that will be deep merged with the default config.
-   * This is a more convenient alternative to babelConfigOverrides.
-   */
+  /** Consider using babelConfigOverrides instead */
   babelConfig?: TransformOptions
-  /** Advanced: Use this for full control over babel config merging */
   babelConfigOverrides?: (defaultConfig: TransformOptions) => TransformOptions
   /**
    * Overrides the main module name which is normally defined as the `main` field in `package.json`.

package/types/metro-config/getMetroConfigFromViteConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMetroConfigFromViteConfig.d.ts","sourceRoot":"","sources":["../../src/metro-config/getMetroConfigFromViteConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAY1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,EAAe,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAI/D,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,cAAc,EACtB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,mBAAmB,CAAC,CAwK9B"}
+{"version":3,"file":"getMetroConfigFromViteConfig.d.ts","sourceRoot":"","sources":["../../src/metro-config/getMetroConfigFromViteConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAW1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,EAAe,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAI/D,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,cAAc,EACtB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,mBAAmB,CAAC,CA6H9B"}

package/types/metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patchMetroServerWithViteConfigAndMetroPluginOptions.d.ts","sourceRoot":"","sources":["../../src/metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAkEhE,wBAAgB,mDAAmD,CACjE,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,kBAAkB,QAwC5B"}
+{"version":3,"file":"patchMetroServerWithViteConfigAndMetroPluginOptions.d.ts","sourceRoot":"","sources":["../../src/metro-config/patchMetroServerWithViteConfigAndMetroPluginOptions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAIhE,wBAAgB,mDAAmD,CACjE,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,kBAAkB,QA0C5B"}

package/types/plugins/metroPlugin.d.ts

@@ -6,29 +6,8 @@ type MetroInputConfig = Parameters<typeof loadConfigT>[1];
 export type MetroPluginOptions = {
     argv?: MetroYargArguments;
     defaultConfigOverrides?: MetroInputConfig | ((defaultConfig: MetroInputConfig) => MetroInputConfig);
-    /**
-     * Shorthand for setting `useWatchman` in Metro's resolver config.
-     * When true, enables Watchman for file watching. When false, disables it.
-     */
-    watchman?: boolean;
-    /**
-     * Array of module names or glob patterns that should be resolved to an empty module.
-     * This is useful for excluding modules that break the React Native build.
-     *
-     * Supports glob patterns via micromatch:
-     * - Exact match: `'jsonwebtoken'`
-     * - Wildcard: `'@aws-sdk/*'`
-     * - Multiple wildcards: `'@aws-sdk/**'`
-     *
-     * Example: `['node:http2', 'jsonwebtoken', '@aws-sdk/*']`
-     */
-    excludeModules?: string[];
-    /**
-     * Babel configuration that will be deep merged with the default config.
-     * This is a more convenient alternative to babelConfigOverrides.
-     */
+    /** Consider using babelConfigOverrides instead */
     babelConfig?: TransformOptions;
-    /** Advanced: Use this for full control over babel config merging */
     babelConfigOverrides?: (defaultConfig: TransformOptions) => TransformOptions;
     /**
      * Overrides the main module name which is normally defined as the `main` field in `package.json`.

package/types/plugins/metroPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metroPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/metroPlugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAOxC,OAAO,KAAK,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,OAAO,CAAA;AAMtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAIjE,KAAK,kBAAkB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAC3D,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAEzD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,kBAAkB,CAAA;IACzB,sBAAsB,CAAC,EACnB,gBAAgB,GAChB,CAAC,CAAC,aAAa,EAAE,gBAAgB,KAAK,gBAAgB,CAAC,CAAA;IAC3D;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;;;;OAUG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAA;IAC9B,oEAAoE;IACpE,oBAAoB,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,KAAK,gBAAgB,CAAA;IAC5E;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,wBAAgB,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,YAAY,CAgJ1E"}
+{"version":3,"file":"metroPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/metroPlugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAOxC,OAAO,KAAK,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,OAAO,CAAA;AAMtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAIjE,KAAK,kBAAkB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAC3D,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAEzD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,kBAAkB,CAAA;IACzB,sBAAsB,CAAC,EACnB,gBAAgB,GAChB,CAAC,CAAC,aAAa,EAAE,gBAAgB,KAAK,gBAAgB,CAAC,CAAA;IAC3D,kDAAkD;IAClD,WAAW,CAAC,EAAE,gBAAgB,CAAA;IAC9B,oBAAoB,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,KAAK,gBAAgB,CAAA;IAC5E;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,wBAAgB,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,YAAY,CAgJ1E"}

package/types/transformer/loadBabelConfig.d.ts

@@ -6,5 +6,5 @@ import type { TransformOptions } from './babel-core';
  */
 export declare const loadBabelConfig: ({ projectRoot }: {
     projectRoot: string;
-}) => Pick<TransformOptions, "presets" | "extends">;
+}) => Pick<TransformOptions, "extends" | "presets">;
 //# sourceMappingURL=loadBabelConfig.d.ts.map