From 61fd13c55f5e69a9d8b32dd0d74b08870783bcce Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 30 Dec 2021 00:26:01 +0100 Subject: build: Switch to esbuild We will build all packages except the frontend (where vite remains in use) with esbuild. For some reason, the @yarnpkg/esbuild-plugin-pnp doesn't allow esbuild to load esm modules and we fall back to commonjs for dependencies. Hence we had to switch back to node_modules (but still rely on yarn hardlinking for a more efficient install). --- packages/preload/esbuild.config.js | 19 +++++++++++++++++++ packages/preload/package.json | 4 +--- packages/preload/vite.config.js | 31 ------------------------------- 3 files changed, 20 insertions(+), 34 deletions(-) create mode 100644 packages/preload/esbuild.config.js delete mode 100644 packages/preload/vite.config.js (limited to 'packages/preload') diff --git a/packages/preload/esbuild.config.js b/packages/preload/esbuild.config.js new file mode 100644 index 0000000..76ac33f --- /dev/null +++ b/packages/preload/esbuild.config.js @@ -0,0 +1,19 @@ +// @ts-check + +const { chrome } = require('../../config/build-common'); +const { getConfig } = require('../../config/esbuild-config'); + +module.exports = getConfig({ + absWorkingDir: __dirname, + entryPoints: [ + 'src/index.ts', + ], + outfile: 'dist/index.cjs', + format: 'cjs', + platform: 'node', + target: chrome, + sourcemap: 'inline', + external: [ + 'electron', + ], +}); diff --git a/packages/preload/package.json b/packages/preload/package.json index caa23b6..5eb6055 100644 --- a/packages/preload/package.json +++ b/packages/preload/package.json @@ -8,7 +8,6 @@ "scripts": { "clean": "rimraf dist", "test": "jest", - "build": "vite build", "typecheck": "tsc" }, "dependencies": { @@ -24,7 +23,6 @@ "jsdom": "^19.0.0", "rimraf": "^3.0.2", "ts-jest": "^27.1.2", - "typescript": "^4.5.4", - "vite": "^2.7.7" + "typescript": "^4.5.4" } } diff --git a/packages/preload/vite.config.js b/packages/preload/vite.config.js deleted file mode 100644 index 409d912..0000000 --- a/packages/preload/vite.config.js +++ /dev/null @@ -1,31 +0,0 @@ -// @ts-check - -import { builtinModules } from 'module'; - -import { chrome, makeConfig } from '../../config/vite-common'; - -/** @type {string} */ -const PACKAGE_ROOT = __dirname; - -/** - * @type {import('vite').UserConfig} - * @see https://vitejs.dev/config/ - */ -const config = makeConfig({ - root: PACKAGE_ROOT, - build: { - target: chrome, - lib: { - entry: 'src/index.ts', - formats: ['cjs'], - }, - rollupOptions: { - external: [ - 'electron', - ...builtinModules, - ], - }, - }, -}); - -export default config; -- cgit v1.2.3-54-g00ecf