@catladder/pipeline 0.0.0-refactor-remove-envsubst-266e91b9 → 0.0.0-refactor-env-context-7ff87d8e

package/bin/catladder-gitlab.js

@@ -1,3 +1,3 @@
 #! /usr/bin/env node
 
-require("../dist/catladder-gitlab.js");
+require("../dist/bundles/catladder-gitlab/index.js");

package/dist/build/base/createBuildJob.d.ts

@@ -1,5 +1,5 @@
-import { Context } from "../..";
-import { CatladderJob } from "../../types/jobs";
+import type { Context } from "../..";
+import type { CatladderJob } from "../../types/jobs";
 export declare const createBuildJob: (context: Context, {
   script,
   variables,

package/dist/build/base/getBuildInfo.d.ts

@@ -1,2 +1,2 @@
-import { Context } from "../../types";
+import type { Context } from "../../types";
 export declare const getBuildInfo: (context: Context) => string[];

package/dist/build/docker.d.ts

@@ -1,5 +1,5 @@
-import { Context } from "../types";
-import { CatladderJob } from "../types/jobs";
+import type { Context } from "../types";
+import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: Context) => {
   DOCKER_REGISTRY: string;
   DOCKER_REGISTRY_IMAGE_PATH: string;
@@ -30,11 +30,38 @@ export declare const getDockerBuildVariables: (context: Context) => {
   KUBERNETES_MEMORY_LIMIT: string;
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
+export declare const getDockerJobBaseProps: (context: Context) => {
+  image: string;
+  services: {
+    name: string;
+    command: string[];
+  }[];
+  variables: {
+    DOCKER_REGISTRY: string;
+    DOCKER_REGISTRY_IMAGE_PATH: string;
+    DOCKER_CACHE_IMAGE: string;
+    DOCKER_IMAGE_NAME: string;
+    DOCKER_IMAGE: string;
+    DOCKER_IMAGE_TAG: string;
+    DOCKER_BUILDKIT: string;
+    DOCKERFILE_ADDITIONS: string | undefined;
+    DOCKERFILE_ADDITIONS_END: string | undefined;
+    APP_DIR: string;
+    DOCKER_HOST: string;
+    DOCKER_TLS_CERTDIR: string;
+    DOCKER_DIR: string;
+    DOCKER_DRIVER: string;
+    KUBERNETES_CPU_REQUEST: string;
+    KUBERNETES_CPU_LIMIT: string;
+    KUBERNETES_MEMORY_REQUEST: string;
+    KUBERNETES_MEMORY_LIMIT: string;
+  };
+};
 export declare const createDockerBuildJobBase: (context: Context, {
   script,
-  variables,
   ...def
 }: Partial<CatladderJob>) => CatladderJob;
+export declare const gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
 export declare const createDockerBuildJobDefault: (context: Context, {
   script,
   ...def

package/dist/build/docker.js

@@ -61,7 +61,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createDockerBuildJobDefault = exports.createDockerBuildJobBase = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+exports.createDockerBuildJobDefault = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 
 var lodash_1 = require("lodash");
 
@@ -96,10 +96,18 @@ var requiresDockerBuild = function (context) {
     return true;
   }
 
+  if ((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    return true;
+  }
+
   if ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker) {
     return true;
   }
 
+  if ((0, deploy_1.isOfDeployType)(deployConfig, "dockerTag")) {
+    return true;
+  }
+
   return false;
 };
 
@@ -123,33 +131,41 @@ var getDockerBuildVariables = function (context) {
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
 
-var createDockerBuildJobBase = function (context, _a) {
-  var script = _a.script,
-      variables = _a.variables,
-      def = __rest(_a, ["script", "variables"]);
-
-  return (0, lodash_1.merge)({
-    name: exports.DOCKER_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    stage: "build",
+var getDockerJobBaseProps = function (context) {
+  return {
     image: (0, runner_1.getRunnerImage)("docker-build"),
     services: [{
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: __assign(__assign({}, (0, exports.getDockerBuildVariables)(context)), variables !== null && variables !== void 0 ? variables : {}),
+    variables: (0, exports.getDockerBuildVariables)(context)
+  };
+};
+
+exports.getDockerJobBaseProps = getDockerJobBaseProps;
+
+var createDockerBuildJobBase = function (context, _a) {
+  var script = _a.script,
+      def = __rest(_a, ["script"]);
+
+  return (0, lodash_1.merge)(__assign(__assign({
+    name: exports.DOCKER_BUILD_JOB_NAME,
+    envMode: "jobPerEnv",
+    stage: "build"
+  }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }, def);
+  }), def);
 };
 
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
+exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
 
 var createDockerBuildJobDefault = function (context, _a) {
   var script = _a.script,
       def = __rest(_a, ["script"]);
 
   return (0, exports.createDockerBuildJobBase)(context, __assign({
-    script: __spreadArray(__spreadArray([], __read(script || []), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"], false)
+    script: __spreadArray(__spreadArray([], __read(script || []), false), [exports.gitlabDockerLogin, "docker version", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"], false)
   }, def));
 };
 

package/dist/build/index.d.ts

@@ -1,11 +1,12 @@
-import { Context } from "../types/context";
-import { CatladderJob } from "../types/jobs";
-import { BuildConfig } from "./types";
+import type { Context } from "../types/context";
+import type { EnvironmentContext } from "../types/environmentContext";
+import type { CatladderJob } from "../types/jobs";
+import type { BuildConfig, BuildConfigType } from "./types";
 export * from "./types";
 export * from "./node";
-export declare type BuildTypes = { [type in BuildConfig["type"]]: {
+export declare type BuildTypes = { [type in BuildConfigType]: {
   jobs: (context: Context) => CatladderJob[];
-  defaults: () => Partial<Extract<BuildConfig, {
+  defaults: (envVarContext: EnvironmentContext<BuildConfigType, any>) => Partial<Extract<BuildConfig, {
     type: type;
   }>>;
 } };

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

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

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

@@ -1,5 +1,5 @@
-import { Context } from "../../types/context";
-import { GitlabJobCache } from "../../types/gitlab-types";
+import type { Context } from "../../types/context";
+import type { GitlabJobCache } from "../../types/gitlab-types";
 export declare const getYarnCache: (context: Context, policy?: string) => GitlabJobCache[];
 export declare const getNodeModulesCache: (context: Context, policy?: string) => GitlabJobCache[];
 export declare const getNodeCache: (context: Context, policy?: string) => GitlabJobCache[];

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

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

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

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

package/dist/build/node/meteor.js

@@ -73,6 +73,9 @@ var createMeteorBuildJobs = function (context) {
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
     image: (0, runner_1.getRunnerImage)("jobs-meteor"),
+    variables: {
+      METEOR_DISABLE_OPTIMISTIC_CACHING: "1"
+    },
     script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
     artifacts: {
       paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
@@ -80,6 +83,9 @@ var createMeteorBuildJobs = function (context) {
   }) : null;
   return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: ["ensureMeteorDockerfile"],
+    variables: {
+      METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
+    },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
   })], false);
 };

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

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

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

@@ -1,4 +1,4 @@
-import { Context } from "../../types";
+import type { Context } from "../../types";
 export declare const getYarnInstallCommand: (context: Context, options?: {
   prodOnly?: boolean | undefined;
   noScripts?: boolean | undefined;

package/dist/build/node/yarn.js

@@ -41,7 +41,19 @@ exports.getYarnInstall = exports.ensureNodeVersion = exports.getYarnInstallComma
 var getYarnInstallCommand = function (context, options) {
   var _a;
 
-  return ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) ? "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" : "") : (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "", "yarn plugin import workspace-tools && yarn workspaces focus --production") // needs yarn plugin import workspace-tools
+  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" : "");
+  } // 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") // needs yarn plugin import workspace-tools
   : "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "", "yarn install --immutable");
 };
 

package/dist/build/types.d.ts

@@ -59,12 +59,22 @@ export declare type BuildConfigNodeStatic = BuildConfigNodeBase & {
 };
 export declare 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;
 };
 export declare type BuildConfigStorybook = BuildConfigNodeBase & {
   type: "storybook";
   startCommand?: never;
 };
 export declare type BuildConfig = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor;
+export declare type BuildConfigType = BuildConfig["type"];
+export declare type BuildConfigGeneric<T extends BuildConfigType> = Extract<BuildConfig, {
+  type: T;
+}>;
 export declare const isOfBuildType: <T extends ("node" | "node-static" | "meteor" | "storybook")[]>(t: BuildConfig, ...types: T) => t is Extract<BuildConfigNode, {
   type: T[number];
 }> | Extract<BuildConfigNodeStatic, {