From d8caaf7bf893338b17d3f71c7656e4d3cc883b6a Mon Sep 17 00:00:00 2001
From: Gary Xue <105693507+gxueatlassian@users.noreply.github.com>
Date: Thu, 14 Dec 2023 16:06:07 +1100
Subject: [PATCH] add dlq-service during BB pipeline (#2617)

reverse optional dep logic and only add dlq-service during BB pipeline\
---
 .github/workflows/on-push.yml | 16 ----------------
 .yarnrc                       |  2 --
 Dockerfile                    |  1 -
 Dockerfile.prod               |  2 +-
 package.json                  |  3 ---
 spa/package.json              |  3 +--
 6 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 .yarnrc

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index e0736d7d48..1e9f9cc09e 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -18,10 +18,6 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-      - name: remove internal package
-        run: |
-          sed -i '/sqs-queue-dlq-service/d' ./package.json
-          cat ./package.json
       - run: yarn install --frozen-lockfile
       - run: yarn run lint
       - run: yarn run build:release
@@ -35,10 +31,6 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-      - name: remove internal package
-        run: |
-          sed -i '/sqs-queue-dlq-service/d' ./package.json
-          cat ./package.json
       - run: yarn install --frozen-lockfile
       - run: yarn run playwright install
       - name: create .env file
@@ -92,10 +84,6 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-      - name: remove internal package
-        run: |
-          sed -i '/sqs-queue-dlq-service/d' ./package.json
-          cat ./package.json
       - run: yarn install --frozen-lockfile
       - run: yarn spa:build
       - name: create .env file
@@ -150,10 +138,6 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v1
-      - name: remove internal package
-        run: |
-          sed -i '/sqs-queue-dlq-service/d' ./package.json
-          cat ./package.json
       - name: Build Docker image
         uses: docker/build-push-action@v2.7.0
         with:
diff --git a/.yarnrc b/.yarnrc
deleted file mode 100644
index 8cffd708aa..0000000000
--- a/.yarnrc
+++ /dev/null
@@ -1,2 +0,0 @@
---install.ignore-optional true
---add.ignore-optional true
diff --git a/Dockerfile b/Dockerfile
index 951ce2c3a1..aa1df173b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,6 @@ COPY . /app
 WORKDIR /app
 
 # Installing packages
-RUN sed -i '/sqs-queue-dlq-service/d' ./package.json
 RUN cat ./package.json
 RUN yarn install --frozen-lockfile
 
diff --git a/Dockerfile.prod b/Dockerfile.prod
index 2124c5a1fb..ff4001057a 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -18,7 +18,7 @@ COPY . /app
 WORKDIR /app
 
 # Installing packages
-RUN rm .yarnrc
+RUN yarn add @atlassian/sqs-queue-dlq-service
 RUN yarn install --frozen-lockfile
 RUN yarn list
 
diff --git a/package.json b/package.json
index 630890b35e..3a42fedeb0 100644
--- a/package.json
+++ b/package.json
@@ -182,9 +182,6 @@
 		"ts-node-dev": "^2.0.0",
 		"yaml-lint": "^1.2.4"
 	},
-	"optionalDependencies": {
-		"@atlassian/sqs-queue-dlq-service": "^2.1.1"
-	},
 	"volta": {
 		"node": "18.18.1",
 		"yarn": "1.22.18"
diff --git a/spa/package.json b/spa/package.json
index e315188bcf..c77338c4b6 100644
--- a/spa/package.json
+++ b/spa/package.json
@@ -71,6 +71,5 @@
     "react-scripts": "^5.0.1",
     "ts-jest": "^29.1.1",
     "typescript": "^5.0.2"
-  },
-  "optionalDependencies": {}
+  }
 }