@catladder/pipeline 1.99.0 → 1.100.0

package/dist/build/custom/testJob.js

@@ -43,6 +43,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 exports.__esModule = true;
 exports.createCustomTestJobs = void 0;
+var path_1 = require("path");
 var utils_1 = require("../../utils");
 var types_1 = require("../types");
 var RUNNER_CUSTOM_TEST_VARIABLES = {
@@ -52,7 +53,7 @@ var RUNNER_CUSTOM_TEST_VARIABLES = {
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
 var createCustomTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
   // don't run tests after release
   if (((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.trigger) === "taggedRelease") {
     return [];
@@ -71,26 +72,39 @@ var createCustomTestJobs = function (context) {
     needs: [],
     envMode: "none"
   };
-  var auditJob = buildConfig.audit ? __assign(__assign({
+  var auditJob = buildConfig.audit ? __assign(__assign(__assign({
     name: "🛡 audit"
   }, base), {
     image: (_d = (_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.jobImage) !== null && _d !== void 0 ? _d : buildConfig.jobImage,
     cache: undefined,
     script: __spreadArray([], __read((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : []), false),
     allow_failure: true
-  }) : null;
-  var lintJob = buildConfig.lint ? __assign(__assign({
+  }), createArtifactsConfig(context.componentConfig.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports)) : null;
+  var lintJob = buildConfig.lint ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
-    image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage,
-    script: __spreadArray([], __read((_k = (0, utils_1.ensureArray)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)) !== null && _k !== void 0 ? _k : []), false)
-  }) : null;
-  var testJob = buildConfig.test ? __assign(__assign({
+    image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage,
+    script: __spreadArray([], __read((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : []), false)
+  }), createArtifactsConfig(context.componentConfig.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports)) : null;
+  var testJob = buildConfig.test ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
-    image: (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage,
-    script: __spreadArray([], __read((_p = (0, utils_1.ensureArray)((_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.command)) !== null && _p !== void 0 ? _p : []), false)
-  }) : null;
+    image: (_p = (_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.jobImage) !== null && _p !== void 0 ? _p : buildConfig.jobImage,
+    script: __spreadArray([], __read((_r = (0, utils_1.ensureArray)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : []), false)
+  }), createArtifactsConfig(context.componentConfig.dir, (_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.artifactsReports)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
-exports.createCustomTestJobs = createCustomTestJobs;
+exports.createCustomTestJobs = createCustomTestJobs;
+var createArtifactsConfig = function (rootPath, artifactsReports) {
+  var _a, _b;
+  return artifactsReports ? {
+    artifacts: {
+      paths: [],
+      reports: {
+        junit: (_b = (_a = artifactsReports === null || artifactsReports === void 0 ? void 0 : artifactsReports.junit) === null || _a === void 0 ? void 0 : _a.map(function (p) {
+          return (0, path_1.join)(rootPath, p);
+        })) !== null && _b !== void 0 ? _b : []
+      }
+    }
+  } : undefined;
+};

package/dist/build/node/buildJob.js

@@ -74,13 +74,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")

package/dist/build/node/yarn.d.ts

@@ -1,7 +1,4 @@
 import type { Context } from "../../types";
-export declare const getYarnInstallCommand: (context: Context, options?: {
-  prodOnly?: boolean | undefined;
-  noScripts?: boolean | undefined;
-} | undefined) => string;
 export declare const ensureNodeVersion: (context: Context) => string[];
-export declare const getYarnInstall: (context: Context) => string[];
+export declare const getYarnInstall: (context: Context) => string[];
+export declare const getDockerAppCopyAndBuildScript: (context: Context) => string;

package/dist/build/node/yarn.js

@@ -32,28 +32,40 @@ 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.getYarnInstall = getYarnInstall;
+exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;

package/dist/build/types.d.ts

@@ -1,5 +1,14 @@
 import type { GitlabJobImage, GitlabJobService } from "../types";
 import type { CatladderJob } from "../types/jobs";
+export declare type BuildConfigArtifactsReports = {
+  /**
+   * The junit report collects JUnit report format XML files.
+   * The collected Unit test reports upload to GitLab as an artifact.
+   * Paths are prefixed with component's root folder.
+   * eg. `["dist/test-results/TEST-*.xml", "dist/rspec.xml", ...]`
+   */
+  junit?: string[];
+};
 export declare type BuildConfigBase = {
   /**
    * command to run on the image to start the app (e.g. yarn start)
@@ -50,15 +59,7 @@ export declare type BuildConfigBase = {
    * additional CI/CD artifacts reports,
    * use to display information in merge requests, pipeline views and security dashboards.
    */
-  artifactsReports?: {
-    /**
-     * The junit report collects JUnit report format XML files.
-     * The collected Unit test reports upload to GitLab as an artifact.
-     * Paths are prefixed with component's root folder.
-     * eg. `["dist/test-results/TEST-*.xml", "dist/rspec.xml", ...]`
-     */
-    junit?: string[];
-  };
+  artifactsReports?: BuildConfigArtifactsReports;
 };
 export declare type BuildConfigNodeBase = BuildConfigBase;
 export declare type BuildConfigNode = {
@@ -102,6 +103,11 @@ export declare type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" |
   lint?: {
     command?: string | string[];
     jobImage?: GitlabJobImage;
+    /**
+     * additional CI/CD artifacts reports,
+     * use to display information in merge requests, pipeline views and security dashboards.
+     */
+    artifactsReports?: BuildConfigArtifactsReports;
   };
   /**
    * custom test, disabled when not set
@@ -109,6 +115,11 @@ export declare type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" |
   test?: {
     command?: string | string[];
     jobImage?: GitlabJobImage;
+    /**
+     * additional CI/CD artifacts reports,
+     * use to display information in merge requests, pipeline views and security dashboards.
+     */
+    artifactsReports?: BuildConfigArtifactsReports;
   };
   /**
    * custom audit, disabled when not set
@@ -116,6 +127,11 @@ export declare type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" |
   audit?: {
     command?: string | string[];
     jobImage?: GitlabJobImage;
+    /**
+     * additional CI/CD artifacts reports,
+     * use to display information in merge requests, pipeline views and security dashboards.
+     */
+    artifactsReports?: BuildConfigArtifactsReports;
   };
   /**
    * custom sbom (software bill of materials), set false to disable