@granite-js/mpack 0.1.29 → 0.1.31

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @granite-js/mpack
 
+## 0.1.31
+
+### Patch Changes
+
+- 9bf8b50: expose resolveRequest option
+- e957833: expose `resolver.resolverMainFields` and `resolver.unstable_conditionNames` options
+- Updated dependencies [9bf8b50]
+- Updated dependencies [e957833]
+  - @granite-js/plugin-core@0.1.31
+  - @granite-js/devtools-frontend@0.1.31
+  - @granite-js/utils@0.1.31
+
+## 0.1.30
+
+### Patch Changes
+
+- 9e9ea71: escape `from` string of alias config when creating RegExp
+  - @granite-js/devtools-frontend@0.1.30
+  - @granite-js/plugin-core@0.1.30
+  - @granite-js/utils@0.1.30
+
 ## 0.1.29
 
 ### Patch Changes

package/dist/bundler/plugins/resolvePlugin/alias/setupAliasResolver.js

@@ -83,7 +83,8 @@ function setupAliasResolver(build, aliasConfig) {
 }
 function resolveAliasConfig(build, aliasConfig) {
   const { from, to, exact } = aliasConfig;
-  const filter = new RegExp(exact ? `^${from}$` : `^${from}(?:$|/)`);
+  const escapedFrom = escapeRegExpString(from);
+  const filter = new RegExp(exact ? `^${escapedFrom}$` : `^${escapedFrom}(?:$|/)`);
   const resolver = (0, import_resolveHelpers.createNonRecursiveResolver)(build);
   const aliasResolver = (boundArgs, path2, options) => {
     const result = resolver({ ...boundArgs, path: path2 }, options);
@@ -102,6 +103,9 @@ function resolveAliasConfig(build, aliasConfig) {
   };
   return { filter, resolveAlias };
 }
+function escapeRegExpString(str) {
+  return str.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&");
+}
 function normalizeResolveResult(result) {
   if (typeof result === "string") {
     return { path: (0, import_esbuildUtils.normalizePath)(result), options: void 0 };

package/dist/metro/build.js

@@ -58,7 +58,7 @@ async function buildAll(optionsList, { config, concurrency = 2 }) {
       try {
         const buildResult = await buildImpl(config, options);
         buildResults.push(buildResult);
-      } catch {
+      } finally {
         semaphore.release();
       }
     })

package/dist/metro/enhancedResolver.d.ts

@@ -1,7 +1,6 @@
-interface CustomResolutionContext {
-    sourceExts: string[];
-    originModulePath: string;
-    preferNativePlatform?: boolean;
+import type { MetroResolutionContext } from '@granite-js/plugin-core';
+interface CreateResolverOptions {
+    conditionNames?: string[];
 }
-export declare function createResolver(rootPath: string): (context: CustomResolutionContext, request: string, platform: string | null) => any;
+export declare function createResolver(rootPath: string, options?: CreateResolverOptions): (context: MetroResolutionContext, request: string, platform: string | null) => any;
 export {};

package/dist/metro/enhancedResolver.js

@@ -51,7 +51,7 @@ const SUPPORTED_BUILTIN_FALLBACKS = {
 };
 const builtinModules = new Set(import_module.default.builtinModules);
 const resolvers = /* @__PURE__ */ new Map();
-function createResolver(rootPath) {
+function createResolver(rootPath, options) {
   function createResolverImpl(context, platform, rootPath2) {
     const baseExtensions = context.sourceExts.map((extension) => `.${extension}`);
     let finalExtensions = [...baseExtensions];
@@ -63,9 +63,9 @@ function createResolver(rootPath) {
     }
     const resolver = import_enhanced_resolve.default.create.sync({
       extensions: finalExtensions,
-      mainFields: import_constants.RESOLVER_MAIN_FIELDS,
+      mainFields: context.mainFields,
+      conditionNames: options?.conditionNames ?? [...import_constants.RESOLVER_EXPORTS_MAP_CONDITIONS, "require", "node", "default"],
       mainFiles: ["index"],
-      conditionNames: [...import_constants.RESOLVER_EXPORTS_MAP_CONDITIONS, "require", "node", "default"],
       modules: ["node_modules", import_path.default.join(rootPath2, "src")]
     });
     function resolve(context2, request) {

package/dist/metro/getMetroConfig.js

@@ -63,6 +63,9 @@ async function getMetroConfig({ rootPath }, additionalConfig) {
   const reactNativePath = import_path.default.dirname(resolveFromRoot("react-native/package.json", rootPath));
   const resolvedRootPath = await (0, import_getMonorepoRoot.getMonorepoRoot)(rootPath);
   const packageRootPath = await (0, import_utils.getPackageRoot)();
+  const resolveRequest = additionalConfig?.resolver?.resolveRequest ?? (0, import_enhancedResolver.createResolver)(rootPath, {
+    conditionNames: additionalConfig?.resolver?.conditionNames
+  });
   return (0, import_loadConfig.mergeConfig)(defaultConfig, {
     projectRoot: additionalConfig?.projectRoot || rootPath,
     watchFolders: [resolvedRootPath, packageRootPath, ...additionalConfig?.watchFolders || []],
@@ -94,7 +97,7 @@ async function getMetroConfig({ rootPath }, additionalConfig) {
       // metro
       platforms: ["android", "ios"],
       useWatchman: false,
-      resolveRequest: (0, import_enhancedResolver.createResolver)(rootPath),
+      resolveRequest,
       // metro-file-map
       sourceExts: [...import_constants.SOURCE_EXTENSIONS.map((extension) => extension.replace(/^\.?/, "")), "cjs", "mjs"],
       blockList: (0, import_exclusionList.default)(
@@ -102,7 +105,8 @@ async function getMetroConfig({ rootPath }, additionalConfig) {
       ),
       nodeModulesPaths: additionalConfig?.resolver?.nodeModulesPaths || [],
       extraNodeModules: additionalConfig?.resolver?.extraNodeModules || {},
-      disableHierarchicalLookup: additionalConfig?.resolver?.disableHierarchicalLookup
+      disableHierarchicalLookup: additionalConfig?.resolver?.disableHierarchicalLookup,
+      resolverMainFields: additionalConfig?.resolver?.resolverMainFields ?? import_constants.RESOLVER_MAIN_FIELDS
     },
     serializer: {
       getModulesRunBeforeMainModule: () => [resolveFromRoot("react-native/Libraries/Core/InitializeCore", rootPath)],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/mpack",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "A bundler for Granite apps",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -89,9 +89,9 @@
     "@babel/traverse": "^7.14.0",
     "@babel/types": "^7.0.0",
     "@fastify/static": "7.0.1",
-    "@granite-js/devtools-frontend": "0.1.29",
-    "@granite-js/plugin-core": "0.1.29",
-    "@granite-js/utils": "0.1.29",
+    "@granite-js/devtools-frontend": "0.1.31",
+    "@granite-js/plugin-core": "0.1.31",
+    "@granite-js/utils": "0.1.31",
     "@inquirer/prompts": "^7.2.3",
     "@react-native-community/cli-plugin-metro": "11.3.7",
     "@react-native-community/cli-server-api": "11.3.7",