Merge pull request #12 from electron-vite/v0.11.2

V0.11.2

Author: caoxiemeihao

.gitignore

@@ -110,6 +110,7 @@ package-lock.json
 yarn.lock
 
 /types
+/builtins
 /index.mjs
 /index.cjs
 /index.js

CHANGELOG.md

@@ -1,6 +1,15 @@
+## 0.11.2 (2022-11-18)
+
+1. Pre-Bundling Node.js built-in modules by default.
+2. Fixed incorrect loading of static resources *(It does not support custom assetsDir)*.
+
+- ee51908 feat: build built-in modules 🌱
+- 51d5287 fix: `assetsDir` default value
+- 5d0dfc0 refactor: always Pre-Bundling built-in modules
+
 ## 0.11.1 (2022-11-16)
 
-- a8c546b fix: add 'vite-plugin-electron-renderer/electron-renderer' to `optimizeDeps.exclude`
+- a8c546b fix: add 'vite-plugin-electron-renderer/electron-renderer' to `optimizeDeps.exclude`.
 
 ## 0.11.0 (2022-11-15)
 

examples/quick-start/renderer/samples/node.js-api.ts

@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import fs from 'fs'
+import fs from 'fs/promises'
 
 console.log('Electron API:\n', ipcRenderer)
-console.log('Node.js API:\n', fs)
+console.log('Node.js API(fs/promises):\n', fs)

examples/quick-start/vite.config.ts

@@ -14,7 +14,6 @@ export default defineConfig({
       // Like Vite's pre bundling
       optimizeDeps: {
         include: [
-          'fs',             // built-in
           'serialport',     // cjs(C++)
           'electron-store', // cjs
           'execa',          // esm

examples/worker/renderer/index.ts

@@ -1,11 +1,7 @@
-import fs from 'fs'
-
 document.getElementById('app')!.innerHTML = `
 <h1>examples/web-worker</h1>
 <button id="worker">Click to load Web Worker</button>
 `
 document.getElementById('worker')!.addEventListener('click', () => {
   new Worker(new URL('./worker.ts', import.meta.url), { type: 'module' })
 })
-
-console.log(fs)

examples/worker/renderer/worker.ts

@@ -1,7 +1,5 @@
 import { join } from 'path'
-import path from 'path'
-import fs from 'fs'
+import fs from 'node:fs/promises'
 
-console.log(join('a', 'b'))
-console.log(path.join('c', 'd'))
-console.log(fs)
+console.log("join('a', 'b') ->", join('a', 'b'))
+console.log('node:fs/promises ->', fs)

examples/worker/vite.config.ts

@@ -16,12 +16,6 @@ export default defineConfig({
     }),
     renderer({
       nodeIntegration: true,
-      optimizeDeps: {
-        include: [
-          'fs',
-          'path',
-        ]
-      },
     }),
   ],
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-electron-renderer",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Support use Node.js API in Electron-Renderer",
   "main": "index.mjs",
   "types": "types",
@@ -9,7 +9,7 @@
       "import": "./index.mjs",
       "require": "./index.js"
     },
-    "./electron-renderer": "./electron-renderer.js"
+    "./*": "./*"
   },
   "repository": {
     "type": "git",
@@ -38,7 +38,8 @@
     "types",
     "index.mjs",
     "index.js",
-    "electron-renderer.js"
+    "electron-renderer.js",
+    "builtins"
   ],
   "keywords": [
     "vite",

src/build-config.ts

@@ -4,16 +4,16 @@ import type { ExternalOption, RollupOptions } from 'rollup'
 
 export const builtins = [
   'electron',
-  ...builtinModules,
-  ...builtinModules.map(mod => `node:${mod}`),
+  ...builtinModules.filter(m => !m.startsWith('_')),
+  ...builtinModules.filter(m => !m.startsWith('_')).map(mod => `node:${mod}`),
 ]
 
 export default function buildConfig(nodeIntegration?: boolean): Plugin {
   return {
     name: 'vite-plugin-electron-renderer:build-config',
     apply: 'build',
     config(config) {
-      // make sure that Electron can be loaded into the local file using `loadFile` after packaging
+      // Make sure that Electron can be loaded into the local file using `loadFile` after packaging
       config.base ??= './'
 
       config.build ??= {}
@@ -24,6 +24,11 @@ export default function buildConfig(nodeIntegration?: boolean): Plugin {
       // https://github.com/electron-vite/electron-vite-vue/issues/107
       config.build.cssCodeSplit ??= false
 
+      // TODO: compatible with custom assetsDir
+      // This will guarantee the proper loading of static resources, such as images, `worker.js`
+      // The `.js` file can be loaded correctly with cjs-shim.ts
+      config.build.assetsDir ??= ''
+
       if (nodeIntegration) {
         config.build.rollupOptions ??= {}
         config.build.rollupOptions.external = withExternal(config.build.rollupOptions.external)

src/index.ts

@@ -18,7 +18,7 @@ export default function renderer(
 ): PluginOption {
   return [
     buildConfig(options.nodeIntegration),
+    optimizer(options.optimizeDeps),
     options.nodeIntegration && cjsShim(),
-    options.optimizeDeps && optimizer(options.optimizeDeps),
   ]
 }