From e6194d0212adf17298f83dd5a41d86a7b0546514 Mon Sep 17 00:00:00 2001 From: Derek Nance Date: Tue, 17 Feb 2026 16:13:43 -0600 Subject: [PATCH] bit desktop main/preload tsconfig --- bitwarden_license/bit-desktop/tsconfig.main.json | 8 ++++++++ .../bit-desktop/tsconfig.preload.json | 4 ++++ bitwarden_license/bit-desktop/webpack.config.js | 14 ++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 bitwarden_license/bit-desktop/tsconfig.main.json create mode 100644 bitwarden_license/bit-desktop/tsconfig.preload.json diff --git a/bitwarden_license/bit-desktop/tsconfig.main.json b/bitwarden_license/bit-desktop/tsconfig.main.json new file mode 100644 index 00000000000..e30696f1a6d --- /dev/null +++ b/bitwarden_license/bit-desktop/tsconfig.main.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "moduleResolution": "nodenext", + "module": "nodenext" + }, + "include": ["src/entry.ts", "src/global.d.ts"] +} diff --git a/bitwarden_license/bit-desktop/tsconfig.preload.json b/bitwarden_license/bit-desktop/tsconfig.preload.json new file mode 100644 index 00000000000..4ce824e79af --- /dev/null +++ b/bitwarden_license/bit-desktop/tsconfig.preload.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig", + "include": ["src/preload.ts", "src/global.d.ts"] +} diff --git a/bitwarden_license/bit-desktop/webpack.config.js b/bitwarden_license/bit-desktop/webpack.config.js index 04223f69d29..79b1eefc838 100644 --- a/bitwarden_license/bit-desktop/webpack.config.js +++ b/bitwarden_license/bit-desktop/webpack.config.js @@ -18,11 +18,17 @@ module.exports = (webpackConfig, context) => { }, main: { entry: path.resolve(__dirname, "src/entry.ts"), - tsConfig: path.resolve(context.context.root, "bitwarden_license/bit-desktop/tsconfig.json"), + tsConfig: path.resolve( + context.context.root, + "bitwarden_license/bit-desktop/tsconfig.main.json", + ), }, preload: { entry: path.resolve(__dirname, "src/preload.ts"), - tsConfig: path.resolve(context.context.root, "bitwarden_license/bit-desktop/tsconfig.json"), + tsConfig: path.resolve( + context.context.root, + "bitwarden_license/bit-desktop/tsconfig.preload.json", + ), }, outputPath: path.resolve(context.context.root, context.options.outputPath), }); @@ -36,11 +42,11 @@ module.exports = (webpackConfig, context) => { }, main: { entry: path.resolve(__dirname, "src/entry.ts"), - tsConfig: path.resolve(__dirname, "tsconfig.json"), + tsConfig: path.resolve(__dirname, "tsconfig.main.json"), }, preload: { entry: path.resolve(__dirname, "src/preload.ts"), - tsConfig: path.resolve(__dirname, "tsconfig.json"), + tsConfig: path.resolve(__dirname, "tsconfig.preload.json"), }, }); }