From 9af827e56b58b6b6eccc30a690a8ca1513b643f4 Mon Sep 17 00:00:00 2001 From: weryques Date: Wed, 28 Mar 2018 15:21:13 -0300 Subject: [PATCH] Update webpack and buid.sh --- build.sh | 16 ++++++++-------- package-lock.json | 24 +++++------------------- package.json | 5 ----- webpack.config.js | 13 +++++-------- 4 files changed, 18 insertions(+), 40 deletions(-) diff --git a/build.sh b/build.sh index 4a51486fe..cb3a2bfa9 100755 --- a/build.sh +++ b/build.sh @@ -12,15 +12,15 @@ current_OS=`uname` # For macOS (Darwin) if [ $current_OS == "Darwin" ]; then - find src -type f \( -name "*.js" -or -name "*.vue" \) -exec md5 {} \; | sort -k 2 | md5 > last-js-build.md5 - find src -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5 - find src -type f \( -name "composer.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-composer-build.md5 - find src -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-package-build.md5 + find src ./webpack.config.js -type f \( -name "*.js" -or -name "*.vue" -or -name "webpack.config.js" \) -exec md5 {} \; | sort -k 2 | md5 > last-js-build.md5 + find ./src/scss/ ./src/admin/scss/ -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5 + find ./composer.json -type f \( -name "composer.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-composer-build.md5 + find ./package.json -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-package-build.md5 else - find src -type f \( -name "*.js" -or -name "*.vue" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5 - find src -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5 - find src -type f \( -name "composer.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-composer-build.md5 - find src -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-package-build.md5 + find src ./webpack.config.js -type f \( -name "*.js" -or -name "*.vue" -or -name "webpack.config.js" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5 + find ./src/scss/ ./src/admin/scss/ -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5 + find ./composer.json -type f \( -name "composer.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-composer-build.md5 + find ./package.json -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-package-build.md5 fi new_md5_package=$(", "private": true, "scripts": { - "dev": "cross-env NODE_ENV=development webpack --mode development --open --inline --hot", "build": "cross-env NODE_ENV=production webpack --mode production --progress --hide-modules" }, "dependencies": { "axios": "^0.18.0", "buefy": "^0.6.3", "bulma": "^0.6.2", - "fs": "0.0.1-security", "html-to-json": "^0.6.0", "mdi": "^2.1.99", "moment": "^2.21.0", - "net": "^1.0.2", "node-sass": "^4.7.2", - "qs": "^6.5.1", "sass-loader": "^6.0.6", - "tls": "0.0.1", "vue": "^2.5.16", "vue-router": "^3.0.1", "vuedraggable": "^2.16.0", diff --git a/webpack.config.js b/webpack.config.js index d6c820cdc..60fbadc96 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -12,7 +12,6 @@ module.exports = { publicPath: './src/assets/', filename: '[name]-components.js' }, - devtool: 'eval-source-map', module: { rules: [ { @@ -59,12 +58,10 @@ module.exports = { 'vue$': 'vue/dist/vue.esm.js' } }, - devServer: { - historyApiFallback: true, - noInfo: true - }, node: { - fs: 'empty' + fs: 'empty', + net: 'empty', + tls: 'empty' }, performance: { hints: false @@ -72,7 +69,7 @@ module.exports = { }; if (process.env.NODE_ENV === 'production') { - module.exports.devtool = 'inline-source-map'; + module.exports.devtool = ''; //'eval-source-map'; // Add it to use vue dev tools // http://vue-loader.vuejs.org/en/workflow/production.html module.exports.plugins = (module.exports.plugins || []).concat([ new webpack.DefinePlugin({ @@ -82,7 +79,7 @@ if (process.env.NODE_ENV === 'production') { }), new UglifyJsPlugin({ parallel: true, - sourceMap: true, + sourceMap: false, //Changes to true to use vue dev tools }), new webpack.LoaderOptionsPlugin({ minimize: true