@maka/maka-cli 5.74.0 → 5.76.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/backlog.d.ts +7 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/backlog.js +40 -5
- package/bundle/typescript/src/commands/game/sideQuest/commands/backlog.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/hack.js +3 -3
- package/bundle/typescript/src/commands/game/sideQuest/commands/hack.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/look.js +12 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/look.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/mark.js +4 -4
- package/bundle/typescript/src/commands/game/sideQuest/commands/mark.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/move.d.ts +42 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/move.js +312 -46
- package/bundle/typescript/src/commands/game/sideQuest/commands/move.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/rest.js +8 -0
- package/bundle/typescript/src/commands/game/sideQuest/commands/rest.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/search.js +20 -15
- package/bundle/typescript/src/commands/game/sideQuest/commands/search.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/take.js +10 -2
- package/bundle/typescript/src/commands/game/sideQuest/commands/take.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/commands/tap.js +9 -8
- package/bundle/typescript/src/commands/game/sideQuest/commands/tap.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/factories/chargen-factory.d.ts +83 -0
- package/bundle/typescript/src/commands/game/sideQuest/factories/chargen-factory.js +253 -0
- package/bundle/typescript/src/commands/game/sideQuest/factories/chargen-factory.js.map +1 -0
- package/bundle/typescript/src/commands/game/sideQuest/factories/repro-scene.js +116 -3
- package/bundle/typescript/src/commands/game/sideQuest/factories/repro-scene.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/game.d.ts +39 -0
- package/bundle/typescript/src/commands/game/sideQuest/game.js +85 -14
- package/bundle/typescript/src/commands/game/sideQuest/game.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/headless.js +5 -3
- package/bundle/typescript/src/commands/game/sideQuest/headless.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/models/npc.d.ts +28 -0
- package/bundle/typescript/src/commands/game/sideQuest/models/npc.js +33 -5
- package/bundle/typescript/src/commands/game/sideQuest/models/npc.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/models/player.d.ts +35 -0
- package/bundle/typescript/src/commands/game/sideQuest/models/player.js +46 -0
- package/bundle/typescript/src/commands/game/sideQuest/models/player.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/types/repro.d.ts +184 -3
- package/bundle/typescript/src/commands/game/sideQuest/types/repro.js +51 -1
- package/bundle/typescript/src/commands/game/sideQuest/types/repro.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/ar.js +38 -3
- package/bundle/typescript/src/commands/game/sideQuest/utilities/ar.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-dump.js +21 -5
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-dump.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-vocab.d.ts +17 -2
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-vocab.js +30 -3
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-vocab.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog.d.ts +14 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/fuzzy-match.d.ts +24 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/fuzzy-match.js +31 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/fuzzy-match.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/grid-names.d.ts +20 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/grid-names.js +21 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/grid-names.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/grid-view.js +16 -5
- package/bundle/typescript/src/commands/game/sideQuest/utilities/grid-view.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/marks.js +2 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/marks.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/repro-launch.d.ts +3 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/repro-launch.js +13 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/repro-launch.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-grid.d.ts +71 -18
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-grid.js +109 -21
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-grid.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-view.d.ts +38 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-view.js +46 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-view.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.d.ts +31 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.js +41 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/web-character-generator.d.ts +29 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/web-character-generator.js +33 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/web-character-generator.js.map +1 -0
- package/bundle/typescript/src/commands/game/sideQuest-backlog.sub.cmd.js +1 -1
- package/bundle/typescript/src/commands/game/sideQuest-backlog.sub.cmd.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest.sub.cmd.js +72 -8
- package/bundle/typescript/src/commands/game/sideQuest.sub.cmd.js.map +1 -1
- package/bundle/typescript/src/commands/set/global.sub.cmd.js +1 -20
- package/bundle/typescript/src/commands/set/global.sub.cmd.js.map +1 -1
- package/bundle/typescript/src/commands/update.js +6 -88
- package/bundle/typescript/src/commands/update.js.map +1 -1
- package/bundle/typescript/src/generator.js +1 -0
- package/bundle/typescript/src/generator.js.map +1 -1
- package/bundle/typescript/src/templates/meteor/collection/tests.js +1 -1
- package/bundle/typescript/src/templates/meteor/collection/tests.js.ts +1 -1
- package/bundle/typescript/src/templates/react/test/test.js.jsx +31 -29
- package/bundle/typescript/src/templates/react/test/test.js.tsx +31 -29
- package/bundle/typescript/src/tools/browser/open-browser.d.ts +7 -0
- package/bundle/typescript/src/tools/browser/open-browser.js +21 -0
- package/bundle/typescript/src/tools/browser/open-browser.js.map +1 -0
- package/bundle/typescript/src/tools/pkg/pkg.class.js +12 -1
- package/bundle/typescript/src/tools/pkg/pkg.class.js.map +1 -1
- package/bundle/typescript/src/tools/self-update/update-maka.d.ts +15 -0
- package/bundle/typescript/src/tools/self-update/update-maka.js +107 -0
- package/bundle/typescript/src/tools/self-update/update-maka.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,38 +1,40 @@
|
|
|
1
|
+
import { Meteor } from 'meteor/meteor';
|
|
1
2
|
import { render } from '@testing-library/react';
|
|
2
3
|
<% if (test === 'mocha') { %>import { expect } from 'chai';<% } %>
|
|
3
4
|
|
|
4
|
-
<% if(clientGraphql === 'apollo') { %>
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const mocks = [
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
5
|
+
if (Meteor.isClient) {<% if(clientGraphql === 'apollo') { %>
|
|
6
|
+
const { MockedProvider } = require('@apollo/client/testing/react');
|
|
7
|
+
const gql = require('graphql-tag');
|
|
8
|
+
const mocks = [
|
|
9
|
+
{
|
|
10
|
+
request: {
|
|
11
|
+
query: gql`query { trucks }`, // consider importing the query from the actual component
|
|
12
|
+
variables: {
|
|
13
|
+
sample: 'variable'
|
|
14
|
+
},
|
|
13
15
|
},
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
result: {
|
|
17
|
+
data: {
|
|
18
|
+
trucks: 'hello trucks'
|
|
19
|
+
}
|
|
18
20
|
}
|
|
19
21
|
}
|
|
20
|
-
|
|
21
|
-
];
|
|
22
|
+
];
|
|
22
23
|
<% } %>
|
|
23
|
-
const { <%=className%>%> } = require('./<%= fileName %>');
|
|
24
|
-
describe('<<%= className %>/>', function() {
|
|
24
|
+
const { <%=className%>%> } = require('./<%= fileName %>');
|
|
25
|
+
describe('<<%= className %>/>', function() {
|
|
25
26
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
27
|
+
it('did render', () => {
|
|
28
|
+
<%if(clientGraphql === 'apollo') { %>
|
|
29
|
+
const <%=camelCaseName%> = render(
|
|
30
|
+
<MockedProvider mocks={mocks}>
|
|
31
|
+
<<%= className %>/>
|
|
32
|
+
</MockedProvider>
|
|
33
|
+
);<% } else { %>
|
|
34
|
+
const <%=camelCaseName%> = render(<<%= className %>/>);<% } %>
|
|
35
|
+
const testMessage = <% if (isLayout) { %>''<% } else if (withTranslations) { %>'<h2>example</h2>'<% } else { %>'<h2>Find me in <%= myPath %></h2>'<% } %>
|
|
36
|
+
const node = <%=camelCaseName%>.container.querySelector('#<%=cssCaseName%>');
|
|
37
|
+
<% if (test === 'mocha') { %>expect(node.innerHTML).equals(testMessage);<% } else { %>expect(node.innerHTML).toBe(testMessage);<% } %>
|
|
38
|
+
});
|
|
37
39
|
});
|
|
38
|
-
}
|
|
40
|
+
}
|
|
@@ -1,38 +1,40 @@
|
|
|
1
|
+
import { Meteor } from 'meteor/meteor';
|
|
1
2
|
import { render } from '@testing-library/react';
|
|
2
3
|
<% if (test === 'mocha') { %>import { expect } from 'chai';<% } %>
|
|
3
4
|
|
|
4
|
-
<% if(clientGraphql === 'apollo') { %>
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const mocks = [
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
5
|
+
if (Meteor.isClient) {<% if(clientGraphql === 'apollo') { %>
|
|
6
|
+
const { MockedProvider } = require('@apollo/client/testing/react');
|
|
7
|
+
const gql = require('graphql-tag');
|
|
8
|
+
const mocks = [
|
|
9
|
+
{
|
|
10
|
+
request: {
|
|
11
|
+
query: gql`query { trucks }`, // consider importing the query from the actual component
|
|
12
|
+
variables: {
|
|
13
|
+
sample: 'variable'
|
|
14
|
+
},
|
|
13
15
|
},
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
result: {
|
|
17
|
+
data: {
|
|
18
|
+
trucks: 'hello trucks'
|
|
19
|
+
}
|
|
18
20
|
}
|
|
19
21
|
}
|
|
20
|
-
|
|
21
|
-
];
|
|
22
|
+
];
|
|
22
23
|
<% } %>
|
|
23
|
-
const { <%=className%>%> } = require('./<%= fileName %>');
|
|
24
|
-
describe('<<%= className %>/>', function() {
|
|
24
|
+
const { <%=className%>%> } = require('./<%= fileName %>');
|
|
25
|
+
describe('<<%= className %>/>', function() {
|
|
25
26
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
27
|
+
it('did render', () => {
|
|
28
|
+
<%if(clientGraphql === 'apollo') { %>
|
|
29
|
+
const <%=camelCaseName%> = render(
|
|
30
|
+
<MockedProvider mocks={mocks}>
|
|
31
|
+
<<%= className %>/>
|
|
32
|
+
</MockedProvider>
|
|
33
|
+
);<% } else { %>
|
|
34
|
+
const <%=camelCaseName%> = render(<<%= className %>/>);<% } %>
|
|
35
|
+
const testMessage = <% if (isLayout) { %>''<% } else if (withTranslations) { %>'<h2>example</h2>'<% } else { %>'<h2>Find me in <%= myPath %></h2>'<% } %>
|
|
36
|
+
const node = <%=camelCaseName%>.container.querySelector('#<%=cssCaseName%>');
|
|
37
|
+
<% if (test === 'mocha') { %>expect(node!.innerHTML).equals(testMessage);<% } else { %>expect(node!.innerHTML).toBe(testMessage);<% } %>
|
|
38
|
+
});
|
|
37
39
|
});
|
|
38
|
-
}
|
|
40
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Best-effort browser launch (no third-party dependency -- shells out to
|
|
3
|
+
* each OS's own "open a URL" command). Purely a convenience; failure here
|
|
4
|
+
* is never fatal -- the caller is expected to have already shown the URL,
|
|
5
|
+
* so the flow it's part of still works without it.
|
|
6
|
+
*/
|
|
7
|
+
export declare function openBrowser(url: string): void;
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { exec } from 'child_process';
|
|
2
|
+
import { Log } from '../log/log.class.js';
|
|
3
|
+
/**
|
|
4
|
+
* Best-effort browser launch (no third-party dependency -- shells out to
|
|
5
|
+
* each OS's own "open a URL" command). Purely a convenience; failure here
|
|
6
|
+
* is never fatal -- the caller is expected to have already shown the URL,
|
|
7
|
+
* so the flow it's part of still works without it.
|
|
8
|
+
*/
|
|
9
|
+
export function openBrowser(url) {
|
|
10
|
+
const command = process.platform === 'win32'
|
|
11
|
+
? `start "" "${url}"`
|
|
12
|
+
: process.platform === 'darwin'
|
|
13
|
+
? `open "${url}"`
|
|
14
|
+
: `xdg-open "${url}"`;
|
|
15
|
+
exec(command, (err) => {
|
|
16
|
+
if (err) {
|
|
17
|
+
Log.notice(`Could not open a browser automatically. Please visit: ${url}`);
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=open-browser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"open-browser.js","sourceRoot":"","sources":["../../../../../src/tools/browser/open-browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAE1C;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC1C,CAAC,CAAC,aAAa,GAAG,GAAG;QACrB,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAC7B,CAAC,CAAC,SAAS,GAAG,GAAG;YACjB,CAAC,CAAC,aAAa,GAAG,GAAG,CAAC;IAE1B,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACpB,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,MAAM,CAAC,yDAAyD,GAAG,EAAE,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -225,8 +225,19 @@ export class PKG {
|
|
|
225
225
|
}
|
|
226
226
|
if (opts.shouldInstall && missingPackages.length > 0) {
|
|
227
227
|
await this.installNpmPackage(missingPackages.join(' '), opts);
|
|
228
|
-
// Re-check if the packages now exist after the install
|
|
228
|
+
// Re-check if the packages now exist after the install. npm prunes
|
|
229
|
+
// an empty devDependencies object on save, so a package.json that
|
|
230
|
+
// had none before the install can come back without the key at
|
|
231
|
+
// all -- default it the same way the pre-install read above does,
|
|
232
|
+
// or an install into a devDependencies-less project throws here
|
|
233
|
+
// on every subsequent run instead of returning a result.
|
|
229
234
|
const updatedPackageJSON = JSON.parse(fs.readFileSync(path.join(packageDirectory, 'package.json')).toString());
|
|
235
|
+
if (!updatedPackageJSON.dependencies) {
|
|
236
|
+
updatedPackageJSON.dependencies = {};
|
|
237
|
+
}
|
|
238
|
+
if (!updatedPackageJSON.devDependencies) {
|
|
239
|
+
updatedPackageJSON.devDependencies = {};
|
|
240
|
+
}
|
|
230
241
|
for (const pkg of missingPackages) {
|
|
231
242
|
if (!(updatedPackageJSON.dependencies[pkg] || updatedPackageJSON.devDependencies[pkg])) {
|
|
232
243
|
return false; // At least one package was not installed successfully
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pkg.class.js","sourceRoot":"","sources":["../../../../../src/tools/pkg/pkg.class.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pkg.class.js","sourceRoot":"","sources":["../../../../../src/tools/pkg/pkg.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* THE WHOLE `maka update maka` FLOW, callable from anywhere that has a
|
|
3
|
+
* reason to update the CLI mid-task -- extracted from commands/update.ts
|
|
4
|
+
* when repro benches gained a version lock, so "this bench needs 5.76.0,
|
|
5
|
+
* update now?" can act on a yes instead of printing a command to retype.
|
|
6
|
+
*
|
|
7
|
+
* Exit semantics are the command's own and deliberately kept: failures
|
|
8
|
+
* process.exit(1), and a caller must treat a successful return as "the
|
|
9
|
+
* NEXT process is the new version" -- the running one is unchanged, so
|
|
10
|
+
* after an update the only honest continuation is to tell the user to
|
|
11
|
+
* re-run and exit.
|
|
12
|
+
*
|
|
13
|
+
* Returns true when an update was installed, false when already latest.
|
|
14
|
+
*/
|
|
15
|
+
export declare function updateMakaCli(): Promise<boolean>;
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import os from 'os';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
import { Log } from '../log/log.class.js';
|
|
5
|
+
import { cliVersion } from '../version/cli-version.js';
|
|
6
|
+
/**
|
|
7
|
+
* THE WHOLE `maka update maka` FLOW, callable from anywhere that has a
|
|
8
|
+
* reason to update the CLI mid-task -- extracted from commands/update.ts
|
|
9
|
+
* when repro benches gained a version lock, so "this bench needs 5.76.0,
|
|
10
|
+
* update now?" can act on a yes instead of printing a command to retype.
|
|
11
|
+
*
|
|
12
|
+
* Exit semantics are the command's own and deliberately kept: failures
|
|
13
|
+
* process.exit(1), and a caller must treat a successful return as "the
|
|
14
|
+
* NEXT process is the new version" -- the running one is unchanged, so
|
|
15
|
+
* after an update the only honest continuation is to tell the user to
|
|
16
|
+
* re-run and exit.
|
|
17
|
+
*
|
|
18
|
+
* Returns true when an update was installed, false when already latest.
|
|
19
|
+
*/
|
|
20
|
+
export async function updateMakaCli() {
|
|
21
|
+
const current = cliVersion();
|
|
22
|
+
const { fetchLatestRelease, updateAvailable, tagToVersion, assetNameFor, downloadAsset, sha256Hex, digestMatches, extractArchive, swapPlanFor, executeSwapPlan, } = await import('./self-update.js');
|
|
23
|
+
Log.header(`Checking the latest maka release...`);
|
|
24
|
+
const release = await fetchLatestRelease();
|
|
25
|
+
const latest = tagToVersion(release.tag_name);
|
|
26
|
+
if (!updateAvailable(current, release.tag_name)) {
|
|
27
|
+
Log.success(`maka ${current} is already the latest.`);
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
Log.notice(`Update available: ${current} -> ${latest}`);
|
|
31
|
+
const { isPackaged } = await import('../sdk-loader/sdk-loader.class.js');
|
|
32
|
+
if (!isPackaged()) {
|
|
33
|
+
// npm owns this install's layout (bin shims, prefix); replacing the
|
|
34
|
+
// files underneath it would leave npm's book-keeping describing a
|
|
35
|
+
// binary it no longer manages. Let npm do its own job.
|
|
36
|
+
Log.notice('This maka is installed through npm -- updating via npm.');
|
|
37
|
+
const { default: spawn } = await import('cross-spawn');
|
|
38
|
+
const out = spawn.sync('npm', ['i', '-g', '@maka/maka-cli@latest'], { stdio: 'inherit' });
|
|
39
|
+
if (out.status !== 0) {
|
|
40
|
+
Log.error(`npm exited with ${out.status ?? 'a spawn failure'} -- maka was not updated.`);
|
|
41
|
+
process.exit(1);
|
|
42
|
+
}
|
|
43
|
+
Log.success(`maka updated to ${latest}.`);
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
const assetName = assetNameFor(process.platform, process.arch);
|
|
47
|
+
if (!assetName) {
|
|
48
|
+
Log.error(`No prebuilt maka binary exists for ${process.platform}/${process.arch}.`);
|
|
49
|
+
Log.notice('Built targets: linux x64/arm64, macOS x64/arm64, Windows x64.');
|
|
50
|
+
process.exit(1);
|
|
51
|
+
}
|
|
52
|
+
const asset = release.assets.find(a => a.name === assetName);
|
|
53
|
+
if (!asset) {
|
|
54
|
+
// The dist repo prunes binaries off older releases, but the LATEST
|
|
55
|
+
// release always carries a full set -- an absent asset here means the
|
|
56
|
+
// publish is mid-flight or failed, not that the target is unsupported.
|
|
57
|
+
Log.error(`The ${release.tag_name} release has no ${assetName} yet. Try again in a few minutes.`);
|
|
58
|
+
process.exit(1);
|
|
59
|
+
}
|
|
60
|
+
const exePath = process.execPath;
|
|
61
|
+
// Staging lives NEXT TO the executable so the final rename cannot cross
|
|
62
|
+
// a filesystem; it also surfaces a permissions problem before any
|
|
63
|
+
// download time is spent.
|
|
64
|
+
const stageDir = path.join(path.dirname(exePath), '.maka-update-stage');
|
|
65
|
+
try {
|
|
66
|
+
fs.rmSync(stageDir, { recursive: true, force: true });
|
|
67
|
+
fs.mkdirSync(stageDir, { recursive: true });
|
|
68
|
+
}
|
|
69
|
+
catch (e) {
|
|
70
|
+
Log.error(`Cannot write next to the maka executable (${path.dirname(exePath)}): ${e.message}`);
|
|
71
|
+
Log.notice('Re-run with the permissions the install location requires.');
|
|
72
|
+
process.exit(1);
|
|
73
|
+
}
|
|
74
|
+
const archivePath = path.join(os.tmpdir(), assetName);
|
|
75
|
+
Log.notice(`Downloading ${assetName} (${Math.round(asset.size / 1024 / 1024)}MB)...`);
|
|
76
|
+
await downloadAsset(asset, archivePath);
|
|
77
|
+
const verdict = digestMatches(asset.digest, sha256Hex(archivePath));
|
|
78
|
+
if (verdict === false) {
|
|
79
|
+
Log.error('Checksum mismatch: the downloaded file does not match the release digest. Not installing it.');
|
|
80
|
+
process.exit(1);
|
|
81
|
+
}
|
|
82
|
+
if (verdict === null) {
|
|
83
|
+
// Absent digest is GitHub's field missing, not tampering evidence --
|
|
84
|
+
// but unverified must never read as verified.
|
|
85
|
+
Log.warn('The release publishes no digest for this asset; installing UNVERIFIED (downloaded over TLS from github.com).');
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
Log.notice('Checksum verified.');
|
|
89
|
+
}
|
|
90
|
+
const stagedBinary = await extractArchive(archivePath, stageDir);
|
|
91
|
+
if (!fs.existsSync(stagedBinary) || fs.statSync(stagedBinary).size < 10 * 1024 * 1024) {
|
|
92
|
+
Log.error(`The extracted binary at ${stagedBinary} is missing or implausibly small. Not installing it.`);
|
|
93
|
+
process.exit(1);
|
|
94
|
+
}
|
|
95
|
+
executeSwapPlan(swapPlanFor(process.platform, exePath, stagedBinary));
|
|
96
|
+
try {
|
|
97
|
+
fs.rmSync(stageDir, { recursive: true, force: true });
|
|
98
|
+
fs.rmSync(archivePath, { force: true });
|
|
99
|
+
}
|
|
100
|
+
catch { /* cosmetic -- the update itself is done */ }
|
|
101
|
+
Log.success(`maka updated: ${current} -> ${latest}. The new version runs from your next command.`);
|
|
102
|
+
if (process.platform === 'win32') {
|
|
103
|
+
Log.notice(`Windows keeps the running executable as ${path.basename(exePath)}.old until the next update clears it.`);
|
|
104
|
+
}
|
|
105
|
+
return true;
|
|
106
|
+
}
|
|
107
|
+
//# sourceMappingURL=update-maka.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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.76.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.",
|