@catladder/pipeline 0.0.0-more-collapse-deeb54d7 → 0.0.0-multiple-gitlab-includes-3df5566d

package/dist/build/rails/build.js

@@ -32,23 +32,39 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+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));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRailsBuildJobs = void 0;
+var __1 = require("../..");
 var base_1 = require("../base");
 var docker_1 = require("../docker");
 var types_1 = require("../types");
 var createRailsBuildJobs = function (context) {
   var _a, _b, _c;
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
     // should not happen
     throw new Error("build type is not rails");
   }
+  // if its not a standalone build, we don't need to run tests
+  if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
+    throw new Error("workspace builds are not supported for rails apps");
+  }
   if ((0, docker_1.hasDockerfile)(context)) {
-    return (0, base_1.createBuildJobs)(context, {
+    return (0, base_1.createComponentBuildJobs)(context, {
       appBuild: undefined,
       dockerBuild: {
-        script: (0, docker_1.getDockerBuildDefaultScript)(),
+        script: (0, docker_1.getDockerBuildDefaultScript)(context),
         variables: {}
       }
     });
@@ -60,14 +76,14 @@ var createRailsBuildJobs = function (context) {
       v = _b[1];
     return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
   }).join(" ");
-  return (0, base_1.createBuildJobs)(context, {
+  return (0, base_1.createComponentBuildJobs)(context, {
     appBuild: undefined,
     dockerBuild: {
-      variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
+      variables: __assign({}, context.environment.jobOnlyVars.build.envVars),
       // custom script
-      script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.build.dir), "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
       //  replace private git ssh gem sources with https to make bundler with credentials via env var work
-      "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")]
+      "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")], false)
     }
   });
 };

package/dist/build/rails/index.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../types";
+import type { ComponentContext } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createRailsJobs: (context: Context) => CatladderJob[];
+export declare const createRailsJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/rails/index.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRailsJobs = void 0;
 var build_1 = require("./build");
 var test_1 = require("./test");

package/dist/build/rails/test.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../..";
+import { type ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createRailsTestJobs: (context: Context) => CatladderJob[];
+export declare const createRailsTestJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/rails/test.js

@@ -41,18 +41,26 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRailsTestJobs = void 0;
+var __1 = require("../..");
 var utils_1 = require("../../utils");
 var createRailsTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
   // don't run tests after release
-  if (((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.trigger) === "taggedRelease") {
+  // TODO: this will be replaced by using rules
+  if (context.trigger === "taggedRelease") {
     return [];
   }
-  var buildConfig = context.componentConfig.build;
+  // if its not a standalone build, we don't need to run tests
+  if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
+    return [];
+  }
+  var buildConfig = context.build.config;
   var base = {
-    variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
+    variables: __assign({}, context.environment.jobOnlyVars.build.envVars),
     stage: "test",
     needs: [],
     envMode: "none"
@@ -63,7 +71,7 @@ var createRailsTestJobs = function (context) {
   var bundlerCache = {
     key: {
       files: ["Gemfile.lock"],
-      prefix: "$CI_JOB_IMAGE"
+      prefix: "$CI_JOB_IMAGE" // a changed image might have different OS libraries which no longer work with the cached gems
     },
     paths: [bundlerCacheDir]
   };
@@ -71,23 +79,23 @@ var createRailsTestJobs = function (context) {
     name: "🛡 audit"
   }, base), {
     cache: undefined,
-    image: (_e = (_d = (_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.jobImage) !== null && _d !== void 0 ? _d : buildConfig.jobImage) !== null && _e !== void 0 ? _e : defaultImage,
-    script: __spreadArray(["cd ".concat(context.componentConfig.dir)], __read((_g = (0, utils_1.ensureArray)((_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.command)) !== null && _g !== void 0 ? _g : ["gem install bundler-audit", "bundle audit check"]), false),
+    image: (_c = (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage) !== null && _c !== void 0 ? _c : defaultImage,
+    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_e = (0, utils_1.ensureArrayOrNull)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : ["gem install bundler-audit", "bundle audit check"]), false),
     allow_failure: true
   }) : null;
   var lintJob = buildConfig.lint !== false ? __assign(__assign({
     name: "👮 lint"
   }, base), {
     cache: bundlerCache,
-    image: (_k = (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage) !== null && _k !== void 0 ? _k : defaultImage,
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(bundlerInstall), false), __read((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["bundle exec rubocop"]), false)
+    image: (_h = (_g = (_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.jobImage) !== null && _g !== void 0 ? _g : buildConfig.jobImage) !== null && _h !== void 0 ? _h : defaultImage,
+    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_k = (0, utils_1.ensureArrayOrNull)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)) !== null && _k !== void 0 ? _k : ["bundle exec rubocop"]), false)
   }) : null;
   var testJob = buildConfig.test !== false ? __assign(__assign({
     name: "🧪 test"
   }, base), {
     cache: bundlerCache,
-    image: (_q = (_p = (_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.jobImage) !== null && _p !== void 0 ? _p : buildConfig.jobImage) !== null && _q !== void 0 ? _q : defaultImage,
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(bundlerInstall), false), __read((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : ["bundle exec rspec"]), false)
+    image: (_o = (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage) !== null && _o !== void 0 ? _o : defaultImage,
+    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_q = (0, utils_1.ensureArrayOrNull)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)) !== null && _q !== void 0 ? _q : ["bundle exec rspec"]), false)
   }) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };

