@gjsify/rolldown-plugin-gjsify 0.64.1-next.243 → 0.64.1-next.244

package/lib/plugins/unresolved-workspace-import.d.ts

@@ -47,6 +47,19 @@ export interface WorkspaceImportGuardOptions {
      * `@gjsify/tsc/bundle` from the project first and the running CLI second for
      * exactly this reason; `tests/e2e/node-free-bootstrap` states that invariant.
      *
+     * TWO PROBES, in order. First the anchor itself. If that returns null, the
+     * `@gjsify/node-polyfills` package.json as seen from the anchor, used as the
+     * importer of a third resolve. The CLI does not depend on `@gjsify/module`,
+     * `fs`, `path`… directly: `@gjsify/node-polyfills` is the dependency that
+     * declares every Node substitution. A full install hoists them to the root,
+     * where the CLI file sees them by accident; a focused or partial install
+     * (`gjsify install --focus`, version conflicts) leaves them nested under
+     * `node_modules/@gjsify/node-polyfills/node_modules`, invisible from the CLI
+     * file. Measured: Learn6502's Flatpak build could not bundle `@mdx-js/rollup`
+     * (`cannot resolve @gjsify/module`, the substitution for `node:module`).
+     * `@gjsify/web-polyfills` is not a probe: the CLI depends on it directly, so
+     * the browser target's substitutions already resolve from the anchor.
+     *
      * PROJECT FIRST, ALWAYS: consulted only after normal resolution returns
      * null, so a workspace that HAS the package keeps using it and nothing about
      * a warm tree changes. A project resolve that ERRORED is not a null and is

package/lib/plugins/unresolved-workspace-import.js

@@ -24,6 +24,7 @@ import { dirname } from 'node:path';
 const OWN_PROBE = 'gjsify-unresolved-workspace-import/probe';
 /** Bare `@gjsify/*` package specifier — the workspace edge this guard protects. */
 const WORKSPACE_SCOPE = '@gjsify/';
+const NODE_POLYFILLS = '@gjsify/node-polyfills';
 /**
  * How many reverse-looked-up source specifiers the error may name before the
  * list stops being evidence and becomes noise. A per-builtin target inverts to
@@ -278,11 +279,19 @@ export function unresolvedWorkspaceImportPlugin(options) {
         // package, and rescuing there would turn "project first, always" into
         // "project first unless the project errors".
         if (resolverFailure === undefined && toolchainAnchor !== undefined) {
-            const fromToolchain = await this.resolve(verdict.candidate, toolchainAnchor, {
-                skipSelf: true,
-                kind,
-                custom: { [OWN_PROBE]: true },
-            });
+            const probe = { skipSelf: true, kind, custom: { [OWN_PROBE]: true } };
+            let fromToolchain = await this.resolve(verdict.candidate, toolchainAnchor, probe);
+            let foundVia = toolchainAnchor;
+            if (!fromToolchain) {
+                // Second probe, from `@gjsify/node-polyfills` — see `toolchainAnchor`.
+                // `package.json` is the one subpath it always exports, so it names the
+                // package's real install directory whatever the layout.
+                const polyfills = await this.resolve(`${NODE_POLYFILLS}/package.json`, toolchainAnchor, probe);
+                if (polyfills) {
+                    fromToolchain = await this.resolve(verdict.candidate, polyfills.id, probe);
+                    foundVia = polyfills.id;
+                }
+            }
             if (fromToolchain) {
                 // The one visible trace that this artifact is MIXED — some of its
                 // `@gjsify/*` from the project, this one from the CLI's own
@@ -292,7 +301,7 @@ export function unresolvedWorkspaceImportPlugin(options) {
                 // `resolvedCache`: one line per (candidate, importer dir, kind).
                 this.warn(`gjsify: \`${verdict.candidate}\` did not resolve from the project ` +
                     `(imported by ${importer ?? '<entry>'}) — using the copy installed beside the ` +
-                    `running CLI (${toolchainAnchor}). Build the workspace package to use the ` +
+                    `running CLI (${foundVia}). Build the workspace package to use the ` +
                     `project's own copy.`);
                 resolvedCache.set(key, fromToolchain);
                 return fromToolchain;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.64.1-next.243",
+    "version": "0.64.1-next.244",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -63,12 +63,12 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "0.64.1-next.243",
-        "@gjsify/resolve-npm": "0.64.1-next.243",
-        "@gjsify/rolldown-plugin-deepkit": "0.64.1-next.243",
-        "@gjsify/rolldown-plugin-pnp": "0.64.1-next.243",
-        "@gjsify/utils": "0.64.1-next.243",
-        "@gjsify/vite-plugin-blueprint": "0.64.1-next.243",
+        "@gjsify/console": "0.64.1-next.244",
+        "@gjsify/resolve-npm": "0.64.1-next.244",
+        "@gjsify/rolldown-plugin-deepkit": "0.64.1-next.244",
+        "@gjsify/rolldown-plugin-pnp": "0.64.1-next.244",
+        "@gjsify/utils": "0.64.1-next.244",
+        "@gjsify/vite-plugin-blueprint": "0.64.1-next.244",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.17.0",
         "acorn-typescript": "^1.4.13",
@@ -78,7 +78,7 @@
         "sass": "^1.101.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "0.64.1-next.243",
+        "@gjsify/lightningcss-native": "0.64.1-next.244",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {
@@ -90,8 +90,8 @@
         }
     },
     "devDependencies": {
-        "@gjsify/cli": "0.64.1-next.243",
-        "@gjsify/unit": "0.64.1-next.243",
+        "@gjsify/cli": "0.64.1-next.244",
+        "@gjsify/unit": "0.64.1-next.244",
         "@types/node": "^25.9.2",
         "rolldown": "^1.1.4",
         "typescript": "^6.0.3"
@@ -104,5 +104,5 @@
             "win32": "supported"
         }
     },
-    "gitHead": "f88c7b1074d454e211094963a9f4dc7d0982bf32"
+    "gitHead": "9a6ca179c1a74477f23791c5b8f6d5a7bffaee61"
 }