Bump settings config

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

build/vue-builds.sh

@@ -14,6 +14,7 @@ do
 	cp $entryFile $backupFile
 
 	# Make the app
+	set -e
 	cd "$path/../"
 	make
 
@@ -25,7 +26,7 @@ do
 	if ! diff -q $entryFile $backupFile &>/dev/null
 	then
 		echo "$entryFile build is NOT up-to-date! Please send the proper production build within the pull request"
-		cat /root/.npm/_logs/*.log
+		cat $HOME/.npm/_logs/*.log
 		exit 2
 	else
 		echo "$entryFile build is up-to-date"

settings/package.json

@@ -34,10 +34,10 @@
     "babel-preset-stage-3": "^6.24.1",
     "css-loader": "^0.28.11",
     "file-loader": "^1.1.11",
-    "vue-loader": "^14.2.2",
+    "vue-loader": "^15.2.4",
     "vue-template-compiler": "^2.5.16",
-    "webpack": "^4.8.3",
-    "webpack-cli": "^2.1.4",
+    "webpack": "^4.11.1",
+    "webpack-cli": "^3.0.2",
     "webpack-merge": "^4.1.2"
   }
 }

settings/webpack.common.js

@@ -1,9 +1,10 @@
 const path = require('path')
+const { VueLoaderPlugin } = require('vue-loader');
 
 module.exports = {
   entry: './src/main.js',
   output: {
-    path: path.resolve(__dirname, './js'),
+    path: __dirname + '/js',
     publicPath: '/dist/',
     filename: 'main.js'
   },
@@ -12,39 +13,30 @@ module.exports = {
       {
         test: /\.css$/,
         use: [
-          'vue-style-loader',
           'css-loader'
         ],
       },
       {
         test: /\.scss$/,
         use: [
-          'vue-style-loader',
 					'css-loader',
+					'sass-loader'
         ],
       },
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        options: {
-          loaders: {}
-          // other vue-loader options go here
-        }
       },
       {
         test: /\.js$/,
         loader: 'babel-loader',
         exclude: /node_modules/
       },
-      {
-        test: /\.(png|jpg|gif|svg)$/,
-        loader: 'file-loader',
-        options: {
-          name: '[name].[ext]?[hash]'
-        }
-      }
     ]
   },
+  plugins: [
+    new VueLoaderPlugin()
+  ],
   resolve: {
     alias: {
       'vue$': 'vue/dist/vue.esm.js'