From 6f8bf58456aec5d5bced175d21e7f84d7a9d3760 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 23 May 2025 17:33:57 +0300 Subject: [PATCH] chore(desktop/esbuild): convert webpack config --- apps/desktop/package.json | 42 ++++++++++++++++++- apps/desktop/tsconfig.app.json | 10 +++-- ...pack.config.cjs => webpack.config.cjs.bak} | 0 3 files changed, 48 insertions(+), 4 deletions(-) rename apps/desktop/{webpack.config.cjs => webpack.config.cjs.bak} (100%) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 71b61fcce..f7011b20f 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -44,6 +44,46 @@ "nx": { "name": "desktop", "targets": { + "build": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], + "options": { + "main": "apps/desktop/src/electron-main.ts", + "outputPath": "apps/desktop/dist", + "outputFileName": "main.js", + "tsConfig": "apps/desktop/tsconfig.app.json", + "platform": "node", + "external": [ + "electron", + "@electron/remote", + "better-sqlite3", + "./xhr-sync-worker.js" + ], + "format": [ + "cjs" + ], + "assets": [ + { + "glob": "**/*", + "input": "apps/server/dist/node_modules", + "output": "node_modules" + }, + { + "glob": "**/*", + "input": "apps/server/dist/assets", + "output": "." + }, + { + "glob": "xhr-sync-worker.js", + "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", + "output": "" + } + ], + "declarationRootDir": "apps/desktop/src" + } + }, "rebuild-deps": { "executor": "nx:run-commands", "dependsOn": [ @@ -110,4 +150,4 @@ } } } -} +} \ No newline at end of file diff --git a/apps/desktop/tsconfig.app.json b/apps/desktop/tsconfig.app.json index 8a23da03c..1c37e3a04 100644 --- a/apps/desktop/tsconfig.app.json +++ b/apps/desktop/tsconfig.app.json @@ -1,17 +1,21 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "module": "ESNext", + "moduleResolution": "bundler", + "target": "ES2020", "outDir": "dist", + "strict": false, "types": [ "node", "express" ], "rootDir": "src", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "verbatimModuleSyntax": false + "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo" }, "include": [ - "src/**/*.ts" + "src/**/*.ts", + "../server/src/*.d.ts" ], "exclude": [ "eslint.config.js", diff --git a/apps/desktop/webpack.config.cjs b/apps/desktop/webpack.config.cjs.bak similarity index 100% rename from apps/desktop/webpack.config.cjs rename to apps/desktop/webpack.config.cjs.bak