@vxrn/vite-plugin-metro 1.2.8 → 1.2.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -81,54 +81,50 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
81
81
  };
82
82
  }
83
83
  const defaultConfig = {
84
- ..._defaultConfig,
85
- resolver: {
86
- ..._defaultConfig?.resolver,
87
- ...(watchman !== void 0 ? {
88
- useWatchman: watchman
89
- } : {}),
90
- sourceExts: ["js", "jsx", "json", "ts", "tsx", "mjs", "cjs"],
91
- // `one` related packages are using `.mjs` extensions. This somehow fixes `.native` files not being resolved correctly when `.mjs` files are present.
92
- resolveRequest: (context, moduleName, platform) => {
93
- const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
94
- if (excludeModules && excludeModules.length > 0 && import_micromatch.default.isMatch(moduleName, excludeModules)) return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
95
- if (moduleName.startsWith("@babel/runtime")) {
96
- const contextOverride = {
97
- ...context,
98
- unstable_conditionNames: context.unstable_conditionNames.filter(c => c !== "import")
99
- };
100
- return origResolveRequestFn(contextOverride, moduleName, platform);
101
- }
102
- return origResolveRequestFn(context, moduleName, platform);
84
+ ..._defaultConfig,
85
+ resolver: {
86
+ ..._defaultConfig?.resolver,
87
+ ...(watchman !== void 0 ? {
88
+ useWatchman: watchman
89
+ } : {}),
90
+ sourceExts: ["js", "jsx", "json", "ts", "tsx", "mjs", "cjs"],
91
+ // `one` related packages are using `.mjs` extensions. This somehow fixes `.native` files not being resolved correctly when `.mjs` files are present.
92
+ resolveRequest: (context, moduleName, platform) => {
93
+ const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
94
+ if (moduleName.startsWith("@babel/runtime")) {
95
+ const contextOverride = {
96
+ ...context,
97
+ unstable_conditionNames: context.unstable_conditionNames.filter(c => c !== "import")
98
+ };
99
+ return origResolveRequestFn(contextOverride, moduleName, platform);
103
100
  }
104
- },
105
- transformer: {
106
- ..._defaultConfig?.transformer,
107
- babelTransformerPath: (0, import_projectImport.projectResolve)(projectRoot, "@vxrn/vite-plugin-metro/babel-transformer")
108
- // TODO: This is what Expo is doing, but do we really need this?
109
- // Doing so seems to make the release build broken since assets will be
110
- // copied to /.../Xcode/DerivedData/.../Build/Products/Release-iphonesimulator/...app/assets/?unstable_path=.%2Fsrc%2Fimages/logo.png
111
- // publicPath: '/assets/?unstable_path=.',
112
- },
113
- reporter: await (0, import_getTerminalReporter.getTerminalReporter)(projectRoot)
101
+ return origResolveRequestFn(context, moduleName, platform);
102
+ }
114
103
  },
115
- userConfig = typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides,
116
- userResolveRequest = userConfig?.resolver?.resolveRequest,
104
+ transformer: {
105
+ ..._defaultConfig?.transformer,
106
+ babelTransformerPath: (0, import_projectImport.projectResolve)(projectRoot, "@vxrn/vite-plugin-metro/babel-transformer")
107
+ // TODO: This is what Expo is doing, but do we really need this?
108
+ // Doing so seems to make the release build broken since assets will be
109
+ // copied to /.../Xcode/DerivedData/.../Build/Products/Release-iphonesimulator/...app/assets/?unstable_path=.%2Fsrc%2Fimages/logo.png
110
+ // publicPath: '/assets/?unstable_path=.',
111
+ },
112
+ reporter: await (0, import_getTerminalReporter.getTerminalReporter)(projectRoot)
113
+ };
114
+ let finalConfig = {
115
+ ...defaultConfig,
116
+ ...(typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides)
117
+ };
118
+ if (excludeModules && excludeModules.length > 0) {
119
+ const existingResolveRequest = finalConfig.resolver?.resolveRequest;
117
120
  finalConfig = {
118
- ...defaultConfig,
119
- ...userConfig,
121
+ ...finalConfig,
120
122
  resolver: {
121
- ...defaultConfig.resolver,
122
- ...userConfig?.resolver,
123
- resolveRequest: (context, moduleName, platform) => {
124
- const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
125
- if (excludeModules && excludeModules.length > 0 && import_micromatch.default.isMatch(moduleName, excludeModules)) return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
126
- if (userResolveRequest) return userResolveRequest(context, moduleName, platform);
127
- const defaultResolveRequestFn = defaultConfig.resolver.resolveRequest;
128
- return defaultResolveRequestFn(context, moduleName, platform);
129
- }
123
+ ...finalConfig.resolver,
124
+ resolveRequest: (context, moduleName, platform) => import_micromatch.default.isMatch(moduleName, excludeModules) ? (_defaultConfig?.resolver?.resolveRequest || context.resolveRequest)(context, "@vxrn/vite-plugin-metro/empty", platform) : existingResolveRequest ? existingResolveRequest(context, moduleName, platform) : context.resolveRequest(context, moduleName, platform)
130
125
  }
131
126
  };
127
+ }
132
128
  return {
133
129
  ...(await loadConfig({
134
130
  cwd: projectRoot,
@@ -62,8 +62,6 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
62
62
  // `one` related packages are using `.mjs` extensions. This somehow fixes `.native` files not being resolved correctly when `.mjs` files are present.
63
63
  resolveRequest: (context, moduleName, platform) => {
64
64
  const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
65
- if (excludeModules && excludeModules.length > 0 && import_micromatch.default.isMatch(moduleName, excludeModules))
66
- return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
67
65
  if (moduleName.startsWith("@babel/runtime")) {
68
66
  const contextOverride = {
69
67
  ...context,
@@ -86,23 +84,21 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
86
84
  // publicPath: '/assets/?unstable_path=.',
87
85
  },
88
86
  reporter: await (0, import_getTerminalReporter.getTerminalReporter)(projectRoot)
89
- }, userConfig = typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides, userResolveRequest = userConfig?.resolver?.resolveRequest, finalConfig = {
87
+ };
88
+ let finalConfig = {
90
89
  ...defaultConfig,
91
- ...userConfig,
92
- resolver: {
93
- ...defaultConfig.resolver,
94
- ...userConfig?.resolver,
95
- resolveRequest: (context, moduleName, platform) => {
96
- const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
97
- if (excludeModules && excludeModules.length > 0 && import_micromatch.default.isMatch(moduleName, excludeModules))
98
- return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
99
- if (userResolveRequest)
100
- return userResolveRequest(context, moduleName, platform);
101
- const defaultResolveRequestFn = defaultConfig.resolver.resolveRequest;
102
- return defaultResolveRequestFn(context, moduleName, platform);
103
- }
104
- }
90
+ ...typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
105
91
  };
92
+ if (excludeModules && excludeModules.length > 0) {
93
+ const existingResolveRequest = finalConfig.resolver?.resolveRequest;
94
+ finalConfig = {
95
+ ...finalConfig,
96
+ resolver: {
97
+ ...finalConfig.resolver,
98
+ resolveRequest: (context, moduleName, platform) => import_micromatch.default.isMatch(moduleName, excludeModules) ? (_defaultConfig?.resolver?.resolveRequest || context.resolveRequest)(context, "@vxrn/vite-plugin-metro/empty", platform) : existingResolveRequest ? existingResolveRequest(context, moduleName, platform) : context.resolveRequest(context, moduleName, platform)
99
+ }
100
+ };
101
+ }
106
102
  return {
107
103
  ...await loadConfig(
108
104
  {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/metro-config/getMetroConfigFromViteConfig.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["micromatch"]
6
6
  }
@@ -41,8 +41,7 @@ var import_micromatch = __toESM(require("micromatch"), 1),
41
41
  import_getTerminalReporter = require("../utils/getTerminalReporter.native.js"),
42
42
  import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName = require("../utils/patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.native.js");
43
43
  async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
44
- var _userConfig_resolver,
45
- extraConfig = {},
44
+ var extraConfig = {},
46
45
  {
47
46
  root: projectRoot
48
47
  } = config,
@@ -96,7 +95,6 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
96
95
  resolveRequest: function (context, moduleName, platform) {
97
96
  var _defaultConfig_resolver,
98
97
  origResolveRequestFn = (_defaultConfig == null || (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.resolveRequest) || context.resolveRequest;
99
- if (excludeModules && excludeModules.length > 0 && import_micromatch.default.isMatch(moduleName, excludeModules)) return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
100
98
  if (moduleName.startsWith("@babel/runtime")) {
101
99
  var contextOverride = {
102
100
  ...context,
@@ -119,31 +117,35 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
119
117
  // publicPath: '/assets/?unstable_path=.',
120
118
  reporter: await (0, import_getTerminalReporter.getTerminalReporter)(projectRoot)
121
119
  },
122
- userConfig = typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides,
123
- userResolveRequest = userConfig == null || (_userConfig_resolver = userConfig.resolver) === null || _userConfig_resolver === void 0 ? void 0 : _userConfig_resolver.resolveRequest,
124
120
  finalConfig = {
125
121
  ...defaultConfig,
126
- ...userConfig,
122
+ ...(typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides)
123
+ };
124
+ if (excludeModules && excludeModules.length > 0) {
125
+ var _finalConfig_resolver,
126
+ existingResolveRequest = (_finalConfig_resolver = finalConfig.resolver) === null || _finalConfig_resolver === void 0 ? void 0 : _finalConfig_resolver.resolveRequest;
127
+ finalConfig = {
128
+ ...finalConfig,
127
129
  resolver: {
128
- ...defaultConfig.resolver,
129
- ...userConfig?.resolver,
130
+ ...finalConfig.resolver,
130
131
  resolveRequest: function (context, moduleName, platform) {
131
- var _defaultConfig_resolver,
132
- origResolveRequestFn = (_defaultConfig == null || (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.resolveRequest) || context.resolveRequest;
133
- if (excludeModules && excludeModules.length > 0 && import_micromatch.default.isMatch(moduleName, excludeModules)) return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
134
- if (userResolveRequest) return userResolveRequest(context, moduleName, platform);
135
- var defaultResolveRequestFn = defaultConfig.resolver.resolveRequest;
136
- return defaultResolveRequestFn(context, moduleName, platform);
132
+ if (import_micromatch.default.isMatch(moduleName, excludeModules)) {
133
+ var _defaultConfig_resolver,
134
+ origResolveRequestFn = (_defaultConfig == null || (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.resolveRequest) || context.resolveRequest;
135
+ return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
136
+ }
137
+ return existingResolveRequest ? existingResolveRequest(context, moduleName, platform) : context.resolveRequest(context, moduleName, platform);
137
138
  }
138
139
  }
139
- },
140
- metroConfig = await loadConfig({
141
- cwd: projectRoot,
142
- projectRoot,
143
- "reset-cache": !!process.env.METRO_RESET_CACHE,
144
- // TODO: `--clean`
145
- ...argv
146
- }, finalConfig);
140
+ };
141
+ }
142
+ var metroConfig = await loadConfig({
143
+ cwd: projectRoot,
144
+ projectRoot,
145
+ "reset-cache": !!process.env.METRO_RESET_CACHE,
146
+ // TODO: `--clean`
147
+ ...argv
148
+ }, finalConfig);
147
149
  return {
148
150
  ...metroConfig,
149
151
  ...extraConfig
@@ -1 +1 @@
1
- {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getMetroConfigFromViteConfig_exports","__export","getMetroConfigFromViteConfig","module","exports","import_micromatch","__toESM","require","import_projectImport","import_getTerminalReporter","import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","config","metroPluginOptions","_userConfig_resolver","extraConfig","root","projectRoot","mainModuleName","argv","defaultConfigOverrides","watchman","excludeModules","loadConfig","projectImport","getDefaultConfig","_defaultConfig","origRewriteRequestUrl","server","rewriteRequestUrl","resolveMainModuleName","ExpoGoManifestHandlerMiddleware","default","manifestHandlerMiddleware","patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","p","pkg","main","platform","getResolveMainModuleName","url","includes","resolvedMainModulePath","replace","defaultConfig","resolver","useWatchman","sourceExts","resolveRequest","context","moduleName","_defaultConfig_resolver","origResolveRequestFn","length","isMatch","startsWith","contextOverride","unstable_conditionNames","filter","c","transformer","babelTransformerPath","projectResolve","reporter","getTerminalReporter","userConfig","userResolveRequest","finalConfig","defaultResolveRequestFn","metroConfig","cwd","process","env","METRO_RESET_CACHE"],"sources":["../../../src/metro-config/getMetroConfigFromViteConfig.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,oCAAA;AAAAC,QAAA,CAAAD,oCAAA;EAAAE,4BAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAA,CAAAC,OAAA,GAAAT,YAAuB,CAAAK,oCAQvB;AAQA,IAAAK,iBAAsB,GAAAC,OAAA,CAAAC,OAAA,aAEpB;EAAAC,oBAC8B,GAAAD,OAAA;EAAAE,0BAAA,GAAAF,OAAA;EAAAG,mEAAA,GAAAH,OAAA;AAC9B,eAAML,4BACQA,CAAAS,MAAgB,EAAAC,kBACtB;EAYR,IAAIC,oBAAgB;IAAAC,WAAA;IAAA;MAAAC,IAAA,EAAAC;IAAA,IAAAL,MAAA;IAAA;MAAAM,cAAA;MAAAC,IAAA;MAAAC,sBAAA;MAAAC,QAAA;MAAAC;IAAA,IAAAT,kBAAA;IAAA;MAAAU;IAAA,cAAAd,oBAAA,CAAAe,aAAA,EAAAP,WAAA;IAAA;MAAAQ;IAAA,cAAAhB,oBAAA,CAAAe,aAAA,EAAAP,WAAA;IAAAS,cAAA,GAAAD,gBAAA,CAAAR,WAAA;EAClB,IAAAC,cAAM;IAUF,IAAAS,qBAAM,GAAAD,cAAA,CACJE,MAAA,CAAAC,iBAAM;MAAAC,qBAAA;QAAA,IACJC,+BAAA,cAAAtB,oBAAA,CAAAe,aAAA,EAAAP,WAAA,qFAAAe,OAAA,CAAAD,+BAAA;UAAAE,yBAAA,OAAAF,+BAAA,CAAAd,WAAA;QAAA,OACA,IAAAN,mEAAA,CAAAuB,4DAAA,EAAAD,yBAAA,EAAAf,cAAA,aAAAiB,CAAA;UACF,OACAF,yBAAQ,CAAAH,qBAEJ;YAENM,GAAA;cACEC,IAAA,EAAAnB;YACA;YAGMoB,QACC,EAAAH,CAAA,CAAAG;UACL;QAA4B;MAChB,EACb;IAELvB,WAAG,CAAAwB,wBAAA,GAAAT,qBAAA,EAAAJ,cAAA,CAAAE,MAAA,CAAAC,iBAAA,aAAAW,GAAA;MAEL,IAAAA,GAAA,CAAAC,QAAY,sCAA2B;QAGrC,IAAIC,sBAAa,GAAAZ,qBAAA;UACfQ,QAAM;QAA+C,EACnD;QAAU,OAAAE,GAAA,CAAAG,OAAA,+BAAAD,sBAAA;MAAA;MAGZ,OAAAf,qBAAmB,CAAAa,GAAA;IAAoD;EAGzE;EAAgC,IAClCI,aAAA;MACF,GAAAlB,cAAA;MAEAmB,QAAM;QACJ,GAAGnB,cAAA,EAAAmB,QAAA;QACH,IAAAxB,QAAU;UACRyB,WAAG,EAAAzB;QACH,IAAI;QACJ0B,UAAA,EAAY,CAA+C,MAC3D,OACE,MAAM,EAIN,IAAI,EAEA,OAaJ,KAAI,EACF,MAAwB;QACnB;QACkFC,cACvF,WAAAA,CAAAC,OAAA,EAAAC,UAAA,EAAAZ,QAAA;UACA,IAAAa,uBAAO;YAAAC,oBAAsC,IAAA1B,cAAoB,aAAAyB,uBAAA,GAAAzB,cAAA,CAAAmB,QAAA,cAAAM,uBAAA,uBAAAA,uBAAA,CAAAH,cAAA,KAAAC,OAAA,CAAAD,cAAA;UACnE,IAAA1B,cAAA,IAAAA,cAAA,CAAA+B,MAAA,QAAA/C,iBAAA,CAAA0B,OAAA,CAAAsB,OAAA,CAAAJ,UAAA,EAAA5B,cAAA,GAEA,OAAO8B,oBAAqB,CAAAH,OAAS,iCAAoB,EAAAX,QAAA;UAC3D,IAAAY,UAAA,CAAAK,UAAA;YACF,IAAAC,eAAA;cACA,GAAAP,OAAa;cACRQ,uBAAgB,EAAAR,OAAA,CAAAQ,uBAAA,CAAAC,MAAA,WAAAC,CAAA;gBACnB,OAAAA,CAAA,aAAsB;cACpB;YACA;YACF,OAAAP,oBAAA,CAAAI,eAAA,EAAAN,UAAA,EAAAZ,QAAA;UAAA;UAAA,OAAAc,oBAAA,CAAAH,OAAA,EAAAC,UAAA,EAAAZ,QAAA;QAAA;MAAA;MAKFsB,WAAA;QACA,GAAAlC,cAAU,EAAMkC,WAAA;QAIZC,oBACG,MAAApD,oBAA2B,CAAAqD,cAC9B,EAAA7C,WAAA,6CACA;MAOJ;MACA;MACA;MAAU;MACS;MACF8C,QACf,UAAgB,EAACrD,0BAAqB,CAAAsD,mBAAa,EAAA/C,WAAA;IACjD;IAAAgD,UAAM,UAAA7C,sBACJ,cAAgB,GAAUA,sBAAkB,CAAAwB,aAAQ,IAAAxB,sBAAA;IAAA8C,kBAAA,GAAAD,UAAA,aAAAnD,oBAAA,GAAAmD,UAAA,CAAApB,QAAA,cAAA/B,oBAAA,uBAAAA,oBAAA,CAAAkC,cAAA;IAAAmB,WAAA;MAGtD,GAAAvB,aAAI;MAEA,GAAAqB,UAAO;MAKXpB,QAAI;QACF,GAAAD,aAAO,CAAAC,QAAA;QAIT,GAAAoB,UAAM,EAAApB,QAAA;QACNG,cAAO,WAAAA,CAAAC,OAAA,EAAwBC,UAAS,EAAAZ,QAAY;UACtD,IAAAa,uBAAA;YAAAC,oBAAA,IAAA1B,cAAA,aAAAyB,uBAAA,GAAAzB,cAAA,CAAAmB,QAAA,cAAAM,uBAAA,uBAAAA,uBAAA,CAAAH,cAAA,KAAAC,OAAA,CAAAD,cAAA;UACF,IAAA1B,cAAA,IAAAA,cAAA,CAAA+B,MAAA,QAAA/C,iBAAA,CAAA0B,OAAA,CAAAsB,OAAA,CAAAJ,UAAA,EAAA5B,cAAA,GACF,OAAA8B,oBAAA,CAAAH,OAAA,mCAAAX,QAAA;UAaA,IAAO4B,kBAAA,EAXa,OAAMA,kBAAA,CAAAjB,OAAA,EAAAC,UAAA,EAAAZ,QAAA;UACxB,IAAA8B,uBAAA,GAAAxB,aAAA,CAAAC,QAAA,CAAAG,cAAA;UACE,OAAKoB,uBAAA,CAAAnB,OAAA,EAAAC,UAAA,EAAAZ,QAAA;QAAA;MACL;IAC6B;IAAA+B,WAAA,SAAA9C,UAAA;MAAA+C,GAAA,EAC7BrD,WAAG;MAAAA,WACL;MAAA,aACA,IAAAsD,OAAA,CAAAC,GAAA,CAAAC,iBAAA;MACF;MAKE,GAAGtD;IACL,GAAAgD,WAAA;EACF","ignoreList":[]}
1
+ {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getMetroConfigFromViteConfig_exports","__export","getMetroConfigFromViteConfig","module","exports","import_micromatch","__toESM","require","import_projectImport","import_getTerminalReporter","import_patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","config","metroPluginOptions","extraConfig","root","projectRoot","mainModuleName","argv","defaultConfigOverrides","watchman","excludeModules","loadConfig","projectImport","getDefaultConfig","_defaultConfig","origRewriteRequestUrl","server","rewriteRequestUrl","resolveMainModuleName","ExpoGoManifestHandlerMiddleware","default","manifestHandlerMiddleware","patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","p","pkg","main","platform","getResolveMainModuleName","url","includes","resolvedMainModulePath","replace","defaultConfig","resolver","useWatchman","sourceExts","resolveRequest","context","moduleName","_defaultConfig_resolver","origResolveRequestFn","startsWith","contextOverride","unstable_conditionNames","filter","c","transformer","babelTransformerPath","projectResolve","reporter","getTerminalReporter","finalConfig","length","_finalConfig_resolver","existingResolveRequest","isMatch","metroConfig","cwd"],"sources":["../../../src/metro-config/getMetroConfigFromViteConfig.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,oCAAA;AAAAC,QAAA,CAAAD,oCAAA;EAAAE,4BAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAA,CAAAC,OAAA,GAAAT,YAAuB,CAAAK,oCAQvB;AAQA,IAAAK,iBAAsB,GAAAC,OAAA,CAAAC,OAAA,aAEpB;EAAAC,oBAC8B,GAAAD,OAAA;EAAAE,0BAAA,GAAAF,OAAA;EAAAG,mEAAA,GAAAH,OAAA;AAC9B,eAAML,4BACQA,CAAAS,MAAgB,EAAAC,kBACtB;EAYR,IAAIC,WAAA,KAAgB;IAAA;MAAAC,IAAA,EAAAC;IAAA,IAAAJ,MAAA;IAAA;MAAAK,cAAA;MAAAC,IAAA;MAAAC,sBAAA;MAAAC,QAAA;MAAAC;IAAA,IAAAR,kBAAA;IAAA;MAAAS;IAAA,cAAAb,oBAAA,CAAAc,aAAA,EAAAP,WAAA;IAAA;MAAAQ;IAAA,cAAAf,oBAAA,CAAAc,aAAA,EAAAP,WAAA;IAAAS,cAAA,GAAAD,gBAAA,CAAAR,WAAA;EAClB,IAAAC,cAAM;IAUF,IAAAS,qBAAM,GAAAD,cAAA,CACJE,MAAA,CAAAC,iBAAM;MAAAC,qBAAA;QAAA,IACJC,+BAAA,cAAArB,oBAAA,CAAAc,aAAA,EAAAP,WAAA,qFAAAe,OAAA,CAAAD,+BAAA;UAAAE,yBAAA,OAAAF,+BAAA,CAAAd,WAAA;QAAA,OACA,IAAAL,mEAAA,CAAAsB,4DAAA,EAAAD,yBAAA,EAAAf,cAAA,aAAAiB,CAAA;UACF,OACAF,yBAAQ,CAAAH,qBAEJ;YAENM,GAAA;cACEC,IAAA,EAAAnB;YACA;YAGMoB,QACC,EAAAH,CAAA,CAAAG;UACL;QAA4B;MAChB,EACb;IAELvB,WAAG,CAAAwB,wBAAA,GAAAT,qBAAA,EAAAJ,cAAA,CAAAE,MAAA,CAAAC,iBAAA,aAAAW,GAAA;MAEL,IAAAA,GAAA,CAAAC,QAAY,sCAA2B;QAGrC,IAAIC,sBAAa,GAAAZ,qBAAA;UACfQ,QAAM;QAA+C,EACnD;QAAU,OAAAE,GAAA,CAAAG,OAAA,+BAAAD,sBAAA;MAAA;MAGZ,OAAAf,qBAAmB,CAAAa,GAAA;IAAoD;EAGzE;EAAgC,IAClCI,aAAA;MACF,GAAAlB,cAAA;MAEAmB,QAAM;QACJ,GAAGnB,cAAA,EAAAmB,QAAA;QACH,IAAAxB,QAAU;UACRyB,WAAG,EAAAzB;QACH,IAAI;QACJ0B,UAAA,EAAY,CAA+C,MAC3D,OACE,MAAM,EAYN,IAAI,EACF,OAAwB,KACtB,EAAG,KACH,CAAqF;QAEvF;QAAiEC,cACnE,WAAAA,CAAAC,OAAA,EAAAC,UAAA,EAAAZ,QAAA;UAEA,IAAAa,uBAAO;YAAqBC,oBAAqB,IAAA1B,cAAQ,aAAAyB,uBAAA,GAAAzB,cAAA,CAAAmB,QAAA,cAAAM,uBAAA,uBAAAA,uBAAA,CAAAH,cAAA,KAAAC,OAAA,CAAAD,cAAA;UAC3D,IAAAE,UAAA,CAAAG,UAAA;YACF,IAAAC,eAAA;cACA,GAAAL,OAAa;cACRM,uBAAgB,EAAAN,OAAA,CAAAM,uBAAA,CAAAC,MAAA,WAAAC,CAAA;gBACnB,OAAAA,CAAA,aAAsB;cACpB;YACA;YACF,OAAAL,oBAAA,CAAAE,eAAA,EAAAJ,UAAA,EAAAZ,QAAA;UAAA;UAAA,OAAAc,oBAAA,CAAAH,OAAA,EAAAC,UAAA,EAAAZ,QAAA;QAAA;MAAA;MAKFoB,WAAA;QACA,GAAAhC,cAAU,EAAMgC,WAAA;QAClBC,oBAAA,MAAAjD,oBAAA,CAAAkD,cAAA,EAAA3C,WAAA;MAGA;MACE;MACA;MAGF;MAGA;MACE4C,QAAM,YAAAlD,0BAAqC,CAAAmD,mBAAU,EAAA7C,WAAA;IAErD;IAAA8C,WAAA,GAAc;MAAA,GACZnB,aAAG;MAAA,IACH,OAAAxB,sBAAU,iBAAAA,sBAAA,CAAAwB,aAAA,IAAAxB,sBAAA;IAAA;EACO,IAAAE,cACf,IAAgBA,cAAU,CAAA0C,MAAA,GAAY;IAcuB,IAE/DC,qBAAA;MAAAC,sBAAA,IAAAD,qBAAA,GAAAF,WAAA,CAAAlB,QAAA,cAAAoB,qBAAA,uBAAAA,qBAAA,CAAAjB,cAAA;IACFe,WAAA;MACF,GAAAA,WAAA;MAaAlB,QAAO;QAXa,GAAAkB,WAAM,CAAAlB,QAAA;QACxBG,cAAA,WAAAA,CAAAC,OAAA,EAAAC,UAAA,EAAAZ,QAAA;UACE,IAAK/B,iBAAA,CAAAyB,OAAA,CAAAmC,OAAA,CAAAjB,UAAA,EAAA5B,cAAA;YACL,IAAA6B,uBAAA;cAAAC,oBAAA,IAAA1B,cAAA,aAAAyB,uBAAA,GAAAzB,cAAA,CAAAmB,QAAA,cAAAM,uBAAA,uBAAAA,uBAAA,CAAAH,cAAA,KAAAC,OAAA,CAAAD,cAAA;YACA,OAAAI,oBAA6B,CAAAH,OAAA,mCAAAX,QAAA;UAAA;UAC7B,OAAG4B,sBAAA,GAAAA,sBAAA,CAAAjB,OAAA,EAAAC,UAAA,EAAAZ,QAAA,IAAAW,OAAA,CAAAD,cAAA,CAAAC,OAAA,EAAAC,UAAA,EAAAZ,QAAA;QACL;MACA;IACF;EAAA;EAMA,IAAA8B,WAAA,SAAA7C,UAAA;IACF8C,GAAA,EAAApD,WAAA","ignoreList":[]}
@@ -38,8 +38,6 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
38
38
  // `one` related packages are using `.mjs` extensions. This somehow fixes `.native` files not being resolved correctly when `.mjs` files are present.
39
39
  resolveRequest: (context, moduleName, platform) => {
40
40
  const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
41
- if (excludeModules && excludeModules.length > 0 && micromatch.isMatch(moduleName, excludeModules))
42
- return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
43
41
  if (moduleName.startsWith("@babel/runtime")) {
44
42
  const contextOverride = {
45
43
  ...context,
@@ -62,23 +60,21 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
62
60
  // publicPath: '/assets/?unstable_path=.',
63
61
  },
64
62
  reporter: await getTerminalReporter(projectRoot)
65
- }, userConfig = typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides, userResolveRequest = userConfig?.resolver?.resolveRequest, finalConfig = {
63
+ };
64
+ let finalConfig = {
66
65
  ...defaultConfig,
67
- ...userConfig,
68
- resolver: {
69
- ...defaultConfig.resolver,
70
- ...userConfig?.resolver,
71
- resolveRequest: (context, moduleName, platform) => {
72
- const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
73
- if (excludeModules && excludeModules.length > 0 && micromatch.isMatch(moduleName, excludeModules))
74
- return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
75
- if (userResolveRequest)
76
- return userResolveRequest(context, moduleName, platform);
77
- const defaultResolveRequestFn = defaultConfig.resolver.resolveRequest;
78
- return defaultResolveRequestFn(context, moduleName, platform);
79
- }
80
- }
66
+ ...typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides
81
67
  };
68
+ if (excludeModules && excludeModules.length > 0) {
69
+ const existingResolveRequest = finalConfig.resolver?.resolveRequest;
70
+ finalConfig = {
71
+ ...finalConfig,
72
+ resolver: {
73
+ ...finalConfig.resolver,
74
+ resolveRequest: (context, moduleName, platform) => micromatch.isMatch(moduleName, excludeModules) ? (_defaultConfig?.resolver?.resolveRequest || context.resolveRequest)(context, "@vxrn/vite-plugin-metro/empty", platform) : existingResolveRequest ? existingResolveRequest(context, moduleName, platform) : context.resolveRequest(context, moduleName, platform)
75
+ }
76
+ };
77
+ }
82
78
  return {
83
79
  ...await loadConfig(
84
80
  {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/metro-config/getMetroConfigFromViteConfig.ts"],
4
- "mappings": "AACA,OAAO,gBAAgB;AAQvB,SAAS,eAAe,sBAAsB;AAC9C,SAAS,2BAA2B;AACpC,SAAS,oEAAoE;AAM7E,eAAsB,6BACpB,QACA,oBAC8B;AAC9B,QAAM,cAA2B,CAAC,GAC5B,EAAE,MAAM,YAAY,IAAI,QACxB,EAAE,gBAAgB,MAAM,wBAAwB,UAAU,eAAe,IAC7E,oBAEI,EAAE,WAAW,IAAI,MAAM,cAE1B,aAAa,OAAO,GACjB,EAAE,iBAAiB,IAAI,MAAM,cAEhC,aAAa,oBAAoB,GAE9B,iBAAmC,iBAAiB,WAAW;AAErE,MAAI,gBAAgB;AAClB,UAAM,wBAAwB,eAAgB,OAAQ,mBAQhD,wBACJ,OAAO,YAAY;AACjB,YAAM,mCACJ,MAAM;AAAA,QACJ;AAAA,QACA;AAAA,MACF,GACA,QAAQ,iCAEJ,4BAA4B,IAAI,gCAAgC,aAAa,CAAC,CAAC;AAErF;AAAA,QACE;AAAA,QACA;AAAA,MACF,GAEO,CAAC,MACC,0BAA0B,sBAAsB;AAAA,QACrD,KAAK,EAAE,MAAM,eAAe;AAAA,QAC5B,UAAU,EAAE;AAAA,MACd,CAAC;AAAA,IAEL,GAAG;AAEL,gBAAY,2BAA2B,uBAEvC,eAAgB,OAAQ,oBAAoB,CAAC,QAAQ;AACnD,UAAI,IAAI,SAAS,qCAAqC,GAAG;AACvD,cAAM,yBAAyB,sBAAsB;AAAA,UACnD,UAAU;AAAA;AAAA,QACZ,CAAC;AAED,eAAO,IAAI,QAAQ,8BAA8B,sBAAsB;AAAA,MACzE;AAEA,aAAO,sBAAsB,GAAG;AAAA,IAClC;AAAA,EACF;AAEA,QAAM,gBAAkC;AAAA,IACtC,GAAG;AAAA,IACH,UAAU;AAAA,MACR,GAAG,gBAAgB;AAAA,MACnB,GAAI,aAAa,SAAY,EAAE,aAAa,SAAS,IAAI,CAAC;AAAA,MAC1D,YAAY,CAAC,MAAM,OAAO,QAAQ,MAAM,OAAO,OAAO,KAAK;AAAA;AAAA,MAC3D,gBAAgB,CAAC,SAAS,YAAY,aAAa;AACjD,cAAM,uBACJ,gBAAgB,UAAU,kBAAkB,QAAQ;AAGtD,YAAI,kBAAkB,eAAe,SAAS,KACxC,WAAW,QAAQ,YAAY,cAAc;AAC/C,iBAAO,qBAAqB,SAAS,iCAAiC,QAAQ;AAalF,YAAI,WAAW,WAAW,gBAAgB,GAAG;AAC3C,gBAAM,kBAAkB;AAAA,YACtB,GAAG;AAAA,YACH,yBAAyB,QAAQ,wBAAwB,OAAO,CAAC,MAAM,MAAM,QAAQ;AAAA,UACvF;AACA,iBAAO,qBAAqB,iBAAiB,YAAY,QAAQ;AAAA,QACnE;AAEA,eAAO,qBAAqB,SAAS,YAAY,QAAQ;AAAA,MAC3D;AAAA,IACF;AAAA,IACA,aAAa;AAAA,MACX,GAAG,gBAAgB;AAAA,MACnB,sBAAsB;AAAA,QACpB;AAAA,QACA;AAAA,MACF;AAAA;AAAA;AAAA;AAAA;AAAA,IAKF;AAAA,IACA,UAAU,MAAM,oBAAoB,WAAW;AAAA,EACjD,GAGM,aACJ,OAAO,0BAA2B,aAC9B,uBAAuB,aAAa,IACpC,wBAGA,qBAAqB,YAAY,UAAU,gBAG3C,cAAgC;AAAA,IACpC,GAAG;AAAA,IACH,GAAG;AAAA,IACH,UAAU;AAAA,MACR,GAAG,cAAc;AAAA,MACjB,GAAG,YAAY;AAAA,MACf,gBAAgB,CAAC,SAAS,YAAY,aAAa;AACjD,cAAM,uBACJ,gBAAgB,UAAU,kBAAkB,QAAQ;AAGtD,YAAI,kBAAkB,eAAe,SAAS,KACxC,WAAW,QAAQ,YAAY,cAAc;AAC/C,iBAAO,qBAAqB,SAAS,iCAAiC,QAAQ;AAKlF,YAAI;AACF,iBAAO,mBAAmB,SAAS,YAAY,QAAQ;AAIzD,cAAM,0BAA0B,cAAc,SAAU;AACxD,eAAO,wBAAwB,SAAS,YAAY,QAAQ;AAAA,MAC9D;AAAA,IACF;AAAA,EACF;AAaA,SAAO;AAAA,IACL,GAZkB,MAAM;AAAA,MACxB;AAAA,QACE,KAAK;AAAA,QACL;AAAA,QACA,eAAe,CAAC,CAAC,QAAQ,IAAI;AAAA;AAAA,QAC7B,GAAG;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,IAKE,GAAG;AAAA,EACL;AACF;",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -45,54 +45,50 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
45
45
  };
46
46
  }
47
47
  const defaultConfig = {
48
- ..._defaultConfig,
49
- resolver: {
50
- ..._defaultConfig?.resolver,
51
- ...(watchman !== void 0 ? {
52
- useWatchman: watchman
53
- } : {}),
54
- sourceExts: ["js", "jsx", "json", "ts", "tsx", "mjs", "cjs"],
55
- // `one` related packages are using `.mjs` extensions. This somehow fixes `.native` files not being resolved correctly when `.mjs` files are present.
56
- resolveRequest: (context, moduleName, platform) => {
57
- const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
58
- if (excludeModules && excludeModules.length > 0 && micromatch.isMatch(moduleName, excludeModules)) return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
59
- if (moduleName.startsWith("@babel/runtime")) {
60
- const contextOverride = {
61
- ...context,
62
- unstable_conditionNames: context.unstable_conditionNames.filter(c => c !== "import")
63
- };
64
- return origResolveRequestFn(contextOverride, moduleName, platform);
65
- }
66
- return origResolveRequestFn(context, moduleName, platform);
48
+ ..._defaultConfig,
49
+ resolver: {
50
+ ..._defaultConfig?.resolver,
51
+ ...(watchman !== void 0 ? {
52
+ useWatchman: watchman
53
+ } : {}),
54
+ sourceExts: ["js", "jsx", "json", "ts", "tsx", "mjs", "cjs"],
55
+ // `one` related packages are using `.mjs` extensions. This somehow fixes `.native` files not being resolved correctly when `.mjs` files are present.
56
+ resolveRequest: (context, moduleName, platform) => {
57
+ const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
58
+ if (moduleName.startsWith("@babel/runtime")) {
59
+ const contextOverride = {
60
+ ...context,
61
+ unstable_conditionNames: context.unstable_conditionNames.filter(c => c !== "import")
62
+ };
63
+ return origResolveRequestFn(contextOverride, moduleName, platform);
67
64
  }
68
- },
69
- transformer: {
70
- ..._defaultConfig?.transformer,
71
- babelTransformerPath: projectResolve(projectRoot, "@vxrn/vite-plugin-metro/babel-transformer")
72
- // TODO: This is what Expo is doing, but do we really need this?
73
- // Doing so seems to make the release build broken since assets will be
74
- // copied to /.../Xcode/DerivedData/.../Build/Products/Release-iphonesimulator/...app/assets/?unstable_path=.%2Fsrc%2Fimages/logo.png
75
- // publicPath: '/assets/?unstable_path=.',
76
- },
77
- reporter: await getTerminalReporter(projectRoot)
65
+ return origResolveRequestFn(context, moduleName, platform);
66
+ }
78
67
  },
79
- userConfig = typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides,
80
- userResolveRequest = userConfig?.resolver?.resolveRequest,
68
+ transformer: {
69
+ ..._defaultConfig?.transformer,
70
+ babelTransformerPath: projectResolve(projectRoot, "@vxrn/vite-plugin-metro/babel-transformer")
71
+ // TODO: This is what Expo is doing, but do we really need this?
72
+ // Doing so seems to make the release build broken since assets will be
73
+ // copied to /.../Xcode/DerivedData/.../Build/Products/Release-iphonesimulator/...app/assets/?unstable_path=.%2Fsrc%2Fimages/logo.png
74
+ // publicPath: '/assets/?unstable_path=.',
75
+ },
76
+ reporter: await getTerminalReporter(projectRoot)
77
+ };
78
+ let finalConfig = {
79
+ ...defaultConfig,
80
+ ...(typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides)
81
+ };
82
+ if (excludeModules && excludeModules.length > 0) {
83
+ const existingResolveRequest = finalConfig.resolver?.resolveRequest;
81
84
  finalConfig = {
82
- ...defaultConfig,
83
- ...userConfig,
85
+ ...finalConfig,
84
86
  resolver: {
85
- ...defaultConfig.resolver,
86
- ...userConfig?.resolver,
87
- resolveRequest: (context, moduleName, platform) => {
88
- const origResolveRequestFn = _defaultConfig?.resolver?.resolveRequest || context.resolveRequest;
89
- if (excludeModules && excludeModules.length > 0 && micromatch.isMatch(moduleName, excludeModules)) return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
90
- if (userResolveRequest) return userResolveRequest(context, moduleName, platform);
91
- const defaultResolveRequestFn = defaultConfig.resolver.resolveRequest;
92
- return defaultResolveRequestFn(context, moduleName, platform);
93
- }
87
+ ...finalConfig.resolver,
88
+ resolveRequest: (context, moduleName, platform) => micromatch.isMatch(moduleName, excludeModules) ? (_defaultConfig?.resolver?.resolveRequest || context.resolveRequest)(context, "@vxrn/vite-plugin-metro/empty", platform) : existingResolveRequest ? existingResolveRequest(context, moduleName, platform) : context.resolveRequest(context, moduleName, platform)
94
89
  }
95
90
  };
91
+ }
96
92
  return {
97
93
  ...(await loadConfig({
98
94
  cwd: projectRoot,
@@ -1 +1 @@
1
- {"version":3,"names":["micromatch","projectImport","projectResolve","getTerminalReporter","patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","getMetroConfigFromViteConfig","config","metroPluginOptions","extraConfig","root","projectRoot","mainModuleName","argv","defaultConfigOverrides","watchman","excludeModules","loadConfig","getDefaultConfig","_defaultConfig","origRewriteRequestUrl","server","rewriteRequestUrl","resolveMainModuleName","ExpoGoManifestHandlerMiddleware","default","manifestHandlerMiddleware","p","pkg","main","platform","getResolveMainModuleName","url","includes","resolvedMainModulePath","replace","defaultConfig","resolver","useWatchman","sourceExts","resolveRequest","context","moduleName","origResolveRequestFn","length","isMatch","startsWith","contextOverride","unstable_conditionNames","filter","c","transformer","babelTransformerPath","reporter","userConfig","userResolveRequest","finalConfig","defaultResolveRequestFn","cwd","process","env","METRO_RESET_CACHE"],"sources":["../../../src/metro-config/getMetroConfigFromViteConfig.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["micromatch","projectImport","projectResolve","getTerminalReporter","patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","getMetroConfigFromViteConfig","config","metroPluginOptions","extraConfig","root","projectRoot","mainModuleName","argv","defaultConfigOverrides","watchman","excludeModules","loadConfig","getDefaultConfig","_defaultConfig","origRewriteRequestUrl","server","rewriteRequestUrl","resolveMainModuleName","ExpoGoManifestHandlerMiddleware","default","manifestHandlerMiddleware","p","pkg","main","platform","getResolveMainModuleName","url","includes","resolvedMainModulePath","replace","defaultConfig","resolver","useWatchman","sourceExts","resolveRequest","context","moduleName","origResolveRequestFn","startsWith","contextOverride","unstable_conditionNames","filter","c","transformer","babelTransformerPath","reporter","finalConfig","length","existingResolveRequest","isMatch","cwd","process","env","METRO_RESET_CACHE"],"sources":["../../../src/metro-config/getMetroConfigFromViteConfig.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -3,8 +3,7 @@ import { projectImport, projectResolve } from "../utils/projectImport.native.js"
3
3
  import { getTerminalReporter } from "../utils/getTerminalReporter.native.js";
4
4
  import { patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName } from "../utils/patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName.native.js";
5
5
  async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
6
- var _userConfig_resolver,
7
- extraConfig = {},
6
+ var extraConfig = {},
8
7
  {
9
8
  root: projectRoot
10
9
  } = config,
@@ -58,7 +57,6 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
58
57
  resolveRequest: function (context, moduleName, platform) {
59
58
  var _defaultConfig_resolver,
60
59
  origResolveRequestFn = (_defaultConfig == null || (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.resolveRequest) || context.resolveRequest;
61
- if (excludeModules && excludeModules.length > 0 && micromatch.isMatch(moduleName, excludeModules)) return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
62
60
  if (moduleName.startsWith("@babel/runtime")) {
63
61
  var contextOverride = {
64
62
  ...context,
@@ -81,31 +79,35 @@ async function getMetroConfigFromViteConfig(config, metroPluginOptions) {
81
79
  // publicPath: '/assets/?unstable_path=.',
82
80
  reporter: await getTerminalReporter(projectRoot)
83
81
  },
84
- userConfig = typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides,
85
- userResolveRequest = userConfig == null || (_userConfig_resolver = userConfig.resolver) === null || _userConfig_resolver === void 0 ? void 0 : _userConfig_resolver.resolveRequest,
86
82
  finalConfig = {
87
83
  ...defaultConfig,
88
- ...userConfig,
84
+ ...(typeof defaultConfigOverrides == "function" ? defaultConfigOverrides(defaultConfig) : defaultConfigOverrides)
85
+ };
86
+ if (excludeModules && excludeModules.length > 0) {
87
+ var _finalConfig_resolver,
88
+ existingResolveRequest = (_finalConfig_resolver = finalConfig.resolver) === null || _finalConfig_resolver === void 0 ? void 0 : _finalConfig_resolver.resolveRequest;
89
+ finalConfig = {
90
+ ...finalConfig,
89
91
  resolver: {
90
- ...defaultConfig.resolver,
91
- ...userConfig?.resolver,
92
+ ...finalConfig.resolver,
92
93
  resolveRequest: function (context, moduleName, platform) {
93
- var _defaultConfig_resolver,
94
- origResolveRequestFn = (_defaultConfig == null || (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.resolveRequest) || context.resolveRequest;
95
- if (excludeModules && excludeModules.length > 0 && micromatch.isMatch(moduleName, excludeModules)) return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
96
- if (userResolveRequest) return userResolveRequest(context, moduleName, platform);
97
- var defaultResolveRequestFn = defaultConfig.resolver.resolveRequest;
98
- return defaultResolveRequestFn(context, moduleName, platform);
94
+ if (micromatch.isMatch(moduleName, excludeModules)) {
95
+ var _defaultConfig_resolver,
96
+ origResolveRequestFn = (_defaultConfig == null || (_defaultConfig_resolver = _defaultConfig.resolver) === null || _defaultConfig_resolver === void 0 ? void 0 : _defaultConfig_resolver.resolveRequest) || context.resolveRequest;
97
+ return origResolveRequestFn(context, "@vxrn/vite-plugin-metro/empty", platform);
98
+ }
99
+ return existingResolveRequest ? existingResolveRequest(context, moduleName, platform) : context.resolveRequest(context, moduleName, platform);
99
100
  }
100
101
  }
101
- },
102
- metroConfig = await loadConfig({
103
- cwd: projectRoot,
104
- projectRoot,
105
- "reset-cache": !!process.env.METRO_RESET_CACHE,
106
- // TODO: `--clean`
107
- ...argv
108
- }, finalConfig);
102
+ };
103
+ }
104
+ var metroConfig = await loadConfig({
105
+ cwd: projectRoot,
106
+ projectRoot,
107
+ "reset-cache": !!process.env.METRO_RESET_CACHE,
108
+ // TODO: `--clean`
109
+ ...argv
110
+ }, finalConfig);
109
111
  return {
110
112
  ...metroConfig,
111
113
  ...extraConfig
@@ -1 +1 @@
1
- {"version":3,"names":["micromatch","projectImport","projectResolve","getTerminalReporter","patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","getMetroConfigFromViteConfig","config","metroPluginOptions","_userConfig_resolver","extraConfig","root","projectRoot","mainModuleName","argv","defaultConfigOverrides","watchman","excludeModules","loadConfig","getDefaultConfig","_defaultConfig","origRewriteRequestUrl","server","rewriteRequestUrl","resolveMainModuleName","ExpoGoManifestHandlerMiddleware","default","manifestHandlerMiddleware","p","pkg","main","platform","getResolveMainModuleName","url","includes","resolvedMainModulePath","replace","defaultConfig","resolver","useWatchman","sourceExts","resolveRequest","context","moduleName","_defaultConfig_resolver","origResolveRequestFn","length","isMatch","startsWith","contextOverride","unstable_conditionNames","filter","c","transformer","babelTransformerPath","reporter","userConfig","userResolveRequest","finalConfig","defaultResolveRequestFn","metroConfig","cwd","process","env","METRO_RESET_CACHE"],"sources":["../../../src/metro-config/getMetroConfigFromViteConfig.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["micromatch","projectImport","projectResolve","getTerminalReporter","patchExpoGoManifestHandlerMiddlewareWithCustomMainModuleName","getMetroConfigFromViteConfig","config","metroPluginOptions","extraConfig","root","projectRoot","mainModuleName","argv","defaultConfigOverrides","watchman","excludeModules","loadConfig","getDefaultConfig","_defaultConfig","origRewriteRequestUrl","server","rewriteRequestUrl","resolveMainModuleName","ExpoGoManifestHandlerMiddleware","default","manifestHandlerMiddleware","p","pkg","main","platform","getResolveMainModuleName","url","includes","resolvedMainModulePath","replace","defaultConfig","resolver","useWatchman","sourceExts","resolveRequest","context","moduleName","_defaultConfig_resolver","origResolveRequestFn","startsWith","contextOverride","unstable_conditionNames","filter","c","transformer","babelTransformerPath","reporter","finalConfig","length","_finalConfig_resolver","existingResolveRequest","isMatch","metroConfig","cwd"],"sources":["../../../src/metro-config/getMetroConfigFromViteConfig.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vxrn/vite-plugin-metro",
3
- "version": "1.2.8",
3
+ "version": "1.2.9",
4
4
  "sideEffects": false,
5
5
  "type": "module",
6
6
  "main": "dist/cjs",
@@ -60,7 +60,7 @@
60
60
  "@babel/core": "^7.28.5",
61
61
  "@babel/helper-plugin-utils": "^7.27.1",
62
62
  "@babel/types": "^7.28.5",
63
- "@vxrn/debug": "1.2.8",
63
+ "@vxrn/debug": "1.2.9",
64
64
  "babel-preset-expo": "*",
65
65
  "launch-editor": "^2.10.0",
66
66
  "micromatch": "^4.0.8",
@@ -91,13 +91,6 @@ export async function getMetroConfigFromViteConfig(
91
91
  const origResolveRequestFn =
92
92
  _defaultConfig?.resolver?.resolveRequest || context.resolveRequest
93
93
 
94
- // Handle excludeModules - resolve excluded modules to empty module using glob patterns
95
- if (excludeModules && excludeModules.length > 0) {
96
- if (micromatch.isMatch(moduleName, excludeModules)) {
97
- return origResolveRequestFn(context, '@vxrn/vite-plugin-metro/empty', platform)
98
- }
99
- }
100
-
101
94
  // HACK: Do not assert the "import" condition for `@babel/runtime`. This
102
95
  // is a workaround for ESM <-> CJS interop, as we need the CJS versions of
103
96
  // `@babel/runtime` helpers.
@@ -132,43 +125,40 @@ export async function getMetroConfigFromViteConfig(
132
125
  reporter: await getTerminalReporter(projectRoot),
133
126
  }
134
127
 
135
- // Apply user's defaultConfigOverrides to get the final config with user's custom resolveRequest
136
- const userConfig =
137
- typeof defaultConfigOverrides === 'function'
128
+ // Apply user's defaultConfigOverrides first
129
+ let finalConfig: MetroInputConfig = {
130
+ ...defaultConfig,
131
+ ...(typeof defaultConfigOverrides === 'function'
138
132
  ? defaultConfigOverrides(defaultConfig)
139
- : defaultConfigOverrides
140
-
141
- // Get the user's custom resolveRequest if they provided one
142
- const userResolveRequest = userConfig?.resolver?.resolveRequest
133
+ : defaultConfigOverrides),
134
+ }
143
135
 
144
- // Build the final config, wrapping resolveRequest to handle excludeModules
145
- const finalConfig: MetroInputConfig = {
146
- ...defaultConfig,
147
- ...userConfig,
148
- resolver: {
149
- ...defaultConfig.resolver,
150
- ...userConfig?.resolver,
151
- resolveRequest: (context, moduleName, platform) => {
152
- const origResolveRequestFn =
153
- _defaultConfig?.resolver?.resolveRequest || context.resolveRequest
136
+ // If excludeModules is provided, wrap the resolveRequest to handle it
137
+ if (excludeModules && excludeModules.length > 0) {
138
+ const existingResolveRequest = finalConfig.resolver?.resolveRequest
154
139
 
155
- // Handle excludeModules first - resolve excluded modules to empty module using glob patterns
156
- if (excludeModules && excludeModules.length > 0) {
140
+ finalConfig = {
141
+ ...finalConfig,
142
+ resolver: {
143
+ ...finalConfig.resolver,
144
+ resolveRequest: (context, moduleName, platform) => {
145
+ // Handle excludeModules first - resolve excluded modules to empty module using glob patterns
157
146
  if (micromatch.isMatch(moduleName, excludeModules)) {
147
+ const origResolveRequestFn =
148
+ _defaultConfig?.resolver?.resolveRequest || context.resolveRequest
158
149
  return origResolveRequestFn(context, '@vxrn/vite-plugin-metro/empty', platform)
159
150
  }
160
- }
161
151
 
162
- // If user provided their own resolveRequest, use it
163
- if (userResolveRequest) {
164
- return userResolveRequest(context, moduleName, platform)
165
- }
152
+ // Otherwise use the existing resolveRequest (which includes user overrides and @babel/runtime logic)
153
+ if (existingResolveRequest) {
154
+ return existingResolveRequest(context, moduleName, platform)
155
+ }
166
156
 
167
- // Otherwise use the default logic
168
- const defaultResolveRequestFn = defaultConfig.resolver!.resolveRequest!
169
- return defaultResolveRequestFn(context, moduleName, platform)
157
+ // Fallback to context.resolveRequest
158
+ return context.resolveRequest(context, moduleName, platform)
159
+ },
170
160
  },
171
- },
161
+ }
172
162
  }
173
163
 
174
164
  const metroConfig = await loadConfig(
@@ -1 +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"}
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,CA8J9B"}