@catladder/cli 0.0.0-next-d71e41ba → 0.0.0-next-dccc0a36

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-next-d71e41ba",
+  "version": "0.0.0-next-dccc0a36",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/scripts/generateCliSkillReference.ts

@@ -64,8 +64,9 @@ export const renderCliReference = (): string => {
     "<!-- rendered from the command definitions by",
     "     apps/cli/src/scripts/generateCliSkillReference.ts — do not edit -->",
     "",
-    "All commands run non-interactively as `yarn catladder <command> ...`;",
-    "see SKILL.md for how to pass inputs.",
+    "All commands run non-interactively as `yarn catladder <command> ...`",
+    "(`pnpm catladder ...` in pnpm projects); see SKILL.md for how to",
+    "pass inputs.",
     "",
     defs.map(renderCommand).join("\n\n"),
     "",

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

@@ -1,8 +0,0 @@
-import { BashExpression } from "../../../../bash/src/index.js";
-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;
-}) => Promise<string[]>;
-export declare const getDockerAppCopyAndBuildScript: (context: ComponentContextWithBuild) => Promise<BashExpression>;

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

@@ -1,78 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDockerAppCopyAndBuildScript = exports.getYarnInstall = exports.ensureNodeVersion = void 0;
-const bash_1 = require("../../../../bash/src/index.js");
-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 rebuild`;
-const getYarnInstallCommand = async (context) => {
-    const packageManagerInfo = await context.packageManagerInfo;
-    if (packageManagerInfo.isClassic) {
-        return YARN_INSTALL_CLASSIC;
-    }
-    // inline builds make debugging easier as it prints it out in the logs, instead of writing it in temp files
-    return `yarn install --immutable --inline-builds`;
-};
-const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")([
-    // github actions overrides HOME in container jobs, so also look
-    // for nvm where the catladder images install it (/root/.nvm)
-    'if [ -f "$HOME/.nvm/nvm.sh" ]; then source "$HOME/.nvm/nvm.sh"; elif [ -f /root/.nvm/nvm.sh ]; then export NVM_DIR=/root/.nvm; source /root/.nvm/nvm.sh; fi',
-    "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
-]);
-exports.ensureNodeVersion = ensureNodeVersion;
-const getYarnInstall = async (context, options) => {
-    const postInstall = context.type !== "workspace" &&
-        context.build.type !== "disabled" &&
-        "postInstall" in context.build.config
-        ? context.build.config.postInstall
-        : null;
-    return [
-        ...(0, exports.ensureNodeVersion)(context),
-        ...(0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([await getYarnInstallCommand(context)]),
-        ...(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall)
-            ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((0, utils_1.ensureArray)(postInstall))
-            : []),
-    ];
-};
-exports.getYarnInstall = getYarnInstall;
-const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
-const getDockerAppCopyAndBuildScript = async (context) => {
-    var _a, _b, _c;
-    const packageManagerInfo = await context.packageManagerInfo;
-    if (packageManagerInfo.isClassic) {
-        return new bash_1.BashExpression(`
-RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
-${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) => packageManagerInfo.version.startsWith(v));
-    const 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 new bash_1.BashExpression(`
-    ENV YARN_ENABLE_INLINE_BUILDS=1
-${DOCKER_COPY_FILES}
-${maybeAddWorkspaceToolsCommand}
-RUN ${YARN_BERRY_PROD_INSTALL}
-${yarnRebuildEnabled ? `RUN ${YARN_BERRY_PROD_REBUILD}` : ""}
-
-    `.trim());
-};
-exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;
-//# sourceMappingURL=yarn.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;AAAA,0CAAiD;AAGjD,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,KAAK,EAAE,OAAgB,EAAE,EAAE;IACvD,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC;IAC5D,IAAI,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACjC,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,gEAAgE;IAChE,6DAA6D;IAC7D,6JAA6J;IAC7J,yEAAyE;CAC1E,CAAC,CAAC;AATQ,QAAA,iBAAiB,qBASzB;AAEE,MAAM,cAAc,GAAG,KAAK,EACjC,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,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACzC,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,KAAK,EACjD,OAAkC,EAClC,EAAE;;IACF,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC;IAC5D,IAAI,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACjC,OAAO,IAAI,qBAAc,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,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACzC,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,qBAAc,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;AAjDW,QAAA,8BAA8B,kCAiDzC"}