chore: Struct adjust

script/utils.ts

@@ -1,3 +1,4 @@
+import { sep } from 'path'
 import { get } from 'http'
 import { green } from 'chalk'
 
@@ -18,3 +19,23 @@ export function waitOn(arg0: { port: string | number; interval?: number; }) {
     }, interval)
   })
 }
+
+/** cjs2esm */
+export function cjs2esm() {
+  return {
+    name: '@rollup/plugin-cjs2esm',
+    transform(code: string, filename: string) {
+      if (filename.includes(`${sep}node_modules${sep}`)) {
+        return code
+      }
+
+      const cjsRegexp = /(const|let|var)[\n\s]+(\w+)[\n\s]*=[\n\s]*require\(["|'](.+)["|']\)/g
+      const res = code.match(cjsRegexp)
+      if (res) {
+        // const Store = require('electron-store') -> import Store from 'electron-store'
+        code = code.replace(cjsRegexp, `import $2 from '$3'`)
+      }
+      return code
+    },
+  }
+}

src/main/index.ts

@@ -1,11 +1,10 @@
 /**
  * electron 主文件
  */
+require('dotenv').config({ path: join(__dirname, '../../.env') })
+
 import { join } from 'path'
 import { app, BrowserWindow } from 'electron'
-import dotenv from 'dotenv'
-
-dotenv.config({ path: join(__dirname, '../../.env') })
 
 let win: BrowserWindow
 

src/preload/index.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 /** docoment 加载完成 */
 function domReady(...args) {

src/render/main.ts

@@ -2,12 +2,8 @@ import { createApp } from 'vue'
 import App from './App.vue'
 // vite 会编译 import 的形式；所以 electron 及 node.js 内置模块用 require 形式
 const { ipcRenderer } = require('electron')
-// import { store, isdev } from '/utils/index'
-
 import './index.css'
 
 console.log('ipcRenderer:', ipcRenderer)
-// console.log('Store', store)
-// console.log('electron is dev', isdev)
 
-createApp(App as any).mount('#app').$nextTick(window.ClosePreloadLoading)
+createApp(App).mount('#app').$nextTick(window.ClosePreloadLoading)

src/render/utils/index.ts

@@ -1,7 +0,0 @@
-import store from './store'
-const isdev = require('electron-is-dev')
-
-export {
-  store,
-  isdev,
-}

src/render/utils/store.ts

@@ -1,3 +0,0 @@
-/*@replace = import Store from 'electron-store'*/const Store = require('electron-store')
-
-export default new Store

tsconfig.json

@@ -11,16 +11,12 @@
     "baseUrl": "./",
     "strict": true,
     "paths": {
-      "/assets/*": ["src/render/assets/*"],
+      "@/*": ["src/render/*"],
-      "/components/*": ["src/render/components/*"],
+      "@root/*": ["./*"],
-      "/lib/*": ["src/render/lib/*"],
-      "/utils/*": ["src/render/utils/*"],
-      "/views/*": ["src/render/views/*"]
     },
     "allowSyntheticDefaultImports": true
   },
   "include": [
-    "src/**/*",
+    "src"
-    "typings/*.d.ts"
   ]
 }

vite.config.ts

@@ -1,71 +1,35 @@
+require('dotenv').config({ path: join(__dirname, '.env') })
+
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import { join, sep } from 'path'
+import externals from 'rollup-plugin-node-externals'
-import dotenv from 'dotenv'
+import { join } from 'path'
-
+import { cjs2esm } from './script/utils'
-dotenv.config({ path: join(__dirname, '.env') })
-const root = join(__dirname, 'src/render')
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
-  root,
+  root: join(__dirname, 'src/render'),
-  // base: './',
   server: {
     port: +process.env.PORT,
   },
   resolve: {
     alias: {
+      '@': join(__dirname, 'src/render'),
       '@root': __dirname,
-      '@assets': join(__dirname, 'src/render/assets'),
-      '@components': join(__dirname, 'src/render/components'),
-      '@lib': join(__dirname, 'src/render/lib'),
-      '@utils': join(__dirname, 'src/render/utils'),
-      '@views': join(__dirname, 'src/render/views'),
     },
   },
   optimizeDeps: {
-    // 这里不加也没事，用 require 的形式就能避开 import 被编译成 /@modules/fs?import
+    exclude: ['electron-store', 'electron']
-    // allowNodeBuiltins: ['electron-is-dev', 'electron-store', 'electron']
   },
   build: {
     outDir: join(__dirname, 'dist/render'),
     rollupOptions: {
-      output: {
+      external: ['electron'],
-        // format: 'commonjs',
-      },
-      external: [
-        'crypto',
-        'assert',
-        'fs',
-        'util',
-        'os',
-        'events',
-        'child_process',
-        'http',
-        'https',
-        'path',
-        'electron',
-      ],
       plugins: [
-        {
+        externals(),
-          name: '@rollup/plugin-cjs2esm',
+        // cjs2esm(),
-          transform(code, filename) {
-            if (filename.includes(`${sep}node_modules${sep}`)) {
-              return code
-            }
-
-            const cjsRegexp = /(const|let|var)[\n\s]+(\w+)[\n\s]*=[\n\s]*require\(["|'](.+)["|']\)/g
-            const res = code.match(cjsRegexp)
-            if (res) {
-              // const Store = require('electron-store') -> import Store from 'electron-store'
-              code = code.replace(cjsRegexp, `import $2 from '$3'`)
-            }
-            return code
-          },
-        }
       ],
     },
   },
 })
-