@catladder/cli 0.0.0-main-8f6ef5d1 → 0.0.0-main-3bc751ca
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 +47 -13
- package/dist/bundles/cli/index.js +47 -13
- 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/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
|
@@ -3161,7 +3161,9 @@ var createNodeBuildJobDefinition = function (context) {
|
|
|
3161
3161
|
return {
|
|
3162
3162
|
image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
|
|
3163
3163
|
runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
|
|
3164
|
-
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),
|
|
3164
|
+
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"
|
|
3165
|
+
? (0, cache_1.getWorkspaceDefaultCaches)(context)
|
|
3166
|
+
: [])), false),
|
|
3165
3167
|
script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read(((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : [])), false),
|
|
3166
3168
|
jobTags: buildConfig.jobTags,
|
|
3167
3169
|
};
|
|
@@ -3223,7 +3225,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3223
3225
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
3224
3226
|
};
|
|
3225
3227
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
3226
|
-
exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
3228
|
+
exports.getWorkspaceDefaultCaches = exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
3227
3229
|
var lodash_1 = __nccwpck_require__(3255);
|
|
3228
3230
|
var path_1 = __nccwpck_require__(1017);
|
|
3229
3231
|
var slugify_1 = __importDefault(__nccwpck_require__(4035));
|
|
@@ -3290,6 +3292,17 @@ var getNextCache = function (context) {
|
|
|
3290
3292
|
];
|
|
3291
3293
|
};
|
|
3292
3294
|
exports.getNextCache = getNextCache;
|
|
3295
|
+
var getWorkspaceDefaultCaches = function (context) {
|
|
3296
|
+
return [
|
|
3297
|
+
{
|
|
3298
|
+
// turbo repo
|
|
3299
|
+
key: context.name + "-turbo",
|
|
3300
|
+
policy: "pull-push",
|
|
3301
|
+
paths: [(0, path_1.join)(context.build.dir, ".turbo")],
|
|
3302
|
+
},
|
|
3303
|
+
];
|
|
3304
|
+
};
|
|
3305
|
+
exports.getWorkspaceDefaultCaches = getWorkspaceDefaultCaches;
|
|
3293
3306
|
//# sourceMappingURL=cache.js.map
|
|
3294
3307
|
|
|
3295
3308
|
/***/ }),
|
|
@@ -9280,6 +9293,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
9280
9293
|
exports.getWorkspaceDependencies = exports.getWorkspaces = exports.getYarnVersion = void 0;
|
|
9281
9294
|
var child_process_promise_1 = __nccwpck_require__(5763);
|
|
9282
9295
|
var memoizee_1 = __importDefault(__nccwpck_require__(5839));
|
|
9296
|
+
var jsonParse_1 = __nccwpck_require__(6046);
|
|
9283
9297
|
var execOrFail = function (cmd, onFail) { return __awaiter(void 0, void 0, void 0, function () {
|
|
9284
9298
|
var e_1;
|
|
9285
9299
|
return __generator(this, function (_a) {
|
|
@@ -9306,29 +9320,29 @@ exports.getYarnVersion = (0, memoizee_1.default)(function () { return __awaiter(
|
|
|
9306
9320
|
}); }, { promise: true });
|
|
9307
9321
|
// export for mocking
|
|
9308
9322
|
exports.getWorkspaces = (0, memoizee_1.default)(function (isClassic) { return __awaiter(void 0, void 0, void 0, function () {
|
|
9309
|
-
var _a, _b, _c, _d, _e, _f, _g
|
|
9310
|
-
var
|
|
9311
|
-
return __generator(this, function (
|
|
9312
|
-
switch (
|
|
9323
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
9324
|
+
var _h, _j;
|
|
9325
|
+
return __generator(this, function (_k) {
|
|
9326
|
+
switch (_k.label) {
|
|
9313
9327
|
case 0:
|
|
9314
9328
|
if (!isClassic) return [3 /*break*/, 2];
|
|
9315
9329
|
_c = (_b = Object).values;
|
|
9316
|
-
|
|
9317
|
-
|
|
9330
|
+
_d = jsonParse_1.jsonParseOrThrow;
|
|
9331
|
+
_e = jsonParse_1.jsonParseOrThrow;
|
|
9318
9332
|
return [4 /*yield*/, execOrFail("yarn workspaces --json info", "{}")];
|
|
9319
9333
|
case 1:
|
|
9320
|
-
_a = _c.apply(_b, [
|
|
9334
|
+
_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 : "{}"])]);
|
|
9321
9335
|
return [3 /*break*/, 4];
|
|
9322
9336
|
case 2:
|
|
9323
|
-
|
|
9324
|
-
|
|
9337
|
+
_f = jsonParse_1.jsonParseOrThrow;
|
|
9338
|
+
_g = "[".concat;
|
|
9325
9339
|
return [4 /*yield*/, execOrFail("yarn workspaces list --json --verbose", "")];
|
|
9326
9340
|
case 3:
|
|
9327
|
-
_a =
|
|
9341
|
+
_a = _f.apply(void 0, [_g.apply("[", [(_k.sent())
|
|
9328
9342
|
.trim()
|
|
9329
9343
|
.split("\n")
|
|
9330
9344
|
.join(","), "]"])]);
|
|
9331
|
-
|
|
9345
|
+
_k.label = 4;
|
|
9332
9346
|
case 4: return [2 /*return*/, _a];
|
|
9333
9347
|
}
|
|
9334
9348
|
});
|
|
@@ -9716,6 +9730,26 @@ exports.mergeWithMergingArrays = mergeWithMergingArrays;
|
|
|
9716
9730
|
|
|
9717
9731
|
/***/ }),
|
|
9718
9732
|
|
|
9733
|
+
/***/ 6046:
|
|
9734
|
+
/***/ ((__unused_webpack_module, exports) => {
|
|
9735
|
+
|
|
9736
|
+
"use strict";
|
|
9737
|
+
|
|
9738
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
9739
|
+
exports.jsonParseOrThrow = void 0;
|
|
9740
|
+
var jsonParseOrThrow = function (str) {
|
|
9741
|
+
try {
|
|
9742
|
+
return JSON.parse(str);
|
|
9743
|
+
}
|
|
9744
|
+
catch (e) {
|
|
9745
|
+
throw new Error("could not parse json: ".concat(str));
|
|
9746
|
+
}
|
|
9747
|
+
};
|
|
9748
|
+
exports.jsonParseOrThrow = jsonParseOrThrow;
|
|
9749
|
+
//# sourceMappingURL=jsonParse.js.map
|
|
9750
|
+
|
|
9751
|
+
/***/ }),
|
|
9752
|
+
|
|
9719
9753
|
/***/ 1073:
|
|
9720
9754
|
/***/ (function(__unused_webpack_module, exports) {
|
|
9721
9755
|
|
|
@@ -10642,7 +10642,9 @@ var createNodeBuildJobDefinition = function (context) {
|
|
|
10642
10642
|
return {
|
|
10643
10643
|
image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
|
|
10644
10644
|
runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
|
|
10645
|
-
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),
|
|
10645
|
+
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"
|
|
10646
|
+
? (0, cache_1.getWorkspaceDefaultCaches)(context)
|
|
10647
|
+
: [])), false),
|
|
10646
10648
|
script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read(((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : [])), false),
|
|
10647
10649
|
jobTags: buildConfig.jobTags,
|
|
10648
10650
|
};
|
|
@@ -10704,7 +10706,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
10704
10706
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10705
10707
|
};
|
|
10706
10708
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
10707
|
-
exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
10709
|
+
exports.getWorkspaceDefaultCaches = exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
10708
10710
|
var lodash_1 = __nccwpck_require__(23255);
|
|
10709
10711
|
var path_1 = __nccwpck_require__(71017);
|
|
10710
10712
|
var slugify_1 = __importDefault(__nccwpck_require__(44035));
|
|
@@ -10771,6 +10773,17 @@ var getNextCache = function (context) {
|
|
|
10771
10773
|
];
|
|
10772
10774
|
};
|
|
10773
10775
|
exports.getNextCache = getNextCache;
|
|
10776
|
+
var getWorkspaceDefaultCaches = function (context) {
|
|
10777
|
+
return [
|
|
10778
|
+
{
|
|
10779
|
+
// turbo repo
|
|
10780
|
+
key: context.name + "-turbo",
|
|
10781
|
+
policy: "pull-push",
|
|
10782
|
+
paths: [(0, path_1.join)(context.build.dir, ".turbo")],
|
|
10783
|
+
},
|
|
10784
|
+
];
|
|
10785
|
+
};
|
|
10786
|
+
exports.getWorkspaceDefaultCaches = getWorkspaceDefaultCaches;
|
|
10774
10787
|
//# sourceMappingURL=cache.js.map
|
|
10775
10788
|
|
|
10776
10789
|
/***/ }),
|
|
@@ -16761,6 +16774,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
16761
16774
|
exports.getWorkspaceDependencies = exports.getWorkspaces = exports.getYarnVersion = void 0;
|
|
16762
16775
|
var child_process_promise_1 = __nccwpck_require__(75763);
|
|
16763
16776
|
var memoizee_1 = __importDefault(__nccwpck_require__(85839));
|
|
16777
|
+
var jsonParse_1 = __nccwpck_require__(46046);
|
|
16764
16778
|
var execOrFail = function (cmd, onFail) { return __awaiter(void 0, void 0, void 0, function () {
|
|
16765
16779
|
var e_1;
|
|
16766
16780
|
return __generator(this, function (_a) {
|
|
@@ -16787,29 +16801,29 @@ exports.getYarnVersion = (0, memoizee_1.default)(function () { return __awaiter(
|
|
|
16787
16801
|
}); }, { promise: true });
|
|
16788
16802
|
// export for mocking
|
|
16789
16803
|
exports.getWorkspaces = (0, memoizee_1.default)(function (isClassic) { return __awaiter(void 0, void 0, void 0, function () {
|
|
16790
|
-
var _a, _b, _c, _d, _e, _f, _g
|
|
16791
|
-
var
|
|
16792
|
-
return __generator(this, function (
|
|
16793
|
-
switch (
|
|
16804
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
16805
|
+
var _h, _j;
|
|
16806
|
+
return __generator(this, function (_k) {
|
|
16807
|
+
switch (_k.label) {
|
|
16794
16808
|
case 0:
|
|
16795
16809
|
if (!isClassic) return [3 /*break*/, 2];
|
|
16796
16810
|
_c = (_b = Object).values;
|
|
16797
|
-
|
|
16798
|
-
|
|
16811
|
+
_d = jsonParse_1.jsonParseOrThrow;
|
|
16812
|
+
_e = jsonParse_1.jsonParseOrThrow;
|
|
16799
16813
|
return [4 /*yield*/, execOrFail("yarn workspaces --json info", "{}")];
|
|
16800
16814
|
case 1:
|
|
16801
|
-
_a = _c.apply(_b, [
|
|
16815
|
+
_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 : "{}"])]);
|
|
16802
16816
|
return [3 /*break*/, 4];
|
|
16803
16817
|
case 2:
|
|
16804
|
-
|
|
16805
|
-
|
|
16818
|
+
_f = jsonParse_1.jsonParseOrThrow;
|
|
16819
|
+
_g = "[".concat;
|
|
16806
16820
|
return [4 /*yield*/, execOrFail("yarn workspaces list --json --verbose", "")];
|
|
16807
16821
|
case 3:
|
|
16808
|
-
_a =
|
|
16822
|
+
_a = _f.apply(void 0, [_g.apply("[", [(_k.sent())
|
|
16809
16823
|
.trim()
|
|
16810
16824
|
.split("\n")
|
|
16811
16825
|
.join(","), "]"])]);
|
|
16812
|
-
|
|
16826
|
+
_k.label = 4;
|
|
16813
16827
|
case 4: return [2 /*return*/, _a];
|
|
16814
16828
|
}
|
|
16815
16829
|
});
|
|
@@ -17197,6 +17211,26 @@ exports.mergeWithMergingArrays = mergeWithMergingArrays;
|
|
|
17197
17211
|
|
|
17198
17212
|
/***/ }),
|
|
17199
17213
|
|
|
17214
|
+
/***/ 46046:
|
|
17215
|
+
/***/ ((__unused_webpack_module, exports) => {
|
|
17216
|
+
|
|
17217
|
+
"use strict";
|
|
17218
|
+
|
|
17219
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
17220
|
+
exports.jsonParseOrThrow = void 0;
|
|
17221
|
+
var jsonParseOrThrow = function (str) {
|
|
17222
|
+
try {
|
|
17223
|
+
return JSON.parse(str);
|
|
17224
|
+
}
|
|
17225
|
+
catch (e) {
|
|
17226
|
+
throw new Error("could not parse json: ".concat(str));
|
|
17227
|
+
}
|
|
17228
|
+
};
|
|
17229
|
+
exports.jsonParseOrThrow = jsonParseOrThrow;
|
|
17230
|
+
//# sourceMappingURL=jsonParse.js.map
|
|
17231
|
+
|
|
17232
|
+
/***/ }),
|
|
17233
|
+
|
|
17200
17234
|
/***/ 61073:
|
|
17201
17235
|
/***/ (function(__unused_webpack_module, exports) {
|
|
17202
17236
|
|
|
@@ -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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"}
|
|
@@ -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"}
|