web-manager 2.1.21 → 2.1.27

package/index.js

@@ -240,6 +240,17 @@ function Manager() {
       user.getIdToken(false)
         .then(function(token) {
           var done;
+          // fetch('https://us-central1-' + This.properties.options.libraries.firebase_app.config.projectId + '.cloudfunctions.net/bm_api', {
+          //   method: 'POST',
+          //   body: JSON.stringify({
+          //     authenticationToken: token,
+          //     command: 'signup-handler',
+          //     payload: {
+          //       newsletterSignUp: domLib.select('.auth-newsletter-input').getValue(),
+          //       affiliateCode: This.storage().get('auth.affiliateCode', '')
+          //     }
+          //   }),
+          // })
           fetch('https://us-central1-' + This.properties.options.libraries.firebase_app.config.projectId + '.cloudfunctions.net/bm_signUpHandler', {
             method: 'POST',
             body: JSON.stringify({
@@ -525,6 +536,7 @@ function Manager() {
             libraries: {
               firebase_app: {
                 enabled: true,
+                load: false,
                 config: {
                   apiKey: '',
                   authDomain: '',
@@ -536,13 +548,16 @@ function Manager() {
                 }
               },
               firebase_firestore: {
-                enabled: true
+                enabled: true,
+                load: false,
               },
               firebase_messaging: {
-                enabled: true
+                enabled: true,
+                load: false,
               },
               firebase_auth: {
                 enabled: true,
+                load: false,
               },
               lazysizes: {
                 enabled: true
@@ -1201,12 +1216,11 @@ function Manager() {
       // if (typeof window.firebase !== 'undefined') {
       //   return resolve();
       // }
-      if (options.libraries.firebase_app.enabled === true) {
-        import('firebase/app')
-        .then(function(mod) {
+      var setting = options.libraries.firebase_app
+      if (setting.enabled === true) {
+        function _post() {
           // This.log('Loaded Firebase.');
-          window.firebase = mod.default;
-          window.app = firebase.initializeApp(options.libraries.firebase_app.config);
+          window.app = firebase.initializeApp(setting.config);
 
           Promise.all([
             load_firebase_auth(This, options),
@@ -1215,8 +1229,19 @@ function Manager() {
           ])
           .then(resolve)
           .catch(reject);
-         })
-         .catch(reject);
+        }
+        if (setting.load) {
+          setting.load()
+          _post()
+        } else {
+          import('firebase/app')
+          .then(function(mod) {
+            window.firebase = mod.default;
+            _post()
+           })
+           .catch(reject);
+        }
+        return resolve()
       } else {
         return resolve();
       }
@@ -1229,10 +1254,16 @@ function Manager() {
       // if (typeof utilities.get(window, 'firebase.auth', undefined) !== 'undefined') {
       //   return resolve();
       // }
-      if (options.libraries.firebase_auth.enabled === true) {
-        import('firebase/auth')
-        .then(resolve)
-        .catch(reject);
+      var setting = options.libraries.firebase_auth;
+      if (setting.enabled === true) {
+        if (setting.load) {
+          setting.load()
+          resolve()
+        } else {
+          import('firebase/auth')
+          .then(resolve)
+          .catch(reject);
+        }
       } else {
         return resolve();
       }
@@ -1246,10 +1277,16 @@ function Manager() {
       // if (typeof utilities.get(window, 'firebase.firestore', undefined) !== 'undefined') {
       //   return resolve();
       // }
-      if (options.libraries.firebase_firestore.enabled === true) {
-        import('firebase/firestore')
-        .then(resolve)
-        .catch(reject);
+      var setting = options.libraries.firebase_firestore;
+      if (setting.enabled === true) {
+        if (setting.load) {
+          setting.load()
+          resolve()
+        } else {
+          import('firebase/firestore')
+          .then(resolve)
+          .catch(reject);
+        }
       } else {
         return resolve();
       }
@@ -1261,10 +1298,16 @@ function Manager() {
       // if (typeof utilities.get(window, 'firebase.messaging', undefined) !== 'undefined') {
       //   return resolve();
       // }
-      if (options.libraries.firebase_messaging.enabled === true) {
-        import('firebase/messaging')
-        .then(resolve)
-        .catch(reject);
+      var setting = options.libraries.firebase_messaging;
+      if (setting.enabled === true) {
+        if (setting.load) {
+          setting.load()
+          resolve()
+        } else {
+          import('firebase/messaging')
+          .then(resolve)
+          .catch(reject);
+        }
       } else {
         return resolve();
       }

package/lib/dom.js

@@ -250,22 +250,27 @@ Dom.prototype.exists = function() {
 }
 
 Dom.loadScript = function(options, callback) {
-  options = options || {};
-  options.async = (typeof options.async === 'undefined') ? false : options.async;
-  options.crossorigin = (typeof options.crossorigin === 'undefined') ? false : options.crossorigin;
-  var s = document.createElement('script');
-  s.src = options.src;
-  s.async = options.async;
-  if (options.crossorigin) {
-    s.setAttribute('crossorigin','*');
-  }
-  s.onload = function() {
-    callback();
-  };
-  s.onerror = function() {
-    callback(new Error('Failed to load script ' + options.src));
-  };
-  document.head.appendChild(s);
+  return new Promise(function(resolve, reject) {
+    options = options || {};
+    options.async = (typeof options.async === 'undefined') ? false : options.async;
+    options.crossorigin = (typeof options.crossorigin === 'undefined') ? false : options.crossorigin;
+    var s = document.createElement('script');
+    s.src = options.src;
+    s.async = options.async;
+    if (options.crossorigin) {
+      s.setAttribute('crossorigin','*');
+    }
+    s.onload = function() {
+      if (callback) { callback(); }
+      return resolve();
+    };
+    s.onerror = function() {
+      var error = new Error('Failed to load script ' + options.src);
+      if (callback) { callback(error); }
+      return reject(error);
+    };
+    document.head.appendChild(s);
+  });
 }
 
 Dom.select = function(selector, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "2.1.21",
+  "version": "2.1.27",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -23,9 +23,9 @@
   },
   "homepage": "https://itwcreativeworks.com",
   "dependencies": {
-    "@sentry/browser": "^6.11.0",
+    "@sentry/browser": "^6.15.0",
     "cookieconsent": "^3.1.1",
-    "firebase": "^8.9.1",
+    "firebase": "^8.10.0",
     "lazysizes": "^5.3.2"
   }
-}
+}