Merge pull request #2331 from bitbull-team/feature/override-console-w…

…ith-logger

WIP: Feature/override console with logger

config/default.json

@@ -20,7 +20,8 @@
       "useUrlDispatcher": false
     },    
     "console": {
-      "verbosityLevel": "only-errors"
+      "showErrorOnProduction" : true,
+      "verbosityLevel": "display-everything"
     },
     "redis": {
       "host": "localhost",

core/app.ts

@@ -3,6 +3,7 @@ import RootState from '@vue-storefront/core/types/RootState'
 import Vue from 'vue'
 import buildTimeConfig from 'config'
 import { isServer } from '@vue-storefront/core/helpers'
+import { Logger } from '@vue-storefront/core/lib/logger'
 
 // Plugins
 import i18n from '@vue-storefront/i18n'
@@ -59,13 +60,6 @@ let router: VueRouter = null
 
 Vue.use(VueRouter)
 
-// Will be depreciated in 1.7. Now we are using Logger instead of logs
-if (buildTimeConfig.console.verbosityLevel !== 'display-everything' && process.env.NODE_ENV === 'production') {
-  once('__TAKE_OVER_CONSOLE__', () => {
-    takeOverConsole(buildTimeConfig.console.verbosityLevel)
-  })
-}
-
 const createApp  = async (ssrContext, config): Promise<{app: Vue, router: VueRouter, store: Store<RootState>}> => {
   router = createRouter()
   // sync router with vuex 'router' store

core/client-entry.ts

@@ -14,6 +14,8 @@ import { prepareStoreView, storeCodeFromRoute, currentStoreView, localizedRoute
 import { onNetworkStatusChange } from '@vue-storefront/core/modules/offline-order/helpers/onNetworkStatusChange'
 import '@vue-storefront/core/service-worker/registration' // register the service worker
 import { AsyncDataLoader } from './lib/asyncdataloader'
+import { Logger } from '@vue-storefront/core/lib/logger'
+
 declare var window: any
 
 const invokeClientEntry = async () => {
@@ -103,7 +105,7 @@ const invokeClientEntry = async () => {
         })
         if (c.asyncData) {
           c.asyncData({ store, route: to }).then(result => { // always execute the asyncData() from the top most component first
-            console.debug('Top-most asyncData executed')
+            Logger.debug('Top-most asyncData executed')()
             _ssrHydrateSubcomponents(components, next, to)
           }).catch(next)
         } else {
@@ -119,7 +121,7 @@ const invokeClientEntry = async () => {
   * @example
   * const urls = ['/url1', '/url2', '/url3']
   * serial(urls.map(url => () => $.ajax(url)))
-  *     .then(console.log.bind(console))
+  *     .then(Logger.log.bind(Logger))()
   */
   const serial = funcs =>
     funcs.reduce((promise, func) =>
@@ -129,7 +131,7 @@ const invokeClientEntry = async () => {
   // TODO: move to external file
   EventBus.$on('order/PROCESS_QUEUE', event => {
     if (typeof navigator !== 'undefined' && navigator.onLine) {
-      console.log('Sending out orders queue to server ...')
+      Logger.log('Sending out orders queue to server ...')()
 
       const storeView = currentStoreView()
       const dbNamePrefix = storeView.storeCode ? storeView.storeCode + '-' : ''
@@ -153,7 +155,7 @@ const invokeClientEntry = async () => {
             const orderData = order
             const orderId = id
 
-            console.log('Pushing out order ' + orderId)
+            Logger.log('Pushing out order ' + orderId)()
             return fetch(config.orders.endpoint,
               {
                 method: 'POST',
@@ -165,49 +167,49 @@ const invokeClientEntry = async () => {
                 return response.json()
               } else {
                 orderMutex[id] = false
-                console.error('Error with response - bad content-type!')
+                Logger.error('Error with response - bad content-type!')()
               }
             })
               .then(jsonResponse => {
                 if (jsonResponse && jsonResponse.code === 200) {
-                  console.info('SearchResponse for: ' + orderId + ' = ' + jsonResponse.result)
+                  Logger.info('Response for: ' + orderId + ' = ' + JSON.stringify(jsonResponse.result))()
                   orderData.transmited = true
                   orderData.transmited_at = new Date()
                   ordersCollection.setItem(orderId.toString(), orderData)
                 } else {
-                  console.error(jsonResponse)
+                  Logger.error(jsonResponse)()
                 }
                 orderMutex[id] = false
               }).catch(err => {
                 if (config.orders.offline_orders.notification.enabled) {
                   navigator.serviceWorker.ready.then(registration => {
                     registration.sync.register('orderSync')
                       .then(() => {
-                        console.log('Order sync registered')
+                        Logger.log('Order sync registered')()
                       })
                       .catch(error => {
-                        console.log('Unable to sync', error)
+                        Logger.log('Unable to sync', error)()
                       })
                   })
                 }
-                console.error('Error sending order: ' + orderId, err)
+                Logger.error('Error sending order: ' + orderId, err)()
                 orderMutex[id] = false
               })
           })
         }
       }, (err, result) => {
-        if (err) console.error(err)
-        console.log('Iteration has completed')
+        if (err) Logger.error(err)()
+        Logger.log('Iteration has completed')()
 
         // execute them serially
         serial(fetchQueue)
           .then(res => {
-            console.info('Processing orders queue has finished')
+            Logger.info('Processing orders queue has finished')()
             // store.dispatch('cart/serverPull', { forceClientState: false })
           })
       }).catch(err => {
         // This code runs if there were any errors
-        console.log(err)
+        Logger.log(err)()
       })
     }
   })
@@ -239,11 +241,11 @@ const invokeClientEntry = async () => {
 
       usersCollection.getItem('current-token', (err, currentToken) => { // TODO: if current token is null we should postpone the queue and force re-login - only if the task requires LOGIN!
         if (err) {
-          console.error(err)
+          Logger.error(err)()
         }
         cartsCollection.getItem('current-cart-token', (err, currentCartId) => {
           if (err) {
-            console.error(err)
+            Logger.error(err)()
           }
 
           if (!currentCartId && store.state.cart.cartServerToken) { // this is workaround; sometimes after page is loaded indexedb returns null despite the cart token is properly set
@@ -254,8 +256,8 @@ const invokeClientEntry = async () => {
             currentToken = store.state.user.token
           }
           const fetchQueue = []
-          console.debug('Current User token = ' + currentToken)
-          console.debug('Current Cart token = ' + currentCartId)
+          Logger.debug('Current User token = ' + currentToken)()
+          Logger.debug('Current Cart token = ' + currentCartId)()
           syncTaskCollection.iterate((task, id, iterationNumber) => {
             if (task && !task.transmited && !mutex[id]) { // not sent to the server yet
               mutex[id] = true // mark this task as being processed
@@ -265,19 +267,21 @@ const invokeClientEntry = async () => {
                   mutex[id] = false
                 }).catch(err => {
                   mutex[id] = false
-                  console.error(err)
+                  Logger.error(err)()
                 })
               })
             }
           }, (err, result) => {
-            if (err) console.error(err)
-            console.debug('Iteration has completed')
+            if (err) Logger.error(err)()
+            Logger.debug('Iteration has completed')()
             // execute them serially
             serial(fetchQueue)
-              .then(res => console.debug('Processing sync tasks queue has finished'))
+              .then(res => {
+                Logger.debug('Processing sync tasks queue has finished')()
+              })
           }).catch(err => {
             // This code runs if there were any errors
-            console.log(err)
+            Logger.log(err)()
           })
         })
       })

core/compatibility/lib/extensions.ts

@@ -1,14 +1,14 @@
 import { Logger } from '@vue-storefront/core/lib/logger'
 
-export function registerExtensions (extensions, app, router, store, config, ssrContext = null) {	
-  for (let extEntryPoint of extensions) {	
-    if (extEntryPoint !== null) {	
-      if (extEntryPoint.default) extEntryPoint = extEntryPoint.default	
-      let extDescriptor = extEntryPoint(app, router, store, config, ssrContext) // register module	
-      if (extDescriptor != null) {	
+export function registerExtensions (extensions, app, router, store, config, ssrContext = null) {
+  for (let extEntryPoint of extensions) {
+    if (extEntryPoint !== null) {
+      if (extEntryPoint.default) extEntryPoint = extEntryPoint.default
+      let extDescriptor = extEntryPoint(app, router, store, config, ssrContext) // register module
+      if (extDescriptor != null) {
         Logger.warn('Extension' + extDescriptor.EXTENSION_KEY + ' registered. Extensions are depreciated and will be removed from VS core. Use modules instead')()
-        app.$emit('application-after-registerExtensions', extDescriptor)	
-      }	
-    }	
-  }	
-}
+        app.$emit('application-after-registerExtensions', extDescriptor)
+      }
+    }
+  }
+}

core/helpers/index.ts

@@ -1,6 +1,7 @@
 import rootStore from '@vue-storefront/store'
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
 import { remove as removeAccents } from 'remove-accents'
+import { Logger } from '@vue-storefront/core/lib/logger'
 
 /**
  * Create slugify -> "create-slugify" permalink  of text
@@ -151,7 +152,7 @@ export function once (key, fn) {
   const { process = {} } = global
   const processKey = key + '__ONCE__'
   if (!process.hasOwnProperty(processKey)) {
-    console.debug(`Once ${key}`)
+    Logger.debug(`Once ${key}`, 'helper')()
     process[processKey] = true
     fn()
   }

core/i18n/index.ts

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import config from 'config'
+import { Logger } from '@vue-storefront/core/lib/logger'
 
 Vue.use(VueI18n)
 
@@ -27,7 +28,7 @@ export function loadLanguageAsync (lang: string): Promise<string> {
           loadedLanguages.push(lang)
           return setI18nLanguage(lang)
         }).catch(err => {
-          console.debug('Unable to load translation')
+          Logger.debug('Unable to load translation')()
           return ''
         })
       }

core/lib/asyncdataloader.ts

@@ -1,5 +1,5 @@
 import { isServer } from '@vue-storefront/core/helpers'
-import { Logger } from './logger'
+import { Logger } from '@vue-storefront/core/lib/logger'
 
 const DEFAULT_ACTION_CATEGORY = 'asyncData'
 // Data loader queues all the data fetching operations and runs them at once - to be usedf for example in the `asyncData()` functions
@@ -44,4 +44,4 @@ const AsyncDataLoader = {
   }
 }
 
-export { AsyncDataLoader, AsyncDataLoaderActionContext, AsyncDataLoaderAction } 
+export { AsyncDataLoader, AsyncDataLoaderActionContext, AsyncDataLoaderAction }