package/dist/build/sbom.d.ts

@@ -1,5 +1,5 @@
-import type { Context } from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
 export declare const SBOM_BUILD_JOB_NAME = "\uD83E\uDDFE sbom";
 export declare const SBOM_FILE = "__sbom.json";
-export declare const createSbomBuildJob: (context: Context) => CatladderJob;
+export declare const createSbomBuildJob: (context: ComponentContext) => CatladderJob;

package/dist/build/sbom.js

@@ -1,17 +1,20 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createSbomBuildJob = exports.SBOM_FILE = exports.SBOM_BUILD_JOB_NAME = void 0;
+var _1 = require(".");
 var utils_1 = require("../utils");
 exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
 exports.SBOM_FILE = "__sbom.json";
 var createSbomBuildJob = function (context) {
-  var _a, _b, _c, _d, _e;
-  var buildConfig = context.componentConfig.build;
+  var _a, _b, _c, _d;
+  var buildConfig = context.build.config;
   var defaultImage = "aquasec/trivy:0.38.3";
-  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace) ? "." : context.componentConfig.dir)];
-  var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage : defaultImage;
-  var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_e = (0, utils_1.ensureArray)((_d = buildConfig.sbom) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : defaultScript : defaultScript;
+  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.packageManagerInfo.componentIsInWorkspace ? "." : context.build.dir)];
+  var image = (0, _1.isStandaloneBuildConfig)(buildConfig) && buildConfig.type === "custom" && buildConfig.sbom !== false ? (_b = (_a = buildConfig.sbom) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage : defaultImage;
+  var script = (0, _1.isStandaloneBuildConfig)(buildConfig) && buildConfig.type === "custom" && buildConfig.sbom !== false ? (_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript : defaultScript;
   return {
     name: exports.SBOM_BUILD_JOB_NAME,
     stage: "build",

package/dist/build/types.d.ts

@@ -1,7 +1,36 @@
 import type { Artifacts, EnvVars, GitlabJobImage } from "../types";
 import type { Services } from "../types/gitlab-ci-yml";
-import type { CatladderJob } from "../types/jobs";
-export declare type BuildConfigArtifactsReports = {
+import type { CatladderJob, CatladderJobCache } from "../types/jobs";
+export type CacheConfigAdvanced = Omit<CatladderJobCache, "paths" | "key"> & {
+  /**
+   * if you set a key, the cache is scoped to the key. Be aware that there is a limit in gitlab of 4 caches.
+   *
+   * see https://gitlab.com/gitlab-org/gitlab/-/issues/421962
+   */
+  key: Required<CatladderJobCache>["key"];
+  /**
+   * whether the cache is scoped to the context (component or workspace) or the build directory.
+   *
+   * defaults to context
+   */
+  scope?: "context" | "buildDir" | "global";
+} & CacheConfigSimple;
+export type CacheConfigSimple = {
+  /**
+   * paths to cache. All Paths are relative to the context dir.
+   */
+  paths: string[];
+  /**
+   * whether paths are relative to the base dir. defaults to relative.
+   */
+  pathMode?: "relative" | "absolute";
+  /**
+   * custom base dir
+   */
+  baseDir?: string;
+};
+export type CacheConfig = CacheConfigSimple | CacheConfigAdvanced;
+export type BuildConfigArtifactsReports = {
   /**
    * The junit report collects JUnit report format XML files.
    * The collected Unit test reports upload to GitLab as an artifact.
@@ -10,7 +39,16 @@ export declare type BuildConfigArtifactsReports = {
    */
   junit?: string[];
 };
-export declare type TestJobCustom = {
+export type WithCacheConfig = {
+  cache?: CacheConfig | CacheConfig[];
+  /**
+   * customize cache for the job
+   *
+   * @deprecated use cache
+   */
+  jobCache?: CatladderJob["cache"];
+};
+export type TestJobCustom = {
   command?: string | string[];
   jobImage?: GitlabJobImage;
   /**
@@ -25,7 +63,7 @@ export declare type TestJobCustom = {
    */
   artifacts?: Artifacts;
 };
-export declare type BuildConfigBase = {
+export type BuildConfigBase = {
   /**
    * command to run on the image to start the app (e.g. yarn start)
    */
@@ -36,36 +74,15 @@ export declare type BuildConfigBase = {
    */
   jobVars?: EnvVars;
   /**
-   * additional env vars for the buid jobs
+   * additional vars only for the runner.
+   * Also if you use services: that require env vars, you need to set them here.
    *
-   * @deprecated use jobVars
    */
-  extraVars?: Record<string, string>;
+  runnerVariables?: Record<string, string>;
   /**
    * define the build command
    */
   buildCommand?: string | string[] | null;
-  /**
-   * customize docker build
-   */
-  docker?: {
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
-     *
-     * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
-     * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
-     * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
-     */
-    additionsBegin?: string[];
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
-     *
-     * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
-     * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
-     * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
-     */
-    additionsEnd?: string[];
-  };
   /**
    * customize lint, set false to disable
    */
@@ -90,6 +107,8 @@ export declare type BuildConfigBase = {
   artifactsReports?: BuildConfigArtifactsReports;
   /**
    * customize cache for the job
+   *
+   * @deprecated use cache
    */
   jobCache?: CatladderJob["cache"];
   /**
@@ -100,48 +119,82 @@ export declare type BuildConfigBase = {
    * custom image to use
    */
   jobImage?: GitlabJobImage;
-};
-export declare type BuildConfigNodeBase = BuildConfigBase & {
+} & WithCacheConfig;
+export type BuildConfigNodeBase = BuildConfigBase & {
   /**
    * runs a command after yarn install. postinstall in package.json won't work for yarn plug and play.
    * the command will be invoked in the component dir.
    */
   postInstall?: string | string[];
 };
-export declare type BuildConfigNode = {
+export type BuildConfigNode = {
   type: "node";
+  docker?: Omit<BuildConfigDockerBuiltInNode, "type"> | BuildConfigDocker;
 } & BuildConfigNodeBase;
-export declare type BuildConfigNodeStatic = BuildConfigNodeBase & {
+export type BuildConfigNodeStatic = BuildConfigNodeBase & {
+  /**
+   * @deprecated use type: "node" and docker: { type: "nginx" } instead
+   */
   type: "node-static";
   startCommand?: never;
+  docker?: Omit<BuildConfigDockerBuiltInNgninx, "type"> | BuildConfigDocker;
 };
-export declare type BuildConfigMeteor = BuildConfigNodeBase & {
+export type BuildConfigMeteor = BuildConfigNodeBase & {
   type: "meteor";
   /**
    * whether to run yarn install inside the source folder in the docker image.
    * This is only required if you have custom scripts in your image
    */
   installScripts?: boolean;
+  docker?: Omit<BuildConfigDockerBuiltInMeteor, "type"> | BuildConfigDocker;
 };
-export declare type BuildConfigCustomDocker = BuildConfigBase["docker"] & ({
+export type BuildConfigNodeLike = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor;
+type BuildConfigDockerWithAdditions = {
+  /**
+   * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
+   *
+   */
+  additionsBegin?: string[];
+  /**
+   * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
+   *
+   */
+  additionsEnd?: string[];
+};
+type BuildConfigDockerBuiltInNode = {
+  type: "node";
+} & BuildConfigDockerWithAdditions;
+type BuildConfigDockerBuiltInMeteor = {
+  type: "meteor";
+} & BuildConfigDockerWithAdditions;
+type BuildConfigDockerBuiltInNgninx = {
   /**
    * use the built-in nginx image for simple static apps
    */
   type: "nginx";
-} | {
+} & BuildConfigDockerWithAdditions;
+type BuildConfigDockerBuiltIn = BuildConfigDockerBuiltInNgninx | BuildConfigDockerBuiltInNode | BuildConfigDockerBuiltInMeteor;
+type BuildConfigDockerCustom = {
   /**
    * custom docker build, expect that a Dockerfile in your directory
    */
   type: "custom";
-});
-export declare type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit"> & {
+  /**
+   * where to run the docker build, defaults to the root of the repo.
+   *
+   * Depending on your Dockerfile you may want to change it to "component"
+   */
+  buildContextLocation?: "root" | "component";
+};
+export type BuildConfigDocker = BuildConfigDockerBuiltIn | BuildConfigDockerCustom;
+export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit"> & {
   type: "custom";
   jobImage: GitlabJobImage;
   /**
    * {@link Services}s used in lint, test, audit, and build jobs.
    */
   jobServices?: Services;
-  docker: BuildConfigCustomDocker;
+  docker: BuildConfigDocker;
   /**
    * custom lint, disabled when not set
    */
@@ -165,7 +218,7 @@ export declare type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" |
     jobImage: GitlabJobImage;
   };
 };
-export declare type BuildConfigRails = BuildConfigBase & {
+export type BuildConfigRails = BuildConfigBase & {
   type: "rails";
   /**
    * The [Cloud Native Buildpacks](https://buildpacks.io/) builder configuration.
@@ -200,25 +253,77 @@ export declare type BuildConfigRails = BuildConfigBase & {
     buildVars?: Record<string, string | undefined>;
   };
 };
-export declare type BuildConfigStorybook = BuildConfigNodeBase & {
+export type BuildConfigStorybook = BuildConfigNodeBase & {
+  /**
+   * @deprecated use type: "node" and docker: { type: "nginx" } instead
+   */
   type: "storybook";
   startCommand?: never;
 };
-export declare type BuildConfig = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor | BuildConfigCustom | BuildConfigRails;
-export declare type BuildConfigType = BuildConfig["type"];
-export declare type BuildConfigGeneric<T extends BuildConfigType> = Extract<BuildConfig, {
+export type BuildConfigFromWorkspace = {
+  from: string;
+  docker?: BuildConfigDocker;
+  startCommand?: string;
+  /**
+   * additional paths for artifacts,
+   * by default "dist" and ".next" are allways included
+   */
+  artifactsPaths?: string[];
+} & WithCacheConfig;
+export type BuildConfigStandalone = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor | BuildConfigCustom | BuildConfigRails;
+export type BuildConfig = BuildConfigFromWorkspace | BuildConfigStandalone;
+export type BuildConfigStandaloneType = BuildConfigStandalone["type"];
+export type BuildConfigGeneric<T extends BuildConfigStandaloneType> = Extract<BuildConfig, {
   type: T;
 }>;
-export declare const isOfBuildType: <T extends ("node" | "node-static" | "meteor" | "custom" | "rails" | "storybook")[]>(t: BuildConfig, ...types: T) => t is Extract<BuildConfigNode, {
+export declare const isStandaloneBuildConfig: (t: BuildConfig | false) => t is BuildConfigStandalone;
+export declare const isOfBuildType: <T extends ("node" | "custom" | "rails" | "meteor" | "node-static" | "storybook")[]>(t: BuildConfig, ...types: T) => t is Extract<BuildConfigNode, {
   type: T[number];
 }> | Extract<BuildConfigNodeStatic, {
   type: T[number];
+}> | Extract<BuildConfigStorybook, {
+  type: T[number];
 }> | Extract<BuildConfigMeteor, {
   type: T[number];
 }> | Extract<BuildConfigCustom, {
   type: T[number];
 }> | Extract<BuildConfigRails, {
   type: T[number];
-}> | Extract<BuildConfigStorybook, {
-  type: T[number];
-}>;
+}>;
+export type WorkspaceBuildConfigBase = {
+  dir?: string;
+  /**
+   * customize lint, set false to disable
+   */
+  lint?: false | TestJobCustom;
+  /**
+   * customize test, set false to disable
+   */
+  test?: false | TestJobCustom;
+  /**
+   * customize audit, set false to disable
+   */
+  audit?: false | TestJobCustom;
+  /**
+   * additional vars only for the runner.
+   * Also if you use services: that require env vars, you need to set them here.
+   *
+   */
+  runnerVariables?: Record<string, string>;
+  /**
+   * additional CI/CD artifacts reports,
+   * use to display information in merge requests, pipeline views and security dashboards.
+   */
+  artifactsReports?: BuildConfigArtifactsReports;
+  jobImage?: GitlabJobImage;
+  /**
+   * tags for the underlying job runner (e.g gitlab)
+   */
+  jobTags?: string[];
+} & WithCacheConfig;
+export type WorkspaceBuildConfigNode = {
+  type: "node";
+  buildCommand?: string | string[];
+} & WorkspaceBuildConfigBase;
+export type WorkspaceBuildConfig = WorkspaceBuildConfigNode;
+export {};

package/dist/build/types.js

@@ -1,12 +1,20 @@
 "use strict";
 
-exports.__esModule = true;
-exports.isOfBuildType = void 0;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isOfBuildType = exports.isStandaloneBuildConfig = void 0;
+var isStandaloneBuildConfig = function (t) {
+  if (!t) return false;
+  return !("from" in t);
+};
+exports.isStandaloneBuildConfig = isStandaloneBuildConfig;
 var isOfBuildType = function (t) {
   var types = [];
   for (var _i = 1; _i < arguments.length; _i++) {
     types[_i - 1] = arguments[_i];
   }
+  if (!(0, exports.isStandaloneBuildConfig)(t)) return false;
   return types.includes(t.type);
 };
 exports.isOfBuildType = isOfBuildType;