@maka/maka-cli 5.97.0 → 5.102.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundle/typescript/package.json +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/sheet.d.ts +9 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/sheet.js +33 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/sheet.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/factories/chargen-factory.js +16 -2
- package/bundle/typescript/src/commands/game/sideQuest/factories/chargen-factory.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/game.js +29 -0
- package/bundle/typescript/src/commands/game/sideQuest/game.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/models/player.d.ts +9 -0
- package/bundle/typescript/src/commands/game/sideQuest/models/player.js +27 -1
- package/bundle/typescript/src/commands/game/sideQuest/models/player.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/types/save-file.d.ts +5 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/condition-report.d.ts +6 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/condition-report.js +60 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/condition-report.js.map +1 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/web-character-generator.d.ts +12 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/web-character-generator.js +16 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/web-character-generator.js.map +1 -1
- package/bundle/typescript/src/commands/update.js +4 -2
- package/bundle/typescript/src/commands/update.js.map +1 -1
- package/bundle/typescript/src/tools/self-update/binary-install.d.ts +138 -36
- package/bundle/typescript/src/tools/self-update/binary-install.js +243 -43
- package/bundle/typescript/src/tools/self-update/binary-install.js.map +1 -1
- package/bundle/typescript/src/tools/self-update/update-maka.d.ts +1 -0
- package/bundle/typescript/src/tools/self-update/update-maka.js +289 -16
- package/bundle/typescript/src/tools/self-update/update-maka.js.map +1 -1
- package/package.json +1 -1
|
@@ -20,11 +20,27 @@ import { cliVersion } from '../version/cli-version.js';
|
|
|
20
20
|
*/
|
|
21
21
|
export async function updateMakaCli(opts = {}) {
|
|
22
22
|
const current = cliVersion();
|
|
23
|
+
// Asked before anything else, including the network: the two flags name
|
|
24
|
+
// opposite end states, so there is no reading of "both" that is not a
|
|
25
|
+
// mistake, and finding that out after a download would be rude.
|
|
26
|
+
if (opts.binary && opts.npm) {
|
|
27
|
+
Log.error('--binary and --npm ask for opposite install shapes. Pass one.');
|
|
28
|
+
process.exit(1);
|
|
29
|
+
}
|
|
30
|
+
const { isPackaged } = await import('../sdk-loader/sdk-loader.class.js');
|
|
31
|
+
// --npm FROM A BINARY DOES NOT CONSULT THE DIST REPO AT ALL. Everything
|
|
32
|
+
// below this point is about the GitHub release the binary distribution
|
|
33
|
+
// ships from, and the shape being switched to gets its versions from the
|
|
34
|
+
// npm registry instead -- so asking GitHub what the latest release is
|
|
35
|
+
// would print a "Checking the latest maka release..." header about a
|
|
36
|
+
// number that plays no part in what happens next.
|
|
37
|
+
if (opts.npm && isPackaged()) {
|
|
38
|
+
return await installNpmOverBinary();
|
|
39
|
+
}
|
|
23
40
|
const { fetchLatestRelease, updateAvailable, tagToVersion, assetNameFor, downloadAsset, sha256Hex, digestMatches, extractArchive, } = await import('./self-update.js');
|
|
24
41
|
Log.header(`Checking the latest maka release...`);
|
|
25
42
|
const release = await fetchLatestRelease();
|
|
26
43
|
const latest = tagToVersion(release.tag_name);
|
|
27
|
-
const { isPackaged } = await import('../sdk-loader/sdk-loader.class.js');
|
|
28
44
|
// --binary is a SWITCH OF INSTALL SHAPE, not a version bump -- it must
|
|
29
45
|
// run even when already at the latest version. The version-gate below
|
|
30
46
|
// exists to skip pointless work when there is nothing NEWER to fetch;
|
|
@@ -35,6 +51,16 @@ export async function updateMakaCli(opts = {}) {
|
|
|
35
51
|
if (!isPackaged() && opts.binary) {
|
|
36
52
|
return await installBinaryOverNpmGlobal(release, latest);
|
|
37
53
|
}
|
|
54
|
+
// Asking for the shape you already have is not an error -- it is how
|
|
55
|
+
// most people will type "update me, and make sure I am on this one".
|
|
56
|
+
// Say which shape answered, then carry on into the ordinary update so
|
|
57
|
+
// the second half of the request ("update if needed") still happens.
|
|
58
|
+
if (opts.binary) {
|
|
59
|
+
Log.notice('This maka is already the standalone binary -- nothing to switch, checking for a newer release.');
|
|
60
|
+
}
|
|
61
|
+
else if (opts.npm) {
|
|
62
|
+
Log.notice('This maka is already an npm install -- nothing to switch, checking for a newer release.');
|
|
63
|
+
}
|
|
38
64
|
if (!updateAvailable(current, release.tag_name)) {
|
|
39
65
|
Log.success(`maka ${current} is already the latest.`);
|
|
40
66
|
return false;
|
|
@@ -133,14 +159,17 @@ export async function updateMakaCli(opts = {}) {
|
|
|
133
159
|
*/
|
|
134
160
|
async function installBinaryOverNpmGlobal(release, latestVersion) {
|
|
135
161
|
const { assetNameFor, downloadAsset, sha256Hex, digestMatches, extractArchive, } = await import('./self-update.js');
|
|
136
|
-
const { binaryInstallDir, binaryInstallPath, gatherInstallFacts, classifyGlobalInstall, installStagedBinary, buildVerificationPath, detectPosixProfile, pathExportLine, resolveOnPath, probesMatch, } = await import('./binary-install.js');
|
|
162
|
+
const { binaryInstallDir, binaryInstallPath, gatherInstallFacts, classifyGlobalInstall, installStagedBinary, buildVerificationPath, detectPosixProfile, pathExportLine, resolveOnPath, probesMatch, unlinkPrompt, npmShimDirFor, PATH_EDIT_MARKER, VERSION_PROBE_ARGV, } = await import('./binary-install.js');
|
|
137
163
|
const { default: spawn } = await import('cross-spawn');
|
|
138
164
|
const { spawnSync } = await import('child_process');
|
|
139
|
-
// STEP 1: classify
|
|
140
|
-
//
|
|
141
|
-
//
|
|
165
|
+
// STEP 1: classify, and settle the one case that needs the user's word
|
|
166
|
+
// before any time is spent. A LINKED install (npm link / dev junction --
|
|
167
|
+
// a Windows junction does NOT report as a symlink via
|
|
142
168
|
// fs.lstatSync().isSymbolicLink(), only a realpath comparison catches
|
|
143
|
-
// it)
|
|
169
|
+
// it) is switchable like any other, but it is somebody's working tree on
|
|
170
|
+
// the other end of that link, so the switch is disclosed and confirmed
|
|
171
|
+
// rather than assumed. Asked HERE, ahead of a ~100MB download, so a "no"
|
|
172
|
+
// costs nothing. Anything else unusable stops outright.
|
|
144
173
|
let globalNpmRoot;
|
|
145
174
|
try {
|
|
146
175
|
globalNpmRoot = spawn.sync('npm', ['root', '-g'], { encoding: 'utf8' }).stdout.trim();
|
|
@@ -151,7 +180,15 @@ async function installBinaryOverNpmGlobal(release, latestVersion) {
|
|
|
151
180
|
}
|
|
152
181
|
const facts = gatherInstallFacts(globalNpmRoot);
|
|
153
182
|
const check = classifyGlobalInstall(facts);
|
|
154
|
-
if (check.kind
|
|
183
|
+
if (check.kind === 'linked') {
|
|
184
|
+
Log.warn(check.reason);
|
|
185
|
+
const unlink = await Actions.confirm(unlinkPrompt(facts.globalPackagePath, facts.globalPackageRealPath), true);
|
|
186
|
+
if (!unlink) {
|
|
187
|
+
Log.notice('Stopped -- the link is untouched.');
|
|
188
|
+
return false;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
else if (check.kind !== 'global-npm') {
|
|
155
192
|
Log.error(check.reason);
|
|
156
193
|
process.exit(1);
|
|
157
194
|
}
|
|
@@ -202,9 +239,7 @@ async function installBinaryOverNpmGlobal(release, latestVersion) {
|
|
|
202
239
|
// is the single most invasive step in the whole flow (a persistent,
|
|
203
240
|
// cross-application environment change), so it gets its own explicit
|
|
204
241
|
// yes/no with the exact mechanism named up front.
|
|
205
|
-
const npmShimDir =
|
|
206
|
-
? spawn.sync('npm', ['prefix', '-g'], { encoding: 'utf8' }).stdout.trim()
|
|
207
|
-
: path.join(spawn.sync('npm', ['prefix', '-g'], { encoding: 'utf8' }).stdout.trim(), 'bin');
|
|
242
|
+
const npmShimDir = npmShimDirFor(spawn.sync('npm', ['prefix', '-g'], { encoding: 'utf8' }).stdout.trim(), process.platform);
|
|
208
243
|
let pathEditApplied = false;
|
|
209
244
|
let printedManualLine;
|
|
210
245
|
if (process.platform === 'win32') {
|
|
@@ -241,7 +276,7 @@ async function installBinaryOverNpmGlobal(release, latestVersion) {
|
|
|
241
276
|
Log.notice('Stopped before any PATH change -- your npm install of maka is untouched.');
|
|
242
277
|
return false;
|
|
243
278
|
}
|
|
244
|
-
fs.appendFileSync(profile.profilePath, `\n
|
|
279
|
+
fs.appendFileSync(profile.profilePath, `\n${PATH_EDIT_MARKER}\n${exportLine}\n`);
|
|
245
280
|
pathEditApplied = true;
|
|
246
281
|
}
|
|
247
282
|
else {
|
|
@@ -281,13 +316,19 @@ async function installBinaryOverNpmGlobal(release, latestVersion) {
|
|
|
281
316
|
Log.notice('Your npm install of maka is untouched. Not uninstalling it.');
|
|
282
317
|
process.exit(1);
|
|
283
318
|
}
|
|
284
|
-
|
|
319
|
+
// Run BY THE PATH JUST PROVEN, not by bare name through a shell: the
|
|
320
|
+
// line above established that `maka` resolves to exactly targetPath, so
|
|
321
|
+
// spawning targetPath asks whether that file works without also
|
|
322
|
+
// re-asking a question already answered -- and without depending on a
|
|
323
|
+
// shell to quote a prefix like `C:\Program Files\nodejs`. The
|
|
324
|
+
// constructed PATH still goes in the environment, because what is being
|
|
325
|
+
// tested is the binary under the end state, not under this one.
|
|
326
|
+
const versionCheck = spawnSync(targetPath, VERSION_PROBE_ARGV, {
|
|
285
327
|
encoding: 'utf8',
|
|
286
328
|
env: { ...process.env, [process.platform === 'win32' ? 'Path' : 'PATH']: verificationPath },
|
|
287
|
-
shell: process.platform === 'win32',
|
|
288
329
|
});
|
|
289
|
-
if (versionCheck.status !== 0 || !versionCheck.stdout.includes(latestVersion)) {
|
|
290
|
-
Log.error(`Post-swap verification failed: \`maka
|
|
330
|
+
if (versionCheck.status !== 0 || !(versionCheck.stdout || '').includes(latestVersion)) {
|
|
331
|
+
Log.error(`Post-swap verification failed: \`maka ${VERSION_PROBE_ARGV.join(' ')}\` did not report ${latestVersion}.`);
|
|
291
332
|
Log.notice('Your npm install of maka is untouched. Not uninstalling it.');
|
|
292
333
|
process.exit(1);
|
|
293
334
|
}
|
|
@@ -312,7 +353,17 @@ async function installBinaryOverNpmGlobal(release, latestVersion) {
|
|
|
312
353
|
// STEP 7: only now -- everything above proved the binary works, is on
|
|
313
354
|
// PATH, and survives spawning itself. Last step, and the only
|
|
314
355
|
// destructive one.
|
|
315
|
-
|
|
356
|
+
//
|
|
357
|
+
// ONE COMMAND SERVES BOTH CASES: `npm uninstall -g` on a linked package
|
|
358
|
+
// removes the LINK and leaves the working tree it points at alone, which
|
|
359
|
+
// is exactly what was promised at STEP 1. Only the wording changes, and
|
|
360
|
+
// it has to -- "removing the npm install" would read, to someone whose
|
|
361
|
+
// link points at a checkout they are mid-edit in, like a description of
|
|
362
|
+
// something much worse than what is happening.
|
|
363
|
+
const wasLinked = check.kind === 'linked';
|
|
364
|
+
Log.notice(wasLinked
|
|
365
|
+
? 'Unlinking the global link to maka (the working tree it points at is not touched)...'
|
|
366
|
+
: 'Removing the npm install of maka...');
|
|
316
367
|
const uninstall = spawn.sync('npm', ['uninstall', '-g', '@maka/maka-cli'], { stdio: 'inherit' });
|
|
317
368
|
if (uninstall.status !== 0) {
|
|
318
369
|
Log.error(`npm uninstall exited ${uninstall.status} -- the binary is installed and verified, but the old npm package is still present. Remove it manually: npm uninstall -g @maka/maka-cli`);
|
|
@@ -326,6 +377,9 @@ async function installBinaryOverNpmGlobal(release, latestVersion) {
|
|
|
326
377
|
Log.success(startingVersion === latestVersion
|
|
327
378
|
? `maka switched to the binary distribution at ${latestVersion}, installed at ${targetPath}.`
|
|
328
379
|
: `maka switched to the binary distribution: ${startingVersion} -> ${latestVersion}, installed at ${targetPath}.`);
|
|
380
|
+
if (wasLinked) {
|
|
381
|
+
Log.notice(`Your working tree at ${facts.globalPackageRealPath} is untouched -- \`npm link\` from there puts the link back, and \`maka update maka --npm\` returns to the published npm package.`);
|
|
382
|
+
}
|
|
329
383
|
if (!pathEditApplied) {
|
|
330
384
|
Log.notice(`Reminder: add this to your PATH before your next shell: ${printedManualLine}`);
|
|
331
385
|
}
|
|
@@ -334,4 +388,223 @@ async function installBinaryOverNpmGlobal(release, latestVersion) {
|
|
|
334
388
|
}
|
|
335
389
|
return true;
|
|
336
390
|
}
|
|
391
|
+
/**
|
|
392
|
+
* `maka update maka --npm` from a packaged binary: the trip
|
|
393
|
+
* installBinaryOverNpmGlobal() makes, run backwards. Install the npm
|
|
394
|
+
* package, hand PATH back to npm's shim directory, and retire the binary
|
|
395
|
+
* -- again never leaving both on PATH at once.
|
|
396
|
+
*
|
|
397
|
+
* THE SAME SEQUENCING IS THE SAME SAFETY PROPERTY. Everything up to the
|
|
398
|
+
* final retirement leaves the binary fully intact and working, so a
|
|
399
|
+
* failure or a "no" anywhere in here stops with a maka that still runs.
|
|
400
|
+
* The binary is retired LAST, once the npm install exists, is proven to be
|
|
401
|
+
* what a fresh shell resolves, and is proven to run and report its own
|
|
402
|
+
* version.
|
|
403
|
+
*
|
|
404
|
+
* Nothing here fetches from the dist repo: the npm registry is the source
|
|
405
|
+
* of truth for the shape being switched to, and `npm i -g` already knows
|
|
406
|
+
* how to ask it.
|
|
407
|
+
*/
|
|
408
|
+
async function installNpmOverBinary() {
|
|
409
|
+
const { binaryInstallDir, binaryInstallPath, gatherInstallFacts, npmShimDirFor, buildRevertVerificationPath, resolveOnPath, retireBinaryInstall, detectPosixProfile, pathExportLine, withoutPathExport, hasPathExport, VERSION_PROBE_ARGV, } = await import('./binary-install.js');
|
|
410
|
+
const { default: spawn } = await import('cross-spawn');
|
|
411
|
+
const { spawnSync } = await import('child_process');
|
|
412
|
+
const startingVersion = cliVersion();
|
|
413
|
+
// STEP 1: is there anywhere to switch TO? The binary distribution exists
|
|
414
|
+
// precisely so that a machine needs no Node, so "npm is missing" is an
|
|
415
|
+
// ordinary state here rather than a broken one, and the answer is a
|
|
416
|
+
// pointer at nodejs.org rather than an error about a failed spawn. Asked
|
|
417
|
+
// first, before anything is touched: a machine that cannot host the npm
|
|
418
|
+
// shape must end this command exactly as it started it.
|
|
419
|
+
const npmVersion = spawn.sync('npm', ['--version'], { encoding: 'utf8' });
|
|
420
|
+
if (npmVersion.status !== 0) {
|
|
421
|
+
Log.error('No working npm was found on PATH, so there is nothing to switch to.');
|
|
422
|
+
Log.notice('The npm distribution needs Node.js -- install it from https://nodejs.org and re-run. Your maka binary is untouched.');
|
|
423
|
+
process.exit(1);
|
|
424
|
+
}
|
|
425
|
+
// Recorded BEFORE npm runs, for the one collision case at the end: a
|
|
426
|
+
// binary that was hand-placed into npm's own shim directory is a file
|
|
427
|
+
// npm is about to overwrite with its shim, and retiring it afterwards
|
|
428
|
+
// would delete the install this whole flow just made.
|
|
429
|
+
const runningBinary = process.execPath;
|
|
430
|
+
const runningSizeBefore = fs.existsSync(runningBinary) ? fs.statSync(runningBinary).size : undefined;
|
|
431
|
+
// STEP 2: acquire. The binary is still in place and still working
|
|
432
|
+
// throughout -- if this fails, nothing has been given up.
|
|
433
|
+
Log.notice('Installing @maka/maka-cli from npm...');
|
|
434
|
+
const install = spawn.sync('npm', ['i', '-g', '@maka/maka-cli@latest'], { stdio: 'inherit' });
|
|
435
|
+
if (install.status !== 0) {
|
|
436
|
+
Log.error(`npm exited with ${install.status ?? 'a spawn failure'} -- nothing was installed.`);
|
|
437
|
+
Log.notice('Your maka binary is untouched.');
|
|
438
|
+
process.exit(1);
|
|
439
|
+
}
|
|
440
|
+
// STEP 3: confirm what npm actually landed, and read the version off the
|
|
441
|
+
// installed package rather than off a release tag. The dist repo and the
|
|
442
|
+
// npm registry are two publishing channels that usually agree; "usually"
|
|
443
|
+
// is not a thing to verify against, and the package's own package.json
|
|
444
|
+
// is the version this install will report forever after.
|
|
445
|
+
const globalNpmRoot = spawn.sync('npm', ['root', '-g'], { encoding: 'utf8' }).stdout.trim();
|
|
446
|
+
const facts = gatherInstallFacts(globalNpmRoot);
|
|
447
|
+
if (!facts.globalPackagePath) {
|
|
448
|
+
Log.error(`npm reported success, but ${path.join(globalNpmRoot, '@maka', 'maka-cli')} is not there.`);
|
|
449
|
+
Log.notice('Your maka binary is untouched.');
|
|
450
|
+
process.exit(1);
|
|
451
|
+
}
|
|
452
|
+
let installedVersion;
|
|
453
|
+
try {
|
|
454
|
+
installedVersion = JSON.parse(fs.readFileSync(path.join(facts.globalPackagePath, 'package.json'), 'utf8')).version;
|
|
455
|
+
}
|
|
456
|
+
catch (e) {
|
|
457
|
+
Log.error(`Could not read the installed package's version: ${e.message}`);
|
|
458
|
+
Log.notice('Your maka binary is untouched.');
|
|
459
|
+
process.exit(1);
|
|
460
|
+
}
|
|
461
|
+
// STEP 4: work out the end state -- npm's shims in, maka's own bin
|
|
462
|
+
// directory out, both binaries gone -- and prove a shell would resolve
|
|
463
|
+
// `maka` to the npm install in it. The directory taken off PATH is
|
|
464
|
+
// always binaryInstallDir(), which maka owns outright; a binary someone
|
|
465
|
+
// placed by hand in a shared directory gets its FILE retired but its
|
|
466
|
+
// directory left alone, because that directory may well be /usr/local/bin.
|
|
467
|
+
const managedDir = binaryInstallDir();
|
|
468
|
+
const managedBinary = binaryInstallPath();
|
|
469
|
+
const npmShimDir = npmShimDirFor(spawn.sync('npm', ['prefix', '-g'], { encoding: 'utf8' }).stdout.trim(), process.platform);
|
|
470
|
+
const pathSeparator = path.delimiter;
|
|
471
|
+
const currentPathValue = process.env[process.platform === 'win32' ? 'Path' : 'PATH'] || process.env.PATH || '';
|
|
472
|
+
const verificationPath = buildRevertVerificationPath({
|
|
473
|
+
currentPath: currentPathValue,
|
|
474
|
+
binaryBinDir: managedDir,
|
|
475
|
+
npmShimDir,
|
|
476
|
+
pathSeparator,
|
|
477
|
+
});
|
|
478
|
+
const retiring = [managedBinary, runningBinary];
|
|
479
|
+
const resolved = resolveOnPath('maka', verificationPath, process.platform, pathSeparator, retiring);
|
|
480
|
+
if (!resolved || path.normalize(path.dirname(resolved)) !== path.normalize(npmShimDir)) {
|
|
481
|
+
Log.error(`Once the binary is gone, \`maka\` would resolve to ${resolved ?? 'nothing'}, not npm's shim in ${npmShimDir}.`);
|
|
482
|
+
Log.notice('Your maka binary is untouched. Not removing it.');
|
|
483
|
+
process.exit(1);
|
|
484
|
+
}
|
|
485
|
+
// Spawned BY ITS RESOLVED PATH, not as a bare `maka`: the binary is
|
|
486
|
+
// still on disk and still ahead on the live PATH at this point, so a
|
|
487
|
+
// bare name would run the very thing being replaced and report a
|
|
488
|
+
// convincing version for the wrong install. cross-spawn is what runs it
|
|
489
|
+
// because on Windows the shim is a .cmd, and its prefix routinely
|
|
490
|
+
// contains a space (`C:\Program Files\nodejs`).
|
|
491
|
+
const versionCheck = spawn.sync(resolved, VERSION_PROBE_ARGV, { encoding: 'utf8' });
|
|
492
|
+
if (versionCheck.status !== 0 || !(versionCheck.stdout || '').includes(installedVersion)) {
|
|
493
|
+
Log.error(`Post-install verification failed: \`${resolved} ${VERSION_PROBE_ARGV.join(' ')}\` did not report ${installedVersion}.`);
|
|
494
|
+
Log.notice('Your maka binary is untouched. Not removing it.');
|
|
495
|
+
process.exit(1);
|
|
496
|
+
}
|
|
497
|
+
Log.success(`npm install verified: ${resolved} reports ${installedVersion}.`);
|
|
498
|
+
// STEP 5: the PATH edit -- disclosed and confirmed, never silent, same
|
|
499
|
+
// as the outbound direction. Skipped without ceremony when there is
|
|
500
|
+
// nothing on PATH to undo, which is the common case for anyone who
|
|
501
|
+
// downloaded a binary by hand rather than arriving here via --binary.
|
|
502
|
+
let pathEditApplied = false;
|
|
503
|
+
let printedManualLine;
|
|
504
|
+
const managedDirOnPath = currentPathValue
|
|
505
|
+
.split(pathSeparator)
|
|
506
|
+
.filter(Boolean)
|
|
507
|
+
.some((entry) => path.normalize(entry) === path.normalize(managedDir));
|
|
508
|
+
if (!managedDirOnPath) {
|
|
509
|
+
Log.notice(`${managedDir} is not on your PATH -- no PATH change needed.`);
|
|
510
|
+
}
|
|
511
|
+
else if (process.platform === 'win32') {
|
|
512
|
+
const proceed = await Actions.confirm(`Remove ${managedDir} from your User PATH so \`maka\` resolves to npm's install? (This edits the Windows registry User environment, not just this session.)`, true);
|
|
513
|
+
if (!proceed) {
|
|
514
|
+
Log.notice('Stopped before any PATH change -- the binary is still in place, and npm now has maka installed too. Re-run to finish, or remove the npm install to go back.');
|
|
515
|
+
return false;
|
|
516
|
+
}
|
|
517
|
+
// Same accepted REG_EXPAND_SZ flattening as the --binary direction:
|
|
518
|
+
// GetEnvironmentVariable expands %VAR% entries on read, so writing the
|
|
519
|
+
// value back loses their symbolic form while keeping them working.
|
|
520
|
+
const psCommand = `$cur = [Environment]::GetEnvironmentVariable('Path', 'User'); ` +
|
|
521
|
+
`$dir = ${JSON.stringify(managedDir)}; ` +
|
|
522
|
+
`$next = (($cur -split ';') | Where-Object { $_ -ne '' -and $_ -ne $dir }) -join ';'; ` +
|
|
523
|
+
`if ($next -ne $cur) { [Environment]::SetEnvironmentVariable('Path', $next, 'User') }`;
|
|
524
|
+
const psResult = spawnSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', psCommand], { encoding: 'utf8' });
|
|
525
|
+
if (psResult.status !== 0) {
|
|
526
|
+
Log.error(`Could not update the User PATH: ${psResult.stderr || 'powershell exited ' + psResult.status}`);
|
|
527
|
+
Log.notice(`The binary is still in place. Remove this from your PATH manually and re-run: ${managedDir}`);
|
|
528
|
+
process.exit(1);
|
|
529
|
+
}
|
|
530
|
+
pathEditApplied = true;
|
|
531
|
+
}
|
|
532
|
+
else {
|
|
533
|
+
const profile = detectPosixProfile(process.env.SHELL, os.homedir());
|
|
534
|
+
const contents = profile && fs.existsSync(profile.profilePath)
|
|
535
|
+
? fs.readFileSync(profile.profilePath, 'utf8')
|
|
536
|
+
: undefined;
|
|
537
|
+
if (profile && contents !== undefined && hasPathExport(contents, managedDir)) {
|
|
538
|
+
const proceed = await Actions.confirm(`Remove the maka PATH line from ${profile.profilePath}?`, true);
|
|
539
|
+
if (!proceed) {
|
|
540
|
+
Log.notice('Stopped before any PATH change -- the binary is still in place, and npm now has maka installed too. Re-run to finish, or remove the npm install to go back.');
|
|
541
|
+
return false;
|
|
542
|
+
}
|
|
543
|
+
fs.writeFileSync(profile.profilePath, withoutPathExport(contents, managedDir));
|
|
544
|
+
pathEditApplied = true;
|
|
545
|
+
}
|
|
546
|
+
else {
|
|
547
|
+
// Either $SHELL names no profile this can identify, or the line is
|
|
548
|
+
// not in the one it can see -- a user may have moved it, or be
|
|
549
|
+
// running a different shell than the one --binary wrote for. Naming
|
|
550
|
+
// the exact line beats editing a file that does not contain it.
|
|
551
|
+
printedManualLine = pathExportLine(profile?.shell ?? 'bash', managedDir);
|
|
552
|
+
Log.warn(`Could not find maka's PATH line in a profile this can identify -- if your shell still adds ${managedDir}, remove that line yourself:`);
|
|
553
|
+
Log.notice(` ${printedManualLine}`);
|
|
554
|
+
}
|
|
555
|
+
}
|
|
556
|
+
// STEP 6: retire the binaries. Last, and the only destructive step --
|
|
557
|
+
// everything above proved the npm install exists, resolves first, and
|
|
558
|
+
// runs.
|
|
559
|
+
const retired = [];
|
|
560
|
+
for (const candidate of uniquePaths(retiring)) {
|
|
561
|
+
// The collision case: a binary living in npm's own shim directory has
|
|
562
|
+
// already been overwritten by npm's shim at STEP 2, and removing it now
|
|
563
|
+
// would remove the install this flow just made. A changed size is the
|
|
564
|
+
// tell -- a ~40MB executable and a shim are not close.
|
|
565
|
+
if (path.normalize(candidate) === path.normalize(runningBinary)
|
|
566
|
+
&& runningSizeBefore !== undefined
|
|
567
|
+
&& fs.existsSync(candidate)
|
|
568
|
+
&& fs.statSync(candidate).size !== runningSizeBefore) {
|
|
569
|
+
Log.notice(`${candidate} was replaced by npm's own shim -- leaving it alone.`);
|
|
570
|
+
continue;
|
|
571
|
+
}
|
|
572
|
+
const outcome = retireBinaryInstall(candidate, process.platform);
|
|
573
|
+
if (!outcome.removed)
|
|
574
|
+
continue;
|
|
575
|
+
retired.push(candidate);
|
|
576
|
+
if (outcome.renamedTo) {
|
|
577
|
+
// Windows cannot delete the running executable, so it is renamed
|
|
578
|
+
// aside instead. Named out loud rather than left as a surprise file.
|
|
579
|
+
Log.notice(`Windows keeps the running executable as ${path.basename(outcome.renamedTo)} -- delete it once you have closed this shell.`);
|
|
580
|
+
}
|
|
581
|
+
}
|
|
582
|
+
if (retired.length === 0) {
|
|
583
|
+
Log.notice('No maka binary was left to remove.');
|
|
584
|
+
}
|
|
585
|
+
Log.success(startingVersion === installedVersion
|
|
586
|
+
? `maka switched to the npm distribution at ${installedVersion}.`
|
|
587
|
+
: `maka switched to the npm distribution: ${startingVersion} -> ${installedVersion}.`);
|
|
588
|
+
if (printedManualLine) {
|
|
589
|
+
Log.notice(`Reminder: remove that PATH line before your next shell, or ${managedDir} will keep shadowing npm's maka.`);
|
|
590
|
+
}
|
|
591
|
+
else if (pathEditApplied) {
|
|
592
|
+
Log.notice('Open shells still see the old PATH -- close and reopen your terminal (or start a new shell) to pick up the change.');
|
|
593
|
+
}
|
|
594
|
+
Log.notice('`maka update maka --binary` switches back to the standalone binary.');
|
|
595
|
+
return true;
|
|
596
|
+
}
|
|
597
|
+
/** The candidates to retire, with duplicates collapsed -- the managed
|
|
598
|
+
* install path and the running executable are the same file whenever the
|
|
599
|
+
* binary got here through --binary, which is the ordinary case. */
|
|
600
|
+
function uniquePaths(paths) {
|
|
601
|
+
const seen = new Set();
|
|
602
|
+
return paths.filter((p) => {
|
|
603
|
+
const key = path.normalize(p);
|
|
604
|
+
if (seen.has(key))
|
|
605
|
+
return false;
|
|
606
|
+
seen.add(key);
|
|
607
|
+
return true;
|
|
608
|
+
});
|
|
609
|
+
}
|
|
337
610
|
//# sourceMappingURL=update-maka.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-maka.js","sourceRoot":"","sources":["../../../../../src/tools/self-update/update-maka.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"update-maka.js","sourceRoot":"","sources":["../../../../../src/tools/self-update/update-maka.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.102.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
|
|
6
6
|
"description": "A command line tool for scaffolding Meteor 2.x applications using React.",
|