@maka/maka-cli 5.57.0 → 5.58.0

package/README.md

@@ -10,10 +10,37 @@ NodeJS backed applications deployed to on-prem and cloud-based infrastructures.
 If you like Maka-CLI, consider supporting me at [Patreon](https://www.patreon.com/user/membership?u=110174702)! ☕️
 
 ## Installation
+
+### With Node.js
 ```
   npm i -g @maka/maka-cli
 ```
 
+### Without Node.js — standalone executable
+
+Self-contained builds that need no Node.js installed. Extract, and the binary
+inside is called `maka`. These links always resolve to the most recent
+release, so they never need updating.
+
+| Platform | Download |
+| --- | --- |
+| macOS (Apple Silicon) | [maka-macos-arm64.tar.gz](https://github.com/maka-io/maka-cli/releases/latest/download/maka-macos-arm64.tar.gz) |
+| macOS (Intel) | [maka-macos-x64.tar.gz](https://github.com/maka-io/maka-cli/releases/latest/download/maka-macos-x64.tar.gz) |
+| Linux (x64) | [maka-linux-x64.tar.gz](https://github.com/maka-io/maka-cli/releases/latest/download/maka-linux-x64.tar.gz) |
+| Linux (arm64) | [maka-linux-arm64.tar.gz](https://github.com/maka-io/maka-cli/releases/latest/download/maka-linux-arm64.tar.gz) |
+| Windows (x64) | [maka-win-x64.zip](https://github.com/maka-io/maka-cli/releases/latest/download/maka-win-x64.zip) |
+
+```
+  tar -xzf maka-macos-arm64.tar.gz     # macOS / Linux
+  chmod +x maka
+  ./maka --help
+```
+
+The first Meteor command (`maka build`, `run` or `create`) downloads the
+Meteor toolchain and a Node runtime for it into `~/.meteor/.maka/runtime/`;
+that happens once. Every other command works immediately with nothing to
+download.
+
 ## Getting Started
 ```
   maka create KickTiresApp

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.57.0",
+  "version": "5.58.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",
@@ -30,7 +30,7 @@
     "prep": " cp -R ./src/templates ./bundle/typescript/src/ && cp ./README.md ./bundle/typescript/src/ && cp ./package.json ./bundle/typescript/ && cp ./src/commands/game/sideQuest/scenes/*.json ./bundle/typescript/src/commands/game/sideQuest/scenes/ && chmod +x ./bundle/typescript/src/exec.js",
     "build:bundle": "node scripts/build-bundle.mjs",
     "test:parity": "node scripts/check-bundle-parity.mjs",
-    "package": "npm run build:bundle && pkg bundle/maka.cjs --config pkg.config.json --compress GZip --no-bytecode --public --public-packages \"*\"",
+    "package": "npm run build:bundle && node scripts/package.mjs",
     "distribute": "node scripts/distribute.mjs",
     "prepare": "husky install"
   },

package/bundle/typescript/src/README.md

@@ -10,10 +10,37 @@ NodeJS backed applications deployed to on-prem and cloud-based infrastructures.
 If you like Maka-CLI, consider supporting me at [Patreon](https://www.patreon.com/user/membership?u=110174702)! ☕️
 
 ## Installation
+
+### With Node.js
 ```
   npm i -g @maka/maka-cli
 ```
 
+### Without Node.js — standalone executable
+
+Self-contained builds that need no Node.js installed. Extract, and the binary
+inside is called `maka`. These links always resolve to the most recent
+release, so they never need updating.
+
+| Platform | Download |
+| --- | --- |
+| macOS (Apple Silicon) | [maka-macos-arm64.tar.gz](https://github.com/maka-io/maka-cli/releases/latest/download/maka-macos-arm64.tar.gz) |
+| macOS (Intel) | [maka-macos-x64.tar.gz](https://github.com/maka-io/maka-cli/releases/latest/download/maka-macos-x64.tar.gz) |
+| Linux (x64) | [maka-linux-x64.tar.gz](https://github.com/maka-io/maka-cli/releases/latest/download/maka-linux-x64.tar.gz) |
+| Linux (arm64) | [maka-linux-arm64.tar.gz](https://github.com/maka-io/maka-cli/releases/latest/download/maka-linux-arm64.tar.gz) |
+| Windows (x64) | [maka-win-x64.zip](https://github.com/maka-io/maka-cli/releases/latest/download/maka-win-x64.zip) |
+
+```
+  tar -xzf maka-macos-arm64.tar.gz     # macOS / Linux
+  chmod +x maka
+  ./maka --help
+```
+
+The first Meteor command (`maka build`, `run` or `create`) downloads the
+Meteor toolchain and a Node runtime for it into `~/.meteor/.maka/runtime/`;
+that happens once. Every other command works immediately with nothing to
+download.
+
 ## Getting Started
 ```
   maka create KickTiresApp

package/bundle/typescript/src/maka.js

@@ -63,6 +63,18 @@ void (async () => {
     }
     const argv = minimist(process.argv.slice(2));
     const args = argv._;
+    // Meteor's build system derives tool paths from where the running script
+    // lives, which a packaged executable's virtual snapshot breaks. Rather than
+    // chase those assumptions, hand the whole command to a real Node running
+    // this same CLI from disk -- see tools/sdk-loader/relocate.ts. Decided here,
+    // BEFORE any command runs, so nothing has done half its work by the time we
+    // switch processes. No-op under an npm install and inside the child.
+    const { isPackaged } = await import('./tools/sdk-loader/sdk-loader.class.js');
+    const { needsRealNode, reexecOnRealNode } = await import('./tools/sdk-loader/relocate.js');
+    if (isPackaged() && needsRealNode(args[0])) {
+        await reexecOnRealNode(process.argv.slice(2));
+        return;
+    }
     const deepCopyArgv = JSON.parse(JSON.stringify(argv));
     delete deepCopyArgv._;
     const opts = humps.camelizeKeys(deepCopyArgv);

package/bundle/typescript/src/maka.js.map

@@ -1 +1 @@
-{"version":3,"file":"maka.js","sourceRoot":"","sources":["../../../src/maka.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"maka.js","sourceRoot":"","sources":["../../../src/maka.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/tools/sdk-loader/relocate.d.ts

@@ -0,0 +1,9 @@
+/** True in the child: an ordinary Node process running the CLI out of the
+ *  runtime directory rather than out of node_modules. */
+export declare function isRelocated(): boolean;
+/** Whether this invocation drives Meteor and therefore needs a real Node.
+ *  `command` is the raw first argument, so "g:route" and "build" both work. */
+export declare function needsRealNode(command: unknown): boolean;
+/** Re-execs this command on a real Node and exits with the child's status.
+ *  Never returns. */
+export declare function reexecOnRealNode(args: string[]): Promise<never>;

package/bundle/typescript/src/tools/sdk-loader/relocate.js

@@ -0,0 +1,131 @@
+// Runs Meteor-driving commands on a real Node instead of inside the packaged
+// executable.
+//
+// THE PROBLEM. Meteor's build system computes tool paths from the location of
+// the running script. Inside a packaged executable that location is a virtual
+// snapshot, so a build plugin ends up looking for something like
+// <snapshot>/bundle/isobuild/package-source and dies. That is not one bug: it
+// is a class of them, the instances live in GENERATED plugin bundles where
+// there is nothing central to patch, and fixing them one at a time is
+// unbounded work with no way to know when you are done.
+//
+// THE FIX. Do not fight it. The executable already downloads a real Node for
+// the toolchain to spawn (runtime-fetch.ts), and the CLI is a single
+// self-contained CommonJS bundle. So for SDK-backed commands, write that
+// bundle out to a real directory and re-exec the whole CLI on the real Node.
+// Every path the toolchain derives is then an ordinary filesystem path and the
+// entire class of failures stops existing at once.
+//
+// The child is an ordinary Node process, so process.pkg is undefined there and
+// it takes the normal in-process path -- which also means it cannot recurse
+// back into here. The one thing it must be told is that it is a RELOCATED CLI
+// rather than an npm install, because those two disagree about what a missing
+// SDK means: for an npm install it is a broken install, for this it is a
+// first run that should fetch. MAKA_RELOCATED carries exactly that.
+import fs from 'fs';
+import path from 'path';
+import spawn from 'cross-spawn';
+import { Log } from '../log/log.class.js';
+import { cliVersion } from '../version/cli-version.js';
+import { runtimeDir, ensureNode } from './runtime-fetch.js';
+// The commands that reach ensureSdkInit(), and nothing else:
+//   build   -> mpi.buildViaSdk()
+//   run     -> mpi.runViaSdk()
+//   create  -> scaffold.createEmptyMeteorProject() + pkg.installMeteorPackage()
+//
+// Deliberately NOT here: test, deploy and debug go through
+// mpi.invokeMeteorCommand(), which spawns a real globally-installed `meteor`
+// binary rather than the SDK, so they already work from the executable.
+// Adding a command here that does not need it costs a process launch and a
+// slower start; omitting one that does need it fails loudly rather than
+// silently, which is the safer direction to be wrong in.
+const SDK_BACKED = new Set(['build', 'b', 'run', 'r', 'create', 'c']);
+const RELOCATED_ENV = 'MAKA_RELOCATED';
+/** True in the child: an ordinary Node process running the CLI out of the
+ *  runtime directory rather than out of node_modules. */
+export function isRelocated() {
+    return process.env[RELOCATED_ENV] === '1';
+}
+/** Whether this invocation drives Meteor and therefore needs a real Node.
+ *  `command` is the raw first argument, so "g:route" and "build" both work. */
+export function needsRealNode(command) {
+    if (typeof command !== 'string' || !command) {
+        return false;
+    }
+    return SDK_BACKED.has(command.split(':')[0]);
+}
+function cliHome() {
+    // Keyed by version so an upgraded binary never re-uses the previous
+    // release's bundle.
+    return path.join(runtimeDir(), 'cli', cliVersion());
+}
+/** Copies a directory out of the executable's snapshot onto the real disk.
+ *  read+write rather than copyFileSync: the snapshot filesystem supports
+ *  reading, but is not a real filesystem and does not implement every fs
+ *  operation. */
+function copyOut(src, dest) {
+    fs.mkdirSync(dest, { recursive: true });
+    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        const from = path.join(src, entry.name);
+        const to = path.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            copyOut(from, to);
+        }
+        else {
+            fs.writeFileSync(to, fs.readFileSync(from));
+        }
+    }
+}
+/** Writes the CLI to disk if it isn't already there, and returns the path to
+ *  the bundle to run. */
+function ensureCliOnDisk() {
+    const home = cliHome();
+    const bundle = path.join(home, 'maka.cjs');
+    // Written last, so a run interrupted mid-copy is not mistaken for a
+    // complete one on the next attempt.
+    const marker = path.join(home, '.complete');
+    if (fs.existsSync(marker) && fs.existsSync(bundle)) {
+        return bundle;
+    }
+    fs.rmSync(home, { recursive: true, force: true });
+    fs.mkdirSync(home, { recursive: true });
+    // __filename inside the executable is the snapshot path of this very
+    // bundle, and the snapshot is readable, so the CLI can copy itself out.
+    fs.writeFileSync(bundle, fs.readFileSync(__filename));
+    // The templates are the one asset not inlined into the bundle -- the
+    // scaffolder reads them off disk relative to global.MAKA_COMMAND_PATH.
+    // maka.ts probes <dir>/templates and <dir>/typescript/src/templates, so
+    // laying them out under typescript/src/ makes the child find them by the
+    // same rule the executable uses.
+    const templatesSrc = path.join(global.MAKA_COMMAND_PATH, 'templates');
+    if (fs.existsSync(templatesSrc)) {
+        copyOut(templatesSrc, path.join(home, 'typescript', 'src', 'templates'));
+    }
+    fs.writeFileSync(marker, `${cliVersion()}\n`);
+    return bundle;
+}
+/** Re-execs this command on a real Node and exits with the child's status.
+ *  Never returns. */
+export async function reexecOnRealNode(args) {
+    const node = await ensureNode();
+    const bundle = ensureCliOnDisk();
+    if (process.env.MAKA_DEV === 'True') {
+        Log.notice(`Running on ${node} from ${bundle}`);
+    }
+    const child = spawn(node, [bundle, ...args], {
+        stdio: 'inherit',
+        env: { ...process.env, [RELOCATED_ENV]: '1' },
+    });
+    const { code, signal } = await new Promise((resolve) => {
+        child.on('close', (c, s) => resolve({ code: c, signal: s }));
+        child.on('error', (e) => {
+            Log.error(`Could not start the Meteor toolchain: ${e.message}`);
+            resolve({ code: 1, signal: null });
+        });
+    });
+    // A signalled child has no exit code; report it the way a shell would so
+    // `maka run` interrupted with Ctrl-C does not look like a clean exit.
+    process.exit(signal ? 1 : code ?? 0);
+    throw new Error('unreachable');
+}
+//# sourceMappingURL=relocate.js.map

package/bundle/typescript/src/tools/sdk-loader/relocate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"relocate.js","sourceRoot":"","sources":["../../../../../src/tools/sdk-loader/relocate.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,cAAc;AACd,EAAE;AACF,8EAA8E;AAC9E,8EAA8E;AAC9E,iEAAiE;AACjE,8EAA8E;AAC9E,2EAA2E;AAC3E,sEAAsE;AACtE,wDAAwD;AACxD,EAAE;AACF,6EAA6E;AAC7E,qEAAqE;AACrE,yEAAyE;AACzE,6EAA6E;AAC7E,+EAA+E;AAC/E,mDAAmD;AACnD,EAAE;AACF,+EAA+E;AAC/E,4EAA4E;AAC5E,8EAA8E;AAC9E,8EAA8E;AAC9E,yEAAyE;AACzE,oEAAoE;AACpE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE5D,6DAA6D;AAC7D,iCAAiC;AACjC,+BAA+B;AAC/B,gFAAgF;AAChF,EAAE;AACF,2DAA2D;AAC3D,6EAA6E;AAC7E,wEAAwE;AACxE,2EAA2E;AAC3E,wEAAwE;AACxE,yDAAyD;AACzD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;AAEtE,MAAM,aAAa,GAAG,gBAAgB,CAAC;AAEvC;yDACyD;AACzD,MAAM,UAAU,WAAW;IACzB,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,GAAG,CAAC;AAC5C,CAAC;AAED;+EAC+E;AAC/E,MAAM,UAAU,aAAa,CAAC,OAAgB;IAC5C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO;IACd,oEAAoE;IACpE,oBAAoB;IACpB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACtD,CAAC;AAED;;;iBAGiB;AACjB,SAAS,OAAO,CAAC,GAAW,EAAE,IAAY;IACxC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;AACH,CAAC;AAED;yBACyB;AACzB,SAAS,eAAe;IACtB,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC3C,oEAAoE;IACpE,oCAAoC;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE5C,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAExC,qEAAqE;IACrE,wEAAwE;IACxE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;IAEtD,qEAAqE;IACrE,uEAAuE;IACvE,wEAAwE;IACxE,yEAAyE;IACzE,iCAAiC;IACjC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IACtE,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE,IAAI,CAAC,CAAC;IAC9C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;qBACqB;AACrB,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAc;IACnD,MAAM,IAAI,GAAG,MAAM,UAAU,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACpC,GAAG,CAAC,MAAM,CAAC,cAAc,IAAI,SAAS,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE;QAC3C,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE;KAC9C,CAAC,CAAC;IAEH,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,OAAO,CAEvC,CAAC,OAAO,EAAE,EAAE;QACb,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACtB,GAAG,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAChE,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,yEAAyE;IACzE,sEAAsE;IACtE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;AACjC,CAAC"}

package/bundle/typescript/src/tools/sdk-loader/sdk-loader.class.js

@@ -19,6 +19,7 @@ import { Log } from '../log/log.class.js';
 import { Actions } from '../actions/actions.class.js';
 import { sdkRange } from '../version/cli-version.js';
 import { ensureSdkInstalled, fetchedNodeBinary, ensureNode, sdkPrefixFor } from './runtime-fetch.js';
+import { isRelocated } from './relocate.js';
 // Split into parts on purpose. The packager statically scans for literal
 // specifiers inside require()/require.resolve() calls, and a single
 // '@maka/meteor-sdk' string in such a position makes it decide the entire
@@ -100,14 +101,17 @@ let fetchDeclined = false;
  *  packaged builds -- see applyExecPathOverride(). */
 export async function ensureSdkAvailable() {
     installInspectorShim();
+    yieldMainModuleToSdk();
     const existing = findSdkRoot();
     if (existing) {
         await applyExecPathOverride();
         return existing;
     }
-    if (!isPackaged()) {
+    if (!isPackaged() && !isRelocated()) {
         // An npm install with a missing dependency is a broken install, not
-        // something to paper over with a download.
+        // something to paper over with a download. The relocated child is the
+        // exception: it is this CLI running from the runtime directory on a
+        // fetched Node, where a missing SDK just means first run.
         throw new Error('@maka/meteor-sdk could not be resolved. Try reinstalling maka ' +
             '(`npm i -g @maka/maka-cli`).');
     }
@@ -131,6 +135,37 @@ export async function ensureSdkAvailable() {
     await applyExecPathOverride();
     return root;
 }
+/** Lets the SDK install its own process.mainModule shim when this CLI is
+ *  running as a CommonJS bundle.
+ *
+ *  Build plugins in the wild locate the running tool through
+ *  process.mainModule.filename and then process.mainModule.require() an
+ *  absolute path under it -- zodern:types' bundled tools-imports.js is the
+ *  known case, and it reaches for isobuild/package-source, project-context
+ *  and packaging/tropohouse. The SDK handles this: src/bootstrap.js's
+ *  ensureMainModuleShim() points a fake mainModule at its OWN tools/
+ *  directory so those lookups land on the real files.
+ *
+ *  But that shim is guarded by `if (process.mainModule) return;` -- it only
+ *  fills in the UNDEFINED case, deliberately never clobbering a real CJS main
+ *  module. An npm install has an ESM entry point, so mainModule is undefined
+ *  and the shim engages. The single-file build is CommonJS, so mainModule is
+ *  defined and points at maka.cjs, the shim declines, and every plugin then
+ *  computes <directory of maka.cjs>/isobuild/package-source and dies. That is
+ *  what made `maka build` fail from the executable -- first as
+ *  <snapshot>/bundle/isobuild/..., then, after relocating to a real Node, as
+ *  <runtime>/cli/<version>/isobuild/... The path changed; the cause did not.
+ *
+ *  Clearing it hands the decision back to the SDK, which knows where its own
+ *  tools/ lives. Preferable to fabricating a shim here, which would duplicate
+ *  that knowledge and rot the moment the SDK's layout moves. Only done for the
+ *  two CommonJS-bundle cases; an npm install is left completely alone. */
+function yieldMainModuleToSdk() {
+    if (!isPackaged() && !isRelocated()) {
+        return;
+    }
+    process.mainModule = undefined;
+}
 let inspectorShimmed = false;
 /** Satisfies `import * as inspector from 'inspector'` inside a packaged
  *  executable, where that module does not exist.

package/bundle/typescript/src/tools/sdk-loader/sdk-loader.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-loader.class.js","sourceRoot":"","sources":["../../../../../src/tools/sdk-loader/sdk-loader.class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sdk-loader.class.js","sourceRoot":"","sources":["../../../../../src/tools/sdk-loader/sdk-loader.class.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.57.0",
+  "version": "5.58.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",
@@ -30,7 +30,7 @@
     "prep": " cp -R ./src/templates ./bundle/typescript/src/ && cp ./README.md ./bundle/typescript/src/ && cp ./package.json ./bundle/typescript/ && cp ./src/commands/game/sideQuest/scenes/*.json ./bundle/typescript/src/commands/game/sideQuest/scenes/ && chmod +x ./bundle/typescript/src/exec.js",
     "build:bundle": "node scripts/build-bundle.mjs",
     "test:parity": "node scripts/check-bundle-parity.mjs",
-    "package": "npm run build:bundle && pkg bundle/maka.cjs --config pkg.config.json --compress GZip --no-bytecode --public --public-packages \"*\"",
+    "package": "npm run build:bundle && node scripts/package.mjs",
     "distribute": "node scripts/distribute.mjs",
     "prepare": "husky install"
   },