@gjsify/rolldown-plugin-gjsify 0.3.20 → 0.3.21

package/lib/plugins/alias.js

@@ -13,6 +13,13 @@
 //   - exact string match (no prefix-aware semantics needed at this layer)
 //   - `node:<name>` specifiers map to the same target as `<name>`
 //     (handled in the alias-builder helpers, not here).
+//
+// `extraOptions.kind` is forwarded to `this.resolve()` so package.json
+// `exports` conditions ("import" / "require") match the original call site.
+// Without this, a CJS `require('stream')` in a bundled npm package would
+// resolve through the "import" condition (Rolldown's default), bypassing the
+// `cjs-compat.cjs` shim that unwraps named-export ESM modules to their
+// constructor — breaking `util.inherits(Child, Stream)` patterns.
 export function aliasPlugin(options) {
     const entries = options.entries;
     const keys = Object.keys(entries);
@@ -20,7 +27,7 @@ export function aliasPlugin(options) {
         name: 'gjsify-alias',
         resolveId: {
             order: 'pre',
-            async handler(source, importer) {
+            async handler(source, importer, extraOptions) {
                 if (!Object.prototype.hasOwnProperty.call(entries, source)) {
                     return null;
                 }
@@ -31,6 +38,7 @@ export function aliasPlugin(options) {
                     return null;
                 const resolved = await this.resolve(target, importer, {
                     skipSelf: true,
+                    kind: extraOptions?.kind,
                 });
                 if (resolved !== null) {
                     return resolved;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/rolldown-plugin-gjsify",
-  "version": "0.3.20",
+  "version": "0.3.21",
   "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
   "type": "module",
   "main": "lib/index.js",
@@ -42,10 +42,10 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@gjsify/resolve-npm": "^0.3.20",
-    "@gjsify/rolldown-plugin-deepkit": "^0.3.20",
-    "@gjsify/rolldown-plugin-pnp": "^0.3.20",
-    "@gjsify/vite-plugin-blueprint": "^0.3.20",
+    "@gjsify/resolve-npm": "^0.3.21",
+    "@gjsify/rolldown-plugin-deepkit": "^0.3.21",
+    "@gjsify/rolldown-plugin-pnp": "^0.3.21",
+    "@gjsify/vite-plugin-blueprint": "^0.3.21",
     "@rollup/pluginutils": "^5.3.0",
     "acorn": "^8.16.0",
     "acorn-walk": "^8.3.5",

package/src/plugins/alias.ts

@@ -13,6 +13,13 @@
 //   - exact string match (no prefix-aware semantics needed at this layer)
 //   - `node:<name>` specifiers map to the same target as `<name>`
 //     (handled in the alias-builder helpers, not here).
+//
+// `extraOptions.kind` is forwarded to `this.resolve()` so package.json
+// `exports` conditions ("import" / "require") match the original call site.
+// Without this, a CJS `require('stream')` in a bundled npm package would
+// resolve through the "import" condition (Rolldown's default), bypassing the
+// `cjs-compat.cjs` shim that unwraps named-export ESM modules to their
+// constructor — breaking `util.inherits(Child, Stream)` patterns.
 
 import type { Plugin } from 'rolldown';
 
@@ -28,7 +35,7 @@ export function aliasPlugin(options: AliasPluginOptions): Plugin {
         name: 'gjsify-alias',
         resolveId: {
             order: 'pre' as const,
-            async handler(source, importer) {
+            async handler(source, importer, extraOptions) {
                 if (!Object.prototype.hasOwnProperty.call(entries, source)) {
                     return null;
                 }
@@ -39,6 +46,7 @@ export function aliasPlugin(options: AliasPluginOptions): Plugin {
 
                 const resolved = await this.resolve(target, importer, {
                     skipSelf: true,
+                    kind: extraOptions?.kind,
                 });
                 if (resolved !== null) {
                     return resolved;