Merge pull request #2233 from lukeromanowicz/fix/theme-registration

Fix theme registration
vuestorefront · Jan 18, 2019 · 2239e7a · 2239e7a
2 parents f87f3df + f33e61c
commit 2239e7a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/lib/themes.ts b/core/lib/themes.ts
@@ -1,7 +1,7 @@
 export function registerTheme (themeName, app, routes, store, config, ssrContext) {
-  let themeEntryPoint = require('theme/index.js').initTheme
-  if (themeEntryPoint != null && themeEntryPoint.hasOwnProperty('default')) {
-    themeEntryPoint.default(app, routes, store, config, ssrContext) // register theme
+  const themeEntryPoint = require('theme/index.js')
+  if (themeEntryPoint != null && themeEntryPoint.initTheme) {
+    themeEntryPoint.initTheme(app, routes, store, config, ssrContext) // register theme
   } else {
     throw new Error('Wrong theme name: ' + themeName)
   }