@catladder/cli 1.154.2 → 1.155.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/dist/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js +7 -0
- package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.js +3 -1
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.d.ts +2 -1
- package/dist/pipeline/src/build/node/cache.js +12 -1
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/context/getBuildInfoVariables.d.ts +2 -3
- package/dist/pipeline/src/context/getBuildInfoVariables.js +38 -17
- package/dist/pipeline/src/context/getBuildInfoVariables.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +0 -3
- package/dist/pipeline/src/pipeline/yarn/yarnUtils.js +12 -11
- package/dist/pipeline/src/pipeline/yarn/yarnUtils.js.map +1 -1
- package/dist/pipeline/src/utils/jsonParse.d.ts +1 -0
- package/dist/pipeline/src/utils/jsonParse.js +13 -0
- package/dist/pipeline/src/utils/jsonParse.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -19,6 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
19
19
|
exports.componentContextNeedsBuildTimeDotEnv = exports.writeDotEnv = void 0;
|
|
20
20
|
var lodash_1 = require("lodash");
|
|
21
21
|
var gitlab_1 = require("../../utils/gitlab");
|
|
22
|
+
var getBuildInfoVariables_1 = require("../../context/getBuildInfoVariables");
|
|
22
23
|
/**
|
|
23
24
|
* writes a .env file in the components folder
|
|
24
25
|
* @param context
|
|
@@ -32,6 +33,12 @@ var writeDotEnv = function (context) {
|
|
|
32
33
|
.filter(function (_a) {
|
|
33
34
|
var _b = __read(_a, 2), value = _b[1];
|
|
34
35
|
return !(0, lodash_1.isNil)(value);
|
|
36
|
+
})
|
|
37
|
+
// filter out build variables, since they may interfer with caching like turbo
|
|
38
|
+
// build variables are rarely used anyway and we may treat them differently in the future
|
|
39
|
+
.filter(function (_a) {
|
|
40
|
+
var _b = __read(_a, 1), key = _b[0];
|
|
41
|
+
return !getBuildInfoVariables_1.ALL_BUILD_VARIABLES.includes(key);
|
|
35
42
|
})
|
|
36
43
|
.map(function (_a) {
|
|
37
44
|
var _b = __read(_a, 2), key = _b[0], value = _b[1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeDotEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeDotEnv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAE/B,6CAAyD;
|
|
1
|
+
{"version":3,"file":"writeDotEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeDotEnv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAE/B,6CAAyD;AACzD,6EAA0E;AAE1E;;;;GAIG;AACI,IAAM,WAAW,GAAG,UAAC,OAAyB;IACnD,IAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAE5C,wCAAwC;IACxC,IAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAC5C,uCAAuC;SACtC,MAAM,CAAC,UAAC,EAAS;YAAT,KAAA,aAAS,EAAN,KAAK,QAAA;QAAM,OAAA,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC;IAAb,CAAa,CAAC;QACrC,8EAA8E;QAC9E,yFAAyF;SACxF,MAAM,CAAC,UAAC,EAAK;YAAL,KAAA,aAAK,EAAJ,GAAG,QAAA;QAAM,OAAA,CAAC,2CAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC;IAAlC,CAAkC,CAAC;SACrD,GAAG,CACF,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAE;IAArD,CAAqD,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,IAAA,4BAAmB,EACxB,eAAe,GAAG,OAAO,CAAC,IAAI,EAC9B,eAAe,CAChB,CAAC;QACA,sBAAe,OAAO,CAAC,KAAK,CAAC,GAAG,oBAClC,cAAc,UACZ;KACD,CAAC,CAAC;AACL,CAAC,CAAC;AAvBW,QAAA,WAAW,eAuBtB;AAEK,IAAM,oCAAoC,GAAG,UAClD,OAAyB;IAEzB,OAAO,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,kCAAkC;AACpF,CAAC,CAAC;AAJW,QAAA,oCAAoC,wCAI/C"}
|
|
@@ -62,7 +62,9 @@ var createNodeBuildJobDefinition = function (context) {
|
|
|
62
62
|
return {
|
|
63
63
|
image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
|
|
64
64
|
runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
|
|
65
|
-
cache: __spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
|
|
65
|
+
cache: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false), __read((context.type === "workspace"
|
|
66
|
+
? (0, cache_1.getWorkspaceDefaultCaches)(context)
|
|
67
|
+
: [])), false),
|
|
66
68
|
script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read(((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : [])), false),
|
|
67
69
|
jobTags: buildConfig.jobTags,
|
|
68
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA8C;AAK9C,+CAG6B;AAE7B,qCAA0C;AAC1C,gCAA6E;AAG7E,oCAAsE;AAEtE,kCAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type { Context } from "../../types/context";
|
|
1
|
+
import type { Context, WorkspaceContext } from "../../types/context";
|
|
2
2
|
import type { GitlabJobCache } from "../../types/gitlab-types";
|
|
3
3
|
export declare const getYarnCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
4
4
|
export declare const getNodeModulesCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
5
5
|
export declare const getNodeCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
6
6
|
export declare const getNextCache: (context: Context) => GitlabJobCache[];
|
|
7
|
+
export declare const getWorkspaceDefaultCaches: (context: WorkspaceContext) => GitlabJobCache[];
|
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
29
29
|
};
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
|
-
exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
31
|
+
exports.getWorkspaceDefaultCaches = exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
32
32
|
var lodash_1 = require("lodash");
|
|
33
33
|
var path_1 = require("path");
|
|
34
34
|
var slugify_1 = __importDefault(require("slugify"));
|
|
@@ -95,4 +95,15 @@ var getNextCache = function (context) {
|
|
|
95
95
|
];
|
|
96
96
|
};
|
|
97
97
|
exports.getNextCache = getNextCache;
|
|
98
|
+
var getWorkspaceDefaultCaches = function (context) {
|
|
99
|
+
return [
|
|
100
|
+
{
|
|
101
|
+
// turbo repo
|
|
102
|
+
key: context.name + "-turbo",
|
|
103
|
+
policy: "pull-push",
|
|
104
|
+
paths: [(0, path_1.join)(context.build.dir, ".turbo")],
|
|
105
|
+
},
|
|
106
|
+
];
|
|
107
|
+
};
|
|
108
|
+
exports.getWorkspaceDefaultCaches = getWorkspaceDefaultCaches;
|
|
98
109
|
//# sourceMappingURL=cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA8B;AAC9B,6BAA4B;AAC5B,oDAA8B;AAIvB,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IACpD,OAAO;QACL,sBAAsB;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,MAAM;gBACX,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,OAAO,CAAC;aACjB;YACH,CAAC,CAAC;gBACE,GAAG,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO;gBACzC,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAC1C;KACN,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,YAAY,gBAoBvB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAgB,EAChB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IAEpD,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YACjP,MAAM,QAAA;YACN,KAAK,2BACA,CAAC,sBAAsB;gBACxB,CAAC,CAAC,IAAA,aAAI;oBACF,cAAc;0BACX,CAAC,MAAA,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC9C,OAAA,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAAhC,CAAgC,CACjC,mCAAI,EAAE,CAAC,UACR;gBACJ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,SAC/C;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,mBAAmB,uBA6B9B;AACK,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,8CACK,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,kBAC7B,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UACvC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEK,IAAM,YAAY,GAAG,UAAC,OAAgB;IAC3C,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,aAAa,CAAC;IACzC,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK;SACxB,gBAAgB,CAAC,QAAQ,CAAC;SAC1B,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,WAAI,EAAC,CAAC,EAAE,aAAa,CAAC,EAAtB,CAAsB,CAAC,CAAC;IAEtC,OAAO;QACL;YACE,GAAG,KAAA;YACH,MAAM,EAAE,WAAW;YACnB,KAAK,OAAA;SACN;KACF,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,YAAY,gBAavB"}
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { BashExpression } from "../bash/BashExpression";
|
|
2
2
|
import type { EnvironmentContext } from "../types/environmentContext";
|
|
3
|
+
export declare const ALL_BUILD_VARIABLES: string[];
|
|
3
4
|
export declare const getBuildInfoVariables: (ctx: EnvironmentContext) => {
|
|
4
|
-
|
|
5
|
-
BUILD_INFO_BUILD_TIME: string | BashExpression;
|
|
6
|
-
BUILD_INFO_CURRENT_VERSION: string | BashExpression;
|
|
5
|
+
[k: string]: string | BashExpression;
|
|
7
6
|
};
|
|
@@ -1,27 +1,48 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
3
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
4
|
+
if (!m) return o;
|
|
5
|
+
var i = m.call(o), r, ar = [], e;
|
|
6
|
+
try {
|
|
7
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
8
|
+
}
|
|
9
|
+
catch (error) { e = { error: error }; }
|
|
10
|
+
finally {
|
|
11
|
+
try {
|
|
12
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
13
|
+
}
|
|
14
|
+
finally { if (e) throw e.error; }
|
|
15
|
+
}
|
|
16
|
+
return ar;
|
|
17
|
+
};
|
|
2
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getBuildInfoVariables = void 0;
|
|
19
|
+
exports.getBuildInfoVariables = exports.ALL_BUILD_VARIABLES = void 0;
|
|
4
20
|
var BashExpression_1 = require("../bash/BashExpression");
|
|
5
21
|
var bashExpressionPerPipelineType_1 = require("../bash/bashExpressionPerPipelineType");
|
|
6
|
-
var
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
22
|
+
var BUILD_VARIABLES = {
|
|
23
|
+
BUILD_INFO_BUILD_ID: {
|
|
24
|
+
default: new BashExpression_1.BashExpression("$(git describe --tags 2>/dev/null || git rev-parse HEAD)"),
|
|
25
|
+
},
|
|
26
|
+
BUILD_INFO_BUILD_TIME: {
|
|
27
|
+
default: "unknown-build-time",
|
|
28
|
+
gitlab: new BashExpression_1.BashExpression("$CI_JOB_STARTED_AT"),
|
|
29
|
+
},
|
|
30
|
+
BUILD_INFO_CURRENT_VERSION: {
|
|
31
|
+
default: new BashExpression_1.BashExpression(
|
|
32
|
+
// because we do shallow fetch, we need to ask the origin
|
|
33
|
+
"$(tag=$(git ls-remote origin \"refs/tags/v*[0-9]\" 2>/dev/null | cut -f 2- | sort -V | tail -1 | sed 's/refs\\/tags\\/v//'); [ -z \"$tag\" ] && echo \"0.0.0\" || echo \"$tag\")"),
|
|
34
|
+
},
|
|
17
35
|
};
|
|
36
|
+
exports.ALL_BUILD_VARIABLES = Object.keys(BUILD_VARIABLES);
|
|
18
37
|
var getBuildInfoVariables = function (ctx) {
|
|
19
38
|
var pipelineType = ctx.pipelineType;
|
|
20
|
-
return {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
39
|
+
return Object.fromEntries(Object.entries(BUILD_VARIABLES).map(function (_a) {
|
|
40
|
+
var _b = __read(_a, 2), key = _b[0], value = _b[1];
|
|
41
|
+
return [
|
|
42
|
+
key,
|
|
43
|
+
(0, bashExpressionPerPipelineType_1.getBashExpressionPerPipelineType)(value, pipelineType),
|
|
44
|
+
];
|
|
45
|
+
}));
|
|
25
46
|
};
|
|
26
47
|
exports.getBuildInfoVariables = getBuildInfoVariables;
|
|
27
48
|
//# sourceMappingURL=getBuildInfoVariables.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBuildInfoVariables.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getBuildInfoVariables.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getBuildInfoVariables.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getBuildInfoVariables.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,yDAAwD;AAExD,uFAAyF;AAGzF,IAAM,eAAe,GAAG;IACtB,mBAAmB,EAAE;QACnB,OAAO,EAAE,IAAI,+BAAc,CACzB,0DAA0D,CAC3D;KACF;IACD,qBAAqB,EAAE;QACrB,OAAO,EAAE,oBAAoB;QAC7B,MAAM,EAAE,IAAI,+BAAc,CAAC,oBAAoB,CAAC;KACjD;IACD,0BAA0B,EAAE;QAC1B,OAAO,EAAE,IAAI,+BAAc;QACzB,yDAAyD;QACzD,kLAA0K,CAC3K;KACF;CAGF,CAAC;AAEW,QAAA,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AACzD,IAAM,qBAAqB,GAAG,UAAC,GAAuB;IACnD,IAAA,YAAY,GAAK,GAAG,aAAR,CAAS;IAE7B,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA;YACpD,GAAG;YACH,IAAA,gEAAgC,EAAC,KAAK,EAAE,YAAY,CAAC;SACtD;IAHqD,CAGrD,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,qBAAqB,yBAShC"}
|
|
@@ -7,9 +7,6 @@ export type SecretEnvVar = {
|
|
|
7
7
|
hidden?: boolean;
|
|
8
8
|
};
|
|
9
9
|
declare const getBasePredefinedVariables: (ctx: EnvironmentContext) => {
|
|
10
|
-
BUILD_INFO_BUILD_ID?: string | import("../bash/BashExpression").BashExpression;
|
|
11
|
-
BUILD_INFO_BUILD_TIME?: string | import("../bash/BashExpression").BashExpression;
|
|
12
|
-
BUILD_INFO_CURRENT_VERSION?: string | import("../bash/BashExpression").BashExpression;
|
|
13
10
|
ENV_SHORT: string;
|
|
14
11
|
APP_DIR: string;
|
|
15
12
|
ENV_TYPE: "stage" | "dev" | "review" | "prod" | "local";
|
|
@@ -67,6 +67,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
67
67
|
exports.getWorkspaceDependencies = exports.getWorkspaces = exports.getYarnVersion = void 0;
|
|
68
68
|
var child_process_promise_1 = require("child-process-promise");
|
|
69
69
|
var memoizee_1 = __importDefault(require("memoizee"));
|
|
70
|
+
var jsonParse_1 = require("../../utils/jsonParse");
|
|
70
71
|
var execOrFail = function (cmd, onFail) { return __awaiter(void 0, void 0, void 0, function () {
|
|
71
72
|
var e_1;
|
|
72
73
|
return __generator(this, function (_a) {
|
|
@@ -93,29 +94,29 @@ exports.getYarnVersion = (0, memoizee_1.default)(function () { return __awaiter(
|
|
|
93
94
|
}); }, { promise: true });
|
|
94
95
|
// export for mocking
|
|
95
96
|
exports.getWorkspaces = (0, memoizee_1.default)(function (isClassic) { return __awaiter(void 0, void 0, void 0, function () {
|
|
96
|
-
var _a, _b, _c, _d, _e, _f, _g
|
|
97
|
-
var
|
|
98
|
-
return __generator(this, function (
|
|
99
|
-
switch (
|
|
97
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
98
|
+
var _h, _j;
|
|
99
|
+
return __generator(this, function (_k) {
|
|
100
|
+
switch (_k.label) {
|
|
100
101
|
case 0:
|
|
101
102
|
if (!isClassic) return [3 /*break*/, 2];
|
|
102
103
|
_c = (_b = Object).values;
|
|
103
|
-
|
|
104
|
-
|
|
104
|
+
_d = jsonParse_1.jsonParseOrThrow;
|
|
105
|
+
_e = jsonParse_1.jsonParseOrThrow;
|
|
105
106
|
return [4 /*yield*/, execOrFail("yarn workspaces --json info", "{}")];
|
|
106
107
|
case 1:
|
|
107
|
-
_a = _c.apply(_b, [
|
|
108
|
+
_a = _c.apply(_b, [_d.apply(void 0, [(_j = (_h = _e.apply(void 0, [_k.sent()])) === null || _h === void 0 ? void 0 : _h.data) !== null && _j !== void 0 ? _j : "{}"])]);
|
|
108
109
|
return [3 /*break*/, 4];
|
|
109
110
|
case 2:
|
|
110
|
-
|
|
111
|
-
|
|
111
|
+
_f = jsonParse_1.jsonParseOrThrow;
|
|
112
|
+
_g = "[".concat;
|
|
112
113
|
return [4 /*yield*/, execOrFail("yarn workspaces list --json --verbose", "")];
|
|
113
114
|
case 3:
|
|
114
|
-
_a =
|
|
115
|
+
_a = _f.apply(void 0, [_g.apply("[", [(_k.sent())
|
|
115
116
|
.trim()
|
|
116
117
|
.split("\n")
|
|
117
118
|
.join(","), "]"])]);
|
|
118
|
-
|
|
119
|
+
_k.label = 4;
|
|
119
120
|
case 4: return [2 /*return*/, _a];
|
|
120
121
|
}
|
|
121
122
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarnUtils.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/yarn/yarnUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,sDAAgC;
|
|
1
|
+
{"version":3,"file":"yarnUtils.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/yarn/yarnUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,sDAAgC;AAEhC,mDAAyD;AAEzD,IAAM,UAAU,GAAG,UAAO,GAAW,EAAE,MAAc;;;;;;gBAE1C,qBAAM,IAAA,4BAAI,EAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,EAAR,CAAQ,CAAC,EAAA;oBAA5C,sBAAO,SAAqC,EAAC;;;gBAE7C,sBAAO,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,EAAC;;;;KAEzB,CAAC;AACF,qBAAqB;AACR,QAAA,cAAc,GAAG,IAAA,kBAAQ,EACpC;;;oBACS,qBAAM,UAAU,CAAC,gBAAgB,EAAE,EAAE,CAAC,EAAA;oBAA7C,sBAAO,SAAsC,EAAC;;;KAC/C,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;AAEF,qBAAqB;AACR,QAAA,aAAa,GAAG,IAAA,kBAAQ,EACnC,UAAO,SAAkB;;;;;;qBAChB,SAAS,EAAT,wBAAS;gBACZ,KAAA,CAAA,KAAA,MAAM,CAAA,CAAC,MAAM,CAAA;gBACX,KAAA,4BAAgB,CAAA;gBACd,KAAA,4BAAgB,CAAA;gBACd,qBAAM,UAAU,CAAC,6BAA6B,EAAE,IAAI,CAAC,EAAA;;gBAH3D,KAAA,cACE,kBACE,MAAA,MAAA,kBACE,SAAqD,EACtD,0CAAE,IAAI,mCAAI,IAAI,EAChB,EACF,CAAA;;;gBACD,KAAA,4BAAgB,CAAA;;gBACT,qBAAM,UAAU,CAAC,uCAAuC,EAAE,EAAE,CAAC,EAAA;;gBADpE,KAAA,kBACE,eAAI,CAAC,SAA6D,CAAC;6BAChE,IAAI,EAAE;6BACN,KAAK,CAAC,IAAI,CAAC;6BACX,IAAI,CAAC,GAAG,CAAC,OAAG,EAChB,CAAA;;oBAbL,0BAaM;;;KACP,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;AAEF,4CAA4C;AACrC,IAAM,wBAAwB,GAAG,UACtC,EAAiB,EACjB,aAA8B;IAE9B,OAAO,EAAE;QACP,CAAC,CAAE,uCAAI,EAAE,CAAC,qBAAqB,kBAAK,EAAE,CAAC,+BAA+B,UACjE,OAAO,CAAC,UAAC,QAAQ;YAChB,gCAAgC;YAEhC,IAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CACvC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,KAAK,QAAQ,EAAvB,CAAuB,CAC/B,CAAC;YAEF,IAAI,cAAc,EAAE,CAAC;gBACnB,8CACK,IAAA,gCAAwB,EAAC,cAAc,EAAE,aAAa,CAAC;oBAC1D,cAAc,CAAC,QAAQ;0BACvB;YACJ,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,MAAM,CAAC,OAAO,CAAc;QACjC,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAvBW,QAAA,wBAAwB,4BAuBnC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const jsonParseOrThrow: (str: string) => any;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.jsonParseOrThrow = void 0;
|
|
4
|
+
var jsonParseOrThrow = function (str) {
|
|
5
|
+
try {
|
|
6
|
+
return JSON.parse(str);
|
|
7
|
+
}
|
|
8
|
+
catch (e) {
|
|
9
|
+
throw new Error("could not parse json: ".concat(str));
|
|
10
|
+
}
|
|
11
|
+
};
|
|
12
|
+
exports.jsonParseOrThrow = jsonParseOrThrow;
|
|
13
|
+
//# sourceMappingURL=jsonParse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jsonParse.js","sourceRoot":"","sources":["../../../../../pipeline/src/utils/jsonParse.ts"],"names":[],"mappings":";;;AAAO,IAAM,gBAAgB,GAAG,UAAC,GAAW;IAC1C,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,gCAAyB,GAAG,CAAE,CAAC,CAAC;IAClD,CAAC;AACH,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
|