From d85f09cbed5f3d2501f791e689011ae127df1cbb Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 9 Jan 2022 20:33:53 +0100 Subject: build: Add prettier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit eslint will also enforce prettier rules, so there is no need to call prettier separately in CI. Signed-off-by: Kristóf Marussy --- packages/main/src/index.ts | 108 ++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 45 deletions(-) (limited to 'packages/main/src/index.ts') diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts index bc10b4c..1f80e44 100644 --- a/packages/main/src/index.ts +++ b/packages/main/src/index.ts @@ -33,12 +33,7 @@ import { MainToRendererIpcMessage, RendererToMainIpcMessage, } from '@sophie/shared'; -import { - app, - BrowserView, - BrowserWindow, - ipcMain, -} from 'electron'; +import { app, BrowserView, BrowserWindow, ipcMain } from 'electron'; import { ensureDirSync, readFile, readFileSync } from 'fs-extra'; import { autorun } from 'mobx'; import { getSnapshot, onPatch } from 'mobx-state-tree'; @@ -97,7 +92,9 @@ app.setAboutPanelOptions({ `Node.js: ${process.versions.node}`, `Platform: ${osName()}`, `Arch: ${arch()}`, - `Build date: ${new Date(Number(import.meta.env.BUILD_DATE)).toLocaleString()}`, + `Build date: ${new Date( + Number(import.meta.env.BUILD_DATE), + ).toLocaleString()}`, `Git SHA: ${import.meta.env.GIT_SHA}`, `Git branch: ${import.meta.env.GIT_BRANCH}`, ].join('\n'), @@ -123,11 +120,13 @@ const serviceInject: WebSource = { let mainWindow: BrowserWindow | null = null; const store = createMainStore(); -init(store).then((disposeCompositionRoot) => { - app.on('will-quit', disposeCompositionRoot); -}).catch((err) => { - log.log('Failed to initialize application', err); -}); +init(store) + .then((disposeCompositionRoot) => { + app.on('will-quit', disposeCompositionRoot); + }) + .catch((err) => { + log.log('Failed to initialize application', err); + }); const rendererBaseUrl = getResourceUrl('../renderer/'); function shouldCancelMainWindowRequest(url: string, method: string): boolean { @@ -141,12 +140,20 @@ function shouldCancelMainWindowRequest(url: string, method: string): boolean { return true; } if (isDevelopment) { - if (DEVMODE_ALLOWED_URL_PREFIXES.some((prefix) => normalizedUrl.startsWith(prefix))) { + if ( + DEVMODE_ALLOWED_URL_PREFIXES.some((prefix) => + normalizedUrl.startsWith(prefix), + ) + ) { return false; } if (import.meta.env.VITE_DEV_SERVER_URL !== undefined) { - const isHttp = normalizedUrl.startsWith(import.meta.env.VITE_DEV_SERVER_URL); - const isWs = normalizedUrl.startsWith(import.meta.env.VITE_DEV_SERVER_URL.replace(/^http:/, 'ws:')); + const isHttp = normalizedUrl.startsWith( + import.meta.env.VITE_DEV_SERVER_URL, + ); + const isWs = normalizedUrl.startsWith( + import.meta.env.VITE_DEV_SERVER_URL.replace(/^http:/, 'ws:'), + ); return !isHttp && !isWs; } } @@ -168,19 +175,24 @@ async function createWindow(): Promise { webContents.userAgent = originalUserAgent; - webContents.session.setPermissionRequestHandler((_webContents, _permission, callback) => { - callback(false); - }); + webContents.session.setPermissionRequestHandler( + (_webContents, _permission, callback) => { + callback(false); + }, + ); - webContents.session.webRequest.onBeforeRequest(({ url, method }, callback) => { - callback({ - cancel: shouldCancelMainWindowRequest(url, method), - }); - }); + webContents.session.webRequest.onBeforeRequest( + ({ url, method }, callback) => { + callback({ + cancel: shouldCancelMainWindowRequest(url, method), + }); + }, + ); - const pageUrl = (isDevelopment && import.meta.env.VITE_DEV_SERVER_URL !== undefined) - ? import.meta.env.VITE_DEV_SERVER_URL - : getResourceUrl('../renderer/dist/index.html'); + const pageUrl = + isDevelopment && import.meta.env.VITE_DEV_SERVER_URL !== undefined + ? import.meta.env.VITE_DEV_SERVER_URL + : getResourceUrl('../renderer/dist/index.html'); webContents.on('will-navigate', (event, url) => { if (url !== pageUrl) { @@ -273,9 +285,8 @@ async function createWindow(): Promise { webContents.send(MainToRendererIpcMessage.SharedStorePatch, patch); }); - ipcMain.handle( - ServiceToMainIpcMessage.ApiExposedInMainWorld, - (event) => (event.sender.id === browserView.webContents.id ? serviceInject : null), + ipcMain.handle(ServiceToMainIpcMessage.ApiExposedInMainWorld, (event) => + event.sender.id === browserView.webContents.id ? serviceInject : null, ); browserView.webContents.on('ipc-message', (_event, channel, ...args) => { @@ -305,7 +316,9 @@ async function createWindow(): Promise { browserView.webContents.session.webRequest.onBeforeSendHeaders( ({ url, requestHeaders }, callback) => { - const requestUserAgent = url.match(/^[^:]+:\/\/accounts\.google\.[^./]+\//) + const requestUserAgent = url.match( + /^[^:]+:\/\/accounts\.google\.[^./]+\//, + ) ? chromelessUserAgent : userAgent; callback({ @@ -317,9 +330,11 @@ async function createWindow(): Promise { }, ); - browserView.webContents.loadURL('https://gitlab.com/say-hi-to-sophie/sophie').catch((err) => { - log.error('Failed to load browser', err); - }); + browserView.webContents + .loadURL('https://gitlab.com/say-hi-to-sophie/sophie') + .catch((err) => { + log.error('Failed to load browser', err); + }); return mainWindow.loadURL(pageUrl); } @@ -342,17 +357,20 @@ app.on('window-all-closed', () => { } }); -app.whenReady().then(async () => { - if (isDevelopment) { - try { - await installDevToolsExtensions(); - } catch (err) { - log.error('Failed to install devtools extensions', err); +app + .whenReady() + .then(async () => { + if (isDevelopment) { + try { + await installDevToolsExtensions(); + } catch (err) { + log.error('Failed to install devtools extensions', err); + } } - } - return createWindow(); -}).catch((err) => { - log.error('Failed to create window', err); - process.exit(1); -}); + return createWindow(); + }) + .catch((err) => { + log.error('Failed to create window', err); + process.exit(1); + }); -- cgit v1.2.3-54-g00ecf