@gjsify/rolldown-plugin-gjsify 0.4.26 → 0.4.28

package/lib/index.d.ts

@@ -9,7 +9,7 @@ export type { ProcessStubPluginOptions } from './plugins/process-stub.js';
 export { cssAsStringPlugin } from './plugins/css-as-string.js';
 export { textLoaderPlugin } from './plugins/text-loader.js';
 export type { TextLoaderPluginOptions } from './plugins/text-loader.js';
-export { shebangPlugin, GJS_SHEBANG, expandEnvTemplate, resolveShebangLine } from './plugins/shebang.js';
+export { shebangPlugin, GJS_SHEBANG, NODE_SHEBANG, expandEnvTemplate, resolveShebangLine } from './plugins/shebang.js';
 export type { ShebangPluginOptions } from './plugins/shebang.js';
 export { gjsImportsEmptyPlugin } from './plugins/gjs-imports-empty.js';
 export * from './plugin.js';

package/lib/index.js

@@ -7,7 +7,7 @@ export { REWRITE_FILTER, getBundleDirFromOutput, rewriteContents, shouldRewrite,
 export { processStubPlugin, GJS_PROCESS_STUB, composeBanner } from './plugins/process-stub.js';
 export { cssAsStringPlugin } from './plugins/css-as-string.js';
 export { textLoaderPlugin } from './plugins/text-loader.js';
-export { shebangPlugin, GJS_SHEBANG, expandEnvTemplate, resolveShebangLine } from './plugins/shebang.js';
+export { shebangPlugin, GJS_SHEBANG, NODE_SHEBANG, expandEnvTemplate, resolveShebangLine } from './plugins/shebang.js';
 export { gjsImportsEmptyPlugin } from './plugins/gjs-imports-empty.js';
 export * from './plugin.js';
 import { gjsifyPlugin } from './plugin.js';

package/lib/plugins/gjs-imports-empty.js

@@ -6,6 +6,14 @@
 // Marking them external would leave bare specifiers in the bundle that the
 // browser cannot resolve at runtime; instead we resolve them to a virtual
 // empty ESM module so the bundle is self-contained.
+//
+// Portability note: the `filter: { id: ... }` below is a Rolldown fast-path
+// — Rolldown pre-filters which specifiers reach `handler`. Under Vite (which
+// also runs Rolldown for `build` but does NOT honor the Rolldown-specific
+// hook-level `filter` in every code path, e.g. esbuild dep prebundle or the
+// dev server) the handler may receive ALL ids. The internal guard below makes
+// the plugin correct regardless of whether the filter pre-filtered — it is
+// the load-bearing check; the `filter` is a defense-in-depth optimization.
 const GJSIMPORTS_VIRTUAL_ID = '\0gjsify-empty-gjs-import';
 export function gjsImportsEmptyPlugin() {
     return {
@@ -13,7 +21,13 @@ export function gjsImportsEmptyPlugin() {
         resolveId: {
             order: 'pre',
             filter: { id: /^(@girs\/|gi:\/\/)/ },
-            handler(_source) {
+            handler(source) {
+                // Internal guard: do not rely solely on the Rolldown `filter`
+                // above (it may not pre-filter under Vite). Only intercept
+                // `@girs/*` and `gi://*` specifiers; let everything else fall
+                // through to the default resolver chain.
+                if (!/^(@girs\/|gi:\/\/)/.test(source))
+                    return null;
                 return { id: GJSIMPORTS_VIRTUAL_ID };
             },
         },

package/lib/plugins/shebang.d.ts

@@ -1,5 +1,6 @@
 import type { Plugin } from 'rolldown';
 export declare const GJS_SHEBANG = "#!/usr/bin/env -S gjs -m";
+export declare const NODE_SHEBANG = "#!/usr/bin/env node";
 export interface ShebangPluginOptions {
     enabled?: boolean;
     /** Override the shebang line. Defaults to `GJS_SHEBANG`. */
@@ -21,12 +22,16 @@ export declare function expandEnvTemplate(input: string, env?: Record<string, st
  * that should be prepended to the bundle (without trailing newline), or
  * `null` when shebang injection is disabled.
  *
- *   `true`            → default GJS shebang
+ *   `true`            → `defaultLine` (the target's default shebang)
  *   `false|undefined` → null (disabled)
  *   `"…"`             → string with `${env:NAME[:-default]}` expanded
  *
+ * `defaultLine` lets the caller pick the per-target default that `true`
+ * resolves to — `GJS_SHEBANG` for `--app gjs` (the default), `NODE_SHEBANG`
+ * for `--app node`. An explicit string value always wins over the default.
+ *
  * If the resolved string does not start with `#!`, it is prefixed
  * automatically so users can write `"shebang": "/usr/bin/gjs -m"` instead
  * of `"#!/usr/bin/gjs -m"`.
  */
-export declare function resolveShebangLine(value: boolean | string | undefined): string | null;
+export declare function resolveShebangLine(value: boolean | string | undefined, defaultLine?: string): string | null;

package/lib/plugins/shebang.js

@@ -6,6 +6,7 @@
 // the `#` character is only valid as the very first byte of the file under
 // SpiderMonkey 128+.
 export const GJS_SHEBANG = '#!/usr/bin/env -S gjs -m';
+export const NODE_SHEBANG = '#!/usr/bin/env node';
 /**
  * Strip a leading `#!…\n` from a source module. Rolldown preserves input
  * shebangs verbatim, which ends up embedded mid-chunk after our process-stub
@@ -67,19 +68,23 @@ export function expandEnvTemplate(input, env = process.env) {
  * that should be prepended to the bundle (without trailing newline), or
  * `null` when shebang injection is disabled.
  *
- *   `true`            → default GJS shebang
+ *   `true`            → `defaultLine` (the target's default shebang)
  *   `false|undefined` → null (disabled)
  *   `"…"`             → string with `${env:NAME[:-default]}` expanded
  *
+ * `defaultLine` lets the caller pick the per-target default that `true`
+ * resolves to — `GJS_SHEBANG` for `--app gjs` (the default), `NODE_SHEBANG`
+ * for `--app node`. An explicit string value always wins over the default.
+ *
  * If the resolved string does not start with `#!`, it is prefixed
  * automatically so users can write `"shebang": "/usr/bin/gjs -m"` instead
  * of `"#!/usr/bin/gjs -m"`.
  */
-export function resolveShebangLine(value) {
+export function resolveShebangLine(value, defaultLine = GJS_SHEBANG) {
     if (value === undefined || value === false)
         return null;
     if (value === true)
-        return GJS_SHEBANG;
+        return defaultLine;
     const expanded = expandEnvTemplate(value);
     if (!expanded.trim())
         return null;

package/package.json

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