From ebd6ff36ed6bee947d8d0afa487c26bc1db23088 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 11 May 2022 15:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=89=93=E5=8C=85=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-config/main/webpack.config.base.js | 2 +- build-config/main/webpack.config.prod.js | 4 ++-- build-config/pack.js | 2 +- build-config/renderer-lyric/webpack.config.base.js | 2 +- build-config/renderer-lyric/webpack.config.prod.js | 11 +---------- build-config/renderer/webpack.config.base.js | 2 +- build-config/renderer/webpack.config.prod.js | 2 +- build-config/runner-dev.js | 2 +- package.json | 6 +++--- src/renderer/route/index.js | 2 +- 10 files changed, 13 insertions(+), 22 deletions(-) diff --git a/build-config/main/webpack.config.base.js b/build-config/main/webpack.config.base.js index 7a9c8d31..1bcfb819 100644 --- a/build-config/main/webpack.config.base.js +++ b/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: { diff --git a/build-config/main/webpack.config.prod.js b/build-config/main/webpack.config.prod.js index 641dd317..e2b8472e 100644 --- a/build-config/main/webpack.config.prod.js +++ b/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'), }, ], }), diff --git a/build-config/pack.js b/build-config/pack.js index c956c3d1..2c97a3a7 100644 --- a/build-config/pack.js +++ b/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' }) diff --git a/build-config/renderer-lyric/webpack.config.base.js b/build-config/renderer-lyric/webpack.config.base.js index 5584ba71..a4f0cca7 100644 --- a/build-config/renderer-lyric/webpack.config.base.js +++ b/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: { diff --git a/build-config/renderer-lyric/webpack.config.prod.js b/build-config/renderer-lyric/webpack.config.prod.js index 9b628a42..4805d798 100644 --- a/build-config/renderer-lyric/webpack.config.prod.js +++ b/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"', diff --git a/build-config/renderer/webpack.config.base.js b/build-config/renderer/webpack.config.base.js index b7e4c300..827fa8b5 100644 --- a/build-config/renderer/webpack.config.base.js +++ b/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: { diff --git a/build-config/renderer/webpack.config.prod.js b/build-config/renderer/webpack.config.prod.js index 8607d5ec..167eb208 100644 --- a/build-config/renderer/webpack.config.prod.js +++ b/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'), }, ], }), diff --git a/build-config/runner-dev.js b/build-config/runner-dev.js index 45162c0d..69d820ff 100644 --- a/build-config/runner-dev.js +++ b/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 diff --git a/package.json b/package.json index 850f8470..0cc2dbdc 100644 --- a/package.json +++ b/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 diff --git a/src/renderer/route/index.js b/src/renderer/route/index.js index 0c452bb4..7cb5c956 100644 --- a/src/renderer/route/index.js +++ b/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, } }