vue-cli-plugin-electron-haunv 1.0.3 → 1.0.4

package/bin/dev-runner.js

@@ -7,43 +7,14 @@ const electron = require("electron")
 
 let electronProcess
 let port
-let reloadTimeout
-
-function startElectron() {
-
-    electronProcess = spawn(
-        electron,
-        ["."],
-        {
-            stdio: "inherit",
-            env: {
-                ...process.env,
-                VITE_DEV_SERVER_URL: `http://localhost:${port}`
-            }
-        }
-    )
-
-}
-
-function restartElectron() {
-
-    clearTimeout(reloadTimeout)
-
-    reloadTimeout = setTimeout(() => {
-        if (electronProcess) {
-            electronProcess.kill()
-            startElectron()
-        }
-    }, 300)
-
-}
 
 async function run() {
 
     port = await getPort({
-        port: [8080, 8081, 8082, 8083]
+        port: [8080, 8081, 8082]
     })
 
+    // chạy vue dev server
     spawn(
         "npm",
         ["run", "serve", "--", "--port", port],
@@ -53,19 +24,41 @@ async function run() {
         }
     )
 
+    // đợi vue ready
     await waitOn({
         resources: [`http://localhost:${port}`]
     })
 
+    // chạy electron
     startElectron()
 
+    // hot reload electron
     chokidar
-        .watch(["electron"], {
-            ignored: /node_modules/,
-            ignoreInitial: true
+        .watch(["electron"], { ignoreInitial: true })
+        .on("all", () => {
+            restartElectron()
         })
-        .on("all", restartElectron)
+}
+
+function startElectron() {
+    electronProcess = spawn(
+        electron,
+        ["."],
+        {
+            stdio: "inherit",
+            env: {
+                ...process.env,
+                DEV_SERVER_URL: `http://localhost:${port}`
+            }
+        }
+    )
+}
 
+function restartElectron() {
+    if (electronProcess) {
+        kill(electronProcess.pid)
+        startElectron()
+    }
 }
 
 run()

package/generator/index.js

@@ -1,29 +1,49 @@
 module.exports = (api) => {
 
-    api.render('./template')
+    console.log("✅ Electron plugin applied")
 
     api.extendPackage({
 
         main: "electron/main.js",
 
+        scripts: {
+            "electron:dev": "node node_modules/vue-cli-plugin-electron-haunv/bin/dev-runner.js",
+            "electron:build": "npm run build && electron-builder"
+        },
+
+        devDependencies: {
+            electron: "^latest",
+            "electron-builder": "^latest"
+        },
+
         build: {
             appId: "com.haunv.app",
             productName: "MyApp",
+
             directories: {
                 output: "dist_electron"
             },
+
             files: [
                 "dist/**/*",
                 "electron/**/*"
             ],
+
             win: {
                 target: [
                     "nsis",
                     "portable"
                 ]
+            },
+
+            nsis: {
+                oneClick: false,
+                allowToChangeInstallationDirectory: true
             }
         }
 
     })
 
+    api.render('./template')
+
 }

package/generator/template/electron/main.js

@@ -1,24 +1,24 @@
 const { app, BrowserWindow } = require("electron")
+const path = require("path")
 
-let mainWindow
+let win
 
 function createWindow() {
 
-    mainWindow = new BrowserWindow({
+    win = new BrowserWindow({
         width: 1200,
         height: 800,
         webPreferences: {
-            preload: require("path").join(__dirname, "preload.js"),
-            contextIsolation: true,
-            nodeIntegration: false
+            preload: path.join(__dirname, "preload.js"),
+            contextIsolation: true
         }
     })
 
-    if (process.env.VITE_DEV_SERVER_URL) {
-        mainWindow.loadURL(process.env.VITE_DEV_SERVER_URL)
-        mainWindow.webContents.openDevTools()
+    if (process.env.DEV_SERVER_URL) {
+        win.loadURL(process.env.DEV_SERVER_URL)
+        win.webContents.openDevTools()
     } else {
-        mainWindow.loadFile("dist/index.html")
+        win.loadFile(path.join(__dirname, "../dist/index.html"))
     }
 
 }

package/index.js

@@ -1,8 +1 @@
-module.exports = (api) => {
-    api.extendPackage({
-        scripts: {
-            "electron:dev": "node node_modules/vue-cli-plugin-electron-haunv/bin/dev-runner.js",
-            "electron:build": "electron-builder"
-        }
-    })
-}
+module.exports = () => {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-plugin-electron-haunv",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "index.js",
   "license": "MIT",
 
@@ -10,15 +10,10 @@
     "index.js"
   ],
 
-  "dependencies": {},
-
-  "devDependencies": {
-    "electron": "latest",
-    "electron-builder": "latest",
-    "concurrently": "latest",
-    "wait-on": "latest",
-    "chokidar": "latest",
-    "tree-kill": "latest",
-    "get-port": "latest"
+  "dependencies": {
+    "wait-on": "^7.2.0",
+    "chokidar": "^3.5.3",
+    "tree-kill": "^1.2.2",
+    "get-port": "^7.0.0"
   }
 }

package/bin/hot-reload.js

@@ -1 +0,0 @@
-// custom reload