Merge pull request #2747 from DivanteLtd/hotfix/v1.8.5

Hotfix/v1.8.5

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.5] - 2019.04.17
+
+### Fixed
+- Memory leaks on SSR with Vue.use - @patzick (#2745)
+
 ## [1.8.4] - 2019.03.26
 
 ### Fixed

core/app.ts

@@ -28,7 +28,6 @@ import * as coreFilters from '@vue-storefront/core/filters'
 import * as corePlugins from '@vue-storefront/core/compatibility/plugins'
 
 import { once } from '@vue-storefront/core/helpers'
-import { takeOverConsole } from '@vue-storefront/core/helpers/log'
 import store from '@vue-storefront/core/store'
 
 import { enabledModules } from './modules-entry'
@@ -58,7 +57,9 @@ function createRouter (): VueRouter {
 
 let router: VueRouter = null
 
-Vue.use(VueRouter)
+once('__VUE_EXTEND_RR__', () => {
+  Vue.use(VueRouter)
+})
 
 const createApp  = async (ssrContext, config): Promise<{app: Vue, router: VueRouter, store: Store<RootState>}> => {
   router = createRouter()
@@ -75,13 +76,14 @@ const createApp  = async (ssrContext, config): Promise<{app: Vue, router: VueRou
   store.state.storeView = storeView
   // store.state.shipping.methods = shippingMethods
 
-  Vue.use(Vuelidate)
-  Vue.use(VueLazyload, {attempt: 2, preLoad: 1.5})
-  Vue.use(Meta)
-  Vue.use(VueObserveVisibility)
-
+
   // to depreciate in near future
   once('__VUE_EXTEND__', () => {
+    Vue.use(Vuelidate)
+    Vue.use(VueLazyload, {attempt: 2, preLoad: 1.5})
+    Vue.use(Meta)
+    Vue.use(VueObserveVisibility)
+
     Object.keys(corePlugins).forEach(key => {
       Vue.use(corePlugins[key])
     })

core/helpers/index.ts

@@ -153,7 +153,7 @@ export function once (key, fn) {
   const { process = {} } = global
   const processKey = key + '__ONCE__'
   if (!process.hasOwnProperty(processKey)) {
-    Logger.debug(`Once ${key}`, 'helper')()
+    // Logger.debug(`Once ${key}`, 'helper')()
     process[processKey] = true
     fn()
   }

core/i18n/index.ts

@@ -2,8 +2,11 @@ import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import config from 'config'
 import { Logger } from '@vue-storefront/core/lib/logger'
+import { once } from '@vue-storefront/core/helpers'
 
-Vue.use(VueI18n)
+once('__VUE_EXTEND_I18N__', () => {
+  Vue.use(VueI18n)
+})
 
 const loadedLanguages = ['en-US']
 const i18n = new VueI18n({

core/scripts/resolvers/resolveGraphQL.js

@@ -1,12 +1,16 @@
 import { server, graphql } from 'config'
 import Vue from 'vue'
 import { Logger } from '@vue-storefront/core/lib/logger'
+import { once } from '@vue-storefront/core/helpers'
 
 export const getApolloProvider = async () => {
   if (server.api === 'graphql') {
     const ApolloModule = await import(/* webpackChunkName: "vsf-graphql" */ 'vue-apollo')
     const VueApollo = ApolloModule.default
-    Vue.use(VueApollo)
+
+    once('__VUE_EXTEND_GQL__', () => {
+      Vue.use(VueApollo)
+    })
 
     const HttpLinkModule = await import(/* webpackChunkName: "vsf-graphql" */ 'apollo-link-http')
     const HttpLink = HttpLinkModule.HttpLink

core/store/index.ts

@@ -1,8 +1,11 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import RootState from '@vue-storefront/core/types/RootState'
+import { once } from '@vue-storefront/core/helpers'
 
-Vue.use(Vuex)
+once('__VUE_EXTEND_VUEX__', () => {
+  Vue.use(Vuex)
+})
 
 const state = {
   version: '',

src/modules/droppoint-shipping/components/DroppointMap.vue

@@ -55,15 +55,18 @@
 <script>
 import Vue from 'vue'
 import { required, minLength } from 'vuelidate/lib/validators'
+import { once } from '@vue-storefront/core/helpers'
 
 // GoogleMaps cannot be included while in SSR
 if (process.browser) {
   const VueGoogleMaps = require('vue2-google-maps')
-  Vue.use(VueGoogleMaps, {
-    load: {
-      key: 'AIzaSyBQwWyTufRQqwJajpxqcCPfdgH27qKWNzc',
-      libraries: 'places'
-    }
+  once('__VUE_EXTEND_DROPPOINT__', () => {
+    Vue.use(VueGoogleMaps, {
+      load: {
+        key: 'AIzaSyBQwWyTufRQqwJajpxqcCPfdgH27qKWNzc',
+        libraries: 'places'
+      }
+    })
   })
 }
 

src/modules/google-analytics/hooks/beforeRegistration.ts

@@ -1,15 +1,18 @@
 import VueAnalytics from 'vue-analytics'
 import { router } from '@vue-storefront/core/app'
 import { Logger } from '@vue-storefront/core/lib/logger'
+import { once } from '@vue-storefront/core/helpers'
 
 export function beforeRegistration({ Vue, config, store, isServer }) {
   if (config.analytics.id && !isServer) {
-    Vue.use(VueAnalytics, {
-      id: config.analytics.id,
-      router,
-      ecommerce: {
-        enabled: true
-      }
+    once('__VUE_EXTEND_ANALYTICS__', () => {
+      Vue.use(VueAnalytics, {
+        id: config.analytics.id,
+        router,
+        ecommerce: {
+          enabled: true
+        }
+      })
     })
   } else {
     Logger.warn(

src/themes/default/index.js

@@ -4,8 +4,11 @@ import routes from './router'
 import Vue from 'vue'
 import VueProgressBar from 'vue-progressbar'
 import '@vue-storefront/core/lib/passive-listeners'
+import { once } from '@vue-storefront/core/helpers'
 
-Vue.use(VueProgressBar)
+once('__VUE_EXTEND_DROPPOINT_VPB__', () => {
+  Vue.use(VueProgressBar)
+})
 
 const themeEntry = App
 function initTheme (app, router, store, config, ssrContext) {