From d84a6cffd93f3f56db88ff56f456cd747aa91d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AF=97=E4=BA=BA=E7=9A=84=E5=92=B8=E9=B1=BC?= Date: Sun, 9 Jul 2017 03:25:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Aconfig.ignore=20fix=EF=BC=9A?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BB=A3=E7=A0=81=E5=8E=8B=E7=BC=A9=20=20=20?= =?UTF-8?q?pack:renderer=20-p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/package.json | 3 ++- app/src/main/index.dev.js | 17 +++++++++-------- app/src/renderer/main.js | 14 +++++++------- config.js | 2 +- package.json | 12 ++++++------ webpack.main.config.js | 3 +-- webpack.renderer.config.js | 25 +++++++++++++------------ 7 files changed, 39 insertions(+), 37 deletions(-) diff --git a/app/package.json b/app/package.json index a420b58..478c210 100644 --- a/app/package.json +++ b/app/package.json @@ -7,7 +7,8 @@ "axios": "^0.16.1", "iview": "^2.0.0-rc.18", "moment": "^2.18.1", - "qiniu": "^6.1.13", + "qiniu": "^7.0.4", + "qs": "^6.4.0", "vue": "^2.2.6", "vue-electron": "^1.0.6", "vue-router": "^2.1.2", diff --git a/app/src/main/index.dev.js b/app/src/main/index.dev.js index 5947d90..612c201 100644 --- a/app/src/main/index.dev.js +++ b/app/src/main/index.dev.js @@ -12,20 +12,21 @@ process.env.NODE_ENV = 'development' process.env.BABEL_ENV = 'main' require('babel-register')({ - ignore: /node_modules/ + ignore: /node_modules/ }) // Install `electron-debug` with `devtron` -require('electron-debug')({ showDevTools: true }) +require('electron-debug')({showDevTools: true}) // Install `vue-devtools` require('electron').app.on('ready', () => { - let installExtension = require('electron-devtools-installer') - installExtension.default(installExtension.VUEJS_DEVTOOLS) - .then(() => {}) - .catch(err => { - console.log('Unable to install `vue-devtools`: \n', err) - }) + let installExtension = require('electron-devtools-installer') + installExtension.default(installExtension.VUEJS_DEVTOOLS) + .then(() => { + }) + .catch(err => { + console.log('Unable to install `vue-devtools`: \n', err) + }) }) // Require `main` process to boot app diff --git a/app/src/renderer/main.js b/app/src/renderer/main.js index a244543..702d391 100644 --- a/app/src/renderer/main.js +++ b/app/src/renderer/main.js @@ -9,19 +9,19 @@ import store from './vuex/store' import iView from 'iview'; import 'iview/dist/styles/iview.css'; -Vue.use(Electron) -Vue.use(Router) -Vue.use(iView) -Vue.config.debug = false +Vue.use(Electron); +Vue.use(Router); +Vue.use(iView); +Vue.config.debug = false; const router = new Router({ scrollBehavior: () => ({y: 0}), routes -}) +}); //拦截器 -import axios from 'axios' +import axios from 'axios'; axios.interceptors.response.use((response) => { return response; }, (error) => { @@ -35,4 +35,4 @@ new Vue({ router, store, ...App -}).$mount('#app') +}).$mount('#app'); diff --git a/config.js b/config.js index 4cd4beb..77f2c33 100644 --- a/config.js +++ b/config.js @@ -17,7 +17,7 @@ let config = { asar: false, dir: path.join(__dirname, 'app'), icon: path.join(__dirname, 'app/icons/icon'), - ignore: /\b(src|index\.ejs|icons)\b/, + ignore: /(^\/(src|test|\.[a-z]+|README|yarn|static|dist\/web))|\.gitkeep/, out: path.join(__dirname, 'builds'), overwrite: true, platform: process.env.PLATFORM_TARGET || 'all' diff --git a/package.json b/package.json index d97d5ba..141b5cd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "qiniu-Client", - "version": "0.0.2", + "version": "0.0.3", "description": "An electron-vue project", "scripts": { "build:clean": "cross-env PLATFORM_TARGET=clean node tasks/release.js", @@ -10,7 +10,7 @@ "dev": "node tasks/runner.js", "pack": "npm run pack:main && npm run pack:renderer", "pack:main": "cross-env NODE_ENV=production webpack -p --progress --colors --config webpack.main.config.js", - "pack:renderer": "cross-env NODE_ENV=production webpack -p --progress --colors --config webpack.renderer.config.js", + "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config webpack.renderer.config.js", "postinstall": "cd app && npm install", "build": "node tasks/release.js" }, @@ -19,7 +19,7 @@ "build:mas": "cross-env PLATFORM_TARGET=mas node tasks/release.js", "build:win32": "cross-env PLATFORM_TARGET=win32 node tasks/release.js" }, - "author": "Greg Holguin ", + "author": "诗人的咸鱼 ", "license": "MIT", "devDependencies": { "babel-core": "^6.8.0", @@ -29,6 +29,7 @@ "babel-preset-stage-0": "^6.5.0", "babel-register": "^6.18.0", "babel-runtime": "^6.6.1", + "babili-webpack-plugin": "^0.1.2", "copy-webpack-plugin": "^4.0.1", "cross-env": "^3.1.4", "css-loader": "^0.26.1", @@ -44,7 +45,7 @@ "html-webpack-plugin": "^2.16.1", "json-loader": "^0.5.4", "node-sass": "^4.5.2", - "qs": "^6.4.0", + "prepack-webpack-plugin": "^1.0.1", "sass-loader": "^6.0.3", "style-loader": "^0.13.1", "tree-kill": "^1.1.0", @@ -59,7 +60,6 @@ }, "dependencies": { "electron-json-storage": "^3.0.4", - "node-notifier": "^5.1.2", - "prepack-webpack-plugin": "^1.0.1" + "node-notifier": "^5.1.2" } } diff --git a/webpack.main.config.js b/webpack.main.config.js index e71b942..e3b765d 100644 --- a/webpack.main.config.js +++ b/webpack.main.config.js @@ -11,9 +11,8 @@ const CopyWebpackPlugin = require('copy-webpack-plugin') let mainConfig = { entry: { main: path.join(__dirname, 'app/src/main/index.js') - }, - externals: Object.keys(pkg.dependencies || {}), + //externals: Object.keys(pkg.dependencies || {}), module: { rules: [ { diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js index 131bc2c..9b1fa3d 100644 --- a/webpack.renderer.config.js +++ b/webpack.renderer.config.js @@ -7,6 +7,7 @@ const pkg = require('./app/package.json') const settings = require('./config.js') const webpack = require('webpack') +const BabiliWebpackPlugin = require('babili-webpack-plugin') const ExtractTextPlugin = require('extract-text-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin') @@ -49,6 +50,7 @@ let rendererConfig = { use: { loader: 'vue-loader', options: { + extractCSS: process.env.NODE_ENV === 'production', loaders: { sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1', scss: 'vue-style-loader!css-loader!sass-loader' @@ -95,10 +97,6 @@ let rendererConfig = { }, externals: Object.keys(pkg.dependencies || {}).filter(d => !['vue', 'iview'].includes(d)), resolve: { - modules: [ - path.join(__dirname, 'app/node_modules'), - path.join(__dirname, 'node_modules') - ], alias: { 'vue$': path.join(__dirname, 'app/node_modules/vue/dist/vue.esm.js'), 'components': path.join(__dirname, 'app/src/renderer/components'), @@ -113,21 +111,24 @@ let rendererConfig = { * Adjust rendererConfig for production settings */ if (process.env.NODE_ENV === 'production') { - // rendererConfig.devtool = '' + rendererConfig.devtool = '' rendererConfig.plugins.push( + new BabiliWebpackPlugin({ + removeConsole: true, + removeDebugger: true + }), new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' }), new webpack.LoaderOptionsPlugin({ minimize: true - }) - /*, - new webpack.optimize.UglifyJsPlugin({ - compress: { - warnings: false - } - })*/ + })/*, + new webpack.optimize.UglifyJsPlugin({ + compress: { + warnings: false + } + })*/ ) }