Skip to content

Commit 8dacd1d

Browse files
authored
Merge pull request #125 from FieldDB/bump_deps
Bump deps
2 parents 02ac458 + ef818e3 commit 8dacd1d

File tree

8 files changed

+2111
-8169
lines changed

8 files changed

+2111
-8169
lines changed

.eslintrc.js

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

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [16.x]
19+
node-version: [24.x]
2020
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2121

2222
steps:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:16
1+
FROM node:24
22

33
# Create app directory
44
WORKDIR /usr/src/app

eslint.config.js

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
const { defineConfig, globalIgnores } = require("eslint/config");
2+
3+
const globals = require("globals");
4+
const js = require("@eslint/js");
5+
6+
module.exports = defineConfig([
7+
js.configs.recommended, // Recommended config applied to all files
8+
// js.configs.all, // Lots of rules that might show bugs and complexity
9+
{
10+
languageOptions: {
11+
globals: {
12+
...Object.fromEntries(
13+
Object.entries(globals.browser).map(([key]) => [key, "off"]),
14+
),
15+
...globals.mocha,
16+
...globals.node,
17+
},
18+
19+
ecmaVersion: 12,
20+
parserOptions: {},
21+
},
22+
23+
rules: {
24+
"global-require": "error",
25+
"no-console": "error",
26+
"no-param-reassign": "error",
27+
"no-plusplus": "error",
28+
"no-underscore-dangle": "error",
29+
"no-unused-vars": "error",
30+
"max-len": [
31+
"error",
32+
120,
33+
2,
34+
{
35+
ignoreUrls: true,
36+
ignoreComments: false,
37+
ignoreRegExpLiterals: true,
38+
ignoreStrings: true,
39+
ignoreTemplateLiterals: true,
40+
},
41+
],
42+
},
43+
},
44+
globalIgnores(["**/public", "lib/About.js", "lib/FieldDB.js"]),
45+
]);

lib/user.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,8 +1463,9 @@ function registerNewUser({
14631463
});
14641464
}
14651465

1466-
const connection = new Connection(req.body.connection
1467-
|| req.body.couchConnection) || Connection.defaultConnection(user.appbrand);
1466+
const connection = req.body.connection
1467+
|| req.body.couchConnection ? new Connection(req.body.connection
1468+
|| req.body.couchConnection) : Connection.defaultConnection(user.appbrand);
14681469
connection.appbrand = connection.appbrand || user.appbrand;
14691470
// TODO this has to be come asynchonous if this design is a central server who can register users on other servers
14701471
if (!connection.dbname || connection.dbname === `${user.username}-firstcorpus`) {

nyc.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
'db',
77
],
88
'check-coverage': true,
9-
branches: 67,
9+
branches: 66,
1010
functions: 68,
1111
lines: 78,
1212
statements: 78,

0 commit comments

Comments
 (0)