ignore tests and mocks in compilation

UoaWDCC · Mar 7, 2024 · 4aef54c · 4aef54c
1 parent c9a0268
commit 4aef54c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 23 deletions.
diff --git a/server/package.json b/server/package.json
@@ -37,7 +37,7 @@
     "start": "./node_modules/.bin/concurrently \"yarn nodemon -e ts,js --exec \" \"yarn tsoa spec-and-routes && yarn --cwd=\"../..\" workspace client generate-types\"",
     "tsoa": "./node_modules/.bin/tsoa",
     "nodemon": "../node_modules/.bin/nodemon",
-    "build": "tsc",
+    "build": "tsc -p ./tsconfig.prod.json",
     "serve": "node dist/index.js"
   }
 }
diff --git a/server/src/data-layer/adapters/FirestoreCollections.ts b/server/src/data-layer/adapters/FirestoreCollections.ts
@@ -15,7 +15,7 @@ import {
   EMULATOR_FIRESTORE_PORT,
   EMULATOR_HOST,
   EMULATOR_PROJECT_ID
-} from "test-config/TestConfig"
+} from "./EmulatorConfig"
 
 if (process.env.DEV || process.env.JEST_WORKER_ID !== undefined) {
   initializeApp({ projectId: EMULATOR_PROJECT_ID })

diff --git a/server/src/data-layer/services/UserService.test.ts b/server/src/data-layer/services/UserService.test.ts
@@ -1,4 +1,4 @@
-import { additionalInfoMock } from "test-config/mocks/UserMocks"
+import { additionalInfoMock } from "test-config/mocks/User.mock"
 import UserService from "./UserService"
 import { cleanFirestore } from "test-config/TestUtils"
 

diff --git a/server/src/test-config/TestConfig.ts b/server/src/test-config/TestConfig.ts
diff --git a/server/src/test-config/TestUtils.ts b/server/src/test-config/TestUtils.ts
@@ -2,7 +2,7 @@ import {
   EMULATOR_FIRESTORE_PORT,
   EMULATOR_HOST,
   EMULATOR_PROJECT_ID
-} from "./TestConfig"
+} from "data-layer/adapters/EmulatorConfig"
 
 export async function cleanFirestore() {
   const response = await fetch(

diff --git a/server/src/test-config/mocks/UserMocks.ts b/server/src/test-config/mocks/UserMocks.ts
diff --git a/server/tsconfig.json b/server/tsconfig.json
@@ -15,6 +15,10 @@
     "experimentalDecorators": true,
     "resolveJsonModule": true
   },
-  "include": ["src/**/*", "src/business-layer/security/FirebaseAuth.ts"],
+  "include": [
+    "src/**/*",
+    "src/business-layer/security/FirebaseAuth.ts",
+    "src/data-layer/adapters/EmulatorConfig.ts"
+  ],
   "exclude": ["node_modules", "dist", "src/middleware/__generated__/routes.ts"]
 }