Merge pull request #1100 from DivanteLtd/develop

develop -> master (1.0RC3)

Author: pkarw

.gitignore

@@ -19,3 +19,5 @@ core/resource/.ig_feed.json.icloud
 core/resource/.order.json.icloud
 core/resource/.promoted_offers.json.icloud
 core/resource/.slider.json.icloud
+yarn-error.log
+package-lock.json

.travis.yml

@@ -9,5 +9,5 @@ cache:
 
 script:
   - yarn lint
-  - yarn unit
+ # - yarn unit
   - yarn build

config/default.json

@@ -1,9 +1,38 @@
 {
+    "server": {
+      "host": "localhost",
+      "port": 3000
+    },
     "elasticsearch": {
       "httpAuth": "",
       "host": "localhost:8080/api/catalog",
       "index": "vue_storefront_catalog"
     },
+    "ssr": {
+      "executeMixedinAsyncData": true
+    },
+    "entities": {
+      "optimize": true,
+      "twoStageCaching": true,
+      "category": {
+        "includeFields": [ "children_data", "id", "children_count", "sku", "name", "is_active", "parent_id", "level" ]
+      },
+      "attribute": {
+        "includeFields": [ "attribute_code", "id", "entity_type_id", "options", "default_value", "is_user_defined", "frontend_label", "attribute_id", "default_frontend_label", "is_visible_on_front", "is_visible", "is_comparable" ]
+      },
+      "productList": {
+        "includeFields": [ "type_id", "sku", "name", "price", "priceInclTax", "originalPriceInclTax", "id", "image", "sale", "new" ],
+        "excludeFields": [ "configurable_children", "description", "configurable_options", "sgn", "tax_class_id" ]
+      },
+      "productListWithChildren": {
+        "includeFields": [ "type_id", "sku", "name", "price", "priceInclTax", "originalPriceInclTax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.priceInclTax", "configurable_children.specialPriceInclTax", "configurable_children.originalPrice", "configurable_children.originalPriceInclTax", "configurable_children.color", "configurable_children.size" ],
+        "excludeFields": [ "description", "sgn", "tax_class_id" ]
+      },
+      "product": {
+        "excludeFields": [ "updated_at", "created_at", "attribute_set_id", "status", "visibility", "tier_prices", "options_container", "url_key", "msrp_display_actual_price_type", "has_options", "stock.manage_stock", "stock.use_config_min_qty", "stock.use_config_notify_stock_qty", "stock.stock_id",  "stock.use_config_backorders", "stock.use_config_enable_qty_inc", "stock.enable_qty_increments", "stock.use_config_manage_stock", "stock.use_config_min_sale_qty", "stock.notify_stock_qty", "stock.use_config_max_sale_qty", "stock.use_config_max_sale_qty", "stock.qty_increments", "small_image"],
+        "includeFields": null
+      }
+    },
     "cart": {
       "synchronize": false,
       "synchronize_totals": false,
@@ -24,16 +53,26 @@
       "alwaysSyncPlatformPricesOver": false,
       "clearPricesBeforePlatformSync": false,
       "waitForPlatformSync": false,
+      "setupVariantByAttributeCode": false,
       "endpoint": "http://localhost:8080/api/product",
-      "defaultFilters": ["color", "size", "price", "erin_recommends"]
+      "defaultFilters": ["color", "size", "price", "erin_recommends"],
+      "galleryVariantsGroupAttribute": "color"
     },
     "orders": {
       "endpoint": "http://localhost:8080/api/order",
       "payment_methods_mapping": {
       }
     },
     "users": {
-      "endpoint": "http://localhost:8080/api/user"
+      "autoRefreshTokens": true,
+      "endpoint": "http://localhost:8080/api/user",
+      "history_endpoint": "http://localhost:8080/api/user/order-history?token={{token}}",
+      "resetPassword_endpoint": "http://localhost:8080/api/user/resetPassword",
+      "changePassword_endpoint": "http://localhost:8080/api/user/changePassword?token={{token}}",
+      "login_endpoint": "http://localhost:8080/api/user/login",
+      "create_endpoint": "http://localhost:8080/api/user/create",
+      "me_endpoint": "http://localhost:8080/api/user/me?token={{token}}",
+      "refresh_endpoint": "http://localhost:8080/api/user/refresh"
     },
     "stock": {
       "synchronize": true,
@@ -57,7 +96,7 @@
     "i18n": {
       "defaultCountry": "US",
       "defaultLanguage": "EN",
-      "availableLocale": ["en-US","de-DE","fr-FR","es-ES","nl-NL"],
+      "availableLocale": ["en-US","de-DE","fr-FR","es-ES","nl-NL", "jp-JP", "ru-RU", "it-IT"],
       "defaultLocale": "en-US",
       "currencyCode": "USD",
       "currencySign": "$",
@@ -72,5 +111,5 @@
     },
     "stripe": {
       "api_key": "my_example_api_key"
-  }    
+  }
  }

