@catladder/pipeline 1.149.2 → 1.149.3

package/src/build/node/cache.ts

@@ -9,7 +9,7 @@ export const getYarnCache = (
   policy = "pull-push",
 ): GitlabJobCache[] => {
   const componentIsInWorkspace =
-    context.packageManagerInfo?.componentIsInWorkspace;
+    context.packageManagerInfo.componentIsInWorkspace;
   return [
     componentIsInWorkspace
       ? {
@@ -30,7 +30,7 @@ export const getNodeModulesCache = (
   policy = "pull-push",
 ): GitlabJobCache[] => {
   const componentIsInWorkspace =
-    context.packageManagerInfo?.componentIsInWorkspace;
+    context.packageManagerInfo.componentIsInWorkspace;
 
   // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
@@ -45,7 +45,7 @@ export const getNodeModulesCache = (
         ...(componentIsInWorkspace
           ? uniq([
               "node_modules",
-              ...(context.packageManagerInfo?.workspaces.map((w) =>
+              ...(context.packageManagerInfo.workspaces.map((w) =>
                 join(w.location, "node_modules"),
               ) ?? []),
             ])

package/src/build/node/testJob.ts

@@ -41,7 +41,7 @@ export const createNodeTestJobs = (
           script: [
             `cd ${context.build.dir}`,
             ...(ensureArray(buildConfig.audit?.command) ?? [
-              context.build.packageManagerInfo?.isClassic
+              context.build.packageManagerInfo.isClassic
                 ? "yarn audit"
                 : "yarn npm audit --environment production", // yarn 2
             ]),

package/src/build/node/yarn.ts

@@ -9,7 +9,7 @@ const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
 const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
 
 const getYarnInstallCommand = (context: BuildContext) => {
-  if (context.packageManagerInfo?.isClassic) {
+  if (context.packageManagerInfo.isClassic) {
     return YARN_INSTALL_CLASSIC;
   }
 
@@ -51,7 +51,7 @@ export const getYarnInstall = (
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 
 export const getDockerAppCopyAndBuildScript = (context: BuildContext) => {
-  if (context.packageManagerInfo?.isClassic) {
+  if (context.packageManagerInfo.isClassic) {
     return new BashExpression(
       `
 RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
@@ -64,7 +64,7 @@ RUN ${YARN_INSTALL_CLASSIC} --production
   // 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),
+    context.packageManagerInfo.version.startsWith(v),
   );
   const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
     ? "RUN yarn plugin import workspace-tools"

package/src/build/sbom.ts

@@ -11,7 +11,7 @@ export const createSbomBuildJob = (context: ComponentContext): CatladderJob => {
   const defaultImage = "aquasec/trivy:0.38.3";
   const defaultScript = [
     `trivy fs --quiet --format cyclonedx --output "${SBOM_FILE}" ${
-      context.build.packageManagerInfo?.componentIsInWorkspace
+      context.build.packageManagerInfo.componentIsInWorkspace
         ? "."
         : context.build.dir
     }`,

package/src/context/createComponentContext.ts

@@ -5,11 +5,12 @@ import { DEPLOY_TYPES } from "../deploy";
 import type { DeployConfig, DeployConfigType } from "../deploy/types";
 import type { PipelineType } from "../types";
 import type { Config, PipelineTrigger } from "../types/config";
-import type { ComponentContext, PackageManagerInfo } from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { PartialDeep } from "../types/utils";
 import { mergeWithMergingArrays } from "../utils";
 import { getEnvironment } from "./getEnvironment";
 import { getEnvironmentContext } from "./getEnvironmentContext";
+import { getPackageManagerInfo } from "../pipeline/packageManager";
 
 export type CreateComponentContextContext = {
   config: Config;
@@ -17,7 +18,6 @@ export type CreateComponentContextContext = {
   env: string;
   pipelineType?: PipelineType;
   trigger?: PipelineTrigger;
-  packageManagerInfo?: PackageManagerInfo;
 };
 
 export const createComponentContext = async (
@@ -29,6 +29,11 @@ export const createComponentContext = async (
     );
   }
 
+  const packageManagerInfo = await getPackageManagerInfo(
+    ctx.config,
+    ctx.componentName,
+  );
+
   const envContext = getEnvironmentContext(ctx);
 
   const componentConfigWithoutDefaults = envContext.envConfigRaw;
@@ -62,7 +67,7 @@ export const createComponentContext = async (
 
     build: {
       dir: dir,
-      packageManagerInfo: ctx.packageManagerInfo,
+      packageManagerInfo: packageManagerInfo,
       config: build,
     },
     deploy: deploy
@@ -72,7 +77,7 @@ export const createComponentContext = async (
       : null,
     componentName: ctx.componentName,
     environment,
-    packageManagerInfo: ctx.packageManagerInfo,
+    packageManagerInfo: packageManagerInfo,
     pipelineType: ctx.pipelineType,
     trigger: ctx.trigger,
   };

package/src/pipeline/createJobsForComponent.ts

@@ -1,4 +1,3 @@
-import { isFunction } from "lodash";
 import { BUILD_TYPES } from "../build";
 import type { CreateComponentContextContext } from "../context";
 import { createComponentContext } from "../context";
@@ -9,7 +8,6 @@ import type {
   Context,
 } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
-import { getPackageManagerInfo } from "./packageManager";
 
 const injectDefaultVarsInCustomJobs = (
   context: ComponentContext,
@@ -40,16 +38,8 @@ const createRawJobs = (context: Context): CatladderJob[] => {
 };
 
 export const createJobsForComponent = async (
-  contextContext: Omit<CreateComponentContextContext, "packageManagerInfo">,
+  contextContext: CreateComponentContextContext,
 ): Promise<Array<CatladderJobWithContext>> => {
-  const packageManagerInfo = await getPackageManagerInfo(
-    contextContext.config,
-    contextContext.componentName,
-  );
-
-  const context = await createComponentContext({
-    ...contextContext,
-    packageManagerInfo,
-  });
+  const context = await createComponentContext(contextContext);
   return createRawJobs(context).map((job) => ({ ...job, context }));
 };

package/src/types/context.ts

@@ -87,7 +87,7 @@ export type ContextBeforeConfig = {
 
 export type BuildContext = {
   dir: string;
-  packageManagerInfo?: PackageManagerInfo;
+  packageManagerInfo: PackageManagerInfo;
   config: BuildConfig;
 };
 
@@ -114,7 +114,7 @@ export type ComponentContext = {
   /**
    * @deprecated use buildContext.packageManagerInfo instead
    */
-  packageManagerInfo?: PackageManagerInfo;
+  packageManagerInfo: PackageManagerInfo;
 
   customJobs?: CatladderJob[];
 };