fix: #8947 yarn 3 workspaces

packages/deployment-service/src/codebuild/codebuild-executor-workflow.ts

@@ -5,14 +5,14 @@ import { AbstractWorkflow, PusherProvider, SqsProvider, Workflow } from '../even
 import { SoruceProvider } from './source-provider'
 import { CodeBuild } from 'aws-sdk'
 import yaml from 'yaml'
-import { PackageManagerEnum } from '../pipeline/pipeline-dto'
 import { S3Provider } from '../s3'
 import { TaskEntity } from '../entities/task.entity'
 import { PipelineRunnerProvider } from '../pipeline-runner'
 import { plainToClass } from 'class-transformer'
 import { BitbucketClientData } from '../entities/bitbucket-client.entity'
 import { BitBucketEvent } from '../bitbucket'
 import { ParameterProvider } from '../pipeline'
+import { PackageManagerEnum } from '@reapit/foundations-ts-definitions/deployment-schema'
 
 @Workflow(QueueNamesEnum.CODEBUILD_EXECUTOR)
 export class CodebuildExecutorWorkflow extends AbstractWorkflow<{
@@ -125,6 +125,19 @@ export class CodebuildExecutorWorkflow extends AbstractWorkflow<{
   }) {
     const params = await this.parameterProvider.obtainParameters(pipeline.id as string)
 
+    const setupCommands = [
+      'n install 14',
+      'n use 14',
+      'CACHE_FOLDER=$(find . -maxdepth 1 -mindepth 1 -type d)',
+      'echo $CACHE_FOLDER',
+      'mv $CACHE_FOLDER/* ./',
+      'rm -rf $CACHE_FOLDER',
+    ]
+
+    if (pipeline.packageManager && pipeline.packageManager === PackageManagerEnum.YARN_BERRY) {
+      setupCommands.push('yarn set version berry')
+    }
+
     const start = this.codeBuild.startBuild({
       projectName: process.env.CODE_BUILD_PROJECT_NAME as string,
       buildspecOverride: yaml.stringify({
@@ -138,12 +151,7 @@ export class CodebuildExecutorWorkflow extends AbstractWorkflow<{
               nodejs: 12,
             },
             commands: [
-              'n install 14',
-              'n use 14',
-              'CACHE_FOLDER=$(find . -maxdepth 1 -mindepth 1 -type d)',
-              'echo $CACHE_FOLDER',
-              'mv $CACHE_FOLDER/* ./',
-              'rm -rf $CACHE_FOLDER',
+              ...setupCommands,
               pipeline.packageManager === PackageManagerEnum.YARN
                 ? pipeline.packageManager
                 : `${pipeline.packageManager} install`,

packages/deployment-service/src/pipeline/pipeline-dto.ts

@@ -1,15 +1,11 @@
+import { PackageManagerEnum } from '@reapit/foundations-ts-definitions/deployment-schema'
 import { IsString, IsNotEmpty, IsOptional, IsEnum, MaxLength, IsUUID, Matches, IsUrl } from 'class-validator'
 
 export enum AppTypeEnum {
   REACT = 'react',
   NODE = 'node',
 }
 
-export enum PackageManagerEnum {
-  YARN = 'yarn',
-  NPM = 'npm',
-}
-
 export class PipelineDto {
   @IsString()
   @IsNotEmpty()

packages/developer-portal/src/components/apps/pipeline/pipeline-configure.tsx

@@ -8,6 +8,7 @@ import {
   InputGroup,
   InputWrap,
   Label,
+  Select,
   Toggle,
 } from '@reapit/elements'
 import { boolean, object, SchemaOf, string } from 'yup'
@@ -206,11 +207,12 @@ export const PipelineConfigure: FC = () => {
           </InputWrap>
           <InputWrap>
             <InputGroup>
-              <Toggle id="package-manager-toggle" hasGreyBg {...register('packageManager')}>
-                <ElToggleItem>Yarn</ElToggleItem>
-                <ElToggleItem>NPM</ElToggleItem>
-              </Toggle>
               <Label>Package Manager</Label>
+              <Select id="package-manager-select" {...register('packageManager')}>
+                <option value={PackageManagerEnum.NPM}>NPM</option>
+                <option value={PackageManagerEnum.YARN}>YARN</option>
+                <option value={PackageManagerEnum.YARN_BERRY}>YARN BERRY</option>
+              </Select>
               {errors.packageManager?.message && <InputError message={errors.packageManager.message} />}
             </InputGroup>
           </InputWrap>

packages/foundations-ts-definitions/deployment-schema/index.ts

@@ -98,6 +98,7 @@ export interface TaskModelInterface {
 export enum PackageManagerEnum {
   NPM = 'npm',
   YARN = 'yarn',
+  YARN_BERRY = 'yarn-berry',
 }
 
 export enum AppTypeEnum {