@catladder/cli 0.0.0-main-4abb0711 → 0.0.0-main-ed835115

package/dist/bundles/catenv/index.js

@@ -2383,8 +2383,9 @@ const BashExpression_1 = __nccwpck_require__(2376);
 const utils_1 = __nccwpck_require__(2497);
 const gitlab_1 = __nccwpck_require__(8490);
 const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
+const YARN_BERRY_PROD_INSTALL = `yarn workspaces focus --production`;
 // FIXME: check why and when rebuild is needed
-const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
+const YARN_BERRY_PROD_REBUILD = `yarn rebuild`;
 const getYarnInstallCommand = (context) => {
     if (context.packageManagerInfo.isClassic) {
         return YARN_INSTALL_CLASSIC;
@@ -2414,6 +2415,7 @@ const getYarnInstall = (context, options) => {
 exports.getYarnInstall = getYarnInstall;
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 const getDockerAppCopyAndBuildScript = (context) => {
+    var _a, _b, _c;
     if (context.packageManagerInfo.isClassic) {
         return new BashExpression_1.BashExpression(`
 RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
@@ -2421,6 +2423,14 @@ ${DOCKER_COPY_FILES}
 RUN ${YARN_INSTALL_CLASSIC} --production 
     `.trim());
     }
+    const yarnRebuildEnabledDefault = context.build.type === "fromWorkspace"
+        ? ((_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true)
+        : true;
+    const yarnRebuildEnabled = "docker" in context.build.config &&
+        context.build.config.docker &&
+        "yarnRebuildEnabled" in context.build.config.docker
+        ? ((_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault)
+        : yarnRebuildEnabledDefault;
     // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
     // trying to import those fail on this version
     const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
@@ -2433,7 +2443,8 @@ RUN ${YARN_INSTALL_CLASSIC} --production
     ENV YARN_ENABLE_INLINE_BUILDS=1
 ${DOCKER_COPY_FILES}
 ${maybeAddWorkspaceToolsCommand}
-RUN ${YARN_BERRY_PROD_REBUILD}
+RUN ${YARN_BERRY_PROD_INSTALL}
+${yarnRebuildEnabled ? `RUN ${YARN_BERRY_PROD_REBUILD}` : ""}
 
     `.trim());
 };

package/dist/bundles/cli/index.js

@@ -5635,8 +5635,9 @@ const BashExpression_1 = __nccwpck_require__(42376);
 const utils_1 = __nccwpck_require__(32497);
 const gitlab_1 = __nccwpck_require__(38490);
 const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
+const YARN_BERRY_PROD_INSTALL = `yarn workspaces focus --production`;
 // FIXME: check why and when rebuild is needed
-const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
+const YARN_BERRY_PROD_REBUILD = `yarn rebuild`;
 const getYarnInstallCommand = (context) => {
     if (context.packageManagerInfo.isClassic) {
         return YARN_INSTALL_CLASSIC;
@@ -5666,6 +5667,7 @@ const getYarnInstall = (context, options) => {
 exports.getYarnInstall = getYarnInstall;
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 const getDockerAppCopyAndBuildScript = (context) => {
+    var _a, _b, _c;
     if (context.packageManagerInfo.isClassic) {
         return new BashExpression_1.BashExpression(`
 RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
@@ -5673,6 +5675,14 @@ ${DOCKER_COPY_FILES}
 RUN ${YARN_INSTALL_CLASSIC} --production 
     `.trim());
     }
+    const yarnRebuildEnabledDefault = context.build.type === "fromWorkspace"
+        ? ((_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true)
+        : true;
+    const yarnRebuildEnabled = "docker" in context.build.config &&
+        context.build.config.docker &&
+        "yarnRebuildEnabled" in context.build.config.docker
+        ? ((_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault)
+        : yarnRebuildEnabledDefault;
     // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
     // trying to import those fail on this version
     const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
@@ -5685,7 +5695,8 @@ RUN ${YARN_INSTALL_CLASSIC} --production
     ENV YARN_ENABLE_INLINE_BUILDS=1
 ${DOCKER_COPY_FILES}
 ${maybeAddWorkspaceToolsCommand}
-RUN ${YARN_BERRY_PROD_REBUILD}
+RUN ${YARN_BERRY_PROD_INSTALL}
+${yarnRebuildEnabled ? `RUN ${YARN_BERRY_PROD_REBUILD}` : ""}
 
     `.trim());
 };

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

@@ -1,7 +1,8 @@
 import { BashExpression } from "../../bash/BashExpression";
+import type { ComponentContextWithBuild } from "../../types";
 import { type Context } from "../../types";
 export declare const ensureNodeVersion: (context: Context) => string[];
 export declare const getYarnInstall: (context: Context, options?: {
     noCustomPostInstall: boolean;
 }) => string[];
-export declare const getDockerAppCopyAndBuildScript: (context: Context) => BashExpression;
+export declare const getDockerAppCopyAndBuildScript: (context: ComponentContextWithBuild) => BashExpression;

package/dist/pipeline/src/build/node/yarn.js

@@ -5,8 +5,9 @@ const BashExpression_1 = require("../../bash/BashExpression");
 const utils_1 = require("../../utils");
 const gitlab_1 = require("../../utils/gitlab");
 const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
+const YARN_BERRY_PROD_INSTALL = `yarn workspaces focus --production`;
 // FIXME: check why and when rebuild is needed
-const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
+const YARN_BERRY_PROD_REBUILD = `yarn rebuild`;
 const getYarnInstallCommand = (context) => {
     if (context.packageManagerInfo.isClassic) {
         return YARN_INSTALL_CLASSIC;
@@ -36,6 +37,7 @@ const getYarnInstall = (context, options) => {
 exports.getYarnInstall = getYarnInstall;
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 const getDockerAppCopyAndBuildScript = (context) => {
+    var _a, _b, _c;
     if (context.packageManagerInfo.isClassic) {
         return new BashExpression_1.BashExpression(`
 RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
@@ -43,6 +45,14 @@ ${DOCKER_COPY_FILES}
 RUN ${YARN_INSTALL_CLASSIC} --production 
     `.trim());
     }
+    const yarnRebuildEnabledDefault = context.build.type === "fromWorkspace"
+        ? ((_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true)
+        : true;
+    const yarnRebuildEnabled = "docker" in context.build.config &&
+        context.build.config.docker &&
+        "yarnRebuildEnabled" in context.build.config.docker
+        ? ((_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault)
+        : yarnRebuildEnabledDefault;
     // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
     // trying to import those fail on this version
     const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
@@ -55,7 +65,8 @@ RUN ${YARN_INSTALL_CLASSIC} --production
     ENV YARN_ENABLE_INLINE_BUILDS=1
 ${DOCKER_COPY_FILES}
 ${maybeAddWorkspaceToolsCommand}
-RUN ${YARN_BERRY_PROD_REBUILD}
+RUN ${YARN_BERRY_PROD_INSTALL}
+${yarnRebuildEnabled ? `RUN ${YARN_BERRY_PROD_REBUILD}` : ""}
 
     `.trim());
 };

package/dist/pipeline/src/build/node/yarn.js.map

@@ -1 +1 @@
-{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAE3D,uCAA0C;AAC1C,+CAAyD;AAEzD,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,MAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjD,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,2GAA2G;IAC3G,OAAO,0CAA0C,CAAC;AACpD,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACpD,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;IACA,yDAAyD;IACzD,yEAAyE;CAC1E,CAAC,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,MAAM,cAAc,GAAG,CAC5B,OAAgB,EAChB,OAEC,EACD,EAAE;IACF,MAAM,WAAW,GACf,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;QACjC,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QACnC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW;QAClC,CAAC,CAAC,IAAI,CAAC;IACX,OAAO;QACL,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;QAC7B,GAAG,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACnC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;YAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;YAC7B,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,cAAc,kBAyBzB;AAEF,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,MAAM,8BAA8B,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjE,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB;MACA,oBAAoB;EACxB,iBAAiB;MACb,oBAAoB;KACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB;;EAEF,iBAAiB;EACjB,6BAA6B;MACzB,uBAAuB;;KAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,8BAA8B,kCA+BzC"}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAG3D,uCAA0C;AAC1C,+CAAyD;AAEzD,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,MAAM,uBAAuB,GAAG,oCAAoC,CAAC;AACrE,8CAA8C;AAC9C,MAAM,uBAAuB,GAAG,cAAc,CAAC;AAE/C,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjD,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,2GAA2G;IAC3G,OAAO,0CAA0C,CAAC;AACpD,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACpD,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;IACA,yDAAyD;IACzD,yEAAyE;CAC1E,CAAC,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,MAAM,cAAc,GAAG,CAC5B,OAAgB,EAChB,OAEC,EACD,EAAE;IACF,MAAM,WAAW,GACf,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;QACjC,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QACnC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW;QAClC,CAAC,CAAC,IAAI,CAAC;IACX,OAAO;QACL,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;QAC7B,GAAG,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACnC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;YAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;YAC7B,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,cAAc,kBAyBzB;AAEF,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,MAAM,8BAA8B,GAAG,CAC5C,OAAkC,EAClC,EAAE;;IACF,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB;MACA,oBAAoB;EACxB,iBAAiB;MACb,oBAAoB;KACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,MAAM,yBAAyB,GAC7B,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe;QACpC,CAAC,CAAC,CAAC,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,cAAc,0CAC9C,kBAAkB,mCAAI,IAAI,CAAC;QACjC,CAAC,CAAC,IAAI,CAAC;IAEX,MAAM,kBAAkB,GACtB,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QAChC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;QAC3B,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;QACjD,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,mCAC/C,yBAAyB,CAAC;QAC5B,CAAC,CAAC,yBAAyB,CAAC;IAEhC,wFAAwF;IACxF,8CAA8C;IAC9C,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB;;EAEF,iBAAiB;EACjB,6BAA6B;MACzB,uBAAuB;EAC3B,kBAAkB,CAAC,CAAC,CAAC,OAAO,uBAAuB,EAAE,CAAC,CAAC,CAAC,EAAE;;KAEvD,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AAhDW,QAAA,8BAA8B,kCAgDzC"}

package/dist/pipeline/src/build/types.d.ts

@@ -168,6 +168,12 @@ type BuildConfigDockerWithAdditions = {
 };
 type BuildConfigDockerBuiltInNode = {
     type: "node";
+    /**
+     * whether to run yarn rebuild after yarn install. Defaults to true.
+     *
+     * Future versions of catladder will default to false.
+     */
+    yarnRebuildEnabled?: boolean;
 } & BuildConfigDockerWithAdditions;
 type BuildConfigDockerBuiltInMeteor = {
     type: "meteor";
@@ -342,6 +348,11 @@ export type WorkspaceBuildConfigBase = {
 export type WorkspaceBuildConfigNode = {
     type: "node";
     buildCommand?: string | string[];
+    /**
+     * set docker config defaults for the node build type.
+     * Currently not all options are supported.
+     */
+    dockerDefaults?: Pick<BuildConfigDockerBuiltInNode, "yarnRebuildEnabled">;
 } & WorkspaceBuildConfigBase;
 export type WorkspaceBuildConfig = WorkspaceBuildConfigNode;
 export {};

package/dist/pipeline/src/build/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AA+WO,MAAM,uBAAuB,GAAG,CACrC,CAAsB,EACM,EAAE;IAC9B,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEK,MAAM,aAAa,GAAG,CAC3B,CAAc,EACd,GAAG,KAAQ,EACqC,EAAE;IAClD,IAAI,CAAC,IAAA,+BAAuB,EAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AAqXO,MAAM,uBAAuB,GAAG,CACrC,CAAsB,EACM,EAAE;IAC9B,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEK,MAAM,aAAa,GAAG,CAC3B,CAAc,EACd,GAAG,KAAQ,EACqC,EAAE;IAClD,IAAI,CAAC,IAAA,+BAAuB,EAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}