@gjsify/rolldown-plugin-gjsify 0.37.0 → 0.38.1

package/lib/app/gjs.js

@@ -104,17 +104,25 @@ export const setupForGjs = async (input) => {
         // `require('crypto')`s and cycles back through the @gjsify/crypto alias.
         resolve: {
             mainFields: format === 'esm' ? ['browser', 'module', 'main'] : ['browser', 'main', 'module'],
-            // ESM: omit 'require' — packages listing 'require' before 'import'
-            // would silently route through their CJS entry.
+            // NEITHER 'import' NOR 'require' belongs here — rolldown adds the
+            // one matching each CALL SITE, and naming either explicitly applies
+            // it to both kinds. The exports-map resolver takes the PACKAGE's
+            // first key our list contains, so `'import'` here made a require()
+            // call match an `import` key declared first, handing a CJS consumer
+            // an ESM namespace where it expects `module.exports`. MEASURED on the
+            // express showcase: `is-promise@4` declares `[{import,require,default}, …]`
+            // in that order, so `router`'s `require('is-promise')` bound
+            // `{default: fn}` and every request threw `TypeError: n is not a
+            // function` — answered 200 anyway, and express logged `err.stack`,
+            // which carries no message line on SpiderMonkey, so the flagship
+            // slide printed ~59 anonymous frames per request naming nothing.
             //
-            // `'node'` is deliberately absent. The exports-map resolver iterates
-            // the PACKAGE's keys in declaration order and takes the first one
-            // present in `conditionNames` (our order is irrelevant), so enabling
-            // `node` hands `cross-fetch-ponyfill` its Node-only entry — it
-            // imports `blobFrom`/`fileFrom` and the bundle breaks at link time.
-            // Packages that genuinely need their `node` export under GJS (so far
-            // only `unicorn-magic`'s `traversePathUp`) get an explicit alias.
-            conditionNames: format === 'esm' ? ['browser', 'import'] : ['browser', 'require', 'import'],
+            // `'node'` is absent for a different reason: it hands
+            // `cross-fetch-ponyfill` its Node-only entry, which imports
+            // `blobFrom`/`fileFrom` and breaks the bundle at link time. Packages
+            // that genuinely need their `node` export under GJS (so far only
+            // `unicorn-magic`'s `traversePathUp`) get an explicit alias.
+            conditionNames: ['browser'],
         },
         transform: {
             // GJS 1.86 / SpiderMonkey 140 ≈ firefox140.

package/lib/plugins/css-as-string.js

@@ -331,8 +331,16 @@ let _sassPromise = null;
 async function compileSass(filename) {
     if (!_sassPromise) {
         // Lazy + indirect specifier so `sass` is only resolved when a Sass file
-        // is actually imported (mirrors the lazy lightningcss backend). The
-        // `dart-sass` JS API is pure JS, so it loads under GJS + Node alike.
+        // is actually imported (mirrors the lazy lightningcss backend).
+        //
+        // NODE ONLY — this comment used to claim "loads under GJS + Node alike".
+        // Measured on 0.37.0: under GJS it rejects with `Module not found: sass` — a
+        // BARE specifier resolved at RUNTIME is what GJS's ESM loader cannot do, so
+        // `import './x.scss'` fails with UNLOADABLE_DEPENDENCY. Resolving it to a file
+        // first (`tryLoadNativeBundler`'s trick) does not help: `sass.default.js` then
+        // imports a bare `immutable`. Only INLINING dart-sass works, and 3.6 MB minified
+        // onto a 6.6 MB CLI bundle is a carrier-package decision — status/open-todos.md
+        // (#1053). dart-sass DOES run under GJS: `adwaita-web`'s `build:scss` does.
         _sassPromise = import(/* @vite-ignore */ 'sass');
     }
     try {

package/lib/plugins/process-stub.js

@@ -18,8 +18,34 @@ export const GJS_PROCESS_STUB = 'if(typeof globalThis.process==="undefined"){' +
     // perf-tracking libs, …). Build it as a named local so we can
     // attach the property before stashing it on the stub object.
     'const _h=t=>t?[0,0]:[0,0];_h.bigint=()=>0n;' +
+    // `platform`/`arch`, answered LAZILY by the same `uname -sm` probe
+    // `@gjsify/process` uses (`packages/node/process/src/internal/uname.ts`),
+    // with `@gjsify/utils`' `platform-names.ts` mapping tables inlined minimally
+    // — a banner runs before the module system exists and cannot import the
+    // canonical ones. Those two are the source of truth; keep this in step or a
+    // bundle answers differently depending on whether it pulled
+    // `@gjsify/process` in. These used to be the literals `"linux"`/`"x64"`,
+    // which is a WRONG answer on two of three OSes rather than a missing one.
+    // Lazy, so the cost falls only on a bundle that reads the field AND never
+    // loads `@gjsify/process` (whose register replaces this object): nothing is
+    // spawned at load. Windows is answered from the environment — `uname` is not
+    // on a native Windows PATH, and the env answer is exact.
+    'let _pc;const _p=()=>{if(_pc)return _pc;_pc={platform:"linux",arch:"x64"};' +
+    'try{' +
+    'if(_G.getenv("OS")==="Windows_NT"||_G.getenv("SystemRoot")){' +
+    'const a=(_G.getenv("PROCESSOR_ARCHITECTURE")||"").toLowerCase();' +
+    '_pc={platform:"win32",arch:a==="arm64"?"arm64":a==="x86"?"ia32":"x64"};return _pc}' +
+    'const _r=_G.spawn_sync(null,["uname","-sm"],null,_G.SpawnFlags.SEARCH_PATH,null);' +
+    'if(_r&&_r[0]&&_r[1]){const _t=new TextDecoder().decode(_r[1]).trim().split(/\\s+/);' +
+    'if(_t.length>1){const s=_t[0],m=_t[_t.length-1].toLowerCase();' +
+    '_pc={platform:s==="Linux"?"linux":s==="Darwin"?"darwin":/^CYGWIN/i.test(s)?"cygwin":' +
+    '/^(MINGW|MSYS|Windows)/i.test(s)?"win32":s.toLowerCase(),' +
+    'arch:m==="x86_64"||m==="amd64"?"x64":m==="aarch64"||m==="arm64"?"arm64":' +
+    '/^i[3-6]86$/.test(m)?"ia32":m.startsWith("arm")?"arm":m}}}' +
+    '}catch(e){/* no GLib spawn, or spawn refused: the linux/x64 fallback stands */}' +
+    'return _pc};' +
     'globalThis.process={' +
-    'platform:"linux",arch:"x64",version:"v20.0.0",' +
+    'get platform(){return _p().platform},get arch(){return _p().arch},version:"v20.0.0",' +
     'env:new Proxy({},{' +
     'get(_,p){return typeof p==="string"?(_G.getenv(p)??undefined):undefined},' +
     'set(_,p,v){if(typeof p==="string")_G.setenv(p,String(v),true);return true},' +

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.37.0",
+    "version": "0.38.1",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -55,11 +55,11 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "^0.37.0",
-        "@gjsify/resolve-npm": "^0.37.0",
-        "@gjsify/rolldown-plugin-deepkit": "^0.37.0",
-        "@gjsify/rolldown-plugin-pnp": "^0.37.0",
-        "@gjsify/vite-plugin-blueprint": "^0.37.0",
+        "@gjsify/console": "^0.38.1",
+        "@gjsify/resolve-npm": "^0.38.1",
+        "@gjsify/rolldown-plugin-deepkit": "^0.38.1",
+        "@gjsify/rolldown-plugin-pnp": "^0.38.1",
+        "@gjsify/vite-plugin-blueprint": "^0.38.1",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.17.0",
         "acorn-walk": "^8.3.5",
@@ -68,7 +68,7 @@
         "sass": "^1.101.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "^0.37.0",
+        "@gjsify/lightningcss-native": "^0.38.1",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {