@granite-js/mpack 1.0.24 → 1.0.26

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @granite-js/mpack
 
+## 1.0.26
+
+### Patch Changes
+
+- b50c12f: propagate esbuild resolve result options in alias resolver
+- 4acc9d6: Add INTERNAL\_\_esbuildOptions to allow dynamic configuration of esbuild build options.
+- Updated dependencies [b50c12f]
+- Updated dependencies [4acc9d6]
+  - @granite-js/plugin-core@1.0.26
+  - @granite-js/utils@1.0.26
+
+## 1.0.25
+
+### Patch Changes
+
+- d44c0b0: export withIO API
+- Updated dependencies [d44c0b0]
+  - @granite-js/plugin-core@1.0.25
+  - @granite-js/utils@1.0.25
+
 ## 1.0.24
 
 ### Patch Changes

package/dist/bundler/Bundler.js

@@ -66,7 +66,8 @@ class Bundler {
   async build(options) {
     const { withDispose = true } = options ?? {};
     if (this.esbuildContext == null) {
-      this.esbuildContext = await esbuild.context(this.getBaseBuildOptions());
+      const buildOptions = await this.getBaseBuildOptions();
+      this.esbuildContext = await esbuild.context(buildOptions);
     }
     if (this.status === "prepared" || this.status === "building") {
       this.bundleTask?.abort();
@@ -97,8 +98,8 @@ ${error.stack ?? error.message}`);
       process.exit(1);
     });
   }
-  getBaseBuildOptions() {
-    const { rootDir, metafile, buildConfig } = this.config;
+  async getBaseBuildOptions() {
+    const { rootDir, metafile, dev, buildConfig } = this.config;
     const { platform, entry, outfile = "bundle.js", esbuild: esbuild2 = {} } = buildConfig;
     const { prelude: _, ...esbuildOptions } = esbuild2;
     const platforms = [platform, "native", "react-native"];
@@ -109,7 +110,7 @@ ${error.stack ?? error.message}`);
       ...supportedExtensions
     ].flat();
     this.setupEnvironment();
-    return {
+    const baseBuildOptions = {
       entryPoints: [path.resolve(rootDir, entry)],
       outfile: path.resolve(rootDir, outfile),
       sourcemap: true,
@@ -165,6 +166,8 @@ ${error.stack ?? error.message}`);
         ...esbuildOptions?.plugins ?? []
       ].filter(import_es_toolkit.isNotNil)
     };
+    const buildOptions = buildConfig.INTERNAL__esbuildOptions ? await buildConfig.INTERNAL__esbuildOptions({ dev, platform }, baseBuildOptions) : baseBuildOptions;
+    return buildOptions;
   }
   setupEnvironment() {
     const envString = this.config.dev ?? true ? "development" : "production";

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

@@ -50,15 +50,9 @@ function setupAliasResolver(build, aliasConfig) {
       const trace = import_performance.Performance.trace("alias-resolver", {
         detail: { pattern: filter, path: args.path }
       });
-      const defaultResolveOptions = {
-        resolveDir: args.resolveDir,
-        importer: args.importer,
-        kind: args.kind,
-        with: args.with
-      };
       const resolveResult = await resolveAlias(args);
       const resolvePath = resolveResult.path;
-      const resolveOptions = { ...defaultResolveOptions, ...resolveResult.options ?? {} };
+      const resolveOptions = toResolveOptions(args, resolveResult);
       const cacheKey = `${resolveOptions.kind}:${resolveOptions.resolveDir}:${resolvePath}`;
       if (resolveResultCache.has(cacheKey)) {
         trace.stop({ detail: { cacheHit: true } });
@@ -67,13 +61,23 @@ function setupAliasResolver(build, aliasConfig) {
       if (import_path.default.isAbsolute(resolvePath)) {
         trace.stop({ detail: { isAbsolute: true } });
         const result2 = { path: resolvePath };
+        applyOnResolveResultOptions(result2, resolveResult);
         resolveResultCache.set(cacheKey, result2);
         return result2;
       }
-      const pathOverriddenArgs = { ...args, path: resolvePath };
+      const pathOverriddenArgs = {
+        path: resolvePath,
+        importer: args.importer,
+        namespace: args.namespace,
+        resolveDir: args.resolveDir,
+        kind: args.kind,
+        pluginData: args.pluginData,
+        with: args.with
+      };
       const result = await resolver(pathOverriddenArgs, resolveOptions);
       if (result) {
         trace.stop({ detail: { cacheHit: false, isAbsolute: false } });
+        applyOnResolveResultOptions(result, resolveResult);
         resolveResultCache.set(cacheKey, result);
         return result;
       }
@@ -86,8 +90,19 @@ function resolveAliasConfig(build, aliasConfig) {
   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);
+  const aliasResolver = (args, path2, options) => {
+    const result = resolver(
+      {
+        path: path2,
+        importer: args.importer,
+        namespace: args.namespace,
+        resolveDir: args.resolveDir,
+        kind: args.kind,
+        pluginData: args.pluginData,
+        with: args.with
+      },
+      options
+    );
     (0, import_es_toolkit.assert)(result, "resolver should return result");
     return result;
   };
@@ -108,10 +123,49 @@ function escapeRegExpString(str) {
 }
 function normalizeResolveResult(result) {
   if (typeof result === "string") {
-    return { path: (0, import_esbuildUtils.normalizePath)(result), options: void 0 };
+    return { path: (0, import_esbuildUtils.normalizePath)(result) };
+  }
+  return result;
+}
+function toResolveOptions(args, result) {
+  return {
+    resolveDir: result.resolveDir ?? args.resolveDir,
+    importer: result.importer ?? args.importer,
+    kind: result.kind ?? args.kind,
+    with: result.with ?? args.with
+  };
+}
+function applyOnResolveResultOptions(target, source) {
+  if (source.pluginName !== void 0) {
+    target.pluginName = source.pluginName;
+  }
+  if (source.errors !== void 0) {
+    target.errors = source.errors;
+  }
+  if (source.warnings !== void 0) {
+    target.warnings = source.warnings;
+  }
+  if (source.external !== void 0) {
+    target.external = source.external;
+  }
+  if (source.sideEffects !== void 0) {
+    target.sideEffects = source.sideEffects;
+  }
+  if (source.namespace !== void 0) {
+    target.namespace = source.namespace;
+  }
+  if (source.suffix !== void 0) {
+    target.suffix = source.suffix;
+  }
+  if (source.pluginData !== void 0) {
+    target.pluginData = source.pluginData;
+  }
+  if (source.watchFiles !== void 0) {
+    target.watchFiles = source.watchFiles;
+  }
+  if (source.watchDirs !== void 0) {
+    target.watchDirs = source.watchDirs;
   }
-  const { path: path2, ...options } = result;
-  return { path: path2, options };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/testing/buildWithEsbuild.d.ts

@@ -1,3 +1,6 @@
 import type { BuildConfig } from '@granite-js/plugin-core';
 import * as esbuild from 'esbuild';
-export declare function buildWithEsbuild(buildConfig: BuildConfig, options?: esbuild.BuildOptions): Promise<string>;
+export type BuildWithEsbuildResult = esbuild.BuildResult & {
+    readonly code: string;
+};
+export declare function buildWithEsbuild(buildConfig: BuildConfig, options?: esbuild.BuildOptions): Promise<BuildWithEsbuildResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/mpack",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "A bundler for Granite apps",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -92,8 +92,8 @@
     "@babel/traverse": "7.28.5",
     "@babel/types": "7.28.5",
     "@fastify/middie": "8.3.0",
-    "@granite-js/plugin-core": "1.0.24",
-    "@granite-js/utils": "1.0.24",
+    "@granite-js/plugin-core": "1.0.26",
+    "@granite-js/utils": "1.0.26",
     "@react-native-community/cli-plugin-metro": "11.3.7",
     "@react-native-community/cli-server-api": "11.3.7",
     "@react-native-community/cli-tools": "11.3.7",

package/src/bundler/plugins/resolvePlugin/__tests__/fixtures/resolver-results/foo.d.ts

@@ -0,0 +1 @@
+export const foo: string;