@catladder/cli 0.0.0-main-022bac09 → 0.0.0-main-52820683

package/dist/bundles/catenv/index.js

@@ -39947,9 +39947,12 @@ var createNodeBuildJobs = function (context) {
       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),
       script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
       artifacts: {
-        paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
-          return (0, path_1.join)(context.componentConfig.dir, path);
-        })) !== null && _e !== void 0 ? _e : []), false),
+        paths: __spreadArray([context.componentConfig.dir], __read((_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : []), false).flatMap(function (dir) {
+          var _a, _b;
+          return __spreadArray([(0, path_1.join)(dir, "__build_info.json"), (0, path_1.join)(dir, "dist"), (0, path_1.join)(dir, ".next")], __read((_b = (_a = buildConfig.artifactsPaths) === null || _a === void 0 ? void 0 : _a.map(function (path) {
+            return (0, path_1.join)(dir, path);
+          })) !== null && _b !== void 0 ? _b : []), false);
+        }),
         expire_in: "1 day"
       },
       jobTags: buildConfig.jobTags
@@ -40017,6 +40020,7 @@ exports.__esModule = true;
 exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 var path_1 = __nccwpck_require__(1017);
 var slugify_1 = __importDefault(__nccwpck_require__(4035));
+var lodash_1 = __nccwpck_require__(3255);
 var getYarnCache = function (context, policy) {
   var _a;
   if (policy === void 0) {
@@ -40046,9 +40050,9 @@ var getNodeModulesCache = function (context, policy) {
     // if component is in a shared workspace, use workspace cache. use individual cache else
     key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1["default"])(context.componentConfig.dir) + "-node-modules",
     policy: policy,
-    paths: __spreadArray([], __read(componentIsInWorkspace ? __spreadArray(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
+    paths: __spreadArray([], __read(componentIsInWorkspace ? (0, lodash_1.uniq)(__spreadArray(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
       return (0, path_1.join)(w.location, "node_modules");
-    })) !== null && _c !== void 0 ? _c : []), false) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
+    })) !== null && _c !== void 0 ? _c : []), false)) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
   }];
 };
 exports.getNodeModulesCache = getNodeModulesCache;
@@ -40865,7 +40869,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-022bac09" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-52820683" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -45626,7 +45630,7 @@ var path_equal_1 = __nccwpck_require__(4843);
 var yarnUtils_1 = __nccwpck_require__(1369);
 var getPackageManagerInfo = function (config, componentName) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, workspaceDependencies, pathsToCopyInDocker;
+    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, currentWorkspaceDependencies, pathsToCopyInDocker;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
@@ -45653,19 +45657,15 @@ var getPackageManagerInfo = function (config, componentName) {
           })), false).filter(function (f) {
             return (0, fs_1.existsSync)(f);
           });
-          workspaceDependencies = currentWorkspace ? __spreadArray(__spreadArray([], __read(currentWorkspace.workspaceDependencies), false), __read(currentWorkspace.mismatchedWorkspaceDependencies), false).map(function (name) {
-            var _a;
-            return (_a = workspaces.find(function (w) {
-              return w.name === name;
-            })) === null || _a === void 0 ? void 0 : _a.location;
-          }).filter(Boolean) : [];
-          pathsToCopyInDocker = __spreadArray(__spreadArray(__spreadArray(__spreadArray([packageJson], __read(workspacePackageJson ? [workspacePackageJson] : []), false), [lockFile], false), __read(configFilePaths), false), __read(workspaceDependencies), false);
+          currentWorkspaceDependencies = currentWorkspace ? (0, yarnUtils_1.getWorkspaceDependencies)(currentWorkspace, workspaces) : [];
+          pathsToCopyInDocker = __spreadArray(__spreadArray(__spreadArray(__spreadArray([packageJson], __read(workspacePackageJson ? [workspacePackageJson] : []), false), [lockFile], false), __read(configFilePaths), false), __read(currentWorkspaceDependencies), false);
           return [2 /*return*/, {
             type: "yarn",
             workspaces: workspaces,
             version: version,
             isClassic: isClassic,
             currentWorkspace: currentWorkspace,
+            currentWorkspaceDependencies: currentWorkspaceDependencies,
             componentIsInWorkspace: componentIsInWorkspace,
             pathsToCopyInDocker: pathsToCopyInDocker
           }];
@@ -45798,13 +45798,44 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
   };
 };
 exports.__esModule = true;
-exports.getWorkspaces = exports.getYarnVersion = void 0;
+exports.getWorkspaceDependencies = exports.getWorkspaces = exports.getYarnVersion = void 0;
 var child_process_promise_1 = __nccwpck_require__(5763);
 var memoizee_1 = __importDefault(__nccwpck_require__(5839));
 var execOrFail = function (cmd, onFail) {
@@ -45874,6 +45905,20 @@ exports.getWorkspaces = (0, memoizee_1["default"])(function (isClassic) {
 }, {
   promise: true
 });
+// recursivly get all workspace dependencies
+var getWorkspaceDependencies = function (ws, allWorkspaces) {
+  return ws ? __spreadArray(__spreadArray([], __read(ws.workspaceDependencies), false), __read(ws.mismatchedWorkspaceDependencies), false).flatMap(function (location) {
+    // we have to do this recursivly
+    var otherWorkspace = allWorkspaces.find(function (w) {
+      return w.location === location;
+    });
+    if (otherWorkspace) {
+      return __spreadArray(__spreadArray([], __read((0, exports.getWorkspaceDependencies)(otherWorkspace, allWorkspaces)), false), [otherWorkspace.location], false);
+    }
+    return [];
+  }).filter(Boolean) : [];
+};
+exports.getWorkspaceDependencies = getWorkspaceDependencies;
 
 /***/ }),
 

