@catladder/pipeline 1.11.0 → 1.12.0

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

@@ -1,5 +1,6 @@
 import { Context, GitlabJob, GitlabJobDef } from "../..";
 export declare const createBuildJob: (context: Context, {
   script,
+  variables,
   ...def
 }: Partial<GitlabJobDef>) => GitlabJob;

package/dist/build/base/createBuildJob.js

@@ -79,19 +79,20 @@ var createBuildJob = function (context, _a) {
   var _b, _c;
 
   var script = _a.script,
-      def = __rest(_a, ["script"]);
+      variables = _a.variables,
+      def = __rest(_a, ["script", "variables"]);
 
   return {
     name: constants_1.APP_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
     job: (0, lodash_1.merge)({
+      stage: "build",
       image: (0, __1.getRunnerImage)("jobs-default"),
       needs: [],
       cache: [],
-      variables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
+      variables: __assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
       retry: defaults_1.BASE_RETRY,
       interruptible: true,
-      stage: "build",
       script: __spreadArray(__spreadArray(__spreadArray([], __read((0, getBuildInfo_1.getBuildInfo)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
       artifacts: {
         paths: [context.componentConfig.dir + "/__build_info.json"]

package/dist/build/docker.d.ts

@@ -1,5 +1,7 @@
-import { GitlabJobDef, Context } from "../types";
+import { GitlabJobDef, Context, GitlabJob } from "../types";
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
 export declare const createDockerBuildJob: (context: Context, {
-  script
-}: Pick<GitlabJobDef, "script">) => GitlabJobDef;
+  script,
+  variables,
+  ...def
+}: Partial<GitlabJobDef>) => GitlabJob;

package/dist/build/docker.js

@@ -14,6 +14,17 @@ var __assign = this && this.__assign || function () {
   return __assign.apply(this, arguments);
 };
 
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -54,6 +65,8 @@ exports.createDockerBuildJob = exports.DOCKER_BUILD_JOB_NAME = void 0;
 
 var runner_1 = require("../runner");
 
+var lodash_1 = require("lodash");
+
 var DOCKER_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "1",
@@ -63,35 +76,39 @@ var DOCKER_RUNNER_BUILD_VARIABLES = {
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
 
 var createDockerBuildJob = function (context, _a) {
-  var _b, _c, _d, _e, _f, _g, _h;
-
-  var script = _a.script;
-  var base = {
-    stage: "build",
-    image: (0, runner_1.getRunnerImage)("docker-build"),
-    interruptible: true,
-    services: [{
-      name: "docker:20-dind",
-      command: ["--tls=false"]
-    }],
-    variables: __assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-      DOCKER_BUILDKIT: "1",
-      DOCKERFILE_ADDITIONS: (_c = (_b = context.componentConfig.build.docker) === null || _b === void 0 ? void 0 : _b.additionsBegin) === null || _c === void 0 ? void 0 : _c.join("\n"),
-      DOCKERFILE_ADDITIONS_END: (_e = (_d = context.componentConfig.build.docker) === null || _d === void 0 ? void 0 : _d.additionsEnd) === null || _e === void 0 ? void 0 : _e.join("\n"),
-      APP_DIR: context.componentConfig.dir,
-      DOCKER_HOST: "tcp://0.0.0.0:2375",
-      DOCKER_TLS_CERTDIR: "",
-      DOCKER_DIR: ".",
-      IMAGE_TAG: "$CI_COMMIT_SHA",
-      DOCKER_DRIVER: "overlay2",
-      YARN_FILES: (_h = (_g = (_f = context.yarnInfo) === null || _f === void 0 ? void 0 : _f.files) === null || _g === void 0 ? void 0 : _g.join(" ")) !== null && _h !== void 0 ? _h : "",
-      IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.environment.shortName + "/" + context.componentName,
-      CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.componentName
-    })
+  var _b, _c, _d, _e;
+
+  var script = _a.script,
+      variables = _a.variables,
+      def = __rest(_a, ["script", "variables"]);
+
+  return {
+    name: exports.DOCKER_BUILD_JOB_NAME,
+    envMode: "jobPerEnv",
+    job: (0, lodash_1.merge)({
+      stage: "build",
+      image: (0, runner_1.getRunnerImage)("docker-build"),
+      interruptible: true,
+      services: [{
+        name: "docker:20-dind",
+        command: ["--tls=false"]
+      }],
+      variables: __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
+        DOCKER_BUILDKIT: "1",
+        DOCKERFILE_ADDITIONS: (_c = (_b = context.componentConfig.build.docker) === null || _b === void 0 ? void 0 : _b.additionsBegin) === null || _c === void 0 ? void 0 : _c.join("\n"),
+        DOCKERFILE_ADDITIONS_END: (_e = (_d = context.componentConfig.build.docker) === null || _d === void 0 ? void 0 : _d.additionsEnd) === null || _e === void 0 ? void 0 : _e.join("\n"),
+        APP_DIR: context.componentConfig.dir,
+        DOCKER_HOST: "tcp://0.0.0.0:2375",
+        DOCKER_TLS_CERTDIR: "",
+        DOCKER_DIR: ".",
+        IMAGE_TAG: "$CI_COMMIT_SHA",
+        DOCKER_DRIVER: "overlay2",
+        IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.environment.shortName + "/" + context.componentName,
+        CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.componentName
+      }), variables !== null && variables !== void 0 ? variables : {}),
+      script: __spreadArray(__spreadArray([], __read(script || []), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $IMAGE_NAME:$IMAGE_TAG", "docker tag $IMAGE_NAME:$IMAGE_TAG $CACHE_IMAGE", "docker push $CACHE_IMAGE"], false)
+    }, def)
   };
-  return __assign(__assign({}, base), {
-    script: __spreadArray(__spreadArray([], __read(script), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $IMAGE_NAME:$IMAGE_TAG", "docker tag $IMAGE_NAME:$IMAGE_TAG $CACHE_IMAGE", "docker push $CACHE_IMAGE"], false)
-  });
 };
 
 exports.createDockerBuildJob = createDockerBuildJob;

package/dist/build/node/buildJob.js

@@ -60,6 +60,8 @@ var createBuildJob_1 = require("../base/createBuildJob");
 
 var docker_1 = require("../docker");
 
+var path_1 = require("path");
+
 var types_1 = require("../types");
 
 var cache_1 = require("./cache");
@@ -69,7 +71,7 @@ var constants_2 = require("./constants");
 var yarn_1 = require("./yarn");
 
 var createNodeBuildJobs = function (context) {
-  var _a, _b;
+  var _a, _b, _c, _d, _e;
 
   var buildConfig = context.componentConfig.build;
 
@@ -79,22 +81,33 @@ var createNodeBuildJobs = function (context) {
 
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
-    variables: __assign(__assign(__assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES), context.environment.envVars), (_a = context.componentConfig.build.extraVars) !== null && _a !== void 0 ? _a : {}),
+    variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_b = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _b !== void 0 ? _b : []), false),
+    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
     artifacts: {
-      paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist", context.componentConfig.dir + "/.next"]
+      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((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+        return (0, path_1.join)(context.componentConfig.dir, path);
+      })) !== null && _c !== void 0 ? _c : []), false)
     }
   }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [{
-    name: docker_1.DOCKER_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    job: __assign(__assign({}, (0, docker_1.createDockerBuildJob)(context, {
-      script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"]
-    })), {
-      needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-    })
-  }], false);
+  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [(0, docker_1.createDockerBuildJob)(context, {
+    script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
+    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_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")
+    },
+    needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
+  })], false);
 };
 
 exports.createNodeBuildJobs = createNodeBuildJobs;

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

