build: Bump forge packages and update configs to fix macos15-intel build (#1007)

Author: e-fisher

forge.config.ts

@@ -11,8 +11,8 @@ import path from 'path'
 
 import { CUSTOM_APP_PROTOCOL } from './src/main/deepLinks.constants'
 import { getPlatform, getArch } from './src/utils/electron'
-import { spawnSignFile } from './src/utils/signing'
 import { windowsSign } from './windowsSign'
+import { spawnSignFile } from './windowsSignHook'
 
 function getPlatformSpecificResources() {
   // on mac we are using a single image to build both architectures so we
@@ -122,6 +122,7 @@ const config: ForgeConfig = {
           config: 'vite.preload.config.ts',
         },
         {
+          entry: 'extension/src/background/index.ts',
           config: 'vite.extension.config.mts',
         },
         {

package-lock.json

@@ -25,21 +25,22 @@
     "gen:cdp": "ts-node --transpileOnly scripts/cdp/generateCdpClient.ts > src/utils/cdp/client.ts"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.4.0",
-    "@electron-forge/maker-deb": "^7.4.0",
-    "@electron-forge/maker-dmg": "^7.4.0",
-    "@electron-forge/maker-rpm": "^7.4.0",
-    "@electron-forge/maker-squirrel": "^7.4.0",
-    "@electron-forge/maker-zip": "^7.4.0",
-    "@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
-    "@electron-forge/plugin-fuses": "^7.4.0",
-    "@electron-forge/plugin-vite": "^7.4.0",
-    "@electron-forge/publisher-github": "^7.4.0",
+    "@electron-forge/cli": "^7.10.2",
+    "@electron-forge/maker-deb": "^7.10.2",
+    "@electron-forge/maker-dmg": "^7.10.2",
+    "@electron-forge/maker-rpm": "^7.10.2",
+    "@electron-forge/maker-squirrel": "^7.10.2",
+    "@electron-forge/maker-zip": "^7.10.2",
+    "@electron-forge/plugin-auto-unpack-natives": "^7.10.2",
+    "@electron-forge/plugin-fuses": "^7.10.2",
+    "@electron-forge/plugin-vite": "^7.10.2",
+    "@electron-forge/publisher-github": "^7.10.2",
     "@electron/fuses": "^1.8.0",
     "@tanstack/eslint-plugin-query": "^5.53.0",
     "@testing-library/react": "^16.0.1",
     "@types/chrome": "^0.0.287",
     "@types/diff": "^7.0.2",
+    "@types/electron-squirrel-startup": "^1.0.2",
     "@types/express": "^5.0.3",
     "@types/har-format": "^1.2.16",
     "@types/k6": "^1.3.1",
@@ -154,7 +155,7 @@
     "tree-kill": "^1.2.2",
     "typescript": "^5.4.5",
     "undici": "^7.10.0",
-    "update-electron-app": "^3.0.0",
+    "update-electron-app": "^3.1.2",
     "use-konami": "^1.0.1",
     "webextension-polyfill": "^0.12.0",
     "ws": "^8.18.0",

package.json

@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/electron/main'
 import { app, BrowserWindow, nativeTheme } from 'electron'
 import log from 'electron-log/main'
+import isSquirrelStartup from 'electron-squirrel-startup'
 import path from 'path'
 import { updateElectronApp } from 'update-electron-app'
 
@@ -44,7 +45,7 @@ if (process.env.NODE_ENV !== 'development') {
 }
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
-if (require('electron-squirrel-startup')) {
+if (isSquirrelStartup) {
   app.quit()
 }
 

src/main.ts

@@ -29,11 +29,15 @@ export const instrumentScript = ({
     throw new Error('Failed to parse entry script')
   }
 
+  // Use relative import path with ./ prefix for cross-platform compatibility
+  const scriptBasename = path.basename(scriptPath)
+  const relativePath = `./${scriptBasename}`
+
   traverse(entryAst, {
     [NodeType.ImportDeclaration](node) {
       if (node.source.value === '__USER_SCRIPT_PATH__') {
-        node.source.value = scriptPath
-        node.source.raw = JSON.stringify(scriptPath)
+        node.source.value = relativePath
+        node.source.raw = JSON.stringify(relativePath)
       }
     },
   })

src/main/runner/instrumentation.ts

@@ -129,9 +129,13 @@ const archiveScript = async (
   try {
     const client = new K6Client()
 
+    // Set cwd to script directory for import resolution on Windows
+    const scriptDir = path.dirname(scriptPath)
+
     await client.archive({
       scriptPath,
       outputPath: TEMP_K6_ARCHIVE_PATH,
+      cwd: scriptDir,
     })
 
     return TEMP_K6_ARCHIVE_PATH

src/main/script.ts

@@ -25,6 +25,7 @@ function getDefaultExecutablePath() {
 interface SpawnArgs {
   args: Array<string[] | string | null | undefined | false>
   env?: NodeJS.ProcessEnv
+  cwd?: string
 }
 
 interface SpawnResult {
@@ -36,6 +37,7 @@ interface SpawnResult {
 interface ArchiveArgs {
   scriptPath: string
   outputPath?: string
+  cwd?: string
 }
 
 interface InspectArgs {
@@ -69,13 +71,14 @@ export class K6Client {
     this.#executablePath = executablePath
   }
 
-  async archive({ scriptPath, outputPath }: ArchiveArgs): Promise<void> {
+  async archive({ scriptPath, outputPath, cwd }: ArchiveArgs): Promise<void> {
     const process = this.#spawn('archive', {
       args: [
         outputPath && ['--archive-out', outputPath],
         ['--log-format', 'json'],
         scriptPath,
       ],
+      cwd,
     })
 
     const { code, stderr } = await this.#wait(process)
@@ -171,13 +174,14 @@ export class K6Client {
 
   #spawn(
     command: string,
-    { args, env }: SpawnArgs
+    { args, env, cwd }: SpawnArgs
   ): ChildProcessWithoutNullStreams {
     const flattenedArgs = args
       .filter((arg) => arg !== null && arg !== undefined && arg !== false)
       .flat()
 
     return spawn(this.#executablePath, [command, ...flattenedArgs], {
+      cwd,
       env: {
         ...process.env,
         ...env,

src/utils/k6/client.ts

@@ -54,7 +54,7 @@ export function getBuildDefine(env: ConfigEnv<'build'>) {
   const { command, forgeConfig } = env
   const names = forgeConfig.renderer
     .filter(({ name }) => name != null)
-    .map(({ name }) => name!)
+    .map(({ name }) => name)
   const defineKeys = getDefineKeys(names)
   const define = Object.entries(defineKeys).reduce(
     (acc, [name, keys]) => {

src/utils/signing.ts

@@ -7,14 +7,21 @@ import tsconfigPaths from 'vite-tsconfig-paths'
 export default defineConfig((env) => {
   const forgeEnv = env as ConfigEnv<'renderer'>
   const { root, mode } = forgeEnv
+  const nodeEnv = process.env.NODE_ENV || 'production'
 
   return {
     root,
     mode,
     base: './',
     define: {
       TARGET_PLATFORM: JSON.stringify(process.platform),
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+      'process.env.NODE_ENV': JSON.stringify(nodeEnv),
+      // fix for react-is lib in packaged mode
+      process: JSON.stringify({
+        env: {
+          NODE_ENV: nodeEnv
+        },
+      }),
     },
     build: {
       target: 'esnext',
@@ -43,6 +50,8 @@ export default defineConfig((env) => {
     ],
     resolve: {
       preserveSymlinks: true,
+      // Force vite to use browser-specific package exports
+      conditions: ['browser', 'import', 'module', 'default'],
     },
     clearScreen: false,
   } as UserConfig