@catladder/cli 0.0.0-main-bc2a3387 → 0.0.0-main-205341d4

package/dist/bundles/catenv/index.js

@@ -39377,13 +39377,7 @@ var createNodeBuildJobs = function (context) {
     cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
     variables: {
       // only required for non static
-      YARN_INSTALL: (0, yarn_1.getYarnInstallCommand)(context, {
-        prodOnly: true
-      }),
-      YARN_INSTALL_WITHOUT_SCRIPTS: (0, yarn_1.getYarnInstallCommand)(context, {
-        prodOnly: true,
-        noScripts: true
-      }),
+      DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
       DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
         return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
       })) === null || _e === void 0 ? void 0 : _e.join("\n")
@@ -39786,31 +39780,43 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.getYarnInstall = exports.ensureNodeVersion = exports.getYarnInstallCommand = void 0;
-var getYarnInstallCommand = function (context, options) {
+exports.getDockerAppCopyAndBuildScript = exports.getYarnInstall = exports.ensureNodeVersion = void 0;
+var YARN_INSTALL_CLASSIC = "yarn install --frozen-lockfile";
+// FIXME: check why and when rebuild is needed
+var YARN_BERRY_PROD_REBUILD = "yarn workspaces focus --production && yarn rebuild";
+var getYarnInstallCommand = function (context) {
   var _a;
   if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
-    return "yarn install --frozen-lockfile ".concat((options === null || options === void 0 ? void 0 : options.prodOnly) ? "--production" : "", " ").concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "--ignore-scripts" : "");
+    return YARN_INSTALL_CLASSIC;
   }
-  // is modern
-  // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
-  // trying to import those fail on this version
-  var doesNotShipWithBuiltInPlugins = ["2", "3"].some(function (v) {
-    var _a;
-    return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v);
-  });
-  return (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "").concat(doesNotShipWithBuiltInPlugins ? "yarn plugin import workspace-tools && " : " ", "yarn workspaces focus --production && yarn rebuild") // needs yarn plugin import workspace-tools
-  : "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "", "yarn install --immutable");
+  return "yarn install --immutable";
 };
-exports.getYarnInstallCommand = getYarnInstallCommand;
 var ensureNodeVersion = function (context) {
   return ["if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi"];
 };
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context) {
-  return __spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), [(0, exports.getYarnInstallCommand)(context)], false);
+  return __spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), [getYarnInstallCommand(context)], false);
 };
 exports.getYarnInstall = getYarnInstall;
+var DOCKER_COPY_FILES = "COPY --chown=node:node $APP_DIR .";
+var getDockerAppCopyAndBuildScript = function (context) {
+  var _a;
+  if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
+    return "\nRUN ".concat(YARN_INSTALL_CLASSIC, " --production --ignore-scripts\n").concat(DOCKER_COPY_FILES, "\nRUN ").concat(YARN_INSTALL_CLASSIC, " --production \n    ").trim();
+  }
+  // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
+  // trying to import those fail on this version
+  var doesNotShipWithBuiltInPlugins = ["2", "3"].some(function (v) {
+    var _a;
+    return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v);
+  });
+  var maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins ? "RUN yarn plugin import workspace-tools" : "";
+  // copy first everything and then install
+  // rebuild first does not work as it will run postinstall and that might require files in the app
+  return "\n".concat(DOCKER_COPY_FILES, "\n").concat(maybeAddWorkspaceToolsCommand, "\nRUN ").concat(YARN_BERRY_PROD_REBUILD, "\n\n    ").trim();
+};
+exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;
 
 /***/ }),
 
