Merge dev for v1.1.0 release (#926)

.dockerignore

@@ -3,7 +3,6 @@
 **/dist/
 **/test/
 **/jest*
-**/tsconfig.test.json
 **/vitest*
 **/.env*
 **/.eslint*

.github/workflows/backend-checks.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - main
       - dev
+      - 'feature/**'
     paths:
       - 'backend/**'
 
@@ -20,7 +21,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -30,19 +30,21 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "npm"
-          cache-dependency-path: "./backend/package-lock.json"
+          cache: 'npm'
+          cache-dependency-path: './backend/package-lock.json'
+      - name: Install dependencies
+        run: |
+          npm ci --no-audit
       - name: Run job
         run: |
-          npm ci
           npx eslint .
           npx prettier . --check
+
   build-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [ 18.x ]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -52,10 +54,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "npm"
-          cache-dependency-path: "./backend/package-lock.json"
+          cache: 'npm'
+          cache-dependency-path: './backend/package-lock.json'
+      - name: Install dependencies
+        run: |
+          npm ci --no-audit
       - name: Run job
         run: |
-          npm ci
           npm run build
           npm test

.github/workflows/cloud.yml

@@ -0,0 +1,41 @@
+name: Cloud Code Checks
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+      - dev
+      - 'feature/**'
+    paths:
+      - 'cloud/**'
+
+defaults:
+  run:
+    working-directory: ./cloud
+
+jobs:
+  lint-format:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          sparse-checkout: |
+            .prettierrc
+            cloud
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+          cache-dependency-path: './cloud/package-lock.json'
+      - name: Install dependencies
+        run: |
+          npm ci --no-audit
+      - name: Run job
+        run: |
+          npm run codecheck

.github/workflows/frontend-checks.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - main
       - dev
+      - 'feature/**'
     paths:
       - 'frontend/**'
 
@@ -20,7 +21,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -30,20 +30,22 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "npm"
-          cache-dependency-path: "./frontend/package-lock.json"
+          cache: 'npm'
+          cache-dependency-path: './frontend/package-lock.json'
+      - name: Install dependencies
+        run: |
+          npm ci --no-audit
       - name: Run job
         run: |
-          npm ci
           npx eslint .
           npx stylelint '**/*.css'
           npx prettier . --check
+
   build-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [ 18.x ]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -53,10 +55,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "npm"
-          cache-dependency-path: "./frontend/package-lock.json"
+          cache: 'npm'
+          cache-dependency-path: './frontend/package-lock.json'
+      - name: Install dependencies
+        run: |
+          npm ci --no-audit
       - name: Run job
         run: |
-          npm ci
           npm run build
           npm test

.github/workflows/k6-checks.yml

@@ -20,7 +20,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -30,10 +29,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "npm"
-          cache-dependency-path: "./k6/package-lock.json"
+          cache: 'npm'
+          cache-dependency-path: './k6/package-lock.json'
+      - name: Install dependencies
+        run: |
+          npm ci --no-audit
       - name: Run job
         run: |
-          npm ci
           npx eslint .
           npx prettier . --check

.gitignore

@@ -14,10 +14,11 @@ pids
 *.seed
 *.pid.lock
 
-# Directory for instrumented libs generated by jscoverage/JSCover
+# Coverage and test output
 lib-cov
 coverage
 *.lcov
+reports
 
 # node-waf configuration
 .lock-wscript

backend/.dockerignore

@@ -1,5 +1,6 @@
 node_modules
 build
+reports
 test
 .env*
 .eslintrc.cjs

backend/.eslintrc.cjs

@@ -20,7 +20,7 @@ module.exports = {
 	],
 	parser: '@typescript-eslint/parser',
 	parserOptions: {
-		project: ['./tsconfig.json', './test/tsconfig.json'],
+		project: ['./tsconfig.json', 'test/tsconfig.json'],
 	},
 	plugins: ['@typescript-eslint', 'jest'],
 	ignorePatterns: ['build', 'coverage', 'node_modules'],

backend/Dockerfile

@@ -1,5 +1,4 @@
 FROM node:lts-alpine
-ENV NODE_ENV=production
 
 WORKDIR /usr/app
 COPY package*.json ./

backend/README.md

@@ -1,4 +1,4 @@
-# prompt-injection-api
+# SpyLogic : API
 
 This is the backend module of the SpyLogic app. We are using [Express](https://expressjs.com/) to serve the API.
 

backend/jest.config.ts

@@ -5,19 +5,22 @@ const jestConfig: JestConfigWithTsJest = {
 		'^@src/(.*)': '<rootDir>/src/$1',
 		importMetaUtils$: '<rootDir>/test/importMetaUtils.mock.ts',
 	},
-	modulePathIgnorePatterns: ['build', 'coverage', 'node_modules'],
 	testEnvironment: 'node',
 	transform: {
 		'^.+\\.ts$': [
 			'ts-jest',
 			{
-				tsconfig: './test/tsconfig.json',
+				tsconfig: '<rootDir>/test/tsconfig.json',
 				useESM: true,
 			},
 		],
 	},
 	silent: true,
-	setupFiles: ['./test/setupEnvVars.ts'],
+	setupFiles: ['<rootDir>/test/setupEnvVars.ts'],
+	reporters:
+		process.env.CI === 'true'
+			? ['default', ['jest-junit', { outputDirectory: 'reports' }]]
+			: ['default'],
 };
 
 export default jestConfig;