Skip to content

Commit 0f9fadf

Browse files
authored
Merge branch 'dev' into SIMSBIOHUB-580
2 parents 8b65b7f + 0e36bb5 commit 0f9fadf

File tree

94 files changed

+3221
-3251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+3221
-3251
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ jobs:
595595
needs:
596596
- buildAPI
597597
- deployDatabase
598+
- deployDatabaseSetup
598599
steps:
599600
# Install Node - for `node` and `npm` commands
600601
- name: Setup Node.js

.github/workflows/deployStatic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,7 @@ jobs:
501501
- scaleDownPods
502502
- buildAPI
503503
- deployDatabase
504+
- deployDatabaseSetup
504505
steps:
505506
# Install Node - for `node` and `npm` commands
506507
- name: Setup Node.js

api/.eslintignore

Lines changed: 0 additions & 11 deletions
This file was deleted.

api/.eslintrc

Lines changed: 0 additions & 46 deletions
This file was deleted.

api/.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
"proseWrap": "never",
1313
"endOfLine": "lf",
1414
"arrowParens": "always",
15-
"htmlWhitespaceSensitivity": "ignore"
15+
"htmlWhitespaceSensitivity": "ignore",
16+
"plugins": ["prettier-plugin-organize-imports"]
1617
}

api/eslint.config.mjs

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
import eslintJs from '@eslint/js';
2+
import eslintConfigPrettier from 'eslint-config-prettier';
3+
import eslintPluginMocha from 'eslint-plugin-mocha';
4+
import eslintPluginPrettier from 'eslint-plugin-prettier';
5+
import globals from 'globals';
6+
import typescriptEslint from 'typescript-eslint';
7+
8+
export default [
9+
{
10+
files: ['src/**/*.js', 'src/**/*.ts', 'src/**/*.jsx', 'src/**/*.tsx'],
11+
ignores: ['src/**/*.d.ts'],
12+
languageOptions: {
13+
parser: typescriptEslint.parser,
14+
parserOptions: {
15+
ecmaVersion: 'latest',
16+
sourceType: 'module'
17+
},
18+
globals: {
19+
...globals.node,
20+
...eslintPluginMocha.configs.flat.recommended.languageOptions.globals
21+
}
22+
},
23+
plugins: {
24+
'@typescript-eslint': typescriptEslint.plugin,
25+
prettier: eslintPluginPrettier,
26+
mocha: eslintPluginMocha.configs.flat.recommended.plugins.mocha
27+
},
28+
rules: {
29+
// Root ESLint rules
30+
...eslintJs.configs.recommended.rules,
31+
// Root TypeScript rules
32+
...typescriptEslint.configs.recommended.rules,
33+
// Root Prettier rules
34+
...eslintConfigPrettier.rules,
35+
// Root Mocha rules
36+
...eslintPluginMocha.configs.flat.recommended.rules,
37+
// Prettier rules
38+
'prettier/prettier': ['warn'],
39+
// TypeScript rules
40+
'@typescript-eslint/no-explicit-any': 'off',
41+
'@typescript-eslint/explicit-module-boundary-types': 'off',
42+
'@typescript-eslint/ban-ts-comment': [
43+
'error',
44+
{
45+
'ts-expect-error': false,
46+
'ts-ignore': false,
47+
'ts-nocheck': false,
48+
'ts-check': false
49+
}
50+
],
51+
'@typescript-eslint/no-unused-vars': [
52+
'error',
53+
{
54+
args: 'all',
55+
argsIgnorePattern: '^_',
56+
caughtErrorsIgnorePattern: '^_'
57+
}
58+
],
59+
'@typescript-eslint/no-redeclare': 'off',
60+
// Mocha rules
61+
'mocha/no-mocha-arrows': 'off',
62+
'mocha/no-setup-in-describe': 'off',
63+
'mocha/max-top-level-suites': 'off',
64+
// General rules
65+
'no-undef': 'off', // handled by typescript
66+
'no-redeclare': 'off',
67+
'no-unused-vars': 'off',
68+
'no-var': 'error',
69+
'no-lonely-if': 'error',
70+
curly: 'error'
71+
}
72+
}
73+
];

0 commit comments

Comments
 (0)