@gjsify/rolldown-plugin-gjsify 0.52.0 → 0.54.0

package/lib/utils/scan-globals.js

@@ -126,20 +126,26 @@ export function isRegisterPathResolvable(registerPath, fromDir) {
     const canonical = resolveRegisterAlias(registerPath);
     const pkgName = packageNameFromRegisterPath(canonical);
     const parts = pkgName.split('/');
-    // Walk up the directory tree mirroring Node's module-resolution
-    // algorithm: check <dir>/node_modules/<pkg>/package.json at each level.
-    let dir = fromDir;
-    const root = dir.slice(0, dir.indexOf('/') + 1) || '/';
-    while (true) {
-        const candidate = join(dir, 'node_modules', ...parts, 'package.json');
-        if (existsSync(candidate))
-            return true;
-        if (dir === root)
-            break;
-        const parent = join(dir, '..');
-        if (parent === dir)
-            break;
-        dir = parent;
+    // Several roots when the build may take a `@gjsify/*` from beside the running CLI
+    // (`toolchainAnchor`): the resolver would rescue the import, so this gate must not
+    // drop it first — it did, and `gjsify exec` rebuilt a consumer's bin with every
+    // global skipped because the PROJECT installs no `@gjsify/*` at all.
+    for (const start of typeof fromDir === 'string' ? [fromDir] : fromDir) {
+        // Walk up the directory tree mirroring Node's module-resolution
+        // algorithm: check <dir>/node_modules/<pkg>/package.json at each level.
+        let dir = start;
+        const root = dir.slice(0, dir.indexOf('/') + 1) || '/';
+        while (true) {
+            const candidate = join(dir, 'node_modules', ...parts, 'package.json');
+            if (existsSync(candidate))
+                return true;
+            if (dir === root)
+                break;
+            const parent = join(dir, '..');
+            if (parent === dir)
+                break;
+            dir = parent;
+        }
     }
     return false;
 }

package/lib/utils/zip-path.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Does `path` run THROUGH a `.zip` archive (Yarn PnP's `.yarn/cache/<pkg>.zip/...`)?
+ *
+ * The separator is the host's as well as `/`: `relative()` and rolldown's module ids answer
+ * with `\` on win32, where a `.zip/`-only test never matched and a zip-resident module was
+ * sent down the on-disk path. `\` counts only there, because on POSIX it is a filename
+ * character. `separator` defaults to the host's; a parameter so both hosts are testable on one.
+ */
+export declare function hasZipSegment(path: string, separator?: string): boolean;

package/lib/utils/zip-path.js

@@ -0,0 +1,12 @@
+import { sep } from 'node:path';
+/**
+ * Does `path` run THROUGH a `.zip` archive (Yarn PnP's `.yarn/cache/<pkg>.zip/...`)?
+ *
+ * The separator is the host's as well as `/`: `relative()` and rolldown's module ids answer
+ * with `\` on win32, where a `.zip/`-only test never matched and a zip-resident module was
+ * sent down the on-disk path. `\` counts only there, because on POSIX it is a filename
+ * character. `separator` defaults to the host's; a parameter so both hosts are testable on one.
+ */
+export function hasZipSegment(path, separator = sep) {
+    return path.includes('.zip/') || (separator === '\\' && path.includes('.zip\\'));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.52.0",
+    "version": "0.54.0",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -25,6 +25,9 @@
         "./shims/module-resolve": {
             "default": "./lib/shims/module-resolve.js"
         },
+        "./shims/addon-resolve": {
+            "default": "./lib/shims/addon-resolve.js"
+        },
         "./shims/unicorn-magic": {
             "default": "./lib/shims/unicorn-magic.js"
         }
@@ -60,11 +63,12 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "^0.52.0",
-        "@gjsify/resolve-npm": "^0.52.0",
-        "@gjsify/rolldown-plugin-deepkit": "^0.52.0",
-        "@gjsify/rolldown-plugin-pnp": "^0.52.0",
-        "@gjsify/vite-plugin-blueprint": "^0.52.0",
+        "@gjsify/console": "^0.54.0",
+        "@gjsify/resolve-npm": "^0.54.0",
+        "@gjsify/rolldown-plugin-deepkit": "^0.54.0",
+        "@gjsify/rolldown-plugin-pnp": "^0.54.0",
+        "@gjsify/utils": "^0.54.0",
+        "@gjsify/vite-plugin-blueprint": "^0.54.0",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.17.0",
         "acorn-typescript": "^1.4.13",
@@ -74,7 +78,7 @@
         "sass": "^1.101.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "^0.52.0",
+        "@gjsify/lightningcss-native": "^0.54.0",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {
@@ -86,8 +90,8 @@
         }
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.52.0",
-        "@gjsify/unit": "^0.52.0",
+        "@gjsify/cli": "^0.54.0",
+        "@gjsify/unit": "^0.54.0",
         "@types/node": "^25.9.2",
         "rolldown": "^1.1.4",
         "typescript": "^6.0.3"