diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-01-08 21:36:43 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-01-09 19:53:03 +0100 |
commit | d07e7b834831230b53860d0919a68edc2d36193d (patch) | |
tree | a1f2a021563ddff54f33341c475fc6c6eb787388 /packages/service-preload | |
parent | New configurations based on review comments (WIP) (diff) | |
download | sophie-d07e7b834831230b53860d0919a68edc2d36193d.tar.gz sophie-d07e7b834831230b53860d0919a68edc2d36193d.tar.zst sophie-d07e7b834831230b53860d0919a68edc2d36193d.zip |
build: Eslint fixes for multi-module project
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages/service-preload')
-rw-r--r-- | packages/service-preload/.eslintrc.cjs | 6 | ||||
-rw-r--r-- | packages/service-preload/esbuild.config.js | 6 | ||||
-rw-r--r-- | packages/service-preload/package.json | 10 | ||||
-rw-r--r-- | packages/service-preload/src/index.ts | 12 | ||||
-rw-r--r-- | packages/service-preload/src/utils/log.ts | 49 | ||||
-rw-r--r-- | packages/service-preload/tsconfig.json | 8 | ||||
-rw-r--r-- | packages/service-preload/types/importMeta.d.ts | 7 |
7 files changed, 82 insertions, 16 deletions
diff --git a/packages/service-preload/.eslintrc.cjs b/packages/service-preload/.eslintrc.cjs new file mode 100644 index 0000000..02fab21 --- /dev/null +++ b/packages/service-preload/.eslintrc.cjs | |||
@@ -0,0 +1,6 @@ | |||
1 | module.exports = { | ||
2 | env: { | ||
3 | node: true, | ||
4 | browser: true, | ||
5 | }, | ||
6 | }; | ||
diff --git a/packages/service-preload/esbuild.config.js b/packages/service-preload/esbuild.config.js index b73a071..66f5e84 100644 --- a/packages/service-preload/esbuild.config.js +++ b/packages/service-preload/esbuild.config.js | |||
@@ -1,8 +1,8 @@ | |||
1 | import { chrome } from '../../config/buildConstants.js'; | 1 | import { chrome } from '../../config/buildConstants.js'; |
2 | import { getConfig } from '../../config/esbuildConfig.js'; | 2 | import fileURLToDirname from '../../config/fileURLToDirname.js'; |
3 | import { fileURLToDirname } from '../../config/utils.js'; | 3 | import getEsbuildConfig from '../../config/getEsbuildConfig.js'; |
4 | 4 | ||
5 | export default getConfig({ | 5 | export default getEsbuildConfig({ |
6 | absWorkingDir: fileURLToDirname(import.meta.url), | 6 | absWorkingDir: fileURLToDirname(import.meta.url), |
7 | entryPoints: [ | 7 | entryPoints: [ |
8 | 'src/index.ts', | 8 | 'src/index.ts', |
diff --git a/packages/service-preload/package.json b/packages/service-preload/package.json index 26215a3..14717f8 100644 --- a/packages/service-preload/package.json +++ b/packages/service-preload/package.json | |||
@@ -5,14 +5,12 @@ | |||
5 | "type": "module", | 5 | "type": "module", |
6 | "types": "dist-types/index.d.ts", | 6 | "types": "dist-types/index.d.ts", |
7 | "scripts": { | 7 | "scripts": { |
8 | "typecheck": "tsc" | 8 | "typecheck:workspace": "yarn g:typecheck" |
9 | }, | 9 | }, |
10 | "dependencies": { | 10 | "dependencies": { |
11 | "@sophie/service-shared": "workspace:*", | 11 | "@sophie/service-shared": "workspace:*", |
12 | "electron": "16.0.6" | 12 | "electron": "16.0.6", |
13 | }, | 13 | "loglevel": "^1.8.0", |
14 | "devDependencies": { | 14 | "loglevel-plugin-prefix": "^0.8.4" |
15 | "rimraf": "^3.0.2", | ||
16 | "typescript": "^4.5.4" | ||
17 | } | 15 | } |
18 | } | 16 | } |
diff --git a/packages/service-preload/src/index.ts b/packages/service-preload/src/index.ts index d1ea13c..2bbfefd 100644 --- a/packages/service-preload/src/index.ts +++ b/packages/service-preload/src/index.ts | |||
@@ -18,8 +18,12 @@ | |||
18 | * SPDX-License-Identifier: AGPL-3.0-only | 18 | * SPDX-License-Identifier: AGPL-3.0-only |
19 | */ | 19 | */ |
20 | 20 | ||
21 | import { ipcRenderer, webFrame } from 'electron'; | ||
22 | import { ServiceToMainIpcMessage, webSource } from '@sophie/service-shared'; | 21 | import { ServiceToMainIpcMessage, webSource } from '@sophie/service-shared'; |
22 | import { ipcRenderer, webFrame } from 'electron'; | ||
23 | |||
24 | import { getLogger } from './utils/log'; | ||
25 | |||
26 | const log = getLogger('index'); | ||
23 | 27 | ||
24 | if (webFrame.parent === null) { | 28 | if (webFrame.parent === null) { |
25 | // Inject CSS to simulate `browserView.setBackgroundColor`. | 29 | // Inject CSS to simulate `browserView.setBackgroundColor`. |
@@ -49,14 +53,14 @@ if (webFrame.parent === null) { | |||
49 | * @see https://www.electronjs.org/docs/latest/api/web-contents#contentsexecutejavascriptinisolatedworldworldid-scripts-usergesture | 53 | * @see https://www.electronjs.org/docs/latest/api/web-contents#contentsexecutejavascriptinisolatedworldworldid-scripts-usergesture |
50 | */ | 54 | */ |
51 | async function fetchAndExecuteInjectScript(): Promise<void> { | 55 | async function fetchAndExecuteInjectScript(): Promise<void> { |
52 | const apiExposedResponse = await ipcRenderer.invoke( | 56 | const apiExposedResponse: unknown = await ipcRenderer.invoke( |
53 | ServiceToMainIpcMessage.ApiExposedInMainWorld, | 57 | ServiceToMainIpcMessage.ApiExposedInMainWorld, |
54 | ); | 58 | ); |
55 | const injectSource = webSource.parse(apiExposedResponse); | 59 | const injectSource = webSource.parse(apiExposedResponse); |
56 | // Isolated world 0 is the main world. | 60 | // Isolated world 0 is the main world. |
57 | return webFrame.executeJavaScriptInIsolatedWorld(0, [injectSource]); | 61 | await webFrame.executeJavaScriptInIsolatedWorld(0, [injectSource]); |
58 | } | 62 | } |
59 | 63 | ||
60 | fetchAndExecuteInjectScript().catch((err) => { | 64 | fetchAndExecuteInjectScript().catch((err) => { |
61 | console.log('Failed to fetch inject source:', err); | 65 | log.error('Failed to fetch inject source:', err); |
62 | }); | 66 | }); |
diff --git a/packages/service-preload/src/utils/log.ts b/packages/service-preload/src/utils/log.ts new file mode 100644 index 0000000..0c35319 --- /dev/null +++ b/packages/service-preload/src/utils/log.ts | |||
@@ -0,0 +1,49 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2022 Kristóf Marussy <kristof@marussy.com> | ||
3 | * | ||
4 | * This file is part of Sophie. | ||
5 | * | ||
6 | * Sophie is free software: you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU Affero General Public License as | ||
8 | * published by the Free Software Foundation, version 3. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU Affero General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU Affero General Public License | ||
16 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
17 | * | ||
18 | * SPDX-License-Identifier: AGPL-3.0-only | ||
19 | */ | ||
20 | |||
21 | import loglevel, { Logger } from 'loglevel'; | ||
22 | import prefix from 'loglevel-plugin-prefix'; | ||
23 | |||
24 | if (import.meta.env?.DEV) { | ||
25 | loglevel.setLevel('debug'); | ||
26 | } else { | ||
27 | loglevel.setLevel('info'); | ||
28 | } | ||
29 | |||
30 | prefix.reg(loglevel); | ||
31 | prefix.apply(loglevel, { | ||
32 | format(level, name, timestamp) { | ||
33 | const timeStr = timestamp.toString(); | ||
34 | const nameStr = typeof name === 'undefined' ? '' : ` ${name}`; | ||
35 | return `[${timeStr}] ${level}${nameStr}:`; | ||
36 | }, | ||
37 | }); | ||
38 | |||
39 | export function getLogger(loggerName: string): Logger { | ||
40 | return loglevel.getLogger(loggerName); | ||
41 | } | ||
42 | |||
43 | export function silenceLogger(): void { | ||
44 | loglevel.disableAll(); | ||
45 | const loggers = loglevel.getLoggers(); | ||
46 | Object.keys(loggers).forEach((loggerName) => { | ||
47 | loggers[loggerName].disableAll(); | ||
48 | }); | ||
49 | } | ||
diff --git a/packages/service-preload/tsconfig.json b/packages/service-preload/tsconfig.json index 638690b..0372dde 100644 --- a/packages/service-preload/tsconfig.json +++ b/packages/service-preload/tsconfig.json | |||
@@ -1,5 +1,5 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../config/tsconfig.base.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "noEmit": true, | 4 | "noEmit": true, |
5 | "lib": [ | 5 | "lib": [ |
@@ -10,10 +10,12 @@ | |||
10 | }, | 10 | }, |
11 | "references": [ | 11 | "references": [ |
12 | { | 12 | { |
13 | "path": "../service-shared" | 13 | "path": "../service-shared/tsconfig.build.json" |
14 | } | 14 | } |
15 | ], | 15 | ], |
16 | "include": [ | 16 | "include": [ |
17 | "src/**/*.ts" | 17 | "src/**/*.ts", |
18 | "types/**/*.ts", | ||
19 | "esbuild.config.js" | ||
18 | ] | 20 | ] |
19 | } | 21 | } |
diff --git a/packages/service-preload/types/importMeta.d.ts b/packages/service-preload/types/importMeta.d.ts new file mode 100644 index 0000000..9b73170 --- /dev/null +++ b/packages/service-preload/types/importMeta.d.ts | |||
@@ -0,0 +1,7 @@ | |||
1 | interface ImportMeta { | ||
2 | env: { | ||
3 | DEV: boolean; | ||
4 | MODE: string; | ||
5 | PROD: boolean; | ||
6 | } | ||
7 | } | ||