refactor[core]: use webpack-dev-server now (#355)

* bump deps: update vue-splitpane version

* refactor[chore]: use webpack-dev-serve build

* perf:settings

* doc: uodate readme

.babelrc

@@ -1,10 +1,12 @@
 {
   "presets": [
     ["env", {
-      "modules": false
+      "modules": false,
+      "targets": {
+        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+      }
     }],
     "stage-2"
   ],
-  "plugins": ["transform-runtime"],
+  "plugins": ["transform-vue-jsx", "transform-runtime"]
-  "comments": false
 }

.eslintrc.js

@@ -26,25 +26,49 @@ module.exports = {
   //it is base on https://github.com/vuejs/eslint-config-vue
   'rules': {
     'accessor-pairs': 2,
-        'arrow-spacing': [2, { 'before': true, 'after': true }],
+    'arrow-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
     'block-spacing': [2, 'always'],
-        'brace-style': [2, '1tbs', { 'allowSingleLine': true }],
+    'brace-style': [2, '1tbs', {
-        'camelcase': [0, { 'properties': 'always' }],
+      'allowSingleLine': true
+    }],
+    'camelcase': [0, {
+      'properties': 'always'
+    }],
     'comma-dangle': [2, 'never'],
-        'comma-spacing': [2, { 'before': false, 'after': true }],
+    'comma-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
     'comma-style': [2, 'last'],
     'constructor-super': 2,
     'curly': [2, 'multi-line'],
     'dot-location': [2, 'property'],
     'eol-last': 2,
     'eqeqeq': [2, 'allow-null'],
-        'generator-star-spacing': [2, { 'before': true, 'after': true }],
+    'generator-star-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
     'handle-callback-err': [2, '^(err|error)$'],
-        'indent': [2, 2, { 'SwitchCase': 1 }],
+    'indent': [2, 2, {
+      'SwitchCase': 1
+    }],
     'jsx-quotes': [2, 'prefer-single'],
-        'key-spacing': [2, { 'beforeColon': false, 'afterColon': true }],
+    'key-spacing': [2, {
-        'keyword-spacing': [2, { 'before': true, 'after': true }],
+      'beforeColon': false,
-        'new-cap': [2, { 'newIsCap': true, 'capIsNew': false }],
+      'afterColon': true
+    }],
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'new-cap': [2, {
+      'newIsCap': true,
+      'capIsNew': false
+    }],
     'new-parens': 2,
     'no-array-constructor': 2,
     'no-caller': 2,
@@ -75,12 +99,17 @@ module.exports = {
     'no-irregular-whitespace': 2,
     'no-iterator': 2,
     'no-label-var': 2,
-        'no-labels': [2, { 'allowLoop': false, 'allowSwitch': false }],
+    'no-labels': [2, {
+      'allowLoop': false,
+      'allowSwitch': false
+    }],
     'no-lone-blocks': 2,
     'no-mixed-spaces-and-tabs': 2,
     'no-multi-spaces': 2,
     'no-multi-str': 2,
-        'no-multiple-empty-lines': [2, { 'max': 1 }],
+    'no-multiple-empty-lines': [2, {
+      'max': 1
+    }],
     'no-native-reassign': 2,
     'no-negated-in-lhs': 2,
     'no-new-object': 2,
@@ -108,28 +137,51 @@ module.exports = {
     'no-undef-init': 2,
     'no-unexpected-multiline': 2,
     'no-unmodified-loop-condition': 2,
-        'no-unneeded-ternary': [2, { 'defaultAssignment': false }],
+    'no-unneeded-ternary': [2, {
+      'defaultAssignment': false
+    }],
     'no-unreachable': 2,
     'no-unsafe-finally': 2,
-        'no-unused-vars': [2, { 'vars': 'all', 'args': 'none' }],
+    'no-unused-vars': [2, {
+      'vars': 'all',
+      'args': 'none'
+    }],
     'no-useless-call': 2,
     'no-useless-computed-key': 2,
     'no-useless-constructor': 2,
     'no-useless-escape': 0,
     'no-whitespace-before-property': 2,
     'no-with': 2,
-        'one-var': [2, { 'initialized': 'never' }],
+    'one-var': [2, {
-        'operator-linebreak': [2, 'after', { 'overrides': { '?': 'before', ':': 'before' } }],
+      'initialized': 'never'
+    }],
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
+      }
+    }],
     'padded-blocks': [2, 'never'],
-        'quotes': [2, 'single', { 'avoidEscape': true, 'allowTemplateLiterals': true }],
+    'quotes': [2, 'single', {
+      'avoidEscape': true,
+      'allowTemplateLiterals': true
+    }],
     'semi': [2, 'never'],
-        'semi-spacing': [2, { 'before': false, 'after': true }],
+    'semi-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
     'space-before-blocks': [2, 'always'],
     'space-before-function-paren': [2, 'never'],
     'space-in-parens': [2, 'never'],
     'space-infix-ops': 2,
-        'space-unary-ops': [2, { 'words': true, 'nonwords': false }],
+    'space-unary-ops': [2, {
-        'spaced-comment': [2, 'always', { 'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] }],
+      'words': true,
+      'nonwords': false
+    }],
+    'spaced-comment': [2, 'always', {
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+    }],
     'template-curly-spacing': [2, 'never'],
     'use-isnan': 2,
     'valid-typeof': 2,
@@ -138,7 +190,10 @@ module.exports = {
     'yoda': [2, 'never'],
     'prefer-const': 2,
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-        'object-curly-spacing': [2, 'always', { objectsInObjects: false }],
+    'object-curly-spacing': [2, 'always', {
+      objectsInObjects: false
+    }],
     'array-bracket-spacing': [2, 'never']
   }
 }
+

.gitignore

@@ -2,9 +2,20 @@
 node_modules/
 dist/
 gifs/
-npm-debug.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
 test/unit/coverage
 test/e2e/reports
 selenium-debug.log
+
+# Editor directories and files
 .idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+
 package-lock.json

.postcssrc.js

@@ -3,6 +3,7 @@
 module.exports = {
   "plugins": {
     // to edit target browsers: use "browserslist" field in package.json
+    "postcss-import": {},
     "autoprefixer": {}
   }
 }

README.md

@@ -4,8 +4,8 @@
 
 # vue-element-admin
 
-[![vue](https://img.shields.io/badge/vue-2.5.9-brightgreen.svg)](https://github.com/vuejs/vue)
+[![vue](https://img.shields.io/badge/vue-2.5.10-brightgreen.svg)](https://github.com/vuejs/vue)
-[![element-ui](https://img.shields.io/badge/element--ui-2.0.7-brightgreen.svg)](https://github.com/ElemeFE/element)
+[![element-ui](https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg)](https://github.com/ElemeFE/element)
 [![Build Status](https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master)](https://travis-ci.org/PanJiaChen/vue-element-admin)
 [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg)]()
@@ -26,10 +26,7 @@
  - 模板建议使用: [vueAdmin-template](https://github.com/PanJiaChen/vueAdmin-template)  
  - 桌面端: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 
-
+**注意：该项目使用 element-ui@2.0.0+ 版本，所以最低兼容 vue@2.5.0**
-**注意：该项目目前使用element-ui@2.0.0+版本，所以最低兼容 Vue 2.5.0**
-
-楼主这里有一份调查[问卷](https://www.wjx.cn/m/16866569.aspx) 有空请填写一下，以表对本项目的支持~ps:不是给这个调查问卷网站做广告，所以填完问卷不用点上面抽奖有的没的那些东西
 
 ## 前序准备
 
@@ -43,9 +40,9 @@
  - [手摸手，带你封装一个 vue component](https://segmentfault.com/a/1190000009090836)
  - [手摸手，带你优雅的使用 icon](https://juejin.im/post/59bb864b5188257e7a427c09)
 
- 相应需求，开了一个qq群 `591724180` 方便大家交流
+ 响应需求，开了一个qq群 `591724180` 方便大家交流
 
- 或者可以加入该 **[圈子](https://jianshiapp.com/circles/1209)** 讨论问题
+ 或者加入该群主 **[圈子](https://jianshiapp.com/circles/1209)** 楼主会经常分享一些技术相关的东西
 
  **如有问题请先看上述使用文档和文章，若不能满足，欢迎 issue 和 pr**
 
@@ -53,6 +50,9 @@
 
  **该项目不支持低版本游览器(如ie)，有需求请自行添加polyfill [详情](https://github.com/PanJiaChen/vue-element-admin/wiki#babel-polyfill)**
 
+ <p align="center">
+  <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
+</p>
 
 ## 功能
 - 登录/注销
@@ -88,8 +88,7 @@
 - Dropzone
 - Sticky
 - CountTo
-- Markdown2html
+- Markdown to html
-
 
 ## 开发
 ```bash
@@ -99,24 +98,36 @@
 	# 安装依赖
 	npm install
 	   
-    //or # 建议不要用cnpm  安装有各种诡异的bug 可以通过如下操作解决npm速度慢的问题
+	# 建议不要用cnpm安装 会有各种诡异的bug 可以通过如下操作解决 npm 下载速度慢的问题
 	npm install --registry=https://registry.npm.taobao.org
 
-    # 本地开发 开启服务
+	# 启动服务
 	npm run dev
 ```
 浏览器访问 http://localhost:9527
 
 ## 发布
 ```bash
-    # 发布测试环境 带webpack ananalyzer
+	# 构建测试环境
-    npm run build:sit-preview
+	npm run build:sit
 
 	# 构建生成环境
 	npm run build:prod
 ```
 
-更多信息请参考 [使用文档](https://panjiachen.github.io/vue-element-admin-site/#/)
+## 其它
+```bash
+	# --report to build with bundle size analytics
+	npm run build:prod --report
+
+	# --preview to start a server in local to preview
+	npm run build:prod --preview
+
+	# lint code
+	npm run lint
+```
+
+更多信息请参考 [使用文档](https://panjiachen.github.io/vue-element-admin-site/#/deploy)
 
 ## 目录结构
 ```shell
@@ -124,26 +135,27 @@
 ├── config                     // 配置相关
 ├── src                        // 源代码
 │   ├── api                    // 所有请求
-│   ├── assets                 // 主题 字体等静态资源
+│   ├── assets                 // 主题 图片等静态资源
 │   ├── components             // 全局公用组件
 │   ├── directive              // 全局指令
 │   ├── filtres                // 全局 filter
-│   ├── icons                  // 项目所有 svg icons
+│   ├── icons                  // 项目svg icons
-│   ├── lang                   // 国际化 language
+│   ├── lang                   // 国际化 lang
 │   ├── mock                   // 项目mock 模拟数据
 │   ├── router                 // 路由
-│   ├── store                  // 全局 store管理
+│   ├── store                  // 全局 store
 │   ├── styles                 // 全局样式
 │   ├── utils                  // 全局公用方法
 │   ├── vendor                 // 公用vendor
-│   ├── views                   // view
+│   ├── views                  // views
 │   ├── App.vue                // 入口页面
-│   ├── main.js                // 入口 加载组件 初始化等
+│   ├── main.js                // 入口js 初始化 加载组件等
 │   └── permission.js          // 权限管理
 ├── static                     // 第三方不打包资源
 │   └── Tinymce                // 富文本
 ├── .babelrc                   // babel-loader 配置
-├── eslintrc.js                // eslint 配置项
+├── .eslintrc.js               // eslint 配置项
+├── .postcssrc.js              // postcss 配置项
 ├── .gitignore                 // git 忽略项
 ├── favicon.ico                // favicon图标
 ├── index.html                 // html模板
@@ -154,8 +166,8 @@
 ## Changelog
 Detailed changes for each release are documented in the [release notes](https://github.com/PanJiaChen/vue-element-admin/releases).
 
-## [查看更多demo](http://panjiachen.github.io/vue-element-admin)
+## Online Demo
-![](https://wpimg.wallstcn.com/1bc334a6-32a8-4f29-a037-ac3f5ce32588.png)
+[查看更多demo](http://panjiachen.github.io/vue-element-admin)
 
 ## Donate
 If you find this project useful, you can buy me a cup of coffee

build/build.js

@@ -1,21 +1,21 @@
-require('./check-versions')();
+'use strict'
-var server = require('pushstate-server');
+require('./check-versions')()
-var opn = require('opn')
-var ora = require('ora')
-var rm = require('rimraf')
-var path = require('path')
-var chalk = require('chalk')
-var webpack = require('webpack');
-var config = require('../config');
-var webpackConfig = require('./webpack.prod.conf');
 
-var spinner = ora('building for ' + process.env.NODE_ENV + ' of ' + process.env.env_config+ ' mode...' )
+const ora = require('ora')
+const rm = require('rimraf')
+const path = require('path')
+const chalk = require('chalk')
+const webpack = require('webpack')
+const config = require('../config')
+const webpackConfig = require('./webpack.prod.conf')
+const server = require('pushstate-server')
+
+var spinner = ora('building for '+ process.env.env_config+ ' environment...' )
 spinner.start()
 
-
 rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
   if (err) throw err
-    webpack(webpackConfig, function (err, stats) {
+  webpack(webpackConfig, (err, stats) => {
     spinner.stop()
     if (err) throw err
     process.stdout.write(stats.toString({
@@ -26,14 +26,23 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
       chunkModules: false
     }) + '\n\n')
 
+    if (stats.hasErrors()) {
+      console.log(chalk.red('  Build failed with errors.\n'))
+      process.exit(1)
+    }
+
     console.log(chalk.cyan('  Build complete.\n'))
+    console.log(chalk.yellow(
+      '  Tip: built files are meant to be served over an HTTP server.\n' +
+      '  Opening index.html over file:// won\'t work.\n'
+    ))
     if(process.env.npm_config_preview){
       server.start({
-                port: 9528,
+          port: 9526,
           directory: './dist',
           file: '/index.html'
       });
-            console.log('> Listening at ' +  'http://localhost:9528' + '\n')
+      console.log('> Listening at ' +  'http://localhost:9526' + '\n')
     }
   })
 })

build/check-versions.js

@@ -1,28 +1,35 @@
-var chalk = require('chalk')
+'use strict'
-var semver = require('semver')
+const chalk = require('chalk')
-var packageConfig = require('../package.json')
+const semver = require('semver')
+const packageConfig = require('../package.json')
+const shell = require('shelljs')
 
 function exec (cmd) {
   return require('child_process').execSync(cmd).toString().trim()
 }
 
-var versionRequirements = [
+const versionRequirements = [
   {
     name: 'node',
     currentVersion: semver.clean(process.version),
     versionRequirement: packageConfig.engines.node
-    },
-    {
-        name: 'npm',
-        currentVersion: exec('npm --version'),
-        versionRequirement: packageConfig.engines.npm
   }
 ]
 
+if (shell.which('npm')) {
+  versionRequirements.push({
+    name: 'npm',
+    currentVersion: exec('npm --version'),
+    versionRequirement: packageConfig.engines.npm
+  })
+}
+
 module.exports = function () {
-    var warnings = []
+  const warnings = []
-    for (var i = 0; i < versionRequirements.length; i++) {
+
-        var mod = versionRequirements[i]
+  for (let i = 0; i < versionRequirements.length; i++) {
+    const mod = versionRequirements[i]
+
     if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
       warnings.push(mod.name + ': ' +
         chalk.red(mod.currentVersion) + ' should be ' +
@@ -35,10 +42,12 @@ module.exports = function () {
     console.log('')
     console.log(chalk.yellow('To use this template, you must update following to modules:'))
     console.log()
-        for (var i = 0; i < warnings.length; i++) {
+
-            var warning = warnings[i]
+    for (let i = 0; i < warnings.length; i++) {
+      const warning = warnings[i]
       console.log('  ' + warning)
     }
+
     console.log()
     process.exit(1)
   }

build/dev-client.js

@@ -1,9 +0,0 @@
-/* eslint-disable */
-require('eventsource-polyfill')
-var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
-
-hotClient.subscribe(function (event) {
-  if (event.action === 'reload') {
-    window.location.reload()
-  }
-})

build/dev-server.js

@@ -1,93 +0,0 @@
-require('./check-versions')(); // 检查 Node 和 npm 版本
-
-var config = require('../config');
-if (!process.env.NODE_ENV) {
-    process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
-}
-
-var opn = require('opn')
-var path = require('path');
-var express = require('express');
-var webpack = require('webpack');
-var proxyMiddleware = require('http-proxy-middleware');
-var webpackConfig = require('./webpack.dev.conf');
-
-// default port where dev server listens for incoming traffic
-var port = process.env.PORT || config.dev.port;
-// automatically open browser, if not set will be false
-var autoOpenBrowser = !!config.dev.autoOpenBrowser;
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var proxyTable = config.dev.proxyTable;
-
-var app = express();
-var compiler = webpack(webpackConfig);
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-    publicPath: webpackConfig.output.publicPath,
-    quiet: true
-});
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler, {
-    log: false,
-    heartbeat: 2000
-});
-
-// force page reload when html-webpack-plugin template changes
-// currently disabled until this is resolved:
-// https://github.com/jantimon/html-webpack-plugin/issues/680
-// compiler.plugin('compilation', function (compilation) {
-//   compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-//     hotMiddleware.publish({ action: 'reload' })
-//     cb()
-//   })
-// })
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-    var options = proxyTable[context]
-    if (typeof options === 'string') {
-        options = {target: options}
-    }
-    app.use(proxyMiddleware(options.filter || context, options))
-});
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')());
-
-// serve webpack bundle output
-app.use(devMiddleware);
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware);
-
-// serve pure static assets
-var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory);
-app.use(staticPath, express.static('./static'));
-
-var uri = 'http://localhost:' + port
-
-var _resolve
-var readyPromise = new Promise(resolve => {
-  _resolve = resolve
-})
-
-console.log('> Starting dev server...')
-devMiddleware.waitUntilValid(() => {
-  console.log('> Listening at ' + uri + '\n')
-  // when env is testing, don't need open it
-  if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
-    opn(uri)
-  }
-  _resolve()
-})
-
-var server = app.listen(port)
-
-module.exports = {
-  ready: readyPromise,
-  close: () => {
-    server.close()
-  }
-}

build/utils.js

@@ -1,35 +1,38 @@
-var path = require('path')
+'use strict'
-var config = require('../config')
+const path = require('path')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
+const config = require('../config')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const packageConfig = require('../package.json')
 
 exports.assetsPath = function (_path) {
-  var assetsSubDirectory = process.env.NODE_ENV === 'production'
+  const assetsSubDirectory = process.env.NODE_ENV === 'production'
     ? config.build.assetsSubDirectory
     : config.dev.assetsSubDirectory
+
   return path.posix.join(assetsSubDirectory, _path)
 }
 
 exports.cssLoaders = function (options) {
   options = options || {}
 
-  var cssLoader = {
+  const cssLoader = {
     loader: 'css-loader',
     options: {
-      minimize: process.env.NODE_ENV === 'production',
       sourceMap: options.sourceMap
     }
   }
 
-  var postcssLoader = {
+  const postcssLoader = {
     loader: 'postcss-loader',
     options: {
-      sourceMap: true
+      sourceMap: options.sourceMap
     }
   }
 
   // generate loader string to be used with extract text plugin
   function generateLoaders (loader, loaderOptions) {
-    var loaders = options.usePostCSS !== false ? [cssLoader, postcssLoader] : [cssLoader]
+    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+
     if (loader) {
       loaders.push({
         loader: loader + '-loader',
@@ -65,14 +68,34 @@ exports.cssLoaders = function (options) {
 
 // Generate loaders for standalone style files (outside of .vue)
 exports.styleLoaders = function (options) {
-  var output = []
+  const output = []
-  var loaders = exports.cssLoaders(options)
+  const loaders = exports.cssLoaders(options)
-  for (var extension in loaders) {
+
-    var loader = loaders[extension]
+  for (const extension in loaders) {
+    const loader = loaders[extension]
     output.push({
       test: new RegExp('\\.' + extension + '$'),
       use: loader
     })
   }
+
   return output
 }
+
+exports.createNotifierCallback = () => {
+  const notifier = require('node-notifier')
+
+  return (severity, errors) => {
+    if (severity !== 'error') return
+
+    const error = errors[0]
+    const filename = error.file && error.file.split('!').pop()
+
+    notifier.notify({
+      title: packageConfig.name,
+      message: severity + ': ' + error.name,
+      subtitle: filename || '',
+      icon: path.join(__dirname, 'logo.png')
+    })
+  }
+}

build/vue-loader.conf.js

@@ -1,12 +1,22 @@
-var utils = require('./utils')
+'use strict'
-var config = require('../config')
+const utils = require('./utils')
-var isProduction = process.env.NODE_ENV === 'production'
+const config = require('../config')
+const isProduction = process.env.NODE_ENV === 'production'
+const sourceMapEnabled = isProduction
+  ? config.build.productionSourceMap
+  : config.dev.cssSourceMap
 
 module.exports = {
   loaders: utils.cssLoaders({
-        sourceMap: isProduction
+    sourceMap: sourceMapEnabled,
-            ? config.build.productionSourceMap
-            : config.dev.cssSourceMap,
     extract: isProduction
-    })
+  }),
+  cssSourceMap: sourceMapEnabled,
+  cacheBusting: config.dev.cacheBusting,
+  transformToRequire: {
+    video: ['src', 'poster'],
+    source: 'src',
+    img: 'src',
+    image: 'xlink:href'
+  }
 }

build/webpack.base.conf.js

@@ -1,51 +1,46 @@
-var path = require('path')
+'use strict'
-var utils = require('./utils')
+const path = require('path')
-var config = require('../config')
+const utils = require('./utils')
-var vueLoaderConfig = require('./vue-loader.conf')
+const config = require('../config')
+const vueLoaderConfig = require('./vue-loader.conf')
 
 function resolve (dir) {
   return path.join(__dirname, '..', dir)
 }
 
+const createLintingRule = () => ({
+  test: /\.(js|vue)$/,
+  loader: 'eslint-loader',
+  enforce: 'pre',
+  include: [resolve('src'), resolve('test')],
+  options: {
+    formatter: require('eslint-friendly-formatter'),
+    emitWarning: !config.dev.showEslintErrorsInOverlay
+  }
+})
+
 module.exports = {
+  context: path.resolve(__dirname, '../'),
   entry: {
     app: './src/main.js'
   },
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',
-    publicPath: process.env.NODE_ENV === 'production' ? config.build.assetsPublicPath : config.dev.assetsPublicPath
+    publicPath: process.env.NODE_ENV === 'production'
+      ? config.build.assetsPublicPath
+      : config.dev.assetsPublicPath
   },
   resolve: {
     extensions: ['.js', '.vue', '.json'],
     alias: {
       'vue$': 'vue/dist/vue.esm.js',
       '@': resolve('src'),
-      'src': path.resolve(__dirname, '../src'),
-      'assets': path.resolve(__dirname, '../src/assets'),
-      'components': path.resolve(__dirname, '../src/components'),
-      'views': path.resolve(__dirname, '../src/views'),
-      'styles': path.resolve(__dirname, '../src/styles'),
-      'api': path.resolve(__dirname, '../src/api'),
-      'utils': path.resolve(__dirname, '../src/utils'),
-      'store': path.resolve(__dirname, '../src/store'),
-      'router': path.resolve(__dirname, '../src/router'),
-      'mock': path.resolve(__dirname, '../src/mock'),
-      'vendor': path.resolve(__dirname, '../src/vendor'),
-      'static': path.resolve(__dirname, '../static')
     }
   },
   module: {
     rules: [
-      {
+      ...(config.dev.useEslint ? [createLintingRule()] : []),
-        test: /\.(js|vue)$/,
-        loader: 'eslint-loader',
-        enforce: "pre",
-        include: [resolve('src'), resolve('test')],
-        options: {
-            formatter: require('eslint-friendly-formatter')
-        }
-      },
       {
         test: /\.vue$/,
         loader: 'vue-loader',
@@ -73,6 +68,14 @@ module.exports = {
           name: utils.assetsPath('img/[name].[hash:7].[ext]')
         }
       },
+      {
+        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('media/[name].[hash:7].[ext]')
+        }
+      },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
         loader: 'url-loader',
@@ -83,10 +86,16 @@ module.exports = {
       }
     ]
   },
-  //注入全局mixin
+  node: {
-  // sassResources: path.join(__dirname, '../src/styles/mixin.scss'),
+    // prevent webpack from injecting useless setImmediate polyfill because Vue
-  // sassLoader: {
+    // source contains it (although only uses it if it's native).
-  //     data:  path.join(__dirname, '../src/styles/index.scss')
+    setImmediate: false,
-  // },
+    // prevent webpack from injecting mocks to Node native modules
+    // that does not make sense for the client
+    dgram: 'empty',
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    child_process: 'empty'
+  }
 }
-

build/webpack.dev.conf.js

@@ -1,44 +1,88 @@
-var utils = require('./utils')
+'use strict'
-var path = require('path')
+const path = require('path')
-var webpack = require('webpack')
+const utils = require('./utils')
-var config = require('../config')
+const webpack = require('webpack')
-var merge = require('webpack-merge')
+const config = require('../config')
-var baseWebpackConfig = require('./webpack.base.conf')
+const merge = require('webpack-merge')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
+const baseWebpackConfig = require('./webpack.base.conf')
-var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+const portfinder = require('portfinder')
 
-// add hot-reload related code to entry chunks
+function resolve (dir) {
-Object.keys(baseWebpackConfig.entry).forEach(function (name) {
+  return path.join(__dirname, '..', dir)
-  baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
-})
-
-function resolveApp(relativePath) {
-  return path.resolve(relativePath);
 }
 
-module.exports = merge(baseWebpackConfig, {
+const HOST = process.env.HOST
+const PORT = process.env.PORT && Number(process.env.PORT)
+
+const devWebpackConfig = merge(baseWebpackConfig, {
   module: {
     rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
   },
-  // cheap-source-map is faster for development
+  // cheap-module-eval-source-map is faster for development
-  devtool: '#cheap-source-map',
+  devtool: config.dev.devtool,
-  cache: true,
+
+  // these devServer options should be customized in /config/index.js
+  devServer: {
+    clientLogLevel: 'warning',
+    historyApiFallback: true,
+    hot: true,
+    compress: true,
+    host: HOST || config.dev.host,
+    port: PORT || config.dev.port,
+    open: config.dev.autoOpenBrowser,
+    overlay: config.dev.errorOverlay
+      ? { warnings: false, errors: true }
+      : false,
+    publicPath: config.dev.assetsPublicPath,
+    proxy: config.dev.proxyTable,
+    quiet: true, // necessary for FriendlyErrorsPlugin
+    watchOptions: {
+      poll: config.dev.poll,
+    }
+  },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env': config.dev.env
+      'process.env': require('../config/dev.env')
     }),
-    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
     new webpack.HotModuleReplacementPlugin(),
+    new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
     new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: 'index.html',
-      favicon: resolveApp('favicon.ico'),
       inject: true,
+      favicon: resolve('favicon.ico'),
+      title: 'vue-element-admin',
       path: config.dev.assetsPublicPath + config.dev.assetsSubDirectory
     }),
-    new FriendlyErrorsPlugin()
   ]
 })
 
+module.exports = new Promise((resolve, reject) => {
+  portfinder.basePort = process.env.PORT || config.dev.port
+  portfinder.getPort((err, port) => {
+    if (err) {
+      reject(err)
+    } else {
+      // publish the new Port, necessary for e2e tests
+      process.env.PORT = port
+      // add port to devServer config
+      devWebpackConfig.devServer.port = port
+
+      // Add FriendlyErrorsPlugin
+      devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
+        compilationSuccessInfo: {
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+        },
+        onErrors: config.dev.notifyOnErrors
+        ? utils.createNotifierCallback()
+        : undefined
+      }))
+
+      resolve(devWebpackConfig)
+    }
+  })
+})

build/webpack.prod.conf.js

@@ -1,21 +1,23 @@
-var path = require('path')
+'use strict'
-var utils = require('./utils')
+const path = require('path')
-var webpack = require('webpack')
+const utils = require('./utils')
-var config = require('../config')
+const webpack = require('webpack')
-var merge = require('webpack-merge')
+const config = require('../config')
-var baseWebpackConfig = require('./webpack.base.conf')
+const merge = require('webpack-merge')
-var CopyWebpackPlugin = require('copy-webpack-plugin')
+const baseWebpackConfig = require('./webpack.base.conf')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
-var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 
-var env = config.build[process.env.env_config+'Env']
+function resolve (dir) {
-
+  return path.join(__dirname, '..', dir)
-function resolveApp(relativePath) {
-  return path.resolve(relativePath);
 }
 
-var webpackConfig = merge(baseWebpackConfig, {
+const env = require('../config/'+process.env.env_config+'.env')
+
+const webpackConfig = merge(baseWebpackConfig, {
   module: {
     rules: utils.styleLoaders({
       sourceMap: config.build.productionSourceMap,
@@ -23,64 +25,69 @@ var webpackConfig = merge(baseWebpackConfig, {
       usePostCSS: true
     })
   },
-  devtool: config.build.productionSourceMap ? '#source-map' : false,
+  devtool: config.build.productionSourceMap ? config.build.devtool : false,
   output: {
     path: config.build.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
-    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js'),
+    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
-    publicPath: config.build.assetsPublicPath
   },
   plugins: [
     // http://vuejs.github.io/vue-loader/en/workflow/production.html
     new webpack.DefinePlugin({
       'process.env': env
     }),
-    new webpack.optimize.UglifyJsPlugin({
+    new UglifyJsPlugin({
+      uglifyOptions: {
         compress: {
           warnings: false
+        }
       },
-      sourceMap: true,
+      sourceMap: config.build.productionSourceMap,
       parallel: true
     }),
     // extract css into its own file
     new ExtractTextPlugin({
-      filename: utils.assetsPath('css/[name].[contenthash].css')
+      filename: utils.assetsPath('css/[name].[contenthash].css'),
+      // Setting the following option to `false` will not extract CSS from codesplit chunks.
+      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
+      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
+      allChunks: false,
     }),
     // Compress extracted CSS. We are using this plugin so that possible
     // duplicated CSS from different components can be deduped.
-    new OptimizeCSSPlugin(),
+    new OptimizeCSSPlugin({
+      cssProcessorOptions: config.build.productionSourceMap
+        ? { safe: true, map: { inline: false } }
+        : { safe: true }
+    }),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      filename: 'index.html',
+      filename: config.build.index,
       template: 'index.html',
       inject: true,
-      favicon: resolveApp('favicon.ico'),
+      favicon: resolve('favicon.ico'),
+      title: 'vue-element-admin',
+      path: config.build.assetsPublicPath + config.build.assetsSubDirectory,
       minify: {
         removeComments: true,
         collapseWhitespace: true,
-        removeRedundantAttributes: true,
+        removeAttributeQuotes: true
-        useShortDoctype: true,
+        // more options:
-        removeEmptyAttributes: true,
+        // https://github.com/kangax/html-minifier#options-quick-reference
-        removeStyleLinkTypeAttributes: true,
-        keepClosingSlash: true,
-        minifyJS: true,
-        minifyCSS: true,
-        minifyURLs: true
       },
-      path: config.build.assetsPublicPath + config.build.assetsSubDirectory,
       // necessary to consistently work with multiple chunks via CommonsChunkPlugin
       chunksSortMode: 'dependency'
     }),
-    // cache Module Identifiers
+    // keep module.id stable when vender modules does not change
     new webpack.HashedModuleIdsPlugin(),
     // enable scope hoisting
     new webpack.optimize.ModuleConcatenationPlugin(),
     // split vendor js into its own file
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',
-      minChunks: function (module) {
+      minChunks (module) {
         // any required modules inside node_modules are extracted to vendor
         return (
           module.resource &&
@@ -97,6 +104,15 @@ var webpackConfig = merge(baseWebpackConfig, {
       name: 'manifest',
       minChunks: Infinity
     }),
+    // This instance extracts shared chunks from code splitted chunks and bundles them
+    // in a separate chunk, similar to the vendor chunk
+    // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'app',
+      async: 'vendor-async',
+      children: true,
+      minChunks: 3
+    }),
     // split echarts into its own file
     new webpack.optimize.CommonsChunkPlugin({
       async: 'echarts',
@@ -113,29 +129,47 @@ var webpackConfig = merge(baseWebpackConfig, {
         return context && (context.indexOf('xlsx') >= 0);
       }
     }),
-    // This instance extracts shared chunks from code splitted chunks and bundles them
+     // split codemirror into its own file
-    // in a separate chunk, similar to the vendor chunk
-    // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
      new webpack.optimize.CommonsChunkPlugin({
-      name: 'app',
+      async: 'codemirror',
-      async: 'vendor-async',
+      minChunks(module) {
-      children: true,
+        var context = module.context;
-      minChunks: 3
+        return context && (context.indexOf('codemirror') >= 0);
+      }
     }),
 
     // copy custom static assets
-    new CopyWebpackPlugin([{
+    new CopyWebpackPlugin([
+      {
         from: path.resolve(__dirname, '../static'),
         to: config.build.assetsSubDirectory,
         ignore: ['.*']
-    }])
+      }
+    ])
   ]
 })
 
+if (config.build.productionGzip) {
+  const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+  webpackConfig.plugins.push(
+    new CompressionWebpackPlugin({
+      asset: '[path].gz[query]',
+      algorithm: 'gzip',
+      test: new RegExp(
+        '\\.(' +
+        config.build.productionGzipExtensions.join('|') +
+        ')$'
+      ),
+      threshold: 10240,
+      minRatio: 0.8
+    })
+  )
+}
+
 if (config.build.bundleAnalyzerReport) {
-  var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
   webpackConfig.plugins.push(new BundleAnalyzerPlugin())
 }
 
 module.exports = webpackConfig
-

config/dev.env.js

@@ -1,6 +1,5 @@
 module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
-    BASE_API: '"https://api-dev"',
+	BASE_API: '"https://api-dev"'
-    APP_ORIGIN: '"https://wallstreetcn.com"'
 }

config/index.js

@@ -1,39 +1,83 @@
+'use strict'
+// Template version: 1.2.6
 // see http://vuejs-templates.github.io/webpack for documentation.
-var path = require('path')
+
+const path = require('path')
 
 module.exports = {
+  dev: {
+
+    // Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+    proxyTable: {},
+
+    // Various Dev Server settings
+    host: 'localhost', // can be overwritten by process.env.HOST
+    port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    autoOpenBrowser: true,
+    errorOverlay: true,
+    notifyOnErrors: false,
+    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+
+    // Use Eslint Loader?
+    // If true, your code will be linted during bundling and
+    // linting errors and warnings will be shown in the console.
+    useEslint: true,
+    // If true, eslint errors and warnings will also be shown in the error overlay
+    // in the browser.
+    showEslintErrorsInOverlay: false,
+
+    /**
+     * Source Maps
+     */
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: 'eval-source-map',
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
+
+    // CSS Sourcemaps off by default because relative paths are "buggy"
+    // with this option, according to the CSS-Loader README
+    // (https://github.com/webpack/css-loader#sourcemaps)
+    // In our experience, they generally work as expected,
+    // just be aware of this issue when enabling this option.
+    cssSourceMap: false,
+  },
+
   build: {
-			sitEnv: require('./sit.env'),
+    // Template for index.html
-			prodEnv: require('./prod.env'),
     index: path.resolve(__dirname, '../dist/index.html'),
+
+    // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-			assetsPublicPath: './',          //请根据自己路径配置更改
+
+    // you can set by youself according to actual condition
+    assetsPublicPath: './',
+
+    /**
+     * Source Maps
+     */
+
     productionSourceMap: false,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: '#source-map',
+
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
     productionGzipExtensions: ['js', 'css'],
+
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
     // `npm run build --report`
     // Set to `true` or `false` to always turn it on or off
     bundleAnalyzerReport: process.env.npm_config_report
-    },
-    dev: {
-			env: require('./dev.env'),
-			port: 9527,
-			autoOpenBrowser: true,
-			assetsSubDirectory: 'static',
-			assetsPublicPath: '/',
-			proxyTable: {},
-			// CSS Sourcemaps off by default because relative paths are "buggy"
-			// with this option, according to the CSS-Loader README
-			// (https://github.com/webpack/css-loader#sourcemaps)
-			// In our experience, they generally work as expected,
-			// just be aware of this issue when enabling this option.
-			cssSourceMap: false
   }
 }

config/prod.env.js

@@ -1,6 +1,5 @@
 module.exports = {
 	NODE_ENV: '"production"',
 	ENV_CONFIG: '"prod"',
-    BASE_API: '"https://api-prod"',
+	BASE_API: '"https://api-prod"'
-    APP_ORIGIN: '"https://wallstreetcn.com"'
+}
-};

config/sit.env.js

@@ -1,6 +1,5 @@
 module.exports = {
 	NODE_ENV: '"production"',
 	ENV_CONFIG: '"sit"',
-    BASE_API: '"https://api-sit"',
+	BASE_API: '"https://api-sit"'
-    APP_ORIGIN: '"https://wallstreetcn.com"'
+}
-};

package.json

@@ -1,22 +1,21 @@
 {
   "name": "vue-element-admin",
   "version": "3.3.0",
-  "description": "A Vue.js admin",
+  "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",
   "private": true,
   "scripts": {
-    "dev": "node build/dev-server.js",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
     "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js",
-    "build:sit-preview": "cross-env NODE_ENV=production env_config=sit npm_config_preview=true  npm_config_report=true node build/build.js",
     "lint": "eslint --ext .js,.vue src",
     "test": "npm run lint"
   },
   "dependencies": {
     "axios": "0.17.1",
     "clipboard": "1.7.1",
-    "codemirror": "5.31.0",
+    "codemirror": "5.32.0",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
     "element-ui": "2.0.8",
@@ -24,73 +23,71 @@
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.2",
-    "jszip": "3.1.4",
+    "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "screenfull": "3.3.2",
-    "showdown": "1.8.2",
+    "showdown": "1.8.5",
     "simplemde": "1.11.2",
-    "sortablejs": "1.6.1",
+    "sortablejs": "1.7.0",
     "vue": "2.5.10",
     "vue-count-to": "1.0.13",
     "vue-i18n": "7.3.2",
-    "vue-multiselect": "2.0.6",
+    "vue-multiselect": "2.0.8",
     "vue-router": "3.0.1",
-    "vue-splitpane": "1.0.1",
+    "vue-splitpane": "1.0.2",
     "vuedraggable": "2.15.0",
     "vuex": "3.0.1",
     "xlsx": "^0.11.7"
   },
   "devDependencies": {
-    "autoprefixer": "7.1.6",
+    "autoprefixer": "7.2.3",
     "babel-core": "6.26.0",
-    "babel-eslint": "8.0.2",
+    "babel-eslint": "8.0.3",
+    "babel-helper-vue-jsx-merge-props": "2.0.3",
     "babel-loader": "7.1.2",
+    "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-runtime": "6.23.0",
+    "babel-plugin-transform-vue-jsx": "3.5.0",
     "babel-preset-env": "1.6.1",
     "babel-preset-stage-2": "6.24.1",
-    "babel-register": "6.26.0",
     "chalk": "2.3.0",
-    "connect-history-api-fallback": "1.4.0",
+    "copy-webpack-plugin": "4.3.0",
-    "copy-webpack-plugin": "4.2.0",
     "cross-env": "5.1.1",
     "css-loader": "0.28.7",
-    "eslint": "4.11.0",
+    "eslint": "4.13.1",
     "eslint-friendly-formatter": "3.0.0",
-    "eslint-import-resolver-webpack": "0.8.3",
     "eslint-loader": "1.9.0",
-    "eslint-plugin-html": "3.2.2",
+    "eslint-plugin-html": "4.0.1",
-    "eslint-plugin-import": "2.8.0",
     "eventsource-polyfill": "0.9.6",
-    "express": "4.16.2",
     "extract-text-webpack-plugin": "3.0.2",
-    "file-loader": "0.11.2",
+    "file-loader": "1.1.5",
     "friendly-errors-webpack-plugin": "1.6.1",
-    "function-bind": "1.1.0",
+    "html-webpack-plugin": "2.30.1",
-    "html-webpack-plugin": "2.30.0",
+    "node-notifier": "5.1.2",
-    "http-proxy-middleware": "0.17.4",
+    "node-sass": "^4.7.2",
-    "node-sass": "^4.5.0",
-    "opn": "4.0.2",
     "optimize-css-assets-webpack-plugin": "3.2.0",
-    "ora": "1.1.0",
+    "ora": "1.3.0",
-    "postcss-loader": "^2.0.8",
+    "portfinder": "1.0.13",
-    "pushstate-server": "2.1.0",
+    "postcss-import": "11.0.0",
-    "rimraf": "2.6.0",
+    "postcss-loader": "2.0.9",
+    "pushstate-server": "3.0.1",
+    "rimraf": "2.6.2",
     "sass-loader": "6.0.6",
     "script-loader": "0.7.2",
-    "semver": "5.3.0",
+    "semver": "5.4.1",
-    "style-loader": "0.19.0",
+    "shelljs": "0.7.8",
-    "svg-sprite-loader": "3.4.1",
+    "svg-sprite-loader": "3.5.2",
+    "uglifyjs-webpack-plugin": "1.1.3",
     "url-loader": "0.6.2",
     "vue-loader": "13.5.0",
     "vue-style-loader": "3.0.3",
     "vue-template-compiler": "2.5.10",
     "webpack": "3.10.0",
     "webpack-bundle-analyzer": "2.9.1",
-    "webpack-dev-middleware": "1.12.0",
+    "webpack-dev-server": "2.9.7",
-    "webpack-hot-middleware": "2.20.0",
+    "webpack-merge": "4.1.1"
-    "webpack-merge": "4.1.0"
   },
   "engines": {
     "node": ">= 4.0.0",

src/App.vue

@@ -9,8 +9,3 @@
     name: 'APP'
   }
 </script>
-
-<style lang="scss">
-@import '~normalize.css/normalize.css'; // normalize.css 样式格式化
-@import './styles/index.scss'; // 全局自定义样式
-</style>

src/components/ImageCropper/index.vue

@@ -105,7 +105,7 @@
 <script>
     /* eslint-disable */
     import {effectRipple, data2blob} from './utils';
-    import request from 'utils/request';
+    import request from '@/utils/request';
     import langBag from './lang';
     const mimes = {
         'jpg': 'image/jpeg',

src/main.js

@@ -1,15 +1,23 @@
 import Vue from 'vue'
+
+import 'normalize.css/normalize.css'// A modern alternative to CSS resets
+
 import Element from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
-import i18n from './lang' // 国际化
+
+import '@/styles/index.scss' // global css
+
 import App from './App'
 import router from './router'
 import store from './store'
-import * as filters from './filters' // 全局filter
+
+import i18n from './lang' // Internationalization
 import './icons' // icon
 import './errorLog'// error log
-import './permission' // 权限
+import './permission' // permission control
-import './mock' // 该项目所有请求使用mockjs模拟
+import './mock' // simulation data generator
+
+import * as filters from './filters' // global filter
 
 Vue.use(Element, {
   i18n: (key, value) => i18n.t(key, value)

src/vendor/Export2Excel.js

@@ -1,6 +1,6 @@
 /* eslint-disable */
 require('script-loader!file-saver');
-require('script-loader!vendor/Blob');
+require('script-loader!@/vendor/Blob');
 import XLSX from 'xlsx'
 
 function generateArray(table) {

src/views/example/table/complexTable.vue

@@ -331,7 +331,7 @@ export default {
     },
     handleDownload() {
       require.ensure([], () => {
-        const { export_json_to_excel } = require('vendor/Export2Excel')
+        const { export_json_to_excel } = require('@/vendor/Export2Excel')
         const tHeader = ['时间', '地区', '类型', '标题', '重要性']
         const filterVal = ['timestamp', 'province', 'type', 'title', 'importance']
         const data = this.formatJson(filterVal, this.list)

src/views/excel/exportExcel.vue

@@ -35,7 +35,7 @@
 
 <script>
 import { fetchList } from '@/api/article'
-import { parseTime } from 'utils'
+import { parseTime } from '@/utils'
 
 export default {
   name: 'exportExcel',
@@ -61,7 +61,7 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       require.ensure([], () => {
-        const { export_json_to_excel } = require('vendor/Export2Excel')
+        const { export_json_to_excel } = require('@/vendor/Export2Excel')
         const tHeader = ['序号', '文章标题', '作者', '阅读数', '发布时间']
         const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
         const list = this.list

src/views/excel/selectExcel.vue

@@ -67,7 +67,7 @@ export default {
       if (this.multipleSelection.length) {
         this.downloadLoading = true
         require.ensure([], () => {
-          const { export_json_to_excel } = require('vendor/Export2Excel')
+          const { export_json_to_excel } = require('@/vendor/Export2Excel')
           const tHeader = ['序号', '文章标题', '作者', '阅读数', '发布时间']
           const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
           const list = this.multipleSelection

src/views/excel/uploadExcel.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import UploadExcelComponent from 'components/UploadExcel/index.vue'
+import UploadExcelComponent from '@/components/UploadExcel/index.vue'
 
 export default {
   name: 'uploadExcel',

src/views/layout/Layout.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { Navbar, Sidebar, AppMain, TagsView } from 'views/layout/components'
+import { Navbar, Sidebar, AppMain, TagsView } from './components'
 
 export default {
   name: 'layout',

src/views/zip/index.vue

@@ -60,7 +60,7 @@ export default {
     handleDownload() {
       this.downloadLoading = true
       require.ensure([], () => {
-        const { export_txt_to_zip } = require('vendor/Export2Zip')
+        const { export_txt_to_zip } = require('@/vendor/Export2Zip')
         const tHeader = ['序号', '文章标题', '作者', '阅读数', '发布时间']
         const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
         const list = this.list