aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2021-12-29 13:40:59 +0100
committerLibravatar Kristóf Marussy <kristof@marussy.com>2021-12-29 13:40:59 +0100
commit27c7a09ef45155402f8a89555878e386608d5e32 (patch)
tree84f9f9c1d6d753d7ce15c2b7e441b6bb06869c3a /packages
parentrefactor: Switch back to consola for prettyness (diff)
downloadsophie-27c7a09ef45155402f8a89555878e386608d5e32.tar.gz
sophie-27c7a09ef45155402f8a89555878e386608d5e32.tar.zst
sophie-27c7a09ef45155402f8a89555878e386608d5e32.zip
Revert "refactor: Switch back to consola for prettyness"
Diffstat (limited to 'packages')
-rw-r--r--packages/main/package.json3
-rw-r--r--packages/main/src/controllers/config.ts2
-rw-r--r--packages/main/src/utils/logging.ts28
-rw-r--r--packages/main/vite.config.js6
4 files changed, 25 insertions, 14 deletions
diff --git a/packages/main/package.json b/packages/main/package.json
index 5010092..c4670a8 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -12,10 +12,11 @@
12 "dependencies": { 12 "dependencies": {
13 "@sophie/service-shared": "workspace:*", 13 "@sophie/service-shared": "workspace:*",
14 "@sophie/shared": "workspace:*", 14 "@sophie/shared": "workspace:*",
15 "consola": "^2.15.3",
16 "electron": "16.0.5", 15 "electron": "16.0.5",
17 "json5": "^2.2.0", 16 "json5": "^2.2.0",
18 "lodash": "^4.17.21", 17 "lodash": "^4.17.21",
18 "loglevel": "^1.8.0",
19 "loglevel-plugin-prefix": "^0.8.4",
19 "mobx": "^6.3.10", 20 "mobx": "^6.3.10",
20 "mobx-state-tree": "^5.1.0", 21 "mobx-state-tree": "^5.1.0",
21 "ms": "^2.1.3" 22 "ms": "^2.1.3"
diff --git a/packages/main/src/controllers/config.ts b/packages/main/src/controllers/config.ts
index 564658b..7187ab4 100644
--- a/packages/main/src/controllers/config.ts
+++ b/packages/main/src/controllers/config.ts
@@ -70,7 +70,7 @@ export async function initConfig(
70 logger.info('Config file was not found'); 70 logger.info('Config file was not found');
71 try { 71 try {
72 await writeConfig(); 72 await writeConfig();
73 logger.success('Created config file'); 73 logger.info('Created config file');
74 } catch (err) { 74 } catch (err) {
75 logger.error('Failed to initialize config'); 75 logger.error('Failed to initialize config');
76 } 76 }
diff --git a/packages/main/src/utils/logging.ts b/packages/main/src/utils/logging.ts
index 66f9068..9f1133f 100644
--- a/packages/main/src/utils/logging.ts
+++ b/packages/main/src/utils/logging.ts
@@ -18,16 +18,32 @@
18 * SPDX-License-Identifier: AGPL-3.0-only 18 * SPDX-License-Identifier: AGPL-3.0-only
19 */ 19 */
20 20
21import consola, { BasicReporter, Consola } from 'consola'; 21import loglevel, { Logger } from 'loglevel';
22import prefix from 'loglevel-plugin-prefix';
22 23
23const isDevelopment = import.meta.env.MODE === 'development'; 24const isDevelopment = import.meta.env.MODE === 'development';
24 25
25if (isDevelopment) { 26if (isDevelopment) {
26 // No fancy console in dev mode. 27 loglevel.enableAll();
27 consola.setReporters([new BasicReporter()]);
28 consola.level = 4;
29} 28}
30 29
31export function getLogger(loggerName: string): Consola { 30prefix.reg(loglevel);
32 return consola.withTag(`sophie:${loggerName}`); 31prefix.apply(loglevel, {
32 format(level, name, timestamp) {
33 let shortName = 'global';
34 if (name !== undefined) {
35 const nameSegments = name.split(':');
36 const lastSegment = nameSegments.pop();
37 shortName = [...nameSegments.map((segment) => segment[0]), lastSegment].join(':');
38 }
39 if (isDevelopment) {
40 // `watch.js` already appends timestamps.
41 return `${level} (${shortName})`;
42 }
43 return `[${timestamp}] ${level} (${shortName})`;
44 },
45});
46
47export function getLogger(loggerName: string): Logger {
48 return loglevel.getLogger(`sophie:${loggerName}`);
33} 49}
diff --git a/packages/main/vite.config.js b/packages/main/vite.config.js
index b239b96..bdb0ca1 100644
--- a/packages/main/vite.config.js
+++ b/packages/main/vite.config.js
@@ -20,12 +20,6 @@ const config = makeConfig({
20 'global.process.env': 'global.process["env"]', 20 'global.process.env': 'global.process["env"]',
21 'globalThis.process.env': 'globalThis.process["env"]', 21 'globalThis.process.env': 'globalThis.process["env"]',
22 }, 22 },
23 resolve: {
24 alias: {
25 // Force the nodejs version of consola to be resolved.
26 'consola': 'consola/dist/consola.js',
27 },
28 },
29 build: { 23 build: {
30 target: node, 24 target: node,
31 lib: { 25 lib: {