Merge pull request #1839 from pkarw/develop

Fix for #1838

Author: pkarw

core/build/webpack.base.config.js

@@ -40,6 +40,7 @@ const postcssConfig =  {
     ]
   }
 };
+const isProd = process.env.NODE_ENV === 'production'
 
 module.exports = {
   plugins: [
@@ -49,17 +50,17 @@ module.exports = {
     new HTMLPlugin({
       template: fs.existsSync(themedIndex) ? themedIndex : 'src/index.template.html',
       filename: 'index.html',
-      inject: false
+      inject: isProd == false // in dev mode we're not using clientManifest therefore renderScripts() is returning empty string and we need to inject scripts using HTMLPlugin
     }),
     new HTMLPlugin({
       template: fs.existsSync(themedIndex) ? themedIndexMinimal : 'src/index.minimal.template.html',
       filename: 'index.minimal.html',
-      inject: false
+      inject: isProd == false
     }),
     new HTMLPlugin({
       template: fs.existsSync(themedIndex) ? themedIndexBasic: 'src/index.basic.template.html',
       filename: 'index.basic.html',
-      inject: false
+      inject: isProd == false
     })    
   ],
   devtool: 'source-map',

core/pages/MyAccount.js

@@ -19,14 +19,6 @@ export default {
     }
   },
   beforeMount () {
-    this.$bus.$on('myAccount-before-updateUser', this.onBeforeUpdateUser)
-    this.$bus.$on('myAccount-before-changePassword', this.onBeforeChangePassword)
-  },
-  destroyed () {
-    this.$bus.$off('myAccount-before-updateUser', this.onBeforeUpdateUser)
-    this.$bus.$off('myAccount-before-changePassword', this.onBeforeChangePassword)
-  },
-  mounted () {
     const usersCollection = Vue.prototype.$db.usersCollection
     usersCollection.getItem('current-token', (err, token) => {
       if (err) {
@@ -36,6 +28,12 @@ export default {
         this.$router.push('/')
       }
     })
+    this.$bus.$on('myAccount-before-updateUser', this.onBeforeUpdateUser)
+    this.$bus.$on('myAccount-before-changePassword', this.onBeforeChangePassword)
+  },
+  destroyed () {
+    this.$bus.$off('myAccount-before-updateUser', this.onBeforeUpdateUser)
+    this.$bus.$off('myAccount-before-changePassword', this.onBeforeChangePassword)
   },
   methods: {
     onBeforeChangePassword (passwordData) {