Merge pull request #56 from electron-vite/v0.13.14

V0.13.14

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13.14 (2023-03-31)
+
+- c68d26a fix: move cjs config to cjs-shim.ts #107 | [electron-vite-vue/issues/107](https://github.com/electron-vite/electron-vite-vue/issues/107)
+
 ## 0.13.13 (2023-03-29)
 
 - 8c044c9 fix: `require` instead `await import`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-electron-renderer",
-  "version": "0.13.13",
+  "version": "0.13.14",
   "description": "Support use Node.js API in Electron-Renderer",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/cjs-shim.ts

@@ -7,6 +7,19 @@ export default function cjsShim(): Plugin {
   return {
     name: 'vite-plugin-electron-renderer:cjs-shim',
     apply: 'build',
+    config(config) {
+      // Assets are not loaded correctly under CJS, so some default build options need to be changed here
+      config.build ??= {}
+
+      // https://github.com/electron-vite/electron-vite-vue/issues/107
+      config.build.cssCodeSplit ??= false
+
+      // This ensures that static resources are loaded correctly, such as images, `worker.js`
+      // BWT, the `.js` file can be loaded correctly with `<script id="shim-require-id">`
+      // This causes BUG in ESN
+      config.build.assetsDir ??= ''
+      // TODO: compatible with custom assetsDir for static resources
+    },
     configResolved(_config) {
       config = _config
 

src/index.ts

@@ -52,15 +52,6 @@ export default function renderer(options: RendererOptions = {}): VitePlugin {
       config.base ??= './'
 
       config.build ??= {}
-
-      // https://github.com/electron-vite/electron-vite-vue/issues/107
-      config.build.cssCodeSplit ??= false
-
-      // This ensures that static resources are loaded correctly, such as images, `worker.js`
-      // BWT, the `.js` file can be loaded correctly with './cjs-shim.ts'
-      config.build.assetsDir ??= ''
-      // TODO: compatible with custom assetsDir for static resources
-
       config.build.rollupOptions ??= {}
 
       // Some third-party modules, such as `fs-extra`, it will extend the nativ fs module, maybe we need to stop it