diff --git a/.vscode/.debug.script.mjs b/.vscode/.debug.script.mjs index cbc3357..d649530 100644 --- a/.vscode/.debug.script.mjs +++ b/.vscode/.debug.script.mjs @@ -12,13 +12,13 @@ const pkg = require('../package.json') const envContent = Object.entries(pkg.env).map(([key, val]) => `${key}=${val}`) fs.writeFileSync(path.join(__dirname, '.debug.env'), envContent.join('\n')) -// for debug -fs.writeFileSync(path.join(__dirname, '../node_modules/.electron-vite-debug'), '') - // bootstrap spawn( // TODO: terminate `npm run dev` when Debug exits. process.platform === 'win32' ? 'npm.cmd' : 'npm', ['run', 'dev'], - { stdio: 'inherit' }, + { + stdio: 'inherit', + env: Object.assign(process.env, { VSCODE_DEBUG: 'true' }), + }, ) diff --git a/vite.config.ts b/vite.config.ts index a89efae..337776a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,4 +1,4 @@ -import { existsSync, rmSync } from 'fs' +import { rmSync } from 'fs' import { join } from 'path' import { defineConfig, UserConfig, Plugin } from 'vite' import react from '@vitejs/plugin-react' @@ -50,10 +50,7 @@ export default defineConfig({ }) function withDebug(config: UserConfig): UserConfig { - const debugFile = join(__dirname, 'node_modules/.electron-vite-debug') - const isDebug = existsSync(debugFile) - - if (isDebug) { + if (process.env.VSCODE_DEBUG) { config.build.sourcemap = true config.plugins = (config.plugins || []).concat({ name: 'electron-vite-debug', @@ -61,10 +58,8 @@ function withDebug(config: UserConfig): UserConfig { // TODO: when the next version of `vite-plugine-electron` is released, use the config hook. const index = config.plugins.findIndex(p => p.name === 'electron-main-watcher'); (config.plugins as Plugin[]).splice(index, 1) - rmSync(debugFile) }, }) } - return config }