@catladder/pipeline 3.27.0 → 3.29.1

package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap

@@ -727,7 +727,8 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production
+      RUN yarn rebuild"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -954,7 +955,8 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production
+      RUN yarn rebuild"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1189,7 +1191,8 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production
+      RUN yarn rebuild"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1409,7 +1412,8 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production
+      RUN yarn rebuild"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1629,7 +1633,8 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production
+      RUN yarn rebuild"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -1859,7 +1864,8 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production
+      RUN yarn rebuild"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -2097,7 +2103,8 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production
+      RUN yarn rebuild"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -2320,7 +2327,8 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production
+      RUN yarn rebuild"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock

package/examples/__snapshots__/workspace-api-www.test.ts.snap

@@ -719,7 +719,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -946,7 +946,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1181,7 +1181,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1401,7 +1401,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1621,7 +1621,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -1851,7 +1851,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -2089,7 +2089,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -2312,7 +2312,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production && yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock

package/examples/workspace-api-www.ts

@@ -11,6 +11,9 @@ const config = {
   builds: {
     myWorkspace: {
       type: "node",
+      dockerDefaults: {
+        yarnRebuildEnabled: false,
+      },
     },
   },
   components: {

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "3.27.0",
+  "version": "3.29.1",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",

package/src/build/node/yarn.ts

@@ -1,12 +1,14 @@
 import { BashExpression } from "../../bash/BashExpression";
+import type { ComponentContextWithBuild } from "../../types";
 import { type Context } from "../../types";
 import { ensureArray } from "../../utils";
 import { collapseableSection } from "../../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: Context) => {
   if (context.packageManagerInfo.isClassic) {
@@ -54,7 +56,9 @@ export const getYarnInstall = (
 
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 
-export const getDockerAppCopyAndBuildScript = (context: Context) => {
+export const getDockerAppCopyAndBuildScript = (
+  context: ComponentContextWithBuild,
+) => {
   if (context.packageManagerInfo.isClassic) {
     return new BashExpression(
       `
@@ -65,6 +69,20 @@ RUN ${YARN_INSTALL_CLASSIC} --production
     );
   }
 
+  const yarnRebuildEnabledDefault =
+    context.build.type === "fromWorkspace"
+      ? (context.build.workspaceBuildConfig.dockerDefaults
+          ?.yarnRebuildEnabled ?? true)
+      : true;
+
+  const yarnRebuildEnabled =
+    "docker" in context.build.config &&
+    context.build.config.docker &&
+    "yarnRebuildEnabled" in context.build.config.docker
+      ? (context.build.config.docker.yarnRebuildEnabled ??
+        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) =>
@@ -81,7 +99,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/src/build/types.ts

@@ -204,6 +204,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 = {
@@ -419,6 +425,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;