diff --git a/.babelrc b/.babelrc index b4050098993dc62a14bcc6fd0cbd54f3aaadce13..7876549a10c6f4e157b888ecda6b065d5928c803 100644 --- a/.babelrc +++ b/.babelrc @@ -1,6 +1,11 @@ { "presets": [ - ["env", { "modules": false }], + ["env", { + "modules": false, + "targets": { + "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] + } + }], "stage-2" ], "plugins": ["transform-runtime"], diff --git a/build/dev-server.js b/build/dev-server.js index 254a3bb103847dc7ec01fa9b5c58d20365c715ad..e167ee7eb1d2ce89f6acaf4a48d293db7e1979f0 100644 --- a/build/dev-server.js +++ b/build/dev-server.js @@ -34,12 +34,14 @@ var hotMiddleware = require('webpack-hot-middleware')(compiler, { }); // force page reload when html-webpack-plugin template changes -compiler.plugin('compilation', function (compilation) { - compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) { - hotMiddleware.publish({action: 'reload'}); - cb() - }) -}); +// 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) { diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index cf50e0c95cbfe58b450e5ea395a99c4a4cbd985b..5a2b0b2d1b1f3d9bc01f1b0725c77e366e7a59af 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -30,6 +30,7 @@ var webpackConfig = merge(baseWebpackConfig, { publicPath: config.build.assetsPublicPath }, plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), // http://vuejs.github.io/vue-loader/en/workflow/production.html new webpack.DefinePlugin({ 'process.env': env @@ -38,7 +39,8 @@ var webpackConfig = merge(baseWebpackConfig, { compress: { warnings: false }, - sourceMap: true + sourceMap: true, + parallel: true }), // extract css into its own file new ExtractTextPlugin({ diff --git a/package.json b/package.json index ef2084418ad5a7cc7b932b846b97da2b564c03cd..43cfed4f614ab62c63bc74aa3725b94000721ad9 100644 --- a/package.json +++ b/package.json @@ -13,80 +13,80 @@ "lint": "eslint --ext .js,.vue src" }, "dependencies": { - "axios": "0.16.2", + "axios": "0.17.0", "clipboard": "1.7.1", - "codemirror": "5.26.0", - "dropzone": "5.1.0", + "codemirror": "5.31.0", + "dropzone": "5.2.0", "echarts": "3.7.2", "element-ui": "1.4.2", "file-saver": "1.3.3", - "font-awesome": "^4.7.0", - "js-cookie": "2.1.4", + "font-awesome": "4.7.0", + "js-cookie": "2.2.0", "jsonlint": "1.6.2", - "jszip": "^3.1.4", + "jszip": "3.1.4", "mockjs": "1.0.1-beta3", "normalize.css": "7.0.0", "nprogress": "0.2.0", - "screenfull": "3.2.2", - "showdown": "1.7.1", + "screenfull": "3.3.2", + "showdown": "1.8.0", "simplemde": "1.11.2", - "sortablejs": "1.5.1", + "sortablejs": "1.6.1", "vue": "2.4.2", "vue-count-to": "1.0.5", - "vue-multiselect": "2.0.2", + "vue-multiselect": "2.0.6", "vue-router": "2.7.0", - "vue-splitpane": "^1.0.0", + "vue-splitpane": "1.0.0", "vuedraggable": "2.14.1", "vuex": "2.3.1", - "xlsx": "^0.10.8" + "xlsx": "^0.11.7" }, "devDependencies": { - "autoprefixer": "7.1.1", - "babel-core": "6.25.0", - "babel-eslint": "7.2.3", - "babel-loader": "7.0.0", + "autoprefixer": "7.1.6", + "babel-core": "6.26.0", + "babel-eslint": "8.0.1", + "babel-loader": "7.1.2", "babel-plugin-transform-runtime": "6.23.0", - "babel-preset-env": "1.5.2", + "babel-preset-env": "1.6.1", "babel-preset-stage-2": "6.24.1", - "babel-register": "6.24.1", - "chalk": "1.1.3", - "connect-history-api-fallback": "1.3.0", - "copy-webpack-plugin": "4.0.1", - "cross-env": "5.0.1", - "css-loader": "0.28.4", - "eslint": "3.19.0", + "babel-register": "6.26.0", + "chalk": "2.3.0", + "connect-history-api-fallback": "1.4.0", + "copy-webpack-plugin": "4.2.0", + "cross-env": "5.1.1", + "css-loader": "0.28.7", + "eslint": "4.10.0", "eslint-friendly-formatter": "3.0.0", - "eslint-import-resolver-webpack": "0.8.1", - "eslint-loader": "1.7.1", - "eslint-plugin-html": "3.0.0", - "eslint-plugin-import": "2.3.0", + "eslint-import-resolver-webpack": "0.8.3", + "eslint-loader": "1.9.0", + "eslint-plugin-html": "3.2.2", + "eslint-plugin-import": "2.8.0", "eventsource-polyfill": "0.9.6", - "express": "4.15.3", - "extract-text-webpack-plugin": "2.1.2", + "express": "4.16.2", + "extract-text-webpack-plugin": "3.0.2", "file-loader": "0.11.2", "friendly-errors-webpack-plugin": "1.6.1", "function-bind": "1.1.0", - "html-webpack-plugin": "2.28.0", + "html-webpack-plugin": "2.30.0", "http-proxy-middleware": "0.17.4", "node-sass": "^4.5.0", "opn": "4.0.2", - "optimize-css-assets-webpack-plugin": "1.3.0", + "optimize-css-assets-webpack-plugin": "3.2.0", "ora": "1.1.0", "pushstate-server": "2.1.0", "rimraf": "2.6.0", - "sass-loader": "6.0.5", - "script-loader": "0.7.0", + "sass-loader": "6.0.6", + "script-loader": "0.7.2", "semver": "5.3.0", - "style-loader": "0.17.0", + "style-loader": "0.19.0", "svg-sprite-loader": "3.2.4", - "url-loader": "0.5.8", + "url-loader": "0.6.2", "vue-loader": "13.0.4", - "vue-style-loader": "3.0.1", + "vue-style-loader": "3.0.3", "vue-template-compiler": "2.4.2", - "webpack": "2.6.1", - "webpack-bundle-analyzer": "2.8.2", - "webpack-dev-middleware": "1.10.2", - "webpack-hot-middleware": "2.18.0", + "webpack": "3.8.1", + "webpack-bundle-analyzer": "2.9.0", + "webpack-dev-middleware": "1.12.0", + "webpack-hot-middleware": "2.20.0", "webpack-merge": "4.1.0" }, "engines": {