Merge branch 'master' of github.com:/ChristophWurst/twofactor_sms int…

…o release/0.7.0
nextcloud · Aug 7, 2018 · dae6dc9 · dae6dc9
2 parents d9f99d6 + 6b66af8
commit dae6dc9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/js/webpack.base.config.js b/js/webpack.base.config.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const {VueLoaderPlugin} = require('vue-loader')
 
 module.exports = {
 	entry: './js/init.js',
@@ -20,7 +21,25 @@ module.exports = {
 				options: {
 					loaders: {}
 				}
+			},
+			{
+				test: /\.css$/,
+				use: [
+					{
+						loader: 'vue-style-loader'
+					},
+					{
+						loader: 'css-loader',
+						options: {
+							modules: true,
+							localIdentName: '[local]_[hash:base64:8]'
+						}
+					}
+				]
 			}
 		]
-	}
+	},
+	plugins: [
+		new VueLoaderPlugin()
+	]
 };
diff --git a/package.json b/package.json
@@ -8,8 +8,8 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "./node_modules/webpack-cli/bin/webpack.js --config js/webpack.prod.config.js",
-    "dev": "./node_modules/webpack-cli/bin/webpack.js --config js/webpack.dev.config.js --watch",
+    "build": "./node_modules/webpack-cli/bin/cli.js --config js/webpack.prod.config.js",
+    "dev": "./node_modules/webpack-cli/bin/cli.js --config js/webpack.dev.config.js --watch",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -24,6 +24,7 @@
     "nextcloud_fetch": "^2.1.0",
     "vue": "^2.5.17",
     "vue-loader": "^15.2.7",
+    "vue-style-loader": "^4.1.1",
     "vue-template-compiler": "^2.5.17"
   },
   "devDependencies": {