Skip to content

Commit

Permalink
Merge pull request #233 from mrc-ide/mrc-6018
Browse files Browse the repository at this point in the history
Mrc 6018 - server to node 20 + vitest
  • Loading branch information
M-Kusumgar authored Dec 5, 2024
2 parents 928366b + 2a6e5ee commit e2e861d
Show file tree
Hide file tree
Showing 64 changed files with 4,311 additions and 11,375 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- uses: ./.github/actions/build-and-run-wodin

- name: Test back end
run: npm test --prefix=app/server
run: npm run coverage --prefix=app/server
- name: Check versions
run: npm run genversion --prefix=app/server -- --check-only
- uses: codecov/codecov-action@v4
Expand All @@ -69,7 +69,7 @@ jobs:
- uses: ./.github/actions/build-and-run-wodin

- name: Test back end integration
run: npm run integration-test --prefix=app/server
run: npm run test:integration --prefix=app/server

playwright-tests:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
/app/static/dist/
/app/static/tmp/
/app/static/test-results
/logs/*
47 changes: 0 additions & 47 deletions app/server/.eslintrc.js

This file was deleted.

7 changes: 0 additions & 7 deletions app/server/README.md

This file was deleted.

22 changes: 22 additions & 0 deletions app/server/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// @ts-check

import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';

export default tseslint.config(
eslint.configs.recommended,
...tseslint.configs.recommended,
{
files: ["**/tests/**"],
rules: {
"@typescript-eslint/no-explicit-any": "off"
}
},
{
ignores: [
'**/dist/**',
'**/coverage/**',
'**/public/**'
]
}
);
1 change: 1 addition & 0 deletions app/server/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module "zoo-ids";
8 changes: 0 additions & 8 deletions app/server/jest.config.integration.js

This file was deleted.

8 changes: 0 additions & 8 deletions app/server/jest.config.js

This file was deleted.

5 changes: 5 additions & 0 deletions app/server/nodemon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"execMap": {
"ts": "ts-node --project tsconfig.node.json"
}
}
Loading

0 comments on commit e2e861d

Please sign in to comment.