Merge pull request #94 from electron-vite/v0.10.2

V0.10.2

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.10.2 (2022-10-24)
+
+1. Remove Vite `3.2.0` | #90
+2. ad9bb3c refactor(electron-renderer)!: remove `options.resolve()`, use 'lib-esm' for resolve Node.js modules and `electron` | vite-plugin-electron-renderer
+3. b500039 feat(electron-renderer): support `optimizeDeps` for Electron-Renderer 🚀
+4. f28e66b faet(outDir)!: `dist/electron` -> `dist/electron` | vite-plugin-electron
+
 ## 0.10.1 (2022-10-12)
 
 - 59a24df fix(electron-renderer): use `createRequire()` instead of `import()` 🐞

examples/.gitignore

@@ -0,0 +1 @@
+*/dist-electron

examples/custom-start-electron-app/package.json

@@ -20,6 +20,6 @@
     "electron-builder": "^23.1.0",
     "typescript": "^4.7.4",
     "vite-plugin-electron": "workspace:*",
-    "vite": "^3.2.0-beta.0"
+    "vite": "^3.1.8"
   }
 }

examples/custom-start-electron-app/vite.config.ts

@@ -3,17 +3,15 @@ import { defineConfig } from 'vite'
 import electron from 'vite-plugin-electron'
 
 fs.rmSync('dist', { recursive: true, force: true })
-const cmds = process.argv.slice(2)
-const isdev = !cmds.length || cmds.includes('dev') || cmds.includes('serve')
 
 export default defineConfig({
   plugins: [
     electron({
       entry: 'electron/main.ts',
-      onstart: isdev ? startup => {
+      onstart: options => {
         /** Start Electron App */
-        startup(['.', '--no-sandbox'])
-      } : undefined,
+        options.startup(['.', '--no-sandbox'])
+      },
     }),
   ],
 })

examples/nodeIntegration/electron-builder.json5

@@ -10,7 +10,10 @@
     output: "release/${version}",
     buildResources: "electron/resources",
   },
-  files: ["dist"],
+  files: [
+    "dist",
+    "dist-electron"
+  ],
   win: {
     target: [
       {

examples/nodeIntegration/electron/main.ts

@@ -16,7 +16,7 @@ app.whenReady().then(() => {
   })
 
   if (app.isPackaged) {
-    win.loadFile(path.join(__dirname, '../index.html'))
+    win.loadFile(path.join(__dirname, '../dist/index.html'))
   } else {
     win.loadURL(process.env.VITE_DEV_SERVER_URL)
     win.webContents.openDevTools()

examples/nodeIntegration/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-electron-node-integration",
   "version": "0.0.0",
-  "main": "dist/electron/main.js",
+  "main": "dist-electron/main.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/electron-vite/vite-plugin-electron.git",
@@ -26,9 +26,8 @@
     "execa": "^6.1.0",
     "got": "^12.1.0",
     "node-fetch": "^3.2.8",
+    "vite": "^3.1.8",
     "vite-plugin-electron": "workspace:*",
-    "vite-plugin-electron-renderer": "workspace:*",
-    "vite-plugin-esmodule": "^1.4.1",
-    "vite": "^3.2.0-beta.0"
+    "vite-plugin-electron-renderer": "workspace:*"
   }
 }

examples/nodeIntegration/vite.config.ts

@@ -2,7 +2,6 @@ import fs from 'fs'
 import { defineConfig } from 'vite'
 import electron from 'vite-plugin-electron'
 import renderer from 'vite-plugin-electron-renderer'
-import esmodule from 'vite-plugin-esmodule'
 import pkg from './package.json'
 
 fs.rmSync('dist', { recursive: true, force: true })
@@ -15,13 +14,17 @@ export default defineConfig({
     renderer({
       // Enables use of Node.js API in the Renderer-process
       nodeIntegration: true,
-      // Explicitly specify external modules
-      resolve: () => ['serialport', 'sqlite3'],
+      // Like Vite's pre bundling
+      optimizeDeps: {
+        include: [
+          'serialport',     // cjs(C++)
+          'electron-store', // cjs
+          'execa',          // esm
+          'got',            // esm
+          'node-fetch',     // esm
+        ],
+      },
     }),
-    // If an npm package is a pure ESM format package, 
-    // and the packages it depends on are also in ESM format, 
-    // then put it in `optimizeDeps.exclude` and it will work normally.
-    esmodule(['execa', 'got', 'node-fetch']),
   ],
   build: {
     minify: false,
@@ -30,6 +33,9 @@ export default defineConfig({
     },
   },
   optimizeDeps: {
+    // If an npm package is a pure ESM format package, 
+    // and the packages it depends on are also in ESM format, 
+    // then put it in `optimizeDeps.exclude` and it will work normally.
     // exclude: ['only-support-pure-esmodule-package'],
   },
 })

examples/quick-start/electron/preload.ts

@@ -15,12 +15,12 @@ function domReady(condition: DocumentReadyState[] = ['complete', 'interactive'])
 const safeDOM = {
   append(parent: HTMLElement, child: HTMLElement) {
     if (!Array.from(parent.children).find(e => e === child)) {
-      return parent.appendChild(child)
+      parent.appendChild(child)
     }
   },
   remove(parent: HTMLElement, child: HTMLElement) {
     if (Array.from(parent.children).find(e => e === child)) {
-      return parent.removeChild(child)
+      parent.removeChild(child)
     }
   },
 }

examples/quick-start/package.json

@@ -20,6 +20,6 @@
     "electron-builder": "^23.1.0",
     "typescript": "^4.7.4",
     "vite-plugin-electron": "workspace:*",
-    "vite": "^3.2.0-beta.0"
+    "vite": "^3.1.8"
   }
 }