@@ -40211,7 +40217,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-bc2a3387" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-205341d4" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -44228,7 +44234,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, rcFiles, workspaceDependencies, pathsToCopyInDocker;
+    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, workspaceDependencies, pathsToCopyInDocker;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
@@ -44250,9 +44256,9 @@ var getPackageManagerInfo = function (config, componentName) {
           workspacePackageJson = componentIsInWorkspace ? (0, path_1.join)(workspaceRoot, "package.json") : null;
           lockFile = componentIsInWorkspace ? (0, path_1.join)(workspaceRoot, "yarn.lock") : (0, path_1.join)(component.dir, "yarn.lock");
           configFiles = [".yarnrc", ".yarnrc.yml", ".npmrc", ".yarn"];
-          rcFiles = (componentIsInWorkspace ? configFiles : configFiles.map(function (f) {
+          configFilePaths = __spreadArray(__spreadArray([], __read(configFiles), false), __read(configFiles.map(function (f) {
             return (0, path_1.join)(component.dir, f);
-          })).filter(function (f) {
+          })), 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) {
@@ -44261,7 +44267,7 @@ var getPackageManagerInfo = function (config, componentName) {
               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(rcFiles), false), __read(workspaceDependencies), false);
+          pathsToCopyInDocker = __spreadArray(__spreadArray(__spreadArray(__spreadArray([packageJson], __read(workspacePackageJson ? [workspacePackageJson] : []), false), [lockFile], false), __read(configFilePaths), false), __read(workspaceDependencies), false);
           return [2 /*return*/, {
             type: "yarn",
             workspaces: workspaces,

package/dist/bundles/cli/index.js

@@ -350680,13 +350680,7 @@ var createNodeBuildJobs = function (context) {
     cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
     variables: {
       // only required for non static
-      YARN_INSTALL: (0, yarn_1.getYarnInstallCommand)(context, {
-        prodOnly: true
-      }),
-      YARN_INSTALL_WITHOUT_SCRIPTS: (0, yarn_1.getYarnInstallCommand)(context, {
-        prodOnly: true,
-        noScripts: true
-      }),
+      DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
       DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
         return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
       })) === null || _e === void 0 ? void 0 : _e.join("\n")
@@ -351089,31 +351083,43 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.getYarnInstall = exports.ensureNodeVersion = exports.getYarnInstallCommand = void 0;
-var getYarnInstallCommand = function (context, options) {
+exports.getDockerAppCopyAndBuildScript = exports.getYarnInstall = exports.ensureNodeVersion = void 0;
+var YARN_INSTALL_CLASSIC = "yarn install --frozen-lockfile";
+// FIXME: check why and when rebuild is needed
+var YARN_BERRY_PROD_REBUILD = "yarn workspaces focus --production && yarn rebuild";
+var getYarnInstallCommand = function (context) {
   var _a;
   if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
-    return "yarn install --frozen-lockfile ".concat((options === null || options === void 0 ? void 0 : options.prodOnly) ? "--production" : "", " ").concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "--ignore-scripts" : "");
+    return YARN_INSTALL_CLASSIC;
   }
-  // is modern
-  // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
-  // trying to import those fail on this version
-  var doesNotShipWithBuiltInPlugins = ["2", "3"].some(function (v) {
-    var _a;
-    return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v);
-  });
-  return (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "").concat(doesNotShipWithBuiltInPlugins ? "yarn plugin import workspace-tools && " : " ", "yarn workspaces focus --production && yarn rebuild") // needs yarn plugin import workspace-tools
-  : "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "", "yarn install --immutable");
+  return "yarn install --immutable";
 };
-exports.getYarnInstallCommand = getYarnInstallCommand;
 var ensureNodeVersion = function (context) {
   return ["if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi"];
 };
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context) {
-  return __spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), [(0, exports.getYarnInstallCommand)(context)], false);
+  return __spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), [getYarnInstallCommand(context)], false);
 };
 exports.getYarnInstall = getYarnInstall;
+var DOCKER_COPY_FILES = "COPY --chown=node:node $APP_DIR .";
+var getDockerAppCopyAndBuildScript = function (context) {
+  var _a;
+  if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
+    return "\nRUN ".concat(YARN_INSTALL_CLASSIC, " --production --ignore-scripts\n").concat(DOCKER_COPY_FILES, "\nRUN ").concat(YARN_INSTALL_CLASSIC, " --production \n    ").trim();
+  }
+  // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
+  // trying to import those fail on this version
+  var doesNotShipWithBuiltInPlugins = ["2", "3"].some(function (v) {
+    var _a;
+    return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v);
+  });
+  var maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins ? "RUN yarn plugin import workspace-tools" : "";
+  // copy first everything and then install
+  // rebuild first does not work as it will run postinstall and that might require files in the app
+  return "\n".concat(DOCKER_COPY_FILES, "\n").concat(maybeAddWorkspaceToolsCommand, "\nRUN ").concat(YARN_BERRY_PROD_REBUILD, "\n\n    ").trim();
+};
+exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;
 
 /***/ }),
 
@@ -351514,7 +351520,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-bc2a3387" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-205341d4" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -355531,7 +355537,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, rcFiles, workspaceDependencies, pathsToCopyInDocker;
+    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, workspaceDependencies, pathsToCopyInDocker;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
@@ -355553,9 +355559,9 @@ var getPackageManagerInfo = function (config, componentName) {
           workspacePackageJson = componentIsInWorkspace ? (0, path_1.join)(workspaceRoot, "package.json") : null;
           lockFile = componentIsInWorkspace ? (0, path_1.join)(workspaceRoot, "yarn.lock") : (0, path_1.join)(component.dir, "yarn.lock");
           configFiles = [".yarnrc", ".yarnrc.yml", ".npmrc", ".yarn"];
-          rcFiles = (componentIsInWorkspace ? configFiles : configFiles.map(function (f) {
+          configFilePaths = __spreadArray(__spreadArray([], __read(configFiles), false), __read(configFiles.map(function (f) {
             return (0, path_1.join)(component.dir, f);
-          })).filter(function (f) {
+          })), 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) {
@@ -355564,7 +355570,7 @@ var getPackageManagerInfo = function (config, componentName) {
               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(rcFiles), false), __read(workspaceDependencies), false);
+          pathsToCopyInDocker = __spreadArray(__spreadArray(__spreadArray(__spreadArray([packageJson], __read(workspacePackageJson ? [workspacePackageJson] : []), false), [lockFile], false), __read(configFilePaths), false), __read(workspaceDependencies), false);
           return [2 /*return*/, {
             type: "yarn",
             workspaces: workspaces,

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-main-bc2a3387",
+    "@catladder/pipeline": "0.0.0-main-205341d4",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "0.0.0-main-bc2a3387",
+  "version": "0.0.0-main-205341d4",
   "stableVersion": "0.0.0"
 }