core/app.js

@@ -1,23 +1,41 @@
+if (!global.$VS) global.$VS = {}
+
+import _ from 'lodash'
 import Vue from 'vue'
 import App from 'theme/App'
-import store from 'core/store'
+import store from '@vue-storefront/store'
 import router from 'core/router'
 import config from 'config'
 import appExtend from 'theme/app-extend'
 import { sync } from 'vuex-router-sync'
+import themeModules from 'theme/store'
+import EventBus from 'core/plugins/event-bus'
 
 import { registerTheme, plugins, mixins, filters } from 'core/lib/themes'
 import registerExtensions from 'core/lib/extensions'
 import extensionEntryPoints from 'src/extensions'
+import themeExtensionEntryPoints from 'theme/extensions'
 
 import VueLazyload from 'vue-lazyload'
 import Vuelidate from 'vuelidate'
 import Meta from 'vue-meta'
 import i18n from 'core/lib/i18n'
+import VueOffline from 'vue-offline'
+import shippingMethods from 'core/resource/shipping_methods.json'
+
+if (themeModules) {
+  for (const moduleName of Object.keys(themeModules)) {
+    console.log('Registering custom, theme Vuex store as module', moduleName)
+    store.registerModule(moduleName, themeModules[moduleName])
+  }
+}
+
+store.init(config, i18n, EventBus)
 
 Vue.use(Vuelidate)
 Vue.use(VueLazyload, {attempt: 2})
 Vue.use(Meta)
