@gjsify/rolldown-plugin-gjsify 0.4.31 → 0.4.33

package/lib/app/browser.js

@@ -8,6 +8,7 @@
 import { aliasPlugin } from '../plugins/alias.js';
 import { deepkitPlugin } from '@gjsify/rolldown-plugin-deepkit';
 import blueprintPlugin from '@gjsify/vite-plugin-blueprint';
+import { getDerivedAliasesSync } from '@gjsify/resolve-npm';
 import { globToEntryPoints } from '../utils/entry-points.js';
 import { gjsImportsEmptyPlugin } from '../plugins/gjs-imports-empty.js';
 import { cssAsStringPlugin } from '../plugins/css-as-string.js';
@@ -27,7 +28,12 @@ export const setupForBrowser = async (input) => {
         assert: '@gjsify/assert',
         'node:assert': '@gjsify/assert',
     };
+    // Derived `@gjsify/<X>` aliases driven by per-package `gjsify.runtimes`
+    // triplet declarations. Merge order: derived (lowest priority) → hardcoded
+    // browser polyfills → user. Hardcoded entries WIN for the curated specifier
+    // set, preserving 100% backwards-compatible behavior.
     const aliasMap = {
+        ...getDerivedAliasesSync('browser'),
         ...browserPolyfillAliases,
         ...input.pluginOptions.aliases,
         ...input.userAliases,

package/lib/app/node.js

@@ -11,22 +11,25 @@ import { getAliasesForNode } from '../utils/alias.js';
 import { globToEntryPoints } from '../utils/entry-points.js';
 import { nodeModulesPathRewritePlugin, getBundleDirFromOutput } from '../plugins/rewrite-node-modules-paths.js';
 import { cssAsStringPlugin } from '../plugins/css-as-string.js';
+import { gjsImportsEmptyPlugin } from '../plugins/gjs-imports-empty.js';
 export const setupForNode = async (input) => {
     const userExternal = input.userExternal ?? [];
     // node-datachannel is a native C++ addon that cannot be bundled — its
     // `require('../build/Release/node_datachannel.node')` must resolve at
     // runtime against the real node_modules tree.
     //
-    // Note: Rolldown's `external` array does NOT support glob patterns the
-    // way esbuild's did (`gi://*`, `@girs/*`). We use a function predicate
-    // instead so the gi:// URI scheme and the @girs/ namespace are matched
-    // by prefix.
+    // GJS-specific specifiers (`gi://*`, `@girs/*`) are NOT externalised —
+    // they are intercepted by `gjsImportsEmptyPlugin` (added to the plugins
+    // array below) and redirected to a virtual empty ESM module. Marking them
+    // external would leave bare `import 'gi://Gio?version=2.0'` strings in the
+    // output that Node's default ESM loader rejects with
+    // `ERR_UNSUPPORTED_ESM_URL_SCHEME`. The empty-module redirect makes node
+    // bundles of cross-platform packages (which transitively import @girs/*
+    // via *.gjs.spec / direct internal imports) loadable on Node — the GJS-
+    // only code paths are still gated at runtime by `on('Gjs', …)` or by
+    // `typeof globalThis.imports !== 'undefined'` guards.
     const exactExternal = [...EXTERNALS_NODE, 'node-datachannel', ...userExternal];
     const external = (id) => {
-        if (id.startsWith('gi://'))
-            return true;
-        if (id.startsWith('@girs/'))
-            return true;
         if (exactExternal.includes(id))
             return true;
         return false;
@@ -80,6 +83,12 @@ export const setupForNode = async (input) => {
         treeshake: true,
     };
     const plugins = [
+        // gjsImportsEmptyPlugin runs in `resolveId` order: 'pre', so it
+        // intercepts `@girs/*` and `gi://*` specifiers before `aliasPlugin`
+        // (and before the default resolver tries to read the @girs/* package
+        // entry, which contains a top-level `import 'gi://...'` that Node
+        // cannot resolve). Same composition order as `app/browser.ts`.
+        gjsImportsEmptyPlugin(),
         aliasPlugin({ entries: flattenAliases(aliasMap) }),
         deepkitPlugin({ reflection: input.pluginOptions.reflection }),
         cssAsStringPlugin(),

package/lib/utils/alias.d.ts

@@ -1,5 +1,16 @@
 import type { ResolveAliasOptions } from '../types/index.js';
 export declare const setNodeAliasPrefix: (ALIASES: Record<string, string>) => Record<string, string>;
+/**
+ * Compose the alias map for a target runtime.
+ *
+ * Merge order — later entries WIN, so hardcoded `ALIASES_*` entries take
+ * precedence over derived ones. This preserves 100% backwards-compatible
+ * behavior for the curated set of bare specifiers (`webcrypto`, `assert`, …)
+ * encoded in the hardcoded maps. The derived layer fills in `@gjsify/<X>`
+ * direct-import routes for packages that have declared a `gjsify.runtimes`
+ * triplet, additively — when both sources mention the same key, hardcoded
+ * wins.
+ */
 export declare const getAliasesForGjs: (options: ResolveAliasOptions) => {
     [x: string]: string;
 };

package/lib/utils/alias.js

@@ -1,4 +1,4 @@
-import { EXTERNALS_NODE, EXTERNALS_NPM, ALIASES_GENERAL_FOR_GJS, ALIASES_NODE_FOR_GJS, ALIASES_WEB_FOR_GJS, ALIASES_GENERAL_FOR_NODE, ALIASES_GJS_FOR_NODE, ALIASES_WEB_FOR_NODE, } from '@gjsify/resolve-npm';
+import { EXTERNALS_NODE, EXTERNALS_NPM, ALIASES_GENERAL_FOR_GJS, ALIASES_NODE_FOR_GJS, ALIASES_WEB_FOR_GJS, ALIASES_GENERAL_FOR_NODE, ALIASES_GJS_FOR_NODE, ALIASES_WEB_FOR_NODE, getDerivedAliasesSync, } from '@gjsify/resolve-npm';
 export const setNodeAliasPrefix = (ALIASES) => {
     // Also resolve alias names with `node:${ALIAS}`
     for (const ALIAS in ALIASES) {
@@ -17,11 +17,33 @@ const getAliasesWebForGjs = (_options) => ALIASES_WEB_FOR_GJS;
 const getAliasesGeneralForNode = (_options) => ALIASES_GENERAL_FOR_NODE;
 const getAliasesGjsForNode = (_options) => ALIASES_GJS_FOR_NODE;
 const getAliasesWebForNode = (_options) => ALIASES_WEB_FOR_NODE;
+/**
+ * Compose the alias map for a target runtime.
+ *
+ * Merge order — later entries WIN, so hardcoded `ALIASES_*` entries take
+ * precedence over derived ones. This preserves 100% backwards-compatible
+ * behavior for the curated set of bare specifiers (`webcrypto`, `assert`, …)
+ * encoded in the hardcoded maps. The derived layer fills in `@gjsify/<X>`
+ * direct-import routes for packages that have declared a `gjsify.runtimes`
+ * triplet, additively — when both sources mention the same key, hardcoded
+ * wins.
+ */
 export const getAliasesForGjs = (options) => {
-    return { ...getAliasesGeneralForGjs(options), ...getAliasesNodeForGjs(options), ...getAliasesWebForGjs(options) };
+    return {
+        // Derived first → hardcoded overrides.
+        ...getDerivedAliasesSync('gjs'),
+        ...getAliasesGeneralForGjs(options),
+        ...getAliasesNodeForGjs(options),
+        ...getAliasesWebForGjs(options),
+    };
 };
 export const getAliasesForNode = (options) => {
-    return { ...getAliasesGeneralForNode(options), ...getAliasesGjsForNode(options), ...getAliasesWebForNode(options) };
+    return {
+        ...getDerivedAliasesSync('node'),
+        ...getAliasesGeneralForNode(options),
+        ...getAliasesGjsForNode(options),
+        ...getAliasesWebForNode(options),
+    };
 };
 /** Array of Node.js build in module names (also with node: prefix) */
 export const externalNode = [...EXTERNALS_NODE, ...EXTERNALS_NODE.map((E) => `node:${E}`)];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.4.31",
+    "version": "0.4.33",
     "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.31",
-        "@gjsify/resolve-npm": "^0.4.31",
-        "@gjsify/rolldown-plugin-deepkit": "^0.4.31",
-        "@gjsify/rolldown-plugin-pnp": "^0.4.31",
-        "@gjsify/vite-plugin-blueprint": "^0.4.31",
+        "@gjsify/console": "^0.4.33",
+        "@gjsify/resolve-npm": "^0.4.33",
+        "@gjsify/rolldown-plugin-deepkit": "^0.4.33",
+        "@gjsify/rolldown-plugin-pnp": "^0.4.33",
+        "@gjsify/vite-plugin-blueprint": "^0.4.33",
         "@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.31",
+        "@gjsify/lightningcss-native": "^0.4.33",
         "rolldown": "^1.0.0-rc.18"
     },
     "peerDependenciesMeta": {