From 67f1d00193c3918fa29cb504a302221486a225c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=89=E9=9E=8B=E6=B2=A1=E5=8F=B7?= <308487730@qq.com>
Date: Wed, 15 Dec 2021 08:44:09 +0800
Subject: [PATCH] refactor: electron-builder use npm command

---
 configs/electron-builder.config.mjs | 33 ---------------------------
 electron-builder.json               | 35 +++++++++++++++++++++++++++++
 package.json                        |  2 +-
 scripts/build.mjs                   | 13 -----------
 4 files changed, 36 insertions(+), 47 deletions(-)
 delete mode 100644 configs/electron-builder.config.mjs
 create mode 100644 electron-builder.json

diff --git a/configs/electron-builder.config.mjs b/configs/electron-builder.config.mjs
deleted file mode 100644
index 7df883e..0000000
--- a/configs/electron-builder.config.mjs
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @type {import('electron-builder').Configuration}
- */
-const config = {
-  appId: '308487730@qq.com',
-  asar: true,
-  directories: {
-    output: 'release/${version}',
-    buildResources: 'public',
-  },
-  files: ['!node_modules', 'dist', 'package.json'],
-  mac: {
-    artifactName: '${productName}_${version}.${ext}',
-    target: ['dmg'],
-  },
-  win: {
-    target: [
-      {
-        target: 'nsis',
-        arch: ['x64'],
-      },
-    ],
-    artifactName: '${productName}_${version}.${ext}',
-  },
-  nsis: {
-    oneClick: false,
-    perMachine: false,
-    allowToChangeInstallationDirectory: true,
-    deleteAppDataOnUninstall: false,
-  },
-}
-
-export { config }
diff --git a/electron-builder.json b/electron-builder.json
new file mode 100644
index 0000000..e19332e
--- /dev/null
+++ b/electron-builder.json
@@ -0,0 +1,35 @@
+{
+  "appId": "308487730@qq.com",
+  "asar": true,
+  "directories": {
+    "output": "release/${version}"
+  },
+  "files": [
+    "!node_modules",
+    "dist",
+    "package.json"
+  ],
+  "mac": {
+    "artifactName": "${productName}_${version}.${ext}",
+    "target": [
+      "dmg"
+    ]
+  },
+  "win": {
+    "target": [
+      {
+        "target": "nsis",
+        "arch": [
+          "x64"
+        ]
+      }
+    ],
+    "artifactName": "${productName}_${version}.${ext}"
+  },
+  "nsis": {
+    "oneClick": false,
+    "perMachine": false,
+    "allowToChangeInstallationDirectory": true,
+    "deleteAppDataOnUninstall": false
+  }
+}
diff --git a/package.json b/package.json
index 349b6bf..68c17f7 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "main": "dist/main/index.cjs",
   "scripts": {
     "dev": "node scripts/watch.mjs",
-    "build": "node scripts/build.mjs"
+    "build": "node scripts/build.mjs && electron-builder"
   },
   "engines": {
     "node": ">=14.17.0"
diff --git a/scripts/build.mjs b/scripts/build.mjs
index f2f3891..7c429e7 100644
--- a/scripts/build.mjs
+++ b/scripts/build.mjs
@@ -1,8 +1,6 @@
 process.env.NODE_ENV = 'production'
 
 import { build as viteBuild } from 'vite'
-import { build as electronBuild, Platform } from 'electron-builder'
-import { config as builderConfig } from '../configs/electron-builder.config.mjs'
 import chalk from 'chalk'
 
 const TAG = chalk.bgBlue('[build.mjs]')
@@ -25,16 +23,5 @@ async function buildElectron() {
   }
 }
 
-async function packElectron() {
-  return electronBuild({
-    config: builderConfig,
-    // if you want to build windows platform
-    // targets: Platform.WINDOWS.createTarget(),
-  }).then(result => {
-    console.log(TAG, 'files:', chalk.green(result))
-  })
-}
-
 // bootstrap
 await buildElectron()
-await packElectron()