@shopgate/pwa-common 6.18.0-beta.4 → 6.18.0

package/constants/Device.js

@@ -1,4 +1,4 @@
-var _PAGE_INSETS_ANDROID,_extends3;function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}function _defineProperty(obj,key,value){if(key in obj){Object.defineProperty(obj,key,{value:value,enumerable:true,configurable:true,writable:true});}else{obj[key]=value;}return obj;}export var OS_ALL='all';export var OS_ANDROID='android';export var OS_IOS='ios';export var TYPE_PHONE='phone';export var MODEL_NAMES_IPHONE_X=['iPhone10,3','iPhone10,6','iPhone11,2','iPhone11,4','iPhone11,6','iPhone11,8'];/**
+var _PAGE_INSETS_ANDROID,_extends3;function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}function _defineProperty(obj,key,value){if(key in obj){Object.defineProperty(obj,key,{value:value,enumerable:true,configurable:true,writable:true});}else{obj[key]=value;}return obj;}export var OS_ALL='all';export var OS_ANDROID='android';export var OS_IOS='ios';export var TYPE_PHONE='phone';export var TYPE_TABLET='tablet';export var MODEL_NAMES_IPHONE_X=['iPhone10,3','iPhone10,6','iPhone11,2','iPhone11,4','iPhone11,6','iPhone11,8'];/**
  * Page insets are device screen areas which can't be used to display content. Those come especially
  * relevant on iOS devices with their status bar ot the iPhone notch at the top of the screen.
  */export var PAGE_INSET_NAME_TOP='safeAreaInsetTop';export var PAGE_INSET_NAME_BOTTOM='safeAreaInsetBottom';export var PAGE_INSET_NAME_LEFT='safeAreaInsetLeft';export var PAGE_INSET_NAME_RIGHT='safeAreaInsetRight';export var PAGE_INSETS_ANDROID=(_PAGE_INSETS_ANDROID={},_defineProperty(_PAGE_INSETS_ANDROID,PAGE_INSET_NAME_TOP,0),_defineProperty(_PAGE_INSETS_ANDROID,PAGE_INSET_NAME_BOTTOM,0),_defineProperty(_PAGE_INSETS_ANDROID,PAGE_INSET_NAME_LEFT,0),_defineProperty(_PAGE_INSETS_ANDROID,PAGE_INSET_NAME_RIGHT,0),_PAGE_INSETS_ANDROID);export var PAGE_INSETS_IOS=_extends({},PAGE_INSETS_ANDROID,_defineProperty({},PAGE_INSET_NAME_TOP,20));export var PAGE_INSETS_IPHONE_X=_extends({},PAGE_INSETS_IOS,(_extends3={},_defineProperty(_extends3,PAGE_INSET_NAME_TOP,44),_defineProperty(_extends3,PAGE_INSET_NAME_BOTTOM,30),_extends3));

package/helpers/config/index.js

