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

package/bin/dev-runner.js

@@ -0,0 +1,71 @@
+const { spawn } = require("child_process")
+const waitOn = require("wait-on")
+const getPort = require("get-port").default
+const chokidar = require("chokidar")
+const kill = require("tree-kill")
+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]
+    })
+
+    spawn(
+        "npm",
+        ["run", "serve", "--", "--port", port],
+        {
+            stdio: "inherit",
+            shell: true
+        }
+    )
+
+    await waitOn({
+        resources: [`http://localhost:${port}`]
+    })
+
+    startElectron()
+
+    chokidar
+        .watch(["electron"], {
+            ignored: /node_modules/,
+            ignoreInitial: true
+        })
+        .on("all", restartElectron)
+
+}
+
+run()

package/bin/hot-reload.js

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

package/generator/index.js

@@ -1,46 +1,29 @@
-module.exports = api => {
+module.exports = (api) => {
+
+    api.render('./template')
 
     api.extendPackage({
 
         main: "electron/main.js",
 
-        scripts: {
-
-            "electron:dev": "node electron/dev-runner.js",
-
-            "electron:build":
-                "npm run build && electron-builder"
-
-        },
-
         build: {
-
-            appId: "com.vue.electron.app",
-
-            productName: "VueElectronApp",
-
+            appId: "com.haunv.app",
+            productName: "MyApp",
             directories: {
                 output: "dist_electron"
             },
-
             files: [
                 "dist/**/*",
                 "electron/**/*"
             ],
-
-            asar: true,
-
             win: {
                 target: [
                     "nsis",
                     "portable"
                 ]
             }
-
         }
 
     })
 
-    api.render("./template")
-
 }

package/generator/template/electron/main.js

@@ -1,50 +1,30 @@
 const { app, BrowserWindow } = require("electron")
-const path = require("path")
 
-const installExtension = require("electron-devtools-installer")
-const { VUEJS_DEVTOOLS } = require("electron-devtools-installer")
+let mainWindow
 
-const enableHotReload = require("./hot-reload")
-
-const isDev = !app.isPackaged
-const port = process.argv[2] || 8080
-
-let win
-
-async function createWindow() {
-
-    win = new BrowserWindow({
+function createWindow() {
 
+    mainWindow = new BrowserWindow({
         width: 1200,
         height: 800,
-
         webPreferences: {
-            preload: path.join(__dirname, "preload.js"),
-            contextIsolation: true
+            preload: require("path").join(__dirname, "preload.js"),
+            contextIsolation: true,
+            nodeIntegration: false
         }
-
     })
 
-    if (isDev) {
-
-        win.loadURL(`http://localhost:${port}`)
-
-        win.webContents.openDevTools()
-
-        enableHotReload(win)
-
-        try {
-            await installExtension(VUEJS_DEVTOOLS)
-        } catch { }
-
+    if (process.env.VITE_DEV_SERVER_URL) {
+        mainWindow.loadURL(process.env.VITE_DEV_SERVER_URL)
+        mainWindow.webContents.openDevTools()
     } else {
-
-        win.loadFile(
-            path.join(__dirname, "../dist/index.html")
-        )
-
+        mainWindow.loadFile("dist/index.html")
     }
 
 }
 
-app.whenReady().then(createWindow)
+app.whenReady().then(createWindow)
+
+app.on("window-all-closed", () => {
+    if (process.platform !== "darwin") app.quit()
+})

package/generator/template/electron/preload.js

@@ -1,9 +1,5 @@
 const { contextBridge } = require("electron")
 
-contextBridge.exposeInMainWorld("electronAPI", {
-
-    ping() {
-        return "pong"
-    }
-
+contextBridge.exposeInMainWorld("api", {
+    ping: () => "pong"
 })

package/index.js

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

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "vue-cli-plugin-electron-haunv",
-  "version": "1.0.1",
-  "description": "",
+  "version": "1.0.3",
   "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "type": "commonjs",
-  "dependencies": {
-    "chokidar": "latest",
-    "concurrently": "latest",
+  "license": "MIT",
+
+  "files": [
+    "generator",
+    "bin",
+    "index.js"
+  ],
+
+  "dependencies": {},
+
+  "devDependencies": {
     "electron": "latest",
     "electron-builder": "latest",
-    "electron-devtools-installer": "latest",
-    "get-port": "latest",
+    "concurrently": "latest",
+    "wait-on": "latest",
+    "chokidar": "latest",
     "tree-kill": "latest",
-    "wait-on": "latest"
+    "get-port": "latest"
   }
-}
+}

package/generator/template/electron/dev-runner.js

@@ -1,56 +0,0 @@
-const { spawn } = require("child_process")
-const waitOn = require("wait-on")
-const getPort = require("get-port").default
-const chokidar = require("chokidar")
-const kill = require("tree-kill")
-
-let electronProcess
-let port
-
-function startElectron() {
-
-    electronProcess = spawn(
-        "npx",
-        ["electron", ".", port],
-        { stdio: "inherit" }
-    )
-
-}
-
-function restartElectron() {
-
-    if (electronProcess) {
-
-        kill(electronProcess.pid)
-
-        startElectron()
-
-    }
-
-}
-
-async function run() {
-
-    port = await getPort({
-        port: [8080, 8081, 8082, 8083]
-    })
-
-    spawn(
-        "npm",
-        ["run", "serve", "--", "--port", port],
-        { stdio: "inherit" }
-    )
-
-    await waitOn({
-        resources: [`http://localhost:${port}`]
-    })
-
-    startElectron()
-
-    chokidar
-        .watch(["electron"])
-        .on("change", restartElectron)
-
-}
-
-run()

package/generator/template/electron/hot-reload.js

@@ -1,17 +0,0 @@
-const chokidar = require("chokidar")
-
-function enableHotReload(win) {
-
-    chokidar.watch([
-        __dirname + "/main.js"
-    ]).on("change", () => {
-
-        if (win && !win.isDestroyed()) {
-            win.reload()
-        }
-
-    })
-
-}
-
-module.exports = enableHotReload