I moved all isomorphic-git usage into a single git_utils.ts file and added Dugite as an alternative Git provider. The app now checks the user’s settings and uses dugite when user enabled native git for all isomorphic-git commands. This makes it easy to fully remove isomorphic-git in the future by updating only git_utils.ts. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Adds Dugite-based native Git (bundled binary) and refactors all Git calls to a unified git_utils API, replacing direct isomorphic-git usage across the app. > > - **Git Platform Abstraction**: > - Introduces `dugite` and bundles Git via Electron Forge (`extraResource`) with `LOCAL_GIT_DIRECTORY` setup in `src/main.ts`. > - Adds `src/ipc/git_types.ts` and a comprehensive `src/ipc/utils/git_utils.ts` wrapper supporting both Dugite (native) and `isomorphic-git` (fallback): `commit`, `add`/`addAll`, `remove`, `init`, `clone`, `push`, `setRemoteUrl`, `currentBranch`, `listBranches`, `renameBranch`, `log`, `isIgnored`, `getCurrentCommitHash`, `getGitUncommittedFiles`, `getFileAtCommit`, `checkout`, `stageToRevert`. > - **Refactors (switch to git_utils)**: > - Replaces direct `isomorphic-git` imports in handlers and processors: `app_handlers`, `chat_handlers`, `createFromTemplate`, `github_handlers`, `import_handlers`, `portal_handlers`, `version_handlers`, `response_processor`, `neon_timestamp_utils`, `utils/codebase`. > - Updates tests to mock `git_utils` (`src/__tests__/chat_stream_handlers.test.ts`). > - **Behavioral/Feature Updates**: > - `createFromTemplate` uses `fetch` for GitHub API and `gitClone` for cloning with cache validation. > - GitHub integration uses `gitSetRemoteUrl`/`gitPush`/`gitClone`, handling public vs token URLs and directory creation when native Git is disabled. > - Versioning, imports, app file edits, migrations now stage/commit via `git_utils`. > - **UI/Copy**: > - Updates Settings description for “Enable Native Git”. > - **Config/Version**: > - Bumps version to `0.29.0-beta.1`; adds `dugite` dependency. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit ba098f7f25d85fc6330a41dc718fbfd43fff2d6c. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Will Chen <willchen90@gmail.com>
155 lines
4.4 KiB
TypeScript
155 lines
4.4 KiB
TypeScript
import type { ForgeConfig } from "@electron-forge/shared-types";
|
|
import { MakerSquirrel } from "@electron-forge/maker-squirrel";
|
|
import { MakerZIP } from "@electron-forge/maker-zip";
|
|
import { MakerDeb } from "@electron-forge/maker-deb";
|
|
import { MakerRpm } from "@electron-forge/maker-rpm";
|
|
import { VitePlugin } from "@electron-forge/plugin-vite";
|
|
import { FusesPlugin } from "@electron-forge/plugin-fuses";
|
|
import { FuseV1Options, FuseVersion } from "@electron/fuses";
|
|
import { AutoUnpackNativesPlugin } from "@electron-forge/plugin-auto-unpack-natives";
|
|
|
|
// Based on https://github.com/electron/forge/blob/6b2d547a7216c30fde1e1fddd1118eee5d872945/packages/plugin/vite/src/VitePlugin.ts#L124
|
|
const ignore = (file: string) => {
|
|
if (!file) return false;
|
|
// `file` always starts with `/`
|
|
// @see - https://github.com/electron/packager/blob/v18.1.3/src/copy-filter.ts#L89-L93
|
|
if (file === "/node_modules") {
|
|
return false;
|
|
}
|
|
if (file.startsWith("/drizzle")) {
|
|
return false;
|
|
}
|
|
if (file.startsWith("/scaffold")) {
|
|
return false;
|
|
}
|
|
|
|
if (file.startsWith("/worker") && !file.startsWith("/workers")) {
|
|
return false;
|
|
}
|
|
if (file.startsWith("/node_modules/stacktrace-js")) {
|
|
return false;
|
|
}
|
|
if (file.startsWith("/node_modules/stacktrace-js/dist")) {
|
|
return false;
|
|
}
|
|
if (file.startsWith("/node_modules/better-sqlite3")) {
|
|
return false;
|
|
}
|
|
if (file.startsWith("/node_modules/bindings")) {
|
|
return false;
|
|
}
|
|
if (file.startsWith("/node_modules/file-uri-to-path")) {
|
|
return false;
|
|
}
|
|
if (file.startsWith("/.vite")) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
};
|
|
|
|
const isEndToEndTestBuild = process.env.E2E_TEST_BUILD === "true";
|
|
|
|
const config: ForgeConfig = {
|
|
packagerConfig: {
|
|
protocols: [
|
|
{
|
|
name: "Dyad",
|
|
schemes: ["dyad"],
|
|
},
|
|
],
|
|
icon: "./assets/icon/logo",
|
|
|
|
osxSign: isEndToEndTestBuild
|
|
? undefined
|
|
: {
|
|
identity: process.env.APPLE_TEAM_ID,
|
|
},
|
|
osxNotarize: isEndToEndTestBuild
|
|
? undefined
|
|
: {
|
|
appleId: process.env.APPLE_ID!,
|
|
appleIdPassword: process.env.APPLE_PASSWORD!,
|
|
teamId: process.env.APPLE_TEAM_ID!,
|
|
},
|
|
asar: true,
|
|
ignore,
|
|
extraResource: ["node_modules/dugite/git"],
|
|
// ignore: [/node_modules\/(?!(better-sqlite3|bindings|file-uri-to-path)\/)/],
|
|
},
|
|
rebuildConfig: {
|
|
extraModules: ["better-sqlite3"],
|
|
force: true,
|
|
},
|
|
makers: [
|
|
new MakerSquirrel({
|
|
signWithParams: `/sha1 ${process.env.SM_CODE_SIGNING_CERT_SHA1_HASH} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256`,
|
|
}),
|
|
new MakerZIP({}, ["darwin"]),
|
|
new MakerRpm({}),
|
|
new MakerDeb({
|
|
options: {
|
|
mimeType: ["x-scheme-handler/dyad"],
|
|
},
|
|
}),
|
|
],
|
|
publishers: [
|
|
{
|
|
name: "@electron-forge/publisher-github",
|
|
config: {
|
|
repository: {
|
|
owner: "dyad-sh",
|
|
name: "dyad",
|
|
},
|
|
draft: true,
|
|
force: true,
|
|
prerelease: true,
|
|
},
|
|
},
|
|
],
|
|
plugins: [
|
|
new AutoUnpackNativesPlugin({}),
|
|
new VitePlugin({
|
|
// `build` can specify multiple entry builds, which can be Main process, Preload scripts, Worker process, etc.
|
|
// If you are familiar with Vite configuration, it will look really familiar.
|
|
build: [
|
|
{
|
|
// `entry` is just an alias for `build.lib.entry` in the corresponding file of `config`.
|
|
entry: "src/main.ts",
|
|
config: "vite.main.config.mts",
|
|
target: "main",
|
|
},
|
|
{
|
|
entry: "src/preload.ts",
|
|
config: "vite.preload.config.mts",
|
|
target: "preload",
|
|
},
|
|
{
|
|
entry: "workers/tsc/tsc_worker.ts",
|
|
config: "vite.worker.config.mts",
|
|
target: "main",
|
|
},
|
|
],
|
|
renderer: [
|
|
{
|
|
name: "main_window",
|
|
config: "vite.renderer.config.mts",
|
|
},
|
|
],
|
|
}),
|
|
// Fuses are used to enable/disable various Electron functionality
|
|
// at package time, before code signing the application
|
|
new FusesPlugin({
|
|
version: FuseVersion.V1,
|
|
[FuseV1Options.RunAsNode]: false,
|
|
[FuseV1Options.EnableCookieEncryption]: true,
|
|
[FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
|
|
[FuseV1Options.EnableNodeCliInspectArguments]: isEndToEndTestBuild,
|
|
[FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
|
|
[FuseV1Options.OnlyLoadAppFromAsar]: true,
|
|
}),
|
|
],
|
|
};
|
|
|
|
export default config;
|