@appland/appmap 3.120.0 → 3.121.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/CHANGELOG.md +7 -0
- package/built/cmds/agentInstaller/NodeNoInstaller.js +35 -0
- package/built/cmds/agentInstaller/NodeNoInstaller.js.map +1 -0
- package/built/cmds/agentInstaller/agentInstaller.js +2 -0
- package/built/cmds/agentInstaller/agentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/agentInstallerProcedure.js +2 -0
- package/built/cmds/agentInstaller/agentInstallerProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/install-agent.js +16 -3
- package/built/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/cmds/agentInstaller/installerUI.js +2 -0
- package/built/cmds/agentInstaller/installerUI.js.map +1 -1
- package/built/cmds/agentInstaller/installers.js +2 -3
- package/built/cmds/agentInstaller/installers.js.map +1 -1
- package/built/cmds/agentInstaller/projectConfiguration.js +37 -136
- package/built/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/package.json +1 -1
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js +0 -110
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [@appland/appmap-v3.121.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.120.0...@appland/appmap-v3.121.0) (2024-01-30)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Direct users to appmap-node in the installer ([eb9dd61](https://github.com/getappmap/appmap-js/commit/eb9dd616ee8ea67baba41584bf665814da0239fa)), closes [#1566](https://github.com/getappmap/appmap-js/issues/1566)
|
|
7
|
+
|
|
1
8
|
# [@appland/appmap-v3.120.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.119.0...@appland/appmap-v3.120.0) (2024-01-30)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const node_path_1 = require("node:path");
|
|
7
|
+
const utils_1 = require("../../utils");
|
|
8
|
+
const agentInstaller_1 = __importDefault(require("./agentInstaller"));
|
|
9
|
+
class NodeNoInstaller extends agentInstaller_1.default {
|
|
10
|
+
constructor(path) {
|
|
11
|
+
super('Node.js', path);
|
|
12
|
+
this.buildFile = 'package.json';
|
|
13
|
+
this.documentation = 'https://appmap.io/docs/reference/appmap-node';
|
|
14
|
+
this.language = 'javascript';
|
|
15
|
+
this.appmap_dir = 'tmp/appmap';
|
|
16
|
+
this.isNoop = true;
|
|
17
|
+
}
|
|
18
|
+
installAgent(ui) {
|
|
19
|
+
ui.message('No AppMap installation needed for Node.js projects.');
|
|
20
|
+
ui.message('You can use it directly by prepending `npx appmap-node` to your commands.');
|
|
21
|
+
ui.message(`For more information, see ${this.documentation}`);
|
|
22
|
+
}
|
|
23
|
+
available() {
|
|
24
|
+
return (0, utils_1.exists)((0, node_path_1.join)(this.path, this.buildFile));
|
|
25
|
+
}
|
|
26
|
+
environment() {
|
|
27
|
+
return { 'Node version': process.version };
|
|
28
|
+
}
|
|
29
|
+
checkConfigCommand(ui) { }
|
|
30
|
+
validateAgentCommand() { }
|
|
31
|
+
initCommand() { }
|
|
32
|
+
verifyCommand() { }
|
|
33
|
+
}
|
|
34
|
+
exports.default = NodeNoInstaller;
|
|
35
|
+
//# sourceMappingURL=NodeNoInstaller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NodeNoInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/NodeNoInstaller.ts"],"names":[],"mappings":";;;;;AAAA,yCAAiC;AAEjC,uCAAqC;AACrC,sEAA8C;AAG9C,MAAqB,eAAgB,SAAQ,wBAAc;IAOzD,YAAY,IAAY;QACtB,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAPT,cAAS,GAAG,cAAc,CAAC;QAC3B,kBAAa,GAAG,8CAA8C,CAAC;QAC/D,aAAQ,GAAG,YAAY,CAAC;QACxB,eAAU,GAAG,YAAY,CAAC;QAC1B,WAAM,GAAG,IAAI,CAAC;IAI9B,CAAC;IAED,YAAY,CAAC,EAAe;QAC1B,EAAE,CAAC,OAAO,CAAC,qDAAqD,CAAC,CAAC;QAClE,EAAE,CAAC,OAAO,CAAC,2EAA2E,CAAC,CAAC;QACxF,EAAE,CAAC,OAAO,CAAC,6BAA6B,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,SAAS;QACP,OAAO,IAAA,cAAM,EAAC,IAAA,gBAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,WAAW;QACT,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7C,CAAC;IAED,kBAAkB,CAAC,EAAe,IAAG,CAAC;IACtC,oBAAoB,KAAI,CAAC;IACzB,WAAW,KAAI,CAAC;IAChB,aAAa,KAAI,CAAC;CACnB;AA7BD,kCA6BC"}
|
|
@@ -6,6 +6,8 @@ const commandRunner_1 = require("./commandRunner");
|
|
|
6
6
|
class AgentInstaller {
|
|
7
7
|
constructor(name, path) {
|
|
8
8
|
this.name = name;
|
|
9
|
+
/** whether the installer is noop, ie. no installation necessary */
|
|
10
|
+
this.isNoop = false;
|
|
9
11
|
this.path = (0, path_1.resolve)(path);
|
|
10
12
|
}
|
|
11
13
|
async checkCurrentConfig(ui) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstaller.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAC/B,sCAA4C;AAC5C,mDAAsC;AAItC,MAA8B,cAAc;
|
|
1
|
+
{"version":3,"file":"agentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstaller.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAC/B,sCAA4C;AAC5C,mDAAsC;AAItC,MAA8B,cAAc;IAS1C,YAAqB,IAAY,EAAE,IAAY;QAA1B,SAAI,GAAJ,IAAI,CAAQ;QALjC,mEAAmE;QACnD,WAAM,GAAY,KAAK,CAAC;QAKtC,IAAI,CAAC,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAOD,KAAK,CAAC,kBAAkB,CAAC,EAAe;QACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,GAAG,EAAE;YACR,OAAO;SACR;QAED,IAAI;YACF,MAAM,IAAA,mBAAG,EAAC,GAAG,CAAC,CAAC;SAChB;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,wBAAe,CAAC,GAAa,CAAC,CAAC;SAC1C;IACH,CAAC;CAOF;AApCD,iCAoCC"}
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
6
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
7
8
|
const fs_1 = __importDefault(require("fs"));
|
|
8
9
|
const yargs_1 = __importDefault(require("yargs"));
|
|
@@ -60,6 +61,7 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
60
61
|
await this.verifyProject();
|
|
61
62
|
if (!useExistingAppMapYml) {
|
|
62
63
|
const initCommand = await this.installer.initCommand();
|
|
64
|
+
(0, node_assert_1.default)(initCommand);
|
|
63
65
|
const { stdout } = await (0, commandRunner_1.run)(initCommand);
|
|
64
66
|
const initCommandOutput = JSON.parse(stdout);
|
|
65
67
|
const recommendedConfig = (0, js_yaml_1.load)(initCommandOutput.configuration.contents) || {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,kDAA0B;AAE1B,sCAAuC;AACvC,mDAAsC;AACtC,+CAA6D;AAC7D,sEAA8C;AAC9C,oEAA4C;AAC5C,yDAA2D;AAE3D,qCAAqC;AAErC,MAAqB,uBAAwB,SAAQ,wBAAc;IACjE,KAAK,CAAC,GAAG,CAAC,EAAe;QACvB,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CACxB;YACE,6DAA6D;YAC7D,MAAM,IAAI,CAAC,wBAAwB,EAAE;YACrC,EAAE;YACF,oBAAoB;SACrB;aACE,IAAI,EAAE;aACN,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE;YACZ,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;YACpC,EAAE,CAAC,KAAK,CACN;gBACE,wEAAwE;gBACxE,OAAO,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB;aACpD,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;YACF,MAAM,IAAI,mBAAU,CAAC,mDAAmD,CAAC,CAAC;SAC3E;QAED,IAAI,oBAAoB,GAAG,KAAK,CAAC;QACjC,IAAI,cAAmB,CAAC;QACxB,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,MAAM,qBAAqB,GAAG,MAAM,EAAE,CAAC,qBAAqB,EAAE,CAAC;YAE/D,IAAI,qBAAqB,KAAK,6BAAe,CAAC,KAAK,EAAE;gBACnD,eAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;aAC5B;YAED,IAAI,qBAAqB,KAAK,6BAAe,CAAC,YAAY,EAAE;gBAC1D,IAAI;oBACF,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;oBACnC,oBAAoB,GAAG,IAAI,CAAC;iBAC7B;gBAAC,WAAM;oBACN,MAAM,IAAI,mBAAU,CAClB,uFAAuF,CACxF,CAAC;iBACH;aACF;SACF;QAED,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAElC,IAAI;YACF,MAAM,oBAAoB,GAAgB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACjE,MAAM,WAAW,GAAa,EAAE,CAAC;YACjC,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE;gBACvC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B;YACD,MAAM,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAEtC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE3B,IAAI,CAAC,oBAAoB,EAAE;gBACzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;gBACvD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,mBAAG,EAAC,WAAW,CAAC,CAAC;gBAC1C,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC7C,MAAM,iBAAiB,GAAI,IAAA,cAAI,EAAC,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAS,IAAI,EAAE,CAAC;gBAExF,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;gBACrD,iBAAiB,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;gBAEzD,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;aACzC;iBAAM;gBACL,IAAI,KAAK,GAAG,KAAK,CAAC;gBAClB,MAAM,WAAW,GAAG,CAAC,SAAiB,EAAQ,EAAE;oBAC9C,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;wBAC9B,EAAE,CAAC,OAAO,CAAC,YAAY,SAAS,gBAAgB,CAAC,CAAC;wBAClD,cAAc,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;wBACtD,KAAK,GAAG,IAAI,CAAC;qBACd;gBACH,CAAC,CAAC;gBACF,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAChD,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;iBACtC;aACF;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAC;YAEpE,IAAI,EAAE,CAAC,WAAW;gBAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;YAEpE,MAAM,cAAc,GAAG;gBACrB,eAAK,CAAC,KAAK,CAAC,0CAA0C,CAAC;gBACvD,EAAE;gBACF,eAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC;gBACvC,EAAE;gBACF,iEAAiE;gBACjE,4DAA4D;aAC7D,CAAC;YAEF,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEtC,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM;gBAChB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC;oBACtE,EAAE,CAAC,IAAI,CAAC,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC,CAAC;SAC7C;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,KAAK,GAAG,CAAU,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC;YAC5B,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE;gBACrC,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,QAAQ,CAAC,qCAAqC,CAAC,EAAE;oBAClE,MAAM,IAAA,mBAAG,EAAC,IAAI,uBAAa,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAEzF,MAAM,+BAA+B,GAAG;wBACtC,IAAI;wBACJ,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC;wBAC5C,EAAE;wBACF,+EAA+E;wBAC/E,EAAE;wBACF,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;wBACpB,IAAI;qBACL,CAAC;oBAEF,EAAE,CAAC,KAAK,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtD;qBAAM,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,QAAQ,CAAC,yCAAyC,CAAC,EAAE;oBAC7E,MAAM,yBAAyB,GAAG;wBAChC,IAAI;wBACJ,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC;wBAC5C,EAAE;wBACF,mEAAmE;wBACnE,mEAAmE;wBACnE,qDAAqD;wBACrD,EAAE;wBACF,eAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC;wBAC/C,IAAI;wBACJ,8CAA8C;4BAC5C,8CAA8C;wBAChD,EAAE;qBACH,CAAC;oBAEF,EAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAChD;qBAAM;oBACL,MAAM,CAAC,CAAC;iBACT;aACF;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IAED,eAAe,CAAC,MAA2B;QACzC,YAAE,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const types_1 = require("node:util/types");
|
|
6
7
|
const yargs_1 = __importDefault(require("yargs"));
|
|
7
8
|
const fs_1 = require("fs");
|
|
8
9
|
const errors_1 = require("../errors");
|
|
@@ -15,18 +16,19 @@ const projectConfiguration_1 = require("./projectConfiguration");
|
|
|
15
16
|
const commandRunner_1 = require("./commandRunner");
|
|
16
17
|
const openTicket_1 = __importDefault(require("../../lib/ticket/openTicket"));
|
|
17
18
|
const installerUI_1 = __importDefault(require("./installerUI"));
|
|
18
|
-
class InstallerError {
|
|
19
|
+
class InstallerError extends Error {
|
|
19
20
|
constructor(error, duration, project) {
|
|
21
|
+
super();
|
|
20
22
|
this.duration = duration;
|
|
21
23
|
this.project = project;
|
|
22
|
-
this.error = error
|
|
24
|
+
this.error = (0, types_1.isNativeError)(error) ? error : new Error(String(error));
|
|
23
25
|
this.log = commandRunner_1.ProcessLog.consumeBuffer();
|
|
24
26
|
}
|
|
25
27
|
get message() {
|
|
26
28
|
if (this.error instanceof errors_1.ValidationError || this.error instanceof errors_1.ChildProcessError) {
|
|
27
29
|
return this.error.message;
|
|
28
30
|
}
|
|
29
|
-
else if (this.error
|
|
31
|
+
else if ((0, types_1.isNativeError)(this.error)) {
|
|
30
32
|
return this.error.stack || String(this.error);
|
|
31
33
|
}
|
|
32
34
|
return String(this.error);
|
|
@@ -74,6 +76,7 @@ class InstallerError {
|
|
|
74
76
|
}
|
|
75
77
|
}
|
|
76
78
|
const _handler = async (args) => {
|
|
79
|
+
var _a;
|
|
77
80
|
const { projectType, directory, verbose: isVerbose, interactive: interactiveArg, overwriteAppmapConfig: overwriteAppMapConfig, installerName, buildFile, } = args;
|
|
78
81
|
const errors = [];
|
|
79
82
|
const installers = installers_1.INSTALLERS.map((constructor) => new constructor(directory));
|
|
@@ -82,8 +85,18 @@ const _handler = async (args) => {
|
|
|
82
85
|
const ui = new installerUI_1.default(interactive, { overwriteAppMapConfig, installerName, buildFile });
|
|
83
86
|
try {
|
|
84
87
|
const projects = await (0, projectConfiguration_1.getProjects)(ui, installers, directory, true, projectType);
|
|
88
|
+
const noopsInvoked = new Set();
|
|
85
89
|
for (let i = 0; i < projects.length; i++) {
|
|
86
90
|
const project = projects[i];
|
|
91
|
+
if ((_a = project.selectedInstaller) === null || _a === void 0 ? void 0 : _a.isNoop) {
|
|
92
|
+
// make sure we're not duplicating messages
|
|
93
|
+
if (noopsInvoked.has(project.selectedInstaller.name))
|
|
94
|
+
continue;
|
|
95
|
+
// just give the installer a chance to print a message
|
|
96
|
+
await project.selectedInstaller.installAgent(ui);
|
|
97
|
+
noopsInvoked.add(project.selectedInstaller.name);
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
87
100
|
const installProcedure = new agentInstallerProcedure_1.default(project.selectedInstaller, project.path);
|
|
88
101
|
ui.message(`Installing AppMap agent for ${chalk_1.default.blue(project.name)}...`);
|
|
89
102
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,2BAAoC;AACpC,sCAMmB;AACnB,uCAA4D;AAC5D,wFAAgE;AAChE,kDAA0B;AAC1B,gEAAwC;AACxC,6CAA2D;AAC3D,iEAA2E;AAE3E,mDAA6C;AAC7C,6EAAqD;AACrD,gEAAwC;AAYxC,MAAM,
|
|
1
|
+
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,6 +67,8 @@ class InstallerUI {
|
|
|
67
67
|
return addSubprojects;
|
|
68
68
|
}
|
|
69
69
|
async selectSubprojects(projects) {
|
|
70
|
+
if (projects.length < 2)
|
|
71
|
+
return projects;
|
|
70
72
|
if (!this.interactive) {
|
|
71
73
|
console.warn(`The installer should not be prompting for sub-projects in non-interactive mode!`);
|
|
72
74
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installerUI.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/installerUI.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"installerUI.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/installerUI.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.INSTALLER_NAMES = exports.INSTALLERS = void 0;
|
|
7
|
+
const NodeNoInstaller_1 = __importDefault(require("./NodeNoInstaller"));
|
|
7
8
|
const gradleInstaller_1 = __importDefault(require("./gradleInstaller"));
|
|
8
9
|
const mavenInstaller_1 = __importDefault(require("./mavenInstaller"));
|
|
9
|
-
const javaScriptAgentInstaller_1 = require("./javaScriptAgentInstaller");
|
|
10
10
|
const pythonAgentInstaller_1 = require("./pythonAgentInstaller");
|
|
11
11
|
const rubyAgentInstaller_1 = require("./rubyAgentInstaller");
|
|
12
12
|
const chalk_1 = __importDefault(require("chalk"));
|
|
@@ -14,11 +14,10 @@ exports.INSTALLERS = [
|
|
|
14
14
|
rubyAgentInstaller_1.BundleInstaller,
|
|
15
15
|
gradleInstaller_1.default,
|
|
16
16
|
mavenInstaller_1.default,
|
|
17
|
-
|
|
17
|
+
NodeNoInstaller_1.default,
|
|
18
18
|
pythonAgentInstaller_1.PipInstaller,
|
|
19
19
|
pythonAgentInstaller_1.PipenvInstaller,
|
|
20
20
|
pythonAgentInstaller_1.PoetryInstaller,
|
|
21
|
-
javaScriptAgentInstaller_1.YarnInstaller,
|
|
22
21
|
];
|
|
23
22
|
exports.INSTALLER_NAMES = exports.INSTALLERS.map((installer) => chalk_1.default.blue(installer.identifier));
|
|
24
23
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installers.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/installers.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"installers.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/installers.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAgD;AAEhD,wEAAgD;AAChD,sEAA8C;AAC9C,iEAAwF;AACxF,6DAAuD;AACvD,kDAA0B;AAOb,QAAA,UAAU,GAAyC;IAC9D,oCAAe;IACf,yBAAe;IACf,wBAAc;IACd,yBAAe;IACf,mCAAY;IACZ,sCAAe;IACf,sCAAe;CAChB,CAAC;AAEW,QAAA,eAAe,GAAsB,kBAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAC7E,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CACjC,CAAC;AAEF;;;;GAIG;AACY,KAAK,UAAU,sBAAsB,CAAC,IAAY;IAC/D,MAAM,aAAa,GAAG,kBAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAE7E,gGAAgG;IAChG,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,MAAM,SAAS,CAAC,SAAS,EAAE,CAAC,CACpE,CAAC;IAEF,mEAAmE;IACnE,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAXD,yCAWC"}
|
|
@@ -3,16 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getProjects =
|
|
7
|
-
const assert_1 = __importDefault(require("assert"));
|
|
6
|
+
exports.getProjects = void 0;
|
|
8
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
8
|
const fs_1 = require("fs");
|
|
10
9
|
const path_1 = require("path");
|
|
11
10
|
const errors_1 = require("../errors");
|
|
12
11
|
const installers_1 = __importDefault(require("./installers"));
|
|
13
|
-
const javaScriptAgentInstaller_1 = require("./javaScriptAgentInstaller");
|
|
14
|
-
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
15
|
-
const commandRunner_1 = require("./commandRunner");
|
|
16
12
|
async function resolveSelectedInstallers(ui, projects, userSpecifiedInstaller) {
|
|
17
13
|
// Attempt to resolve selectedInstallers from the user's arg line input.
|
|
18
14
|
if (userSpecifiedInstaller) {
|
|
@@ -54,96 +50,6 @@ async function resolveSelectedInstallers(ui, projects, userSpecifiedInstaller) {
|
|
|
54
50
|
throw new Error('Invalid selection');
|
|
55
51
|
}
|
|
56
52
|
}
|
|
57
|
-
function yarn1Workspaces(info) {
|
|
58
|
-
(0, assert_1.default)(info && typeof info === 'object');
|
|
59
|
-
return Object.entries(info).map(([name, data]) => {
|
|
60
|
-
(0, assert_1.default)(data && typeof data === 'object');
|
|
61
|
-
(0, assert_1.default)('location' in data);
|
|
62
|
-
(0, assert_1.default)(typeof data['location'] === 'string');
|
|
63
|
-
return [name, data['location']];
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
// With yarn 1:
|
|
67
|
-
// - if there's no "workspaces" key in package.json we get the following error:
|
|
68
|
-
// $ yarn workspaces info --json
|
|
69
|
-
// yarn workspaces v1.22.19
|
|
70
|
-
// error Cannot find the root of your workspace - are you sure you're currently in a workspace?
|
|
71
|
-
// info Visit https://yarnpkg.com/en/docs/cli/workspaces for documentation about this command.
|
|
72
|
-
// - if there is a "workspaces" key in package.json the output contains text
|
|
73
|
-
// outside of json. Remove it:
|
|
74
|
-
// $ yarn workspaces info --json
|
|
75
|
-
// yarn workspaces v1.22.19
|
|
76
|
-
// {
|
|
77
|
-
// "workspace-a": {
|
|
78
|
-
// "location": "workspace-a",
|
|
79
|
-
// "workspaceDependencies": [],
|
|
80
|
-
// "mismatchedWorkspaceDependencies": []
|
|
81
|
-
// }
|
|
82
|
-
// }
|
|
83
|
-
// Done in 0.02s.
|
|
84
|
-
async function getYarnSubprojectsVersionOne(dir, installer, subprojects) {
|
|
85
|
-
const cmd = new commandStruct_1.default('yarn', ['workspaces', 'info', '--json'], installer.path);
|
|
86
|
-
let output;
|
|
87
|
-
try {
|
|
88
|
-
output = await (0, commandRunner_1.run)(cmd);
|
|
89
|
-
}
|
|
90
|
-
catch (e) {
|
|
91
|
-
if (errors_1.ChildProcessError.check(e))
|
|
92
|
-
return;
|
|
93
|
-
throw e;
|
|
94
|
-
}
|
|
95
|
-
// Remove any text before and after JSON
|
|
96
|
-
let lines = output.stdout.split('\n');
|
|
97
|
-
let outputClean = '';
|
|
98
|
-
for (const line of lines)
|
|
99
|
-
if (!(line.startsWith('yarn workspaces v') || line.startsWith('Done in ')))
|
|
100
|
-
outputClean += line;
|
|
101
|
-
for (const [name, location] of yarn1Workspaces(JSON.parse(outputClean))) {
|
|
102
|
-
const subProjectPath = (0, path_1.join)(dir, location);
|
|
103
|
-
const subProjectName = (0, path_1.basename)(name);
|
|
104
|
-
const projectConfiguration = {
|
|
105
|
-
name: subProjectName,
|
|
106
|
-
path: subProjectPath,
|
|
107
|
-
// must set the new path in the installer
|
|
108
|
-
availableInstallers: [new javaScriptAgentInstaller_1.YarnInstaller(subProjectPath)],
|
|
109
|
-
};
|
|
110
|
-
subprojects.push(projectConfiguration);
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
async function getYarnSubprojectsVersionAboveOne(dir, installer, subprojects) {
|
|
114
|
-
const cmd = new commandStruct_1.default('yarn', ['workspaces', 'list', '--json'], installer.path);
|
|
115
|
-
const output = await (0, commandRunner_1.run)(cmd);
|
|
116
|
-
for (const line of output.stdout.split('\n')) {
|
|
117
|
-
if (line !== '') {
|
|
118
|
-
const yarnWorkspace = JSON.parse(line);
|
|
119
|
-
const subProjectPath = (0, path_1.join)(dir, yarnWorkspace['location']);
|
|
120
|
-
const subProjectName = (0, path_1.basename)(yarnWorkspace['name']);
|
|
121
|
-
const projectConfiguration = {
|
|
122
|
-
name: subProjectName,
|
|
123
|
-
path: subProjectPath,
|
|
124
|
-
// must set the new path in the installer
|
|
125
|
-
availableInstallers: [new javaScriptAgentInstaller_1.YarnInstaller(subProjectPath)],
|
|
126
|
-
};
|
|
127
|
-
subprojects.push(projectConfiguration);
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
async function getYarnSubprojects(dir, availableInstallers) {
|
|
132
|
-
let subprojects = [];
|
|
133
|
-
for (const installer of availableInstallers) {
|
|
134
|
-
if (installer.name === 'yarn') {
|
|
135
|
-
const yarnInstaller = installer;
|
|
136
|
-
if (await yarnInstaller.isYarnVersionOne()) {
|
|
137
|
-
await getYarnSubprojectsVersionOne(dir, yarnInstaller, subprojects);
|
|
138
|
-
}
|
|
139
|
-
else {
|
|
140
|
-
await getYarnSubprojectsVersionAboveOne(dir, yarnInstaller, subprojects);
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
return subprojects;
|
|
145
|
-
}
|
|
146
|
-
exports.getYarnSubprojects = getYarnSubprojects;
|
|
147
53
|
/**
|
|
148
54
|
* Identifies subprojects and returns an array of ProjectConfigurations if the user chooses to
|
|
149
55
|
* install to them. If the user opts not to install to any subprojects, undefined is returned. This
|
|
@@ -153,61 +59,55 @@ exports.getYarnSubprojects = getYarnSubprojects;
|
|
|
153
59
|
* @returns ProjectConfiguration[] if the user chooses to install to subprojects, otherwise
|
|
154
60
|
* undefined
|
|
155
61
|
*/
|
|
156
|
-
async function getSubprojects(ui, dir, rootHasInstaller
|
|
157
|
-
|
|
158
|
-
const
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
return {
|
|
183
|
-
name: ent.name,
|
|
184
|
-
path: subProjectPath,
|
|
185
|
-
availableInstallers: installers,
|
|
186
|
-
};
|
|
187
|
-
}))).filter(Boolean);
|
|
188
|
-
}
|
|
62
|
+
async function getSubprojects(ui, dir, rootHasInstaller) {
|
|
63
|
+
// read directory to detect sub-projects
|
|
64
|
+
const ents = await fs_1.promises.readdir(dir, { withFileTypes: true });
|
|
65
|
+
const subprojects = (await Promise.all(ents.map(async (ent) => {
|
|
66
|
+
if (!ent.isDirectory()) {
|
|
67
|
+
return null;
|
|
68
|
+
}
|
|
69
|
+
const subProjectPath = (0, path_1.join)(dir, ent.name);
|
|
70
|
+
try {
|
|
71
|
+
await fs_1.promises.access(subProjectPath, fs_1.constants.R_OK);
|
|
72
|
+
}
|
|
73
|
+
catch (_a) {
|
|
74
|
+
// This directory is not readable. Ignore it.
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
const installers = await (0, installers_1.default)(subProjectPath);
|
|
78
|
+
if (!installers.length) {
|
|
79
|
+
return null;
|
|
80
|
+
}
|
|
81
|
+
return {
|
|
82
|
+
name: ent.name,
|
|
83
|
+
path: subProjectPath,
|
|
84
|
+
availableInstallers: installers,
|
|
85
|
+
noopOnly: installers.every(({ isNoop }) => isNoop),
|
|
86
|
+
};
|
|
87
|
+
}))).filter(Boolean);
|
|
189
88
|
if (!subprojects.length) {
|
|
190
89
|
// There's nothing that we can do here.
|
|
191
90
|
return undefined;
|
|
192
91
|
}
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
return
|
|
197
|
-
}
|
|
92
|
+
// don't bother the user to select noop-only projects...
|
|
93
|
+
const selectableSubprojects = subprojects.filter(({ noopOnly }) => !noopOnly);
|
|
94
|
+
if (selectableSubprojects.length > 0 && !(await ui.chooseSubprojects(rootHasInstaller)))
|
|
95
|
+
return;
|
|
198
96
|
const subProjectConfigurations = [];
|
|
199
|
-
const selectedSubprojects = await ui.selectSubprojects(
|
|
97
|
+
const selectedSubprojects = await ui.selectSubprojects(selectableSubprojects.map(({ name }) => name));
|
|
200
98
|
if (selectedSubprojects.length > 0) {
|
|
201
99
|
subProjectConfigurations.push(...subprojects.filter(({ name }) => selectedSubprojects.includes(name)));
|
|
202
100
|
}
|
|
101
|
+
// ...but add them unconditionally so the caller sees them
|
|
102
|
+
subProjectConfigurations.push(...subprojects.filter(({ noopOnly }) => noopOnly));
|
|
203
103
|
return subProjectConfigurations;
|
|
204
104
|
}
|
|
205
105
|
async function getProjects(ui, installers, dir, allowMulti, userSpecifiedInstaller) {
|
|
206
106
|
let projectConfigurations = [];
|
|
207
107
|
const availableInstallers = await (0, installers_1.default)(dir);
|
|
208
|
-
const rootHasInstaller = !!availableInstallers.
|
|
108
|
+
const rootHasInstaller = !!availableInstallers.find(({ isNoop }) => !isNoop);
|
|
209
109
|
if (allowMulti) {
|
|
210
|
-
const subprojects = await getSubprojects(ui, dir, rootHasInstaller
|
|
110
|
+
const subprojects = await getSubprojects(ui, dir, rootHasInstaller);
|
|
211
111
|
if (subprojects === null || subprojects === void 0 ? void 0 : subprojects.length) {
|
|
212
112
|
projectConfigurations.push(...subprojects);
|
|
213
113
|
}
|
|
@@ -223,6 +123,7 @@ async function getProjects(ui, installers, dir, allowMulti, userSpecifiedInstall
|
|
|
223
123
|
name: (0, path_1.basename)(dir),
|
|
224
124
|
path: (0, path_1.resolve)(dir),
|
|
225
125
|
availableInstallers,
|
|
126
|
+
noopOnly: !rootHasInstaller,
|
|
226
127
|
},
|
|
227
128
|
];
|
|
228
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,110 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.YarnInstaller = exports.NpmInstaller = void 0;
|
|
7
|
-
const utils_1 = require("../../utils");
|
|
8
|
-
const commandUtil_1 = require("./commandUtil");
|
|
9
|
-
const path_1 = require("path");
|
|
10
|
-
const commandRunner_1 = require("./commandRunner");
|
|
11
|
-
const agentInstaller_1 = __importDefault(require("./agentInstaller"));
|
|
12
|
-
const chalk_1 = __importDefault(require("chalk"));
|
|
13
|
-
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
14
|
-
const errors_1 = require("../errors");
|
|
15
|
-
const semver_1 = __importDefault(require("semver"));
|
|
16
|
-
const AGENT_PACKAGE = '@appland/appmap-agent-js@latest';
|
|
17
|
-
class JavaScriptInstaller extends agentInstaller_1.default {
|
|
18
|
-
constructor(name, path) {
|
|
19
|
-
super(name, path);
|
|
20
|
-
}
|
|
21
|
-
get language() {
|
|
22
|
-
return 'javascript';
|
|
23
|
-
}
|
|
24
|
-
get appmap_dir() {
|
|
25
|
-
return 'tmp/appmap';
|
|
26
|
-
}
|
|
27
|
-
get documentation() {
|
|
28
|
-
return 'https://appland.com/docs/reference/appmap-agent-js';
|
|
29
|
-
}
|
|
30
|
-
async environment() {
|
|
31
|
-
const version = await (0, commandUtil_1.getOutput)('node', ['--version'], this.path);
|
|
32
|
-
return {
|
|
33
|
-
'Node version': version.ok ? version.output.split(/\s/)[1] : chalk_1.default.red(version.output),
|
|
34
|
-
};
|
|
35
|
-
}
|
|
36
|
-
async initCommand() {
|
|
37
|
-
return new commandStruct_1.default('npx', ['--prefer-online', '@appland/appmap-agent-js@latest', 'init', this.path], this.path);
|
|
38
|
-
}
|
|
39
|
-
async validateAgentCommand() {
|
|
40
|
-
return new commandStruct_1.default('npx', ['--prefer-online', '@appland/appmap-agent-js@latest', 'status', this.path], this.path);
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
class NpmInstaller extends JavaScriptInstaller {
|
|
44
|
-
constructor(path) {
|
|
45
|
-
super(NpmInstaller.identifier, path);
|
|
46
|
-
}
|
|
47
|
-
get buildFile() {
|
|
48
|
-
return 'package-lock.json';
|
|
49
|
-
}
|
|
50
|
-
get buildFilePath() {
|
|
51
|
-
return (0, path_1.join)(this.path, this.buildFile);
|
|
52
|
-
}
|
|
53
|
-
async available() {
|
|
54
|
-
return await (0, utils_1.exists)(this.buildFilePath);
|
|
55
|
-
}
|
|
56
|
-
async checkConfigCommand(_ui) {
|
|
57
|
-
return new commandStruct_1.default('npm', ['install', '--dry-run'], this.path);
|
|
58
|
-
}
|
|
59
|
-
async installAgent(_ui) {
|
|
60
|
-
const cmd = new commandStruct_1.default('npm', ['install', '--saveDev', process.env.APPMAP_AGENT_PACKAGE || AGENT_PACKAGE], this.path);
|
|
61
|
-
await (0, commandRunner_1.run)(cmd);
|
|
62
|
-
}
|
|
63
|
-
async verifyCommand() {
|
|
64
|
-
return undefined;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
exports.NpmInstaller = NpmInstaller;
|
|
68
|
-
NpmInstaller.identifier = 'npm';
|
|
69
|
-
class YarnInstaller extends JavaScriptInstaller {
|
|
70
|
-
constructor(path) {
|
|
71
|
-
super(YarnInstaller.identifier, path);
|
|
72
|
-
}
|
|
73
|
-
get buildFile() {
|
|
74
|
-
return 'yarn.lock';
|
|
75
|
-
}
|
|
76
|
-
get buildFilePath() {
|
|
77
|
-
return (0, path_1.join)(this.path, this.buildFile);
|
|
78
|
-
}
|
|
79
|
-
async available() {
|
|
80
|
-
return await (0, utils_1.exists)(this.buildFilePath);
|
|
81
|
-
}
|
|
82
|
-
async checkConfigCommand(_ui) {
|
|
83
|
-
return new commandStruct_1.default('yarn', ['install', '--immutable'], this.path);
|
|
84
|
-
}
|
|
85
|
-
async installAgent(_ui) {
|
|
86
|
-
const cmd = new commandStruct_1.default('yarn', ['add', '--dev', process.env.APPMAP_AGENT_PACKAGE || AGENT_PACKAGE], this.path);
|
|
87
|
-
await (0, commandRunner_1.run)(cmd);
|
|
88
|
-
}
|
|
89
|
-
async verifyCommand() {
|
|
90
|
-
return undefined;
|
|
91
|
-
}
|
|
92
|
-
async isYarnVersionOne() {
|
|
93
|
-
let isVersionOne;
|
|
94
|
-
try {
|
|
95
|
-
const versionOutput = await (0, commandUtil_1.getOutput)('yarn', ['--version'], this.path);
|
|
96
|
-
const version = semver_1.default.coerce(versionOutput.output);
|
|
97
|
-
if (!version) {
|
|
98
|
-
throw new errors_1.UserConfigError('Could not detect yarn version');
|
|
99
|
-
}
|
|
100
|
-
isVersionOne = !semver_1.default.satisfies(version, '>= 2.0.0');
|
|
101
|
-
}
|
|
102
|
-
catch (err) {
|
|
103
|
-
throw new errors_1.UserConfigError(err);
|
|
104
|
-
}
|
|
105
|
-
return isVersionOne;
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
exports.YarnInstaller = YarnInstaller;
|
|
109
|
-
YarnInstaller.identifier = 'yarn';
|
|
110
|
-
//# sourceMappingURL=javaScriptAgentInstaller.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"javaScriptAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/javaScriptAgentInstaller.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAqC;AACrC,+CAA0C;AAC1C,+BAA4B;AAC5B,mDAAsC;AACtC,sEAA8C;AAC9C,kDAA0B;AAC1B,oEAA4C;AAC5C,sCAA4C;AAC5C,oDAA4B;AAG5B,MAAM,aAAa,GAAG,iCAAiC,CAAC;AAExD,MAAe,mBAAoB,SAAQ,wBAAc;IACvD,YAAY,IAAY,EAAE,IAAY;QACpC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,oDAAoD,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAS,EAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAElE,OAAO;YACL,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;SACvF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,uBAAa,CACtB,KAAK,EACL,CAAC,iBAAiB,EAAE,iCAAiC,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EACzE,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,OAAO,IAAI,uBAAa,CACtB,KAAK,EACL,CAAC,iBAAiB,EAAE,iCAAiC,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,EAC3E,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;CACF;AAED,MAAa,YAAa,SAAQ,mBAAmB;IAGnD,YAAY,IAAY;QACtB,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,MAAM,IAAA,cAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,GAAgB;QACvC,OAAO,IAAI,uBAAa,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAgB;QACjC,MAAM,GAAG,GAAG,IAAI,uBAAa,CAC3B,KAAK,EACL,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,aAAa,CAAC,EAC3E,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,MAAM,IAAA,mBAAG,EAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;;AAnCH,oCAoCC;AAnCQ,uBAAU,GAAG,KAAK,CAAC;AAqC5B,MAAa,aAAc,SAAQ,mBAAmB;IAGpD,YAAY,IAAY;QACtB,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,MAAM,IAAA,cAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,GAAgB;QACvC,OAAO,IAAI,uBAAa,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAgB;QACjC,MAAM,GAAG,GAAG,IAAI,uBAAa,CAC3B,MAAM,EACN,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,aAAa,CAAC,EACnE,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,MAAM,IAAA,mBAAG,EAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,YAAqB,CAAC;QAC1B,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,IAAA,uBAAS,EAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACxE,MAAM,OAAO,GAAG,gBAAM,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAEpD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,wBAAe,CAAC,+BAA+B,CAAC,CAAC;aAC5D;YAED,YAAY,GAAG,CAAC,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;SACvD;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,wBAAe,CAAC,GAAa,CAAC,CAAC;SAC1C;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;;AArDH,sCAsDC;AArDQ,wBAAU,GAAG,MAAM,CAAC"}
|