package/dist/bundles/cli/index.js

@@ -354066,9 +354066,12 @@ var createNodeBuildJobs = function (context) {
       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),
       script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
       artifacts: {
-        paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
-          return (0, path_1.join)(context.componentConfig.dir, path);
-        })) !== null && _e !== void 0 ? _e : []), false),
+        paths: __spreadArray([context.componentConfig.dir], __read((_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : []), false).flatMap(function (dir) {
+          var _a, _b;
+          return __spreadArray([(0, path_1.join)(dir, "__build_info.json"), (0, path_1.join)(dir, "dist"), (0, path_1.join)(dir, ".next")], __read((_b = (_a = buildConfig.artifactsPaths) === null || _a === void 0 ? void 0 : _a.map(function (path) {
+            return (0, path_1.join)(dir, path);
+          })) !== null && _b !== void 0 ? _b : []), false);
+        }),
         expire_in: "1 day"
       },
       jobTags: buildConfig.jobTags
@@ -354136,6 +354139,7 @@ exports.__esModule = true;
 exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 var path_1 = __nccwpck_require__(71017);
 var slugify_1 = __importDefault(__nccwpck_require__(44035));
+var lodash_1 = __nccwpck_require__(23255);
 var getYarnCache = function (context, policy) {
   var _a;
   if (policy === void 0) {
@@ -354165,9 +354169,9 @@ var getNodeModulesCache = function (context, policy) {
     // if component is in a shared workspace, use workspace cache. use individual cache else
     key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1["default"])(context.componentConfig.dir) + "-node-modules",
     policy: policy,
-    paths: __spreadArray([], __read(componentIsInWorkspace ? __spreadArray(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
+    paths: __spreadArray([], __read(componentIsInWorkspace ? (0, lodash_1.uniq)(__spreadArray(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
       return (0, path_1.join)(w.location, "node_modules");
-    })) !== null && _c !== void 0 ? _c : []), false) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
+    })) !== null && _c !== void 0 ? _c : []), false)) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
   }];
 };
 exports.getNodeModulesCache = getNodeModulesCache;
@@ -354984,7 +354988,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-022bac09" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-52820683" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -359745,7 +359749,7 @@ var path_equal_1 = __nccwpck_require__(84843);
 var yarnUtils_1 = __nccwpck_require__(51369);
 var getPackageManagerInfo = function (config, componentName) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, workspaceDependencies, pathsToCopyInDocker;
+    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, currentWorkspaceDependencies, pathsToCopyInDocker;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
@@ -359772,19 +359776,15 @@ var getPackageManagerInfo = function (config, componentName) {
           })), false).filter(function (f) {
             return (0, fs_1.existsSync)(f);
           });
-          workspaceDependencies = currentWorkspace ? __spreadArray(__spreadArray([], __read(currentWorkspace.workspaceDependencies), false), __read(currentWorkspace.mismatchedWorkspaceDependencies), false).map(function (name) {
-            var _a;
-            return (_a = workspaces.find(function (w) {
-              return w.name === name;
-            })) === null || _a === void 0 ? void 0 : _a.location;
-          }).filter(Boolean) : [];
-          pathsToCopyInDocker = __spreadArray(__spreadArray(__spreadArray(__spreadArray([packageJson], __read(workspacePackageJson ? [workspacePackageJson] : []), false), [lockFile], false), __read(configFilePaths), false), __read(workspaceDependencies), false);
+          currentWorkspaceDependencies = currentWorkspace ? (0, yarnUtils_1.getWorkspaceDependencies)(currentWorkspace, workspaces) : [];
+          pathsToCopyInDocker = __spreadArray(__spreadArray(__spreadArray(__spreadArray([packageJson], __read(workspacePackageJson ? [workspacePackageJson] : []), false), [lockFile], false), __read(configFilePaths), false), __read(currentWorkspaceDependencies), false);
           return [2 /*return*/, {
             type: "yarn",
             workspaces: workspaces,
             version: version,
             isClassic: isClassic,
             currentWorkspace: currentWorkspace,
+            currentWorkspaceDependencies: currentWorkspaceDependencies,
             componentIsInWorkspace: componentIsInWorkspace,
             pathsToCopyInDocker: pathsToCopyInDocker
           }];
@@ -359917,13 +359917,44 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
   };
 };
 exports.__esModule = true;
-exports.getWorkspaces = exports.getYarnVersion = void 0;
+exports.getWorkspaceDependencies = exports.getWorkspaces = exports.getYarnVersion = void 0;
 var child_process_promise_1 = __nccwpck_require__(75763);
 var memoizee_1 = __importDefault(__nccwpck_require__(85839));
 var execOrFail = function (cmd, onFail) {
@@ -359993,6 +360024,20 @@ exports.getWorkspaces = (0, memoizee_1["default"])(function (isClassic) {
 }, {
   promise: true
 });
+// recursivly get all workspace dependencies
+var getWorkspaceDependencies = function (ws, allWorkspaces) {
+  return ws ? __spreadArray(__spreadArray([], __read(ws.workspaceDependencies), false), __read(ws.mismatchedWorkspaceDependencies), false).flatMap(function (location) {
+    // we have to do this recursivly
+    var otherWorkspace = allWorkspaces.find(function (w) {
+      return w.location === location;
+    });
+    if (otherWorkspace) {
+      return __spreadArray(__spreadArray([], __read((0, exports.getWorkspaceDependencies)(otherWorkspace, allWorkspaces)), false), [otherWorkspace.location], false);
+    }
+    return [];
+  }).filter(Boolean) : [];
+};
+exports.getWorkspaceDependencies = getWorkspaceDependencies;
 
 /***/ }),