diff --git a/.github/workflows/computer-e2e.yml b/.github/workflows/computer-e2e.yml index ff475405a..731521ea8 100644 --- a/.github/workflows/computer-e2e.yml +++ b/.github/workflows/computer-e2e.yml @@ -26,7 +26,7 @@ on: # Node, so any change to the daemon bundle graph or the main build must # re-run it (the v1.4.129-rc.1 daemon outage shipped with green CI). - 'electron.vite.config.ts' - - 'build-plugins/**' + - 'config/build-plugins/**' - 'src/main/daemon/**' - 'native/computer-use-macos/**' - 'native/computer-use-linux/**' diff --git a/.github/workflows/win-crash-survival-e2e.yml b/.github/workflows/win-crash-survival-e2e.yml index 0098932a1..fb1d63a44 100644 --- a/.github/workflows/win-crash-survival-e2e.yml +++ b/.github/workflows/win-crash-survival-e2e.yml @@ -77,7 +77,7 @@ jobs: '!config/reliability-gates.jsonc', '!config/max-lines-baseline.txt', '!config/vitest.config.ts', - 'build-plugins/**', + 'config/build-plugins/**', 'native/**', 'resources/**', 'electron.vite.config.ts', diff --git a/build-plugins/bootstrap-fatal-exit-banner.ts b/config/build-plugins/bootstrap-fatal-exit-banner.ts similarity index 97% rename from build-plugins/bootstrap-fatal-exit-banner.ts rename to config/build-plugins/bootstrap-fatal-exit-banner.ts index de4da1319..9233d4327 100644 --- a/build-plugins/bootstrap-fatal-exit-banner.ts +++ b/config/build-plugins/bootstrap-fatal-exit-banner.ts @@ -1,4 +1,4 @@ -import { BOOTSTRAP_FATAL_EXIT_GUARD_KEY } from '../src/main/startup/bootstrap-fatal-exit-guard' +import { BOOTSTRAP_FATAL_EXIT_GUARD_KEY } from '../../src/main/startup/bootstrap-fatal-exit-guard' export const BOOTSTRAP_FATAL_LOG_ENV_VAR = 'ORCA_BOOTSTRAP_FATAL_LOG' export const BOOTSTRAP_FATAL_LOG_FILE_NAME = 'bootstrap-fatal.log' const BOOTSTRAP_FATAL_LOG_MAX_BYTES = 262_144 diff --git a/build-plugins/plain-node-entry-guard.ts b/config/build-plugins/plain-node-entry-guard.ts similarity index 100% rename from build-plugins/plain-node-entry-guard.ts rename to config/build-plugins/plain-node-entry-guard.ts diff --git a/config/knip.json b/config/knip.json index cb929266f..c5b96b5a8 100644 --- a/config/knip.json +++ b/config/knip.json @@ -24,7 +24,7 @@ "src/relay/relay.ts", "src/relay/wsl-agent-hook-relay.ts", "config/scripts/**/*.{mjs,cjs,js,ts}", - "build-plugins/**/*.ts", + "config/build-plugins/**/*.ts", "electron.vite.config.ts", "vite.web.config.ts", "config/vitest.config.ts", @@ -34,7 +34,11 @@ "tests/**/*.{ts,tsx,mjs}", "**/*.test.{ts,tsx}" ], - "project": ["src/**/*.{ts,tsx}", "config/scripts/**/*.{mjs,cjs,js,ts}", "build-plugins/**/*.ts"], + "project": [ + "src/**/*.{ts,tsx}", + "config/scripts/**/*.{mjs,cjs,js,ts}", + "config/build-plugins/**/*.ts" + ], "ignore": ["mobile/**", "out/**", "dist/**", "node_modules/**", "resources/**"], "ignoreDependencies": ["electron", "@types/*"], "ignoreExportsUsedInFile": true, diff --git a/config/scripts/computer-e2e-workflow.test.mjs b/config/scripts/computer-e2e-workflow.test.mjs index 21e9df0fc..11eae65d9 100644 --- a/config/scripts/computer-e2e-workflow.test.mjs +++ b/config/scripts/computer-e2e-workflow.test.mjs @@ -219,7 +219,7 @@ describe('computer-use e2e workflow', () => { 'config/scripts/daemon-boot-smoke.mjs', 'config/scripts/windows-daemon-workspace-close-repro.mjs', 'electron.vite.config.ts', - 'build-plugins/**', + 'config/build-plugins/**', 'src/main/daemon/**' ]) ) diff --git a/config/scripts/electron-vite-output-contract.test.ts b/config/scripts/electron-vite-output-contract.test.ts index 931f9b93d..d5f3ffa87 100644 --- a/config/scripts/electron-vite-output-contract.test.ts +++ b/config/scripts/electron-vite-output-contract.test.ts @@ -10,7 +10,7 @@ import { BOOTSTRAP_FATAL_LOG_ENV_VAR, BOOTSTRAP_FATAL_LOG_FILE_NAME, createBootstrapFatalExitBanner -} from '../../build-plugins/bootstrap-fatal-exit-banner' +} from '../build-plugins/bootstrap-fatal-exit-banner' import { electronViteConfig } from '../../electron.vite.config' import { BOOTSTRAP_FATAL_EXIT_GUARD_KEY } from '../../src/main/startup/bootstrap-fatal-exit-guard' diff --git a/config/scripts/plain-node-entry-guard.test.ts b/config/scripts/plain-node-entry-guard.test.ts index b9601a67d..d65b29cd2 100644 --- a/config/scripts/plain-node-entry-guard.test.ts +++ b/config/scripts/plain-node-entry-guard.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import type { Plugin, Rollup } from 'vite' import { afterEach, describe, expect, it } from 'vitest' -import { createPlainNodeEntryGuardPlugin } from '../../build-plugins/plain-node-entry-guard' +import { createPlainNodeEntryGuardPlugin } from '../build-plugins/plain-node-entry-guard' let outputDir: string | undefined diff --git a/config/tsconfig.node.json b/config/tsconfig.node.json index e641dda15..948a9e88a 100644 --- a/config/tsconfig.node.json +++ b/config/tsconfig.node.json @@ -2,7 +2,7 @@ "extends": "@electron-toolkit/tsconfig/tsconfig.node.json", "include": [ "../electron.vite.config.*", - "../build-plugins/**/*", + "./build-plugins/**/*", "../src/main/**/*", "../src/renderer/src/lib/skill-freshness-display-status.ts", "../src/preload/**/*", diff --git a/electron.vite.config.ts b/electron.vite.config.ts index a6e656ac9..4255504f9 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -3,8 +3,8 @@ import { resolve } from 'node:path' import { defineConfig, type UserConfig } from 'electron-vite' import react from '@vitejs/plugin-react' import tailwindcss from '@tailwindcss/vite' -import { createBootstrapFatalExitBanner } from './build-plugins/bootstrap-fatal-exit-banner' -import { createPlainNodeEntryGuardPlugin } from './build-plugins/plain-node-entry-guard' +import { createBootstrapFatalExitBanner } from './config/build-plugins/bootstrap-fatal-exit-banner' +import { createPlainNodeEntryGuardPlugin } from './config/build-plugins/plain-node-entry-guard' import packageJson from './package.json' with { type: 'json' } const BUNDLED_MAIN_DEPENDENCIES = new Set([