@catladder/pipeline 1.99.0 → 1.99.2

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;