Merge pull request #11842 from nextcloud/fix/settings-strict-csp

Fix settings' strict CSP

settings/src/main-admin-security.js

@@ -1,13 +1,10 @@
 import Vue from 'vue'
 
-import AdminTwoFactor from './components/AdminTwoFactor'
+import AdminTwoFactor from './components/AdminTwoFactor.vue'
+
+__webpack_nonce__ = btoa(OC.requestToken)
 
 Vue.prototype.t = t;
 
-new Vue({
+const View = Vue.extend(AdminTwoFactor)
-	el: '#two-factor-auth-settings',
+new View().$mount('#two-factor-auth-settings')
-	template: '<AdminTwoFactor/>',
-	components: {
-		AdminTwoFactor
-	}
-})

settings/webpack.common.js

@@ -40,9 +40,6 @@ module.exports = {
     new VueLoaderPlugin()
   ],
   resolve: {
-    alias: {
-      'vue$': 'vue/dist/vue.esm.js'
-    },
     extensions: ['*', '.js', '.vue', '.json']
   }
 }

settings/webpack.dev.js

@@ -8,5 +8,5 @@ module.exports = merge(common, {
     noInfo: true,
     overlay: true
   },
-  devtool: '#eval-source-map',
+  devtool: 'source-map',
 })