@@ -1,4 +1,6 @@
 import { Context } from "../../types/context";
 import { GitlabJobCache } from "../../types/gitlab-types";
-export declare const getNodeCache: (context: Context) => GitlabJobCache[];
+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[];
 export declare const getNextCache: (context: Context) => GitlabJobCache[];

package/dist/build/node/cache.js

@@ -36,24 +36,52 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.getNextCache = exports.getNodeCache = void 0;
+exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 
 var path_1 = require("path");
 
-var getNodeCache = function (context) {
+var getYarnCache = function (context, policy) {
+  if (policy === void 0) {
+    policy = "pull-push";
+  }
+
+  return [{
+    key: "yarn",
+    policy: policy,
+    paths: [".yarn"]
+  }];
+};
+
+exports.getYarnCache = getYarnCache;
+
+var getNodeModulesCache = function (context, policy) {
   var _a, _b, _c;
 
-  var componentIsInWorkspace = (_a = context.yarnInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
+  if (policy === void 0) {
+    policy = "pull-push";
+  }
+
+  var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
   return [{
     // if component is in a shared workspace, use workspace cache. use individual cache else
     key: componentIsInWorkspace ? "node-modules-workspace" : context.componentConfig.dir + "-node-modules",
-    policy: "pull-push",
-    paths: __spreadArray([".yarn"], __read(componentIsInWorkspace ? __spreadArray(["node_modules"], __read((_c = (_b = context.yarnInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
+    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) {
       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)
   }];
 };
 
+exports.getNodeModulesCache = getNodeModulesCache;
+
+var getNodeCache = function (context, policy) {
+  if (policy === void 0) {
+    policy = "pull-push";
+  }
+
+  return __spreadArray(__spreadArray([], __read((0, exports.getYarnCache)(context, policy)), false), __read((0, exports.getNodeModulesCache)(context, policy)), false);
+};
+
 exports.getNodeCache = getNodeCache;
 
 var getNextCache = function (context) {

package/dist/build/node/meteor.js

@@ -1,19 +1,5 @@
 "use strict";
 
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -92,15 +78,10 @@ var createMeteorBuildJobs = function (context) {
       paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
     }
   }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [{
-    name: docker_1.DOCKER_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    job: __assign(__assign({}, (0, docker_1.createDockerBuildJob)(context, {
-      script: ["ensureMeteorDockerfile"]
-    })), {
-      needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-    })
-  }], false);
+  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [(0, docker_1.createDockerBuildJob)(context, {
+    script: ["ensureMeteorDockerfile"],
+    needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
+  })], false);
 };
 
 exports.createMeteorBuildJobs = createMeteorBuildJobs;

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

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

package/dist/build/node/yarn.js

@@ -1,12 +1,19 @@
 "use strict";
 
 exports.__esModule = true;
-exports.getYarnInstall = void 0;
+exports.getYarnInstall = exports.getYarnInstallCommand = void 0;
 
-var getYarnInstall = function (context) {
+var getYarnInstallCommand = function (context, options) {
   var _a;
 
-  return ["if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi", ((_a = context.yarnInfo) === null || _a === void 0 ? void 0 : _a.isClassic) ? "yarn install --frozen-lockfile" : "yarn install --immutable"];
+  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
+  : "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "", "yarn install --immutable");
+};
+
+exports.getYarnInstallCommand = getYarnInstallCommand;
+
+var getYarnInstall = function (context) {
+  return ["if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi", (0, exports.getYarnInstallCommand)(context)];
 };
 
 exports.getYarnInstall = getYarnInstall;

package/dist/build/types.d.ts

@@ -42,6 +42,12 @@ export declare type BuildConfigBase = {
   audit?: false | {
     command?: string | string[];
   };
+  /**
+   * additional paths for artifacts,
+   * by default "dist" and ".next" are allways included
+   */
+
+  artifactsPaths?: [];
 };
 export declare type BuildConfigNodeBase = BuildConfigBase;
 export declare type BuildConfigNode = {

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-11-0-ea8f9911" || "";
+exports.PIPELINE_IMAGE_TAG = "v1-12-0-eb5ba084" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/index.d.ts

@@ -1,6 +1,6 @@
 import { Config } from "../types/config";
-import { CommitInfo, Context, Environment, YarnInfo } from "../types/context";
+import { CommitInfo, Context, Environment } from "../types/context";
 export declare const getSecretVarName: (env: string, componentName: string, key: string) => string;
 export declare const getSecretVarNameForContext: (context: Context, key: string) => string;
 export declare const getEnvironment: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, skipReferences?: boolean) => Environment;
-export declare const createContext: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, yarnInfo?: YarnInfo | undefined) => Context;
+export declare const createContext: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, packageManagerInfo?: import("../types/context").YarnPackageManagerInfo | undefined) => Context;

package/dist/context/index.js

@@ -183,7 +183,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, skipRefer
 
 exports.getEnvironment = getEnvironment;
 
-var createContext = function (config, componentName, env, commitInfo, yarnInfo) {
+var createContext = function (config, componentName, env, commitInfo, packageManagerInfo) {
   var _a, _b;
 
   if (!/^[a-z0-9-]+$/.test(componentName)) {
@@ -214,7 +214,7 @@ var createContext = function (config, componentName, env, commitInfo, yarnInfo)
     componentName: componentName,
     environment: (0, exports.getEnvironment)(config, componentName, env, commitInfo),
     commitInfo: commitInfo,
-    yarnInfo: yarnInfo
+    packageManagerInfo: packageManagerInfo
   };
 };
 

package/dist/pipeline/createJobs.js

@@ -205,7 +205,7 @@ var deploy_1 = require("../deploy");
 
 var utils_1 = require("../utils");
 
-var yarnInfo_1 = require("./yarnInfo");
+var packageManager_1 = require("./packageManager");
 
 var createRawJobs = function (context) {
   if (context.componentConfig.deploy === false) {
@@ -296,7 +296,7 @@ var addStageNeeds = function (jobs) {
 
 var createJobs = function (envs, config, componentName, trigger) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var commitInfo, yarnInfo;
+    var commitInfo, packageManagerInfo;
 
     var _a;
 
@@ -320,14 +320,14 @@ var createJobs = function (envs, config, componentName, trigger) {
           commitInfo = (_a.buildId = _d.sent(), _a.trigger = trigger, _a);
           return [4
           /*yield*/
-          , (0, yarnInfo_1.getYarnInfo)(config, componentName)];
+          , (0, packageManager_1.getPackageManagerInfo)(config, componentName)];
 
         case 2:
-          yarnInfo = _d.sent();
+          packageManagerInfo = _d.sent();
           return [2
           /*return*/
           , envs.reduce(function (acc, env) {
-            var context = (0, context_1.createContext)(config, componentName, env, commitInfo, yarnInfo);
+            var context = (0, context_1.createContext)(config, componentName, env, commitInfo, packageManagerInfo);
             var jobs = addStageNeeds(createRawJobs(context));
             return __assign(__assign({}, acc), jobs.reduce(function (acc, job) {
               var _a;

package/dist/pipeline/packageManager.d.ts

@@ -0,0 +1,2 @@
+import { Config, PackageManagerInfo } from "../types";
+export declare const getPackageManagerInfo: (config: Config, componentName: string) => Promise<PackageManagerInfo>;

package/dist/pipeline/{yarnInfo.js → packageManager.js}

@@ -183,7 +183,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 };
 
 exports.__esModule = true;
-exports.getYarnInfo = void 0;
+exports.getPackageManagerInfo = void 0;
 
 var child_process_promise_1 = require("child-process-promise");
 
@@ -278,7 +278,7 @@ var getWorkspaces = (0, memoizee_1["default"])(function (isClassic) {
           _k = "[".concat;
           return [4
           /*yield*/
-          , execOrFail("yarn workspaces list --json", "")];
+          , execOrFail("yarn workspaces list --json --verbose", "")];
 
         case 3:
           _a = _j.apply(_h, [_k.apply("[", [_o.sent().trim().split("\n").join(","), "]"])]);
@@ -295,9 +295,9 @@ var getWorkspaces = (0, memoizee_1["default"])(function (isClassic) {
   promise: true
 });
 
-var getYarnInfo = function (config, componentName) {
+var getPackageManagerInfo = function (config, componentName) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var version, isClassic, component, workspaces, componentIsInWorkspace, packageJson, lockFile, RC_FILES, possibleRcFiles, files;
+    var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, rcFiles, workspaceDependencies, pathsToCopyInDocker;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
@@ -316,30 +316,42 @@ var getYarnInfo = function (config, componentName) {
 
         case 2:
           workspaces = _a.sent();
-          componentIsInWorkspace = workspaces.some(function (w) {
+          currentWorkspace = workspaces.find(function (w) {
             return (0, path_equal_1.pathEqual)(component.dir, w.location);
           });
+          componentIsInWorkspace = Boolean(currentWorkspace);
+          workspaceRoot = ".";
           packageJson = (0, path_1.join)(component.dir, "package.json");
-          lockFile = componentIsInWorkspace ? "yarn.lock" : (0, path_1.join)(component.dir, "yarn.lock");
-          RC_FILES = [".yarnrc", ".npmrc"];
-          possibleRcFiles = componentIsInWorkspace ? RC_FILES : RC_FILES.map(function (f) {
+          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) {
             return (0, path_1.join)(component.dir, f);
-          });
-          files = __spreadArray([packageJson, lockFile], __read(possibleRcFiles), false).filter(function (f) {
+          })).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(rcFiles), false), __read(workspaceDependencies), false);
           return [2
           /*return*/
           , {
+            type: "yarn",
             workspaces: workspaces,
             version: version,
             isClassic: isClassic,
+            currentWorkspace: currentWorkspace,
             componentIsInWorkspace: componentIsInWorkspace,
-            files: files
+            pathsToCopyInDocker: pathsToCopyInDocker
           }];
       }
     });
   });
 };
 
-exports.getYarnInfo = getYarnInfo;
+exports.getPackageManagerInfo = getPackageManagerInfo;