@gjsify/rolldown-plugin-gjsify 0.4.19 → 0.4.21

package/lib/utils/auto-globals.d.ts

@@ -64,8 +64,20 @@ export interface AnalysisOptions {
  * Build a `gjsifyPlugin` for the analyser to insert into the plugin array.
  * Late-imported via dynamic `await import()` to break the cyclic dep
  * between this file and `../plugin.ts`.
+ *
+ * Returns either the plugin array directly (legacy form) or the full
+ * orchestrator config `{ options, plugins }`. The latter shape lets
+ * `detectAutoGlobals` reuse the orchestrator's `resolve.conditionNames` /
+ * `mainFields` / `external` / `treeshake` settings for the in-memory
+ * analysis bundle — without that, native-rolldown and npm-rolldown default
+ * to different module-resolution conditions and the bundled output (and
+ * therefore the detected free-global set) diverges between engines.
  */
-type GjsifyPluginFactory = (options: PluginOptions) => RolldownPluginOption | Promise<RolldownPluginOption>;
+type GjsifyFactoryReturn = RolldownPluginOption | {
+    options: InputOptions;
+    plugins: RolldownPluginOption[];
+};
+type GjsifyPluginFactory = (options: PluginOptions) => GjsifyFactoryReturn | Promise<GjsifyFactoryReturn>;
 /**
  * Run an iterative Rolldown build (in-memory) with acorn-based global
  * detection. Each pass uses the globals discovered by the previous pass,

package/lib/utils/auto-globals.js

@@ -70,6 +70,9 @@ function detectedToRegisterPaths(detected) {
     }
     return paths;
 }
+function isFullConfig(v) {
+    return v !== null && typeof v === 'object' && !Array.isArray(v) && 'plugins' in v && 'options' in v;
+}
 /**
  * Run an iterative Rolldown build (in-memory) with acorn-based global
  * detection. Each pass uses the globals discovered by the previous pass,
@@ -105,10 +108,26 @@ export async function detectAutoGlobals(analysisOptions, pluginOptions, gjsifyPl
         return name !== 'gjsify' && name !== 'gjsify-orchestrator';
     });
     for (let iteration = 1; iteration <= MAX_ITERATIONS; iteration++) {
-        const gjsifyInstance = await gjsifyPluginFactory({
+        const factoryResult = await gjsifyPluginFactory({
             ...pluginOptions,
             autoGlobalsInject: currentInject,
         });
+        // Two factory shapes are supported: a plain plugin array (legacy)
+        // or the orchestrator config `{ options, plugins }`. The latter
+        // gives auto-globals access to the per-app `resolve.conditionNames`
+        // / `mainFields` / `external` / `treeshake` settings — without
+        // these, native-rolldown defaults to a different module-resolution
+        // condition set than npm-rolldown, packages resolve to different
+        // entries, and the detected global set diverges between engines.
+        let gjsifyInstance;
+        let orchestratorOptions;
+        if (isFullConfig(factoryResult)) {
+            orchestratorOptions = factoryResult.options;
+            gjsifyInstance = factoryResult.plugins;
+        }
+        else {
+            gjsifyInstance = factoryResult;
+        }
         // The auto-globals inject stub is a side-effect-only ESM file that
         // imports `<pkg>/register/<feature>` paths. Rolldown's `transform.inject`
         // is the source-AST per-identifier rewrite we MUST NOT use (see
@@ -119,14 +138,30 @@ export async function detectAutoGlobals(analysisOptions, pluginOptions, gjsifyPl
         const inputWithInject = currentInject
             ? appendInjectAsEntry(analysisOptions.input, currentInject)
             : analysisOptions.input;
+        // Merge resolve + external + transform from the orchestrator's
+        // options so the analysis bundle goes through the same module
+        // resolution as the final build. Analysis-side overrides
+        // (`analysisOptions.*`) win when explicitly set.
+        const mergedResolve = analysisOptions.resolve ?? orchestratorOptions?.resolve;
+        const mergedExternal = analysisOptions.external ?? orchestratorOptions?.external;
+        const mergedTransform = analysisOptions.transform ?? orchestratorOptions?.transform;
+        const orchTreeshake = orchestratorOptions?.treeshake;
+        // Inline-collect both halves of the plugin chain in their existing
+        // shape: caller plugins first (PnP, user text-loaders), then the
+        // gjsify chain (which may be either a single RolldownPluginOption
+        // or an array of them depending on the factory shape).
+        const gjsifyPluginsArray = Array.isArray(gjsifyInstance)
+            ? gjsifyInstance
+            : [gjsifyInstance];
         const chunkCodes = await bundler({
             rolldownInput: {
                 input: inputWithInject,
-                external: analysisOptions.external,
-                resolve: analysisOptions.resolve,
-                transform: analysisOptions.transform,
-                plugins: [...callerPlugins, gjsifyInstance],
+                external: mergedExternal,
+                resolve: mergedResolve,
+                transform: mergedTransform,
+                plugins: [...callerPlugins, ...gjsifyPluginsArray],
                 logLevel: 'silent',
+                ...(orchTreeshake !== undefined ? { treeshake: orchTreeshake } : {}),
             },
             format: analysisOptions.format ?? 'esm',
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.4.19",
+    "version": "0.4.21",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -45,11 +45,11 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "^0.4.19",
-        "@gjsify/resolve-npm": "^0.4.19",
-        "@gjsify/rolldown-plugin-deepkit": "^0.4.19",
-        "@gjsify/rolldown-plugin-pnp": "^0.4.19",
-        "@gjsify/vite-plugin-blueprint": "^0.4.19",
+        "@gjsify/console": "^0.4.21",
+        "@gjsify/resolve-npm": "^0.4.21",
+        "@gjsify/rolldown-plugin-deepkit": "^0.4.21",
+        "@gjsify/rolldown-plugin-pnp": "^0.4.21",
+        "@gjsify/vite-plugin-blueprint": "^0.4.21",
         "@rollup/pluginutils": "^5.3.0",
         "acorn": "^8.16.0",
         "acorn-walk": "^8.3.5",
@@ -57,7 +57,7 @@
         "lightningcss": "^1.32.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "^0.4.19",
+        "@gjsify/lightningcss-native": "^0.4.21",
         "rolldown": "^1.0.0-rc.18"
     },
     "peerDependenciesMeta": {