From 78118751b12d06f7ab59b92bbd3f2d10b19fb370 Mon Sep 17 00:00:00 2001
From: bossgeekgo <bossgeekgo>
Date: Thu, 15 Feb 2024 00:54:19 +0800
Subject: [PATCH] change puppeteer import path for ui project - always use the
 one in home folder

---
 .../check-and-download-puppeteer.ts                | 14 ++++----------
 packages/ui/src/main/runtimeDesidedEnv.ts          |  1 -
 packages/ui/src/main/window/mainWindow.ts          |  9 ++-------
 3 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 packages/ui/src/main/runtimeDesidedEnv.ts

diff --git a/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer.ts b/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer.ts
index b9070a1..9666afd 100644
--- a/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer.ts
+++ b/packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer.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 { isDev } from '../../runtimeDesidedEnv'
 
 const expectBuildId = process.env.EXPECT_CHROME_FOR_PUPPETEER_BUILD_ID || '121.0.6167.85'
 const cacheDir = path.join(
@@ -13,15 +12,10 @@ const cacheDir = path.join(
 )
 
 const getPuppeteerManagerModule = async () => {
-  if (!isDev) {
-    const runtimeDependencies = await import(
-      path.join(os.homedir(), '.bossgeekgo', 'external-node-runtime-dependencies/index.mjs')
-    )
-    return runtimeDependencies.puppeteerManager
-  } else {
-    const importResult = await import('@puppeteer/browsers')
-    return importResult
-  }
+  const runtimeDependencies = await import(
+    path.join(os.homedir(), '.bossgeekgo', 'external-node-runtime-dependencies/index.mjs')
+  )
+  return runtimeDependencies.puppeteerManager
 }
 
 export const getExpectPuppeteerExecutablePath = async () => {
diff --git a/packages/ui/src/main/runtimeDesidedEnv.ts b/packages/ui/src/main/runtimeDesidedEnv.ts
deleted file mode 100644
index 0a346c5..0000000
--- a/packages/ui/src/main/runtimeDesidedEnv.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const isDev = process.env.NODE_ENV === 'development'
diff --git a/packages/ui/src/main/window/mainWindow.ts b/packages/ui/src/main/window/mainWindow.ts
index fd20ca9..7c7b096 100644
--- a/packages/ui/src/main/window/mainWindow.ts
+++ b/packages/ui/src/main/window/mainWindow.ts
@@ -9,7 +9,6 @@ import {
   writeConfigFile
 } from '@bossgeekgo/geek-auto-start-chat-with-boss/runtime-file-utils.mjs'
 import { ChildProcess } from 'child_process'
-import { isDev } from '../runtimeDesidedEnv'
 import { getExpectPuppeteerExecutablePath } from '../flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/check-and-download-puppeteer'
 let mainWindow: BrowserWindow
 
@@ -90,12 +89,8 @@ export function createMainWindow(): void {
 
     const subProcessEnv = {
       ...process.env,
-      MAIN_BOSSGEEKGO_UI_RUN_MODE: 'geekAutoStartWithBoss'
-    }
-    if (!isDev) {
-      Object.assign(subProcessEnv, {
-        PUPPETEER_EXECUTABLE_PATH: await getExpectPuppeteerExecutablePath()
-      })
+      MAIN_BOSSGEEKGO_UI_RUN_MODE: 'geekAutoStartWithBoss',
+      PUPPETEER_EXECUTABLE_PATH: await getExpectPuppeteerExecutablePath()
     }
     subProcessOfPuppeteer = childProcess.spawn(process.argv[0], process.argv.slice(1), {
       env: subProcessEnv,