From b4e3c17f9e3687e36a4d581630c846553eb0e43b Mon Sep 17 00:00:00 2001 From: geekgeekrun Date: Tue, 5 Mar 2024 10:02:49 +0800 Subject: [PATCH] refactor the `is.dev` to `process.env.NODE_ENV === 'development'` --- .../check-and-download-puppeteer-executable.ts | 3 +-- .../check-and-locate-existed-chromium-executable.ts | 3 +-- packages/ui/src/main/window/mainWindow.ts | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer-executable.ts b/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer-executable.ts index 98d0106..43723f1 100644 --- a/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer-executable.ts +++ b/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer-executable.ts @@ -2,7 +2,6 @@ import * as path from 'node:path' import * as os from 'node:os' import * as fs from 'node:fs' import type { InstalledBrowser } from '@puppeteer/browsers' -import { is } from '@electron-toolkit/utils' import electron from 'electron' import { saveLastUsedAndAvailableBrowserInfo, BrowserInfo } from './history-utils' @@ -15,7 +14,7 @@ const cacheDir = path.join( const getPuppeteerManagerModule = async () => { let puppeteerManager - if (is.dev) { + if (process.env.NODE_ENV === 'development') { puppeteerManager = await import('@puppeteer/browsers') } else { puppeteerManager = ( diff --git a/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-locate-existed-chromium-executable.ts b/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-locate-existed-chromium-executable.ts index 2b8f15d..201057f 100644 --- a/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-locate-existed-chromium-executable.ts +++ b/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-locate-existed-chromium-executable.ts @@ -1,4 +1,3 @@ -import { is } from '@electron-toolkit/utils' import electron from 'electron' import * as os from 'node:os' import * as fs from 'node:fs' @@ -39,7 +38,7 @@ export default async function findAndLocateExistedChromiumExecutable(): Promise< // For other, use findChrome let findChrome: typeof import('find-chrome-bin').findChrome - if (is.dev) { + if (process.env.NODE_ENV === 'development') { findChrome = (await import('find-chrome-bin')).findChrome } else { findChrome = ( diff --git a/packages/ui/src/main/window/mainWindow.ts b/packages/ui/src/main/window/mainWindow.ts index 61259ce..88bec78 100644 --- a/packages/ui/src/main/window/mainWindow.ts +++ b/packages/ui/src/main/window/mainWindow.ts @@ -1,7 +1,6 @@ import { BrowserWindow, ipcMain, shell } from 'electron' import path from 'path' import * as childProcess from 'node:child_process' -import { is } from '@electron-toolkit/utils' import { ensureConfigFileExist, ensureStorageFileExist, @@ -40,7 +39,7 @@ export function createMainWindow(): void { } }) - is.dev && mainWindow.webContents.openDevTools() + process.env.NODE_ENV === 'development' && mainWindow.webContents.openDevTools() mainWindow.on('ready-to-show', () => { mainWindow.show() @@ -53,7 +52,7 @@ export function createMainWindow(): void { // HMR for renderer base on electron-vite cli. // Load the remote URL for development or the local html file for production. - if (is.dev && process.env['ELECTRON_RENDERER_URL']) { + if (process.env.NODE_ENV === 'development' && process.env['ELECTRON_RENDERER_URL']) { mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL']) } else { mainWindow.loadFile(path.join(__dirname, '../renderer/index.html'))