Skip to content

Commit

Permalink
refactor: migrate packaging tools to tsup from rollup
Browse files Browse the repository at this point in the history
Signed-off-by: The1111mp <The1111mp@outlook.com>
  • Loading branch information
1111mp committed Feb 11, 2024
1 parent e057d62 commit 19d17a0
Show file tree
Hide file tree
Showing 11 changed files with 744 additions and 341 deletions.
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"type": "node",
"request": "launch",
"cwd": "${workspaceRoot}",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite-tsup",
"windows": {
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite.cmd"
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite-tsup.cmd"
},
"runtimeArgs": ["--sourcemap", "--watch"],
"env": {
Expand Down
55 changes: 25 additions & 30 deletions electron.vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,41 +1,25 @@
import { resolve } from "path";
import { defineConfig, externalizeDepsPlugin } from "electron-vite";
import react from "@vitejs/plugin-react";
import del from "rollup-plugin-delete";
import { defineConfig } from "electron-vite-tsup";
import react from "@vitejs/plugin-react-swc";
import stylePlugin from "esbuild-style-plugin";
import tailwindcss from "tailwindcss";
import autoprefixer from "autoprefixer";

const isTest = process.env.TEST === "true";

export default defineConfig({
main: {
resolve: {
alias: {
"@src": resolve("src")
}
},
build: {
rollupOptions: {
input: isTest ? "src/main/main.test.ts" : "src/main/main.ts",
output: {
entryFileNames: "main.mjs",
inlineDynamicImports: true,
format: "es"
}
}
},
plugins: [del({ targets: ["release/app/dist", "release/build"] })]
clean: true,
entry: [isTest ? "src/main/main.test.ts" : "src/main/main.ts"],
target: "node18",
format: "esm",
watch: true
},
preload: {
build: {
rollupOptions: {
input: isTest ? "src/preload/preload.test.ts" : "src/preload/index.ts",
output: {
entryFileNames: "preload.js",
inlineDynamicImports: true,
format: "cjs"
}
}
},
plugins: [externalizeDepsPlugin()]
clean: true,
entry: [isTest ? "src/preload/preload.test.ts" : "src/preload/index.ts"],
format: "cjs",
watch: true
},
renderer: {
resolve: {
Expand All @@ -44,6 +28,17 @@ export default defineConfig({
"@renderer": resolve("src/renderer/src")
}
},
build: {
clean: true,
entry: ["src/renderer/src/index.tsx"],
esbuildPlugins: [
stylePlugin({
postcss: {
plugins: [tailwindcss(), autoprefixer()]
}
})
]
},
plugins: [react()]
}
});
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
"typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
"typecheck": "npm run typecheck:node && npm run typecheck:web",
"start": "electron-vite preview --watch",
"dev": "electron-vite dev --watch",
"build": "npm run typecheck && electron-vite build --outDir=release/app/dist",
"start": "electron-vite-tsup preview",
"dev": "electron-vite-tsup dev --watch",
"build": "electron-vite-tsup build --outDir=release/app/dist",
"postinstall": "electron-builder install-app-deps",
"package": "npm run build && electron-builder build --publish never",
"package": "electron-builder build --publish never",
"package:mac": "npm run build && electron-builder build --publish never --mac",
"package:linux": "npm run build && electron-builder build --publish never --linux",
"package:win": "npm run build && electron-builder build --publish never --win",
Expand Down Expand Up @@ -69,6 +69,7 @@
"dayjs": "^1.11.10",
"electron-log": "^5.1.1",
"electron-updater": "^6.1.7",
"electron-vite-tsup": "^2.0.0",
"framer-motion": "^11.0.3",
"got": "^14.2.0",
"intro.js-react": "^1.0.0",
Expand Down Expand Up @@ -97,7 +98,7 @@
"@types/react": "^18.2.52",
"@types/react-dom": "^18.2.18",
"@types/tar-fs": "^2.0.4",
"@vitejs/plugin-react": "^4.2.1",
"@vitejs/plugin-react-swc": "^3.6.0",
"@wdio/cli": "^8.29.7",
"@wdio/globals": "^8.29.7",
"@wdio/local-runner": "^8.29.7",
Expand All @@ -108,16 +109,16 @@
"electron-builder": "^24.9.1",
"electron-debug": "github:1111mp/electron-debug",
"electron-devtools-installer": "^3.2.0",
"electron-vite": "^2.0.0",
"esbuild-style-plugin": "^1.6.3",
"eslint": "^8.56.0",
"eslint-plugin-react": "^7.33.2",
"postcss": "^8.4.33",
"prettier": "^3.2.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup-plugin-delete": "^2.0.0",
"tailwindcss": "^3.4.1",
"ts-node": "^10.9.2",
"tsup": "^8.0.1",
"typescript": "^5.3.3",
"vite": "^5.0.12",
"wdio-electron-service": "^6.2.0",
Expand Down
Loading

0 comments on commit 19d17a0

Please sign in to comment.