@nuskin/ns-util 4.1.1 → 4.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-util",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "baseURL": "/",
   "main": "src/util.js",
   "scripts": {
@@ -23,6 +23,7 @@
   "license": "ISC",
   "homepage": "https://code.tls.nuskin.io/ns-am/nu-skin-aem/wm/ns-util/blob/master/README.md",
   "dependencies": {
+    "@nuskin/events": "1.0.0-cx16-8326.6",
     "@nuskin/ns-common-lib": "1.2.3",
     "@nuskin/nuskinjquery": "2.3.1",
     "axios": "0.21.1",
@@ -44,7 +45,7 @@
     ]
   },
   "devDependencies": {
-    "@nuskin/configuration-sdk": "2.0.0",
+    "@nuskin/configuration-sdk": "2.2.0",
     "@nuskin/ns-jsanalyzer": "1.0.1",
     "axios-mock-adapter": "1.18.2",
     "babel-cli": "6.26.0",

package/src/configurationService.js

@@ -1,5 +1,5 @@
 import nuskin from './namespace.js';
-import './event.js';
+import events from './event.js';
 import mktRegionMapping from './regionMapping.js';
 import RunConfigService from './runConfigService.js';
 import axios from 'axios';
@@ -34,7 +34,7 @@ const setRuntimeOverrides = () => {
     if (shoppingContext && shoppingContext.overrides) {
         nuskin.configuration = _.merge(nuskin.configuration, shoppingContext.overrides);
     }
-    $.setValue(nuskin.events.global.CONFIGURATION_SET);
+    events.setValue(nuskin.events.global.CONFIGURATION_SET);
     return nuskin.configuration;
 };
 
@@ -55,7 +55,7 @@ let getConfiguration = (url, country, domain, forceLoad = false, ignoreContext)
         //         config = res;
         //         nuskin.configuration = config;
         //         lastUrl = url;
-        //         $.setValue(nuskin.events.global.CONFIGURATION_SET);
+        //         events.setValue(nuskin.events.global.CONFIGURATION_SET);
         //     })
         //     .catch(xhr => {
         //         nuskin.configuration = null;
@@ -107,7 +107,7 @@ let getConfiguration = (url, country, domain, forceLoad = false, ignoreContext)
         lastContext = shoppingContext.context;
     }
     //This works here because the configuration ajax calls are synchronous.  If we ever switch to async then we need to publish after the ajax call comes back
-    $.setValue(nuskin.events.global.CONFIGURATION_SET);
+    events.setValue(nuskin.events.global.CONFIGURATION_SET);
     return config;
 };
 

package/src/event.js

@@ -1,6 +1,6 @@
 
 import { BroadcastChannel } from 'broadcast-channel';
-import '@nuskin/nuskinjquery';
+import nsEvents from '@nuskin/events';
 import * as _ from 'lodash';
 import RunConfigUtil from './runConfigUtil.js';
 
@@ -16,8 +16,8 @@ import RunConfigUtil from './runConfigUtil.js';
  * (2) Publish the event through the appropriate nuskin.events wrapper function, such as nuskin.events.publishError(nuskin.events.MY_NEW_ERROR);
  * (3) Subscribe from the code location where you'd like to handle the event: nuskin.events.subscribe( nuskin.events.MY_NEW_ERROR, function(evt) {//handle event});
  *
- * Note that as of now, the wrapper functions for subscribe and publish don't do anything other than route to $.publish()
- * and $.subscribe(). But if we use the wrapper functions here we can centralize for adaptability later on.
+ * Note that as of now, the wrapper functions for subscribe and publish don't do anything other than route to nsEvents.publish()
+ * and nsEvents.subscribe(). But if we use the wrapper functions here we can centralize for adaptability later on.
  *
  * Also note that the functions for error event handling are designed to help standardize the transmission of data in
  * cases such as AJAX request errors.  One could just use the jQuery pub/sub functions directly, but then if we need to
@@ -412,7 +412,7 @@ if (!nuskin.events) {
          * @memberof nuskin.events
          */
         function getValue(eventId, eventCallback, doSubscribe) {
-            $.getValue(eventId, eventCallback, doSubscribe);
+            nsEvents.getValue(eventId, eventCallback, doSubscribe);
         }
 
         /**
@@ -424,7 +424,7 @@ if (!nuskin.events) {
          * @memberof nuskin.events
          */
         function setValue(eventId, eventObject) {
-            $.setValue(eventId, eventObject);
+            nsEvents.setValue(eventId, eventObject);
         }
 
         /**
@@ -434,7 +434,7 @@ if (!nuskin.events) {
          * @memberof nuskin.events
          */
         function unsubscribe(eventId, fn) {
-            $.unsubscribe(eventId, fn);
+            nsEvents.unsubscribe(eventId, fn);
         }
 
         /**
@@ -445,7 +445,7 @@ if (!nuskin.events) {
          * @memberof nuskin.events
          */
         function subscribe(eventId, eventCallback) {
-            $.subscribe(eventId, eventCallback);
+            nsEvents.subscribe(eventId, eventCallback);
         }
 
 
@@ -460,7 +460,7 @@ if (!nuskin.events) {
         function publish(eventId, eventObject = null, fromBroadcast) {
             const mdata = getMetadata(eventId);
             if (!mdata || (mdata && mdata.publish)) {
-                $.publish(eventId, eventObject);
+                nsEvents.publish(eventId, eventObject);
             }
             // If we need to broadcast and it hasn't broadcasted yet
             if (mdata && mdata.broadcast && !fromBroadcast) {
@@ -485,7 +485,7 @@ if (!nuskin.events) {
          * @private
          */
         function publishError(eventId, eventObject) {
-            $.publish(eventId, events.getErrorEventObject(eventObject.messageId ? eventObject.messageId : eventId, eventObject.messageString));
+            nsEvents.publish(eventId, events.getErrorEventObject(eventObject.messageId ? eventObject.messageId : eventId, eventObject.messageString));
         }
 
 
@@ -505,7 +505,7 @@ if (!nuskin.events) {
          *
          */
         function publishAjaxErrorEvent(eventId, url, response, messageId, messageString) {
-            $.publish(eventId, events.getAjaxErrorEventObject(messageId ? messageId : eventId, url, response, messageString));
+            nsEvents.publish(eventId, events.getAjaxErrorEventObject(messageId ? messageId : eventId, url, response, messageString));
         }
 
 
@@ -525,7 +525,7 @@ if (!nuskin.events) {
          * @memberof nuskin.events
          */
         function publishAjaxError(eventId, eventObject) {
-            $.publish(eventId, events.getAjaxErrorEventObject(eventObject.messageId ? eventObject.messageId : eventId, eventObject.url, eventObject.response, eventObject.messageString));
+            nsEvents.publish(eventId, events.getAjaxErrorEventObject(eventObject.messageId ? eventObject.messageId : eventId, eventObject.url, eventObject.response, eventObject.messageString));
         }