Merge pull request #52 from electron-vite/v0.13.11

V0.13.11

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.13.11 (2023-03-27)
+
+- b0312e9 fix: use `__cjs_require` avoid esbuild parse `require`
+- dde27b7 fix: remove esbuild plugin #46
+
 ## 0.13.10 (2023-03-26)
 
 - 8d2d914 fix: use `__cjs_require` avoid esbuild parse

install.mjs

@@ -11,7 +11,10 @@ export const builtins_dir = path.join(__dirname, 'builtins')
 export const electron = `
 const electron = typeof require !== 'undefined'
   // All exports module see https://www.electronjs.org -> API -> Renderer Process Modules
-  ? require("electron")
+  ? (function requireElectron() {
+    const __cjs_require = require;
+    return __cjs_require("electron");
+  }())
   : (function nodeIntegrationWarn() {
     console.error(\`If you need to use "electron" in the Renderer process, make sure that "nodeIntegration" is enabled in the Main process.\`);
     return {
@@ -84,7 +87,9 @@ export async function generateBuiltins() {
     //  ❯ node:trace_events:25:9
 
     const { exports } = libEsm({ exports: Object.keys(await import(module)) })
-    fs.writeFileSync(filename, `const _M_ = require("${module}");\n${exports}`)
+    // Use "__cjs_require" avoid esbuild parse "require"
+    // TODO: better implements
+    fs.writeFileSync(filename, `const __cjs_require = require; const _M_ = __cjs_require("${module}");\n${exports}`)
   }
 
   // Electron

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-electron-renderer",
-  "version": "0.13.10",
+  "version": "0.13.11",
   "description": "Support use Node.js API in Electron-Renderer",
   "main": "index.js",
   "types": "types",

src/index.ts

@@ -9,13 +9,14 @@ import type {
   UserConfig,
 } from 'vite'
 import type { RollupOptions } from 'rollup'
-import type { Plugin as EsbuildPlugin } from 'esbuild'
 import libEsm from 'lib-esm'
 import cjsShim from './cjs-shim'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const builtins = builtinModules.filter(m => !m.startsWith('_')); builtins.push(...builtins.map(m => `node:${m}`))
 const electronBuiltins = ['electron', ...builtins]
+const BUILTIN_PATH = 'vite-plugin-electron-renderer/builtins'
+const RESOLVE_PATH = 'vite-plugin-electron-renderer/.resolve'
 
 export interface RendererOptions {
   /**
@@ -70,22 +71,13 @@ export default function renderer(options: RendererOptions = {}): VitePlugin[] {
         // see - https://github.com/rollup/plugins/blob/commonjs-v24.0.0/packages/commonjs/src/helpers.js#L38
         withIgnore(config.build)
 
-        // -------------------------------------------------
-
-        config.optimizeDeps ??= {}
-        config.optimizeDeps.esbuildOptions ??= {}
-        config.optimizeDeps.esbuildOptions.plugins ??= []
-        config.optimizeDeps.esbuildOptions.plugins.push(esbuildPlugin())
-
-        // -------------------------------------------------
-
         const resolveAliases = await buildResolve(options)
         const builtinAliases: Alias[] = electronBuiltins
           .filter(m => !m.startsWith('node:'))
           .map<Alias>(m => ({
             find: new RegExp(`^(node:)?${m}$`),
             // Vite's pre-bundle only recognizes bare-import
-            replacement: `vite-plugin-electron-renderer/builtins/${m}`,
+            replacement: `${BUILTIN_PATH}/${m}`,
             // TODO: must be use absolute path for `pnnpm` monorepo - `shamefully-hoist=true` 🤔
           }))
 
@@ -174,34 +166,13 @@ ${exports}
 
     aliases.push({
       find: name,
-      replacement: `vite-plugin-electron-renderer/.resolve/${name}`,
+      replacement: `${RESOLVE_PATH}/${name}`,
     })
   }
 
   return aliases
 }
 
-function esbuildPlugin(): EsbuildPlugin {
-  return {
-    name: 'vite-plugin-target:optimizer:esbuild',
-    setup(build) {
-      // https://github.com/vitejs/vite/blob/v4.2.0/packages/vite/src/node/optimizer/esbuildDepPlugin.ts#L277-L279
-      const escape = (text: string) =>
-        `^${text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')}$`
-      const filter = new RegExp(electronBuiltins.map(escape).join('|'))
-
-      // Avoid Vite internal esbuild plugin
-      // https://github.com/vitejs/vite/blob/v4.2.0/packages/vite/src/node/optimizer/esbuildDepPlugin.ts#L288
-      build.onResolve({ filter }, args => {
-        return {
-          path: args.path,
-          external: true,
-        }
-      })
-    },
-  }
-}
-
 function ensureDir(dirname: string) {
   if (!fs.existsSync(dirname)) {
     fs.mkdirSync(dirname, { recursive: true })