@@ -1,7 +1,7 @@
 function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}import pck from"../../package";import{buildThemeConfig}from"./theme";import{assignObjectDeep}from"../data";import{isObject}from"../validation";/**
  * Provides a default app config as a fallback.
  * @mixin AppConfig
- */var defaultAppConfig={appId:'shop_30177',browserConnector:false,colors:{},forgotPasswordUrl:null,hasFavorites:false,hasReviews:true,showWriteReview:true,language:'en-us',logo:'https://example.com/logo',marketId:'US',publicPath:'https://example.com/public',shopName:'Shopgate Connect',webCheckoutShopify:null,hasNoScanner:false,apiUrl:'https://shop_30177.dev.connect.shopgate.com/',shopCNAME:null,currency:'USD',showGmdMenuSubHeaders:false,benchmark:false,sentry:{},theme:{},cartShippingHideAnonymousLegacy:null,cartShippingTextAnonymousLegacy:null,variantSelectionMode:null,product:{variantPreselect:false},cart:{},scanner:{},tracking:{hasWebTrackingEngage:false},webTrackingEngage:{android:'',ios:''}};/**
+ */var defaultAppConfig={appId:'shop_30177',browserConnector:false,colors:{},forgotPasswordUrl:null,hasFavorites:false,hasReviews:true,showWriteReview:true,language:'en-us',logo:'https://example.com/logo',marketId:'US',publicPath:'https://example.com/public',shopName:'Shopgate Connect',webCheckoutShopify:null,hasNoScanner:false,apiUrl:'https://shop_30177.dev.connect.shopgate.com/',shopCNAME:null,currency:'USD',showGmdMenuSubHeaders:false,benchmark:false,sentry:{},theme:{},cartShippingHideAnonymousLegacy:null,cartShippingTextAnonymousLegacy:null,variantSelectionMode:null,product:{variantPreselect:false},cart:{},scanner:{},tracking:{hasWebTrackingEngage:false,useSkuAsProductId:false},webTrackingEngage:{android:'',ios:''}};/**
  * @type {string} package version from package.json
  */export var pckVersion=pck.version;/**
  * Provides a default components config as a fallback.

package/helpers/redux/mutable.js

@@ -1,4 +1,4 @@
-import{isObject}from"../validation";/**
+import noop from'lodash/noop';import{isObject}from"../validation";/**
  * @typedef {Object} MutableFunction
  * @property {Function} replace Replaces the original functionality with a custom function.
  * @property {Function} restore Restores the original function.
@@ -38,7 +38,8 @@ if(res.action===BEFORE_ACTION_NEXT){if(res.args&&res.args.length>0){res=res.args
 if(res.action===BEFORE_ACTION_SKIP_REST){arr.splice(-(arr.length-i));if(res.args&&res.args.length>0){res=res.args;}else{res=args;}}// Check if the step requested to stop any further processing including the action itself
 if(res.action===BEFORE_ACTION_STOP){// Cut off all following step functions including the mutable func
 arr.splice(-(arr.length-i));runAction=false;res=res.args;}// Replace arguments for the next step to get.
-return res;},args);}if(!runAction){return mutatedArgs;}// Call the actual mutable
+return res;},args);}if(!runAction){// the return value here gets passed to the dispatch() so it must be a function or action obj
+return noop;}// Call the actual mutable
 return current.apply(void 0,mutatedArgs);}/**
    * Replaces the original functionality with a custom function.
    * @param {Function} customFunc The function to execute instead of the original one.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common",
-  "version": "6.18.0-beta.4",
+  "version": "6.18.0",
   "description": "Common library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "@sentry/browser": "^4.6.3",
-    "@shopgate/pwa-benchmark": "6.18.0-beta.4",
+    "@shopgate/pwa-benchmark": "6.18.0",
     "@virtuous/conductor": "~2.4.0",
     "@virtuous/react-conductor": "~2.4.0",
     "@virtuous/redux-persister": "1.1.0-beta.7",
@@ -44,7 +44,7 @@
     "url-search-params": "^0.10.0"
   },
   "devDependencies": {
-    "@shopgate/pwa-core": "6.18.0-beta.4",
+    "@shopgate/pwa-core": "6.18.0",
     "lodash": "^4.17.4",
     "prop-types": "~15.7.2",
     "react": "~16.12.0",

package/selectors/client.js

@@ -1,4 +1,4 @@
-import{createSelector}from'reselect';import{hasSGJavaScriptBridge}from'@shopgate/pwa-core/helpers';import{isVersionAtLeast}from'@shopgate/pwa-core/helpers/version';import{SCANNER_MIN_APP_LIB_VERSION}from'@shopgate/pwa-core/constants/Scanner';import{OS_ANDROID,OS_IOS,MODEL_NAMES_IPHONE_X,PAGE_INSETS_ANDROID,PAGE_INSETS_IOS,PAGE_INSETS_IPHONE_X}from"../constants/Device";/**
+import{createSelector}from'reselect';import{hasSGJavaScriptBridge}from'@shopgate/pwa-core/helpers';import{isVersionAtLeast}from'@shopgate/pwa-core/helpers/version';import{SCANNER_MIN_APP_LIB_VERSION}from'@shopgate/pwa-core/constants/Scanner';import{OS_ANDROID,OS_IOS,MODEL_NAMES_IPHONE_X,PAGE_INSETS_ANDROID,PAGE_INSETS_IOS,PAGE_INSETS_IPHONE_X,TYPE_TABLET}from"../constants/Device";/**
  * Returns the client state (state.client)
  * @param {Object} state The application state.
  * @returns {Object}
@@ -22,10 +22,6 @@ import{createSelector}from'reselect';import{hasSGJavaScriptBridge}from'@shopgate
  * @param {string} service The identity service to check.
  * @returns {Function}
  */export function makeSupportsIdentityService(service){var getSupportedIdentityServices=makeGetSupportedIdentityServices();return createSelector(getSupportedIdentityServices,function(services){return services.includes(service);});}/**
- * Checks if the currently stored lib version is one that supports the scanner.
- * @param {Object} state The application state.
- * @returns {boolean}
- */export var hasScannerSupport=createSelector(getClientInformation,function(clientInformation){return isVersionAtLeast(SCANNER_MIN_APP_LIB_VERSION,clientInformation.libVersion);});/**
  * Returns the device platform.
  * @param {Object} state The application state.
  * @return {string|null}
@@ -45,6 +41,11 @@ import{createSelector}from'reselect';import{hasSGJavaScriptBridge}from'@shopgate
  * @param {Object} state The application state.
  * @return {boolean}
  */export var isIos=createSelector(getPlatform,function(platform){return platform===OS_IOS;});/**
+ * Checks if the currently stored lib version is one that supports the scanner.
+ * @param {Object} state The application state.
+ * @returns {boolean}
+ */export var hasScannerSupport=createSelector(getClientInformation,getDeviceInformation,isIos,function(clientInformation,deviceInformation,deviceIsIos){// scanner is not supported on ipads
+var type=deviceInformation.type;var isIpad=type===TYPE_TABLET&&deviceIsIos;return isVersionAtLeast(SCANNER_MIN_APP_LIB_VERSION,clientInformation.libVersion)&&!isIpad;});/**
  * Determines page insets for the current device
  * @param {Object} state The application state.
  * @returns {Object}