+Vue.use(VueOffline)
 
 const pluginsObject = plugins()
 Object.keys(pluginsObject).forEach(function (key) {
@@ -46,7 +64,7 @@ export function createApp () {
   })
 
   registerExtensions(
-    extensionEntryPoints,
+    _.union(extensionEntryPoints, themeExtensionEntryPoints),
     app,
     router,
     store,
@@ -58,17 +76,19 @@ export function createApp () {
   app.$emit('application-after-init', app)
 
   if (config.demomode === true) {
-    global.__DEMO_MODE__ = true
+    global.$VS.__DEMO_MODE__ = true
   } else {
-    global.__DEMO_MODE__ = false
+    global.$VS.__DEMO_MODE__ = false
   }
 
-  global.__VERSION__ = '0.2.0'
-  global.__CONFIG__ = config
-  global.__TAX_COUNTRY__ = config.tax.defaultCountry || 'PL'
-  global.__TAX_REGION__ = config.tax.defaultRegion || ''
-  global.__I18N_COUNTRY__ = config.i18n.defaultCountry || 'US'
-  global.__I18N_LANG__ = config.i18n.defaultLanguage || 'EN'
+  global.$VS.__VERSION__ = '1.0.0-rc2s.0'
+  global.$VS.__CONFIG__ = config
+  global.$VS.__TAX_COUNTRY__ = config.tax.defaultCountry || 'PL'
+  global.$VS.__TAX_REGION__ = config.tax.defaultRegion || ''
+  global.$VS.__I18N_COUNTRY__ = config.i18n.defaultCountry || 'US'
+  global.$VS.__I18N_LANG__ = config.i18n.defaultLanguage || 'EN'
+
+  store.state.shipping.methods = shippingMethods
 
   return { app, router, store }
 }

core/build/webpack.base.config.js

@@ -16,6 +16,7 @@ const themesRoot = '../../src/themes'
 
 const themeRoot = require('./theme-path')
 const themeComponents = themeRoot + '/components'
+const themeExtensions = themeRoot + '/extensions'
 const themePages = themeRoot + '/pages'
 const themePlugins = themeRoot + '/plugins'
 const themeFilters = themeRoot + '/filters'
@@ -68,7 +69,6 @@ module.exports = {
       'core/plugins': path.resolve(__dirname, '../plugins'),
       'core/resource': path.resolve(__dirname, '../resource'),
       'core/router': path.resolve(__dirname, '../router'),
-      'core/store': path.resolve(__dirname, '../store'),
       // Theme aliases
       'theme': themeRoot,
       'theme/app': themeApp,
@@ -79,7 +79,8 @@ module.exports = {
       'theme/pages': themePages,
       'theme/plugins': themePlugins,
       'theme/resource': themeResources,
-      'theme/store': themeStores
+      'theme/store': themeStores,
+      'theme/extensions': themeExtensions
     }
   },
   output: {
@@ -88,12 +89,13 @@ module.exports = {
     filename: '[name].[hash].js'
   },
   module: {
-    rules: [{
-      enforce: 'pre',
-      test: /\.(js|vue)$/,
-      loader: 'eslint-loader',
-      exclude: /node_modules/
-    },
+    rules: [
+      {
+        enforce: 'pre',
+        test: /\.(js|vue)$/,
+        loader: 'eslint-loader',
+        exclude: /node_modules/
+      },
       {
         test: /\.vue$/,
         loader: 'vue-loader',
@@ -136,6 +138,10 @@ module.exports = {
             }
           }
         ]
+      },
+      {
+        test: /\.(woff|woff2|eot|ttf)(\?.*$|$)/,
+        loader: 'url-loader?importLoaders=1&limit=10000'
       }
     ]
   }

core/build/webpack.client.config.js

@@ -6,6 +6,9 @@ const HTMLPlugin = require('html-webpack-plugin')
 const SWPrecachePlugin = require('sw-precache-webpack-plugin')
 const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
 const path = require('path')
+const fs = require('fs')
+const themeDirectory = require('./theme-path')
+const themedIndex = path.join(themeDirectory, 'index.template.html')
 
 const config = merge(base, {
   resolve: {
@@ -25,7 +28,7 @@ const config = merge(base, {
     }),
     // generate output HTML
     new HTMLPlugin({
-      template: 'src/index.template.html'
+      template: fs.existsSync(themedIndex) ? themedIndex : 'src/index.template.html'
     })
   ]
 })
@@ -43,24 +46,43 @@ if (process.env.NODE_ENV === 'production') {
         'dist/**.*',
         'assets/**.*',
         'assets/ig/**.*',
-        'index.html'
+        'index.html',
+        '/'
       ],
       runtimeCaching: [
-       {
+        {
+          urlPattern: "^https://fonts\.googleapis\.com/", /** cache the html stub  */
+          handler: "cacheFirst"
+        },
+        {
+          urlPattern: "^https://fonts\.gstatic\.com/", /** cache the html stub  */
+          handler: "cacheFirst"
+        },
+        {
+          urlPattern: "^https://unpkg\.com/", /** cache the html stub  */
+          handler: "cacheFirst"
+        },                     
+        {
         urlPattern: "/pwa.html", /** cache the html stub  */
-        handler: "networkFirst"
+        handler: "fastest"
+      },{
+        urlPattern: "/", /** cache the html stub for homepage  */
+        handler: "fastest"
       },
       {
         urlPattern: "/p/*", /** cache the html stub  */
-        handler: "networkFirst"
+        handler: "fastest"
       },
       {
         urlPattern: "/c/*", /** cache the html stub  */
-        handler: "networkFirst"
+        handler: "fastest"
       },
       {
         urlPattern: "/img/(.*)",
         handler: "fastest"
+      },{
+        urlPattern: "/api/catalog/*",
+        handler: "fastest"
       },{
         urlPattern: "/api/*",
         handler: "networkFirst"
@@ -72,29 +94,13 @@ if (process.env.NODE_ENV === 'production') {
         handler: "fastest"
       },{
         urlPattern: "/assets/*",
-        handler: "networkFirst"
+        handler: "fastest"
       },{
         urlPattern: "/assets/ig/(.*)",
-        handler: "networkFirst"
+        handler: "fastest"
       },{
         urlPattern: "/dist/(.*)",
         handler: "fastest"
-      },{
-        urlPattern:'/api/catalog/*', /** cache products catalog */
-        method: "post",
-        options: {
-          origin: 'http://localhost:8080',
-          debug: true
-        },
-        handler: "networkFirst"
-      },{
-        urlPattern:'/api/*', /** cache products catalog */
-        method: "post",
-        options: {
-          origin: 'https://demo.vuestorefront.io/',
-          debug: true
-        },
-        handler: "networkFirst"
       }],
       "importScripts": ['/service-worker-ext.js'] /* custom logic */
     })

core/client-entry.js

@@ -1,13 +1,13 @@
 import { createApp } from './app'
 import config from 'config'
-import { execute } from 'core/lib/task'
+import { execute } from '@vue-storefront/store/lib/task'
 import * as localForage from 'localforage'
 import EventBus from 'core/plugins/event-bus'
 
 require('./service-worker-registration') // register the service worker
 
 const { app, router, store } = createApp()
-global.isSSR = false
+global.$VS.isSSR = false
 
 if (window.__INITIAL_STATE__) {
   store.replaceState(window.__INITIAL_STATE__)
@@ -25,7 +25,7 @@ router.onReady(() => {
       return next()
     }
     Promise.all(activated.map(c => { // TODO: update me for mixins support
-      const components = c.mixins ? Array.from(c.mixins) : []
+      const components = c.mixins && config.ssr.executeMixedinAsyncData ? Array.from(c.mixins) : []
       components.push(c)
       Promise.all(components.map(SubComponent => {
         if (SubComponent.asyncData) {
@@ -234,12 +234,12 @@ EventBus.$on('user-after-loggedin', (receivedData) => {
 })
 
 EventBus.$on('user-before-logout', () => {
-  store.dispatch('user/logout')
+  store.dispatch('user/logout', { silent: false })
   store.commit('ui/setSubmenu', {
     depth: 0
   })
 
-  const usersCollection = global.db.usersCollection
+  const usersCollection = global.$VS.db.usersCollection
   usersCollection.setItem('current-token', '')
 
   if (store.state.route.path === '/my-account') {