aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2022-01-10 00:05:01 +0100
committerLibravatar Kristóf Marussy <kristof@marussy.com>2022-01-10 00:05:01 +0100
commit3122a4e8068f71e64dcc46fc6c52957be3927f06 (patch)
treeb44517c524bf2fd880b6b82f32b4e065b7bb567c
parentbuild: Add eslint-plugin-promise (diff)
downloadsophie-3122a4e8068f71e64dcc46fc6c52957be3927f06.tar.gz
sophie-3122a4e8068f71e64dcc46fc6c52957be3927f06.tar.zst
sophie-3122a4e8068f71e64dcc46fc6c52957be3927f06.zip
build: Add eslint-plugin-security
This would run as part of gitlab SAST (if it didn't time out). Signed-off-by: Kristóf Marussy <kristof@marussy.com>
-rw-r--r--.eslintrc.cjs1
-rw-r--r--package.json1
-rw-r--r--packages/main/src/utils/log.ts26
-rw-r--r--packages/renderer/src/utils/log.ts4
-rw-r--r--packages/service-preload/src/utils/log.ts4
-rw-r--r--yarn.lock26
6 files changed, 43 insertions, 19 deletions
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 85c928c..5587ea7 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -13,6 +13,7 @@ module.exports = {
13 'plugin:jest/style', 13 'plugin:jest/style',
14 'plugin:prettier/recommended', 14 'plugin:prettier/recommended',
15 'plugin:promise/recommended', 15 'plugin:promise/recommended',
16 'plugin:security/recommended',
16 'plugin:unicorn/recommended', 17 'plugin:unicorn/recommended',
17 ], 18 ],
18 env: { 19 env: {
diff --git a/package.json b/package.json
index 819f26a..d8b27b1 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
74 "eslint-plugin-promise": "^6.0.0", 74 "eslint-plugin-promise": "^6.0.0",
75 "eslint-plugin-react": "^7.28.0", 75 "eslint-plugin-react": "^7.28.0",
76 "eslint-plugin-react-hooks": "^4.3.0", 76 "eslint-plugin-react-hooks": "^4.3.0",
77 "eslint-plugin-security": "^1.4.0",
77 "eslint-plugin-unicorn": "^40.0.0", 78 "eslint-plugin-unicorn": "^40.0.0",
78 "git-repo-info": "^2.1.1", 79 "git-repo-info": "^2.1.1",
79 "jest": "^27.4.7", 80 "jest": "^27.4.7",
diff --git a/packages/main/src/utils/log.ts b/packages/main/src/utils/log.ts
index 0a632d8..d9748f4 100644
--- a/packages/main/src/utils/log.ts
+++ b/packages/main/src/utils/log.ts
@@ -29,23 +29,19 @@ if (import.meta.env?.DEV) {
29 loglevel.setLevel('info'); 29 loglevel.setLevel('info');
30} 30}
31 31
32const COLORS: Partial<Record<string, ChalkInstance>> = { 32const COLORS: Map<string, ChalkInstance> = new Map([
33 TRACE: chalk.magenta, 33 ['TRACE', chalk.magenta],
34 DEBUG: chalk.cyan, 34 ['DEBUG', chalk.cyan],
35 INFO: chalk.blue, 35 ['INFO', chalk.blue],
36 WARN: chalk.yellow, 36 ['WARN', chalk.yellow],
37 ERROR: chalk.red, 37 ['ERROR', chalk.red],
38 CRITICAL: chalk.red, 38 ['CRITICAL', chalk.red],
39}; 39]);
40
41function getColor(level: string): ChalkInstance {
42 return COLORS[level] ?? chalk.gray;
43}
44 40
45prefix.reg(loglevel); 41prefix.reg(loglevel);
46prefix.apply(loglevel, { 42prefix.apply(loglevel, {
47 format(level, name, timestamp) { 43 format(level, name, timestamp) {
48 const levelColor = getColor(level); 44 const levelColor = COLORS.get(level) ?? chalk.gray;
49 const timeStr = timestamp.toString(); 45 const timeStr = timestamp.toString();
50 const nameStr = 46 const nameStr =
51 typeof name === 'undefined' 47 typeof name === 'undefined'
@@ -62,7 +58,7 @@ export function getLogger(loggerName: string): loglevel.Logger {
62export function silenceLogger(): void { 58export function silenceLogger(): void {
63 loglevel.disableAll(); 59 loglevel.disableAll();
64 const loggers = loglevel.getLoggers(); 60 const loggers = loglevel.getLoggers();
65 Object.keys(loggers).forEach((loggerName) => { 61 Object.values(loggers).forEach((logger) => {
66 loggers[loggerName].disableAll(); 62 logger.disableAll();
67 }); 63 });
68} 64}
diff --git a/packages/renderer/src/utils/log.ts b/packages/renderer/src/utils/log.ts
index c17fc2a..11664b4 100644
--- a/packages/renderer/src/utils/log.ts
+++ b/packages/renderer/src/utils/log.ts
@@ -44,7 +44,7 @@ export function getLogger(loggerName: string): Logger {
44export function silenceLogger(): void { 44export function silenceLogger(): void {
45 loglevel.disableAll(); 45 loglevel.disableAll();
46 const loggers = loglevel.getLoggers(); 46 const loggers = loglevel.getLoggers();
47 Object.keys(loggers).forEach((loggerName) => { 47 Object.values(loggers).forEach((logger) => {
48 loggers[loggerName].disableAll(); 48 logger.disableAll();
49 }); 49 });
50} 50}
diff --git a/packages/service-preload/src/utils/log.ts b/packages/service-preload/src/utils/log.ts
index 0c35319..f0bcd59 100644
--- a/packages/service-preload/src/utils/log.ts
+++ b/packages/service-preload/src/utils/log.ts
@@ -43,7 +43,7 @@ export function getLogger(loggerName: string): Logger {
43export function silenceLogger(): void { 43export function silenceLogger(): void {
44 loglevel.disableAll(); 44 loglevel.disableAll();
45 const loggers = loglevel.getLoggers(); 45 const loggers = loglevel.getLoggers();
46 Object.keys(loggers).forEach((loggerName) => { 46 Object.values(loggers).forEach((logger) => {
47 loggers[loggerName].disableAll(); 47 logger.disableAll();
48 }); 48 });
49} 49}
diff --git a/yarn.lock b/yarn.lock
index 6417171..290446e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4199,6 +4199,15 @@ __metadata:
4199 languageName: node 4199 languageName: node
4200 linkType: hard 4200 linkType: hard
4201 4201
4202"eslint-plugin-security@npm:^1.4.0":
4203 version: 1.4.0
4204 resolution: "eslint-plugin-security@npm:1.4.0"
4205 dependencies:
4206 safe-regex: ^1.1.0
4207 checksum: 31807b2b42fcb3cc670a2f96b4e6f5d716015750bdcd055f0bac9f2cbec74cad0b86405696fe6d46e778d4e3cb819023995651e312c1f61e8d32db93ffb80e38
4208 languageName: node
4209 linkType: hard
4210
4202"eslint-plugin-unicorn@npm:^40.0.0": 4211"eslint-plugin-unicorn@npm:^40.0.0":
4203 version: 40.0.0 4212 version: 40.0.0
4204 resolution: "eslint-plugin-unicorn@npm:40.0.0" 4213 resolution: "eslint-plugin-unicorn@npm:40.0.0"
@@ -7830,6 +7839,13 @@ __metadata:
7830 languageName: node 7839 languageName: node
7831 linkType: hard 7840 linkType: hard
7832 7841
7842"ret@npm:~0.1.10":
7843 version: 0.1.15
7844 resolution: "ret@npm:0.1.15"
7845 checksum: d76a9159eb8c946586567bd934358dfc08a36367b3257f7a3d7255fdd7b56597235af23c6afa0d7f0254159e8051f93c918809962ebd6df24ca2a83dbe4d4151
7846 languageName: node
7847 linkType: hard
7848
7833"retry@npm:^0.12.0": 7849"retry@npm:^0.12.0":
7834 version: 0.12.0 7850 version: 0.12.0
7835 resolution: "retry@npm:0.12.0" 7851 resolution: "retry@npm:0.12.0"
@@ -7913,6 +7929,15 @@ __metadata:
7913 languageName: node 7929 languageName: node
7914 linkType: hard 7930 linkType: hard
7915 7931
7932"safe-regex@npm:^1.1.0":
7933 version: 1.1.0
7934 resolution: "safe-regex@npm:1.1.0"
7935 dependencies:
7936 ret: ~0.1.10
7937 checksum: 9a8bba57c87a841f7997b3b951e8e403b1128c1a4fd1182f40cc1a20e2d490593d7c2a21030fadfea320c8e859219019e136f678c6689ed5960b391b822f01d5
7938 languageName: node
7939 linkType: hard
7940
7916"safe-regex@npm:^2.1.1": 7941"safe-regex@npm:^2.1.1":
7917 version: 2.1.1 7942 version: 2.1.1
7918 resolution: "safe-regex@npm:2.1.1" 7943 resolution: "safe-regex@npm:2.1.1"
@@ -8189,6 +8214,7 @@ __metadata:
8189 eslint-plugin-promise: ^6.0.0 8214 eslint-plugin-promise: ^6.0.0
8190 eslint-plugin-react: ^7.28.0 8215 eslint-plugin-react: ^7.28.0
8191 eslint-plugin-react-hooks: ^4.3.0 8216 eslint-plugin-react-hooks: ^4.3.0
8217 eslint-plugin-security: ^1.4.0
8192 eslint-plugin-unicorn: ^40.0.0 8218 eslint-plugin-unicorn: ^40.0.0
8193 git-repo-info: ^2.1.1 8219 git-repo-info: ^2.1.1
8194 jest: ^27.4.7 8220 jest: ^27.4.7