合并打包的页面文件

build-config/main/webpack.config.base.js

@@ -6,7 +6,7 @@ module.exports = {
   output: {
     filename: '[name].js',
     libraryTarget: 'commonjs2',
-    path: path.join(__dirname, '../../dist/electron'),
+    path: path.join(__dirname, '../../dist'),
   },
   resolve: {
     alias: {

build-config/main/webpack.config.prod.js

@@ -26,11 +26,11 @@ module.exports = merge(baseConfig, {
       patterns: [
         {
           from: path.join(__dirname, '../../src/main/modules/userApi/renderer'),
-          to: path.join(__dirname, '../../dist/electron/userApi/renderer'),
+          to: path.join(__dirname, '../../dist/userApi/renderer'),
         },
         {
           from: path.join(__dirname, '../../src/main/modules/userApi/rendererEvent/name.js'),
-          to: path.join(__dirname, '../../dist/electron/userApi/rendererEvent/name.js'),
+          to: path.join(__dirname, '../../dist/userApi/rendererEvent/name.js'),
         },
       ],
     }),

build-config/pack.js

@@ -14,7 +14,7 @@ const okayLog = chalk.bgGreen.white(' OKAY ') + ' '
 
 
 function build() {
-  del.sync(['dist/electron/**', 'build/**'])
+  del.sync(['dist/**', 'build/**'])
 
   const spinners = new Spinnies({ color: 'blue' })
   spinners.add('main', { text: 'main building' })

build-config/renderer-lyric/webpack.config.base.js

@@ -17,7 +17,7 @@ module.exports = {
   output: {
     filename: '[name].js',
     libraryTarget: 'commonjs2',
-    path: path.join(__dirname, '../../dist/electron'),
+    path: path.join(__dirname, '../../dist'),
     publicPath: 'auto',
   },
   resolve: {

build-config/renderer-lyric/webpack.config.prod.js

@@ -1,8 +1,7 @@
-const path = require('path')
+// const path = require('path')
 const webpack = require('webpack')
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
 const { merge } = require('webpack-merge')
 
 const baseConfig = require('./webpack.config.base')
@@ -20,14 +19,6 @@ module.exports = merge(baseConfig, {
     ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d)),
   ],
   plugins: [
-    new CopyWebpackPlugin({
-      patterns: [
-        {
-          from: path.join(__dirname, '../../src/static'),
-          to: path.join(__dirname, '../../dist/electron/static'),
-        },
-      ],
-    }),
     new webpack.DefinePlugin({
       'process.env': {
         NODE_ENV: '"production"',

build-config/renderer/webpack.config.base.js

@@ -17,7 +17,7 @@ module.exports = {
   output: {
     filename: '[name].js',
     libraryTarget: 'commonjs2',
-    path: path.join(__dirname, '../../dist/electron'),
+    path: path.join(__dirname, '../../dist'),
     publicPath: 'auto',
   },
   resolve: {

build-config/renderer/webpack.config.prod.js

@@ -23,7 +23,7 @@ module.exports = merge(baseConfig, {
       patterns: [
         {
           from: path.join(__dirname, '../../src/static'),
-          to: path.join(__dirname, '../../dist/electron/static'),
+          to: path.join(__dirname, '../../dist/static'),
         },
       ],
     }),

build-config/runner-dev.js

@@ -151,7 +151,7 @@ function startElectron() {
   let args = [
     '--inspect=5858',
     // 'NODE_ENV=development',
-    path.join(__dirname, '../dist/electron/main.js'),
+    path.join(__dirname, '../dist/main.js'),
   ]
 
   // detect yarn or npm and process commandline args accordingly

package.json

@@ -2,7 +2,7 @@
   "name": "lx-music-desktop",
   "version": "1.20.1-beta",
   "description": "一个免费的音乐查找助手",
-  "main": "./dist/electron/main.js",
+  "main": "./dist/main.js",
   "productName": "lx-music-desktop",
   "scripts": {
     "pack": "node build-config/pack.js && npm run pack:win:setup:x64",
@@ -57,7 +57,7 @@
     "publish:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm --x64 -p onTagOrDraft",
     "publish:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64 -p onTagOrDraft",
     "dev": "node build-config/runner-dev.js",
-    "clean:electron": "rimraf dist/electron",
+    "clean:electron": "rimraf dist",
     "clean": "rimraf dist && rimraf build",
     "build:src": "node build-config/pack.js",
     "build:main": "cross-env NODE_ENV=production webpack --config build-config/main/webpack.config.prod.js --progress",
@@ -89,7 +89,7 @@
       "output": "./build"
     },
     "files": [
-      "dist/electron/**/*"
+      "dist/**/*"
     ],
     "asar": {
       "smartUnpack": false

src/renderer/route/index.js

@@ -10,7 +10,7 @@ function route(path, view, name, meta, props) {
     path,
     meta,
     props,
-    component: (resovle) => import(`../views/${view}.vue`).then(resovle),
+    component: require(`../views/${view}.vue`).default,
   }
 }