From c6b084ab93b9e8054e880a884cf8fde1cde3b620 Mon Sep 17 00:00:00 2001
From: akachwala-ch <akachwala@companieshouse.gov.uk>
Date: Wed, 14 Feb 2024 14:33:32 +0000
Subject: [PATCH 1/2] changes to ecs build and package.json

---
 ecs-image-build/docker_start.sh | 2 +-
 package.json                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ecs-image-build/docker_start.sh b/ecs-image-build/docker_start.sh
index a5d867292..8020e3d9b 100755
--- a/ecs-image-build/docker_start.sh
+++ b/ecs-image-build/docker_start.sh
@@ -5,4 +5,4 @@
 PORT=3000
 
 export NODE_PORT=${PORT}
-exec node /opt/dist/src/main/server.js -- ${PORT}
+exec node /opt/server.js -- ${PORT}
diff --git a/package.json b/package.json
index bbf7dda2b..d3f8b5ea1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "acsp-web",
   "version": "1.0.0",
   "description": "A web application for the Authorized Corporate Service Providers (ACSP)",
-  "main": "dist/src/main/server.js",
+  "main": "dist/server.js",
   "engines": {
     "node": ">=20.0.0",
     "npm": "^10"
@@ -10,13 +10,13 @@
   "scripts": {
     "prebuild": "rm -rf ./dist",
     "build:assets": "gulp build",
-    "build:server": "tsc && cp -r src/main/views dist/src/main && cp -r config dist/",
+    "build:server": "tsc && cp -r src/main/views dist/src/main && cp -r src/config dist/",
     "build": "npm run build:assets && npm run build:server",
     "lint": "eslint 'src/**/*.ts' 'src/test/src/**/*.ts'",
     "lint:fix": "eslint 'src/**/*.ts' 'src/test/src/**/*.ts' --fix",
     "test:coverage": "npm run test -- --coverage",
     "test": "jest",
-    "start": "npm run build && source ./dist/config/.env && node dist/src/main/server.js",
+    "start": "npm run build && source ./dist/config/.env && node dist/server.js",
     "start:watch": "nodemon",
     "sonarqube": "sonar-scanner"
   },

From 60e1848e604836bee2927738b7085ee23436edde Mon Sep 17 00:00:00 2001
From: akachwala-ch <akachwala@companieshouse.gov.uk>
Date: Wed, 14 Feb 2024 14:46:18 +0000
Subject: [PATCH 2/2] removing src

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d3f8b5ea1..b48558728 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "prebuild": "rm -rf ./dist",
     "build:assets": "gulp build",
-    "build:server": "tsc && cp -r src/main/views dist/src/main && cp -r src/config dist/",
+    "build:server": "tsc && cp -r src/main/views dist/src/main && cp -r config dist/",
     "build": "npm run build:assets && npm run build:server",
     "lint": "eslint 'src/**/*.ts' 'src/test/src/**/*.ts'",
     "lint:fix": "eslint 'src/**/*.ts' 'src/test/src/**/*.ts' --fix",