From c4899f735986835e9a0516bb264bddbfe8149325 Mon Sep 17 00:00:00 2001 From: Wyatt Mufson Date: Wed, 22 Jan 2025 18:55:41 -0500 Subject: [PATCH] progress --- examples/connect-electron/electron-builder.yml | 2 ++ examples/connect-electron/electron.vite.config.ts | 15 +++++++++++++-- examples/connect-electron/out/app/package.json | 1 + examples/connect-electron/tsconfig.node.json | 5 ++++- examples/connect-electron/tsconfig.web.json | 3 ++- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/examples/connect-electron/electron-builder.yml b/examples/connect-electron/electron-builder.yml index 3fd0d027..fc2e05cd 100644 --- a/examples/connect-electron/electron-builder.yml +++ b/examples/connect-electron/electron-builder.yml @@ -29,6 +29,7 @@ mac: forceCodeSigning: false gatekeeperAssess: false hardenedRuntime: true + type: distribution extendInfo: - NSCameraUsageDescription: Application requests access to the device's camera. - NSMicrophoneUsageDescription: Application requests access to the device's microphone. @@ -36,6 +37,7 @@ mac: - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder. notarize: false dmg: + sign: false artifactName: "${productName}-${version}.${ext}" linux: target: diff --git a/examples/connect-electron/electron.vite.config.ts b/examples/connect-electron/electron.vite.config.ts index e5b5b522..92063fef 100644 --- a/examples/connect-electron/electron.vite.config.ts +++ b/examples/connect-electron/electron.vite.config.ts @@ -3,9 +3,16 @@ import { nodeResolve } from "@rollup/plugin-node-resolve"; import react from "@vitejs/plugin-react"; import { defineConfig, externalizeDepsPlugin } from "electron-vite"; +const externalizedDependenciesExcludeList = ["electron-app-package-json"]; + export default defineConfig({ main: { - plugins: [externalizeDepsPlugin(), nodeResolve()], + plugins: [ + externalizeDepsPlugin({ + exclude: externalizedDependenciesExcludeList, + }), + nodeResolve(), + ], optimizeDeps: { force: true, // TODO: vite cache is not working with monorepo deps updates }, @@ -19,7 +26,11 @@ export default defineConfig({ }, }, preload: { - plugins: [externalizeDepsPlugin()], + plugins: [ + externalizeDepsPlugin({ + exclude: externalizedDependenciesExcludeList, + }), + ], optimizeDeps: { force: true, // TODO: vite cache is not working with monorepo deps updates }, diff --git a/examples/connect-electron/out/app/package.json b/examples/connect-electron/out/app/package.json index e0a6fd9d..2b6acaa5 100644 --- a/examples/connect-electron/out/app/package.json +++ b/examples/connect-electron/out/app/package.json @@ -11,6 +11,7 @@ "express": "catalog:", "@electron-toolkit/preload": "catalog:", "@electron-toolkit/utils": "catalog:", + "@treasure-dev/launcher": "workspace:*", "thirdweb": "catalog:" } } diff --git a/examples/connect-electron/tsconfig.node.json b/examples/connect-electron/tsconfig.node.json index db23a68c..97d932c4 100644 --- a/examples/connect-electron/tsconfig.node.json +++ b/examples/connect-electron/tsconfig.node.json @@ -3,6 +3,9 @@ "include": ["electron.vite.config.*", "src/main/**/*", "src/preload/**/*"], "compilerOptions": { "composite": true, - "types": ["electron-vite/node"] + "types": ["electron-vite/node"], + "paths": { + "@electron-app-package-json": ["./out/app/package.json"] + } } } diff --git a/examples/connect-electron/tsconfig.web.json b/examples/connect-electron/tsconfig.web.json index 647e041a..8a359f1f 100644 --- a/examples/connect-electron/tsconfig.web.json +++ b/examples/connect-electron/tsconfig.web.json @@ -11,7 +11,8 @@ "jsx": "react-jsx", "baseUrl": ".", "paths": { - "@renderer/*": ["src/renderer/src/*"] + "@renderer/*": ["src/renderer/src/*"], + "@electron-app-package-json": ["./out/app/package.json"] } } }