@saasquatch/squatch-js 2.5.1-4 → 2.5.1-6

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.5.1] - 2023-06-07
+
+### Fixed
+
+- Race condition with auto-popup fixed when using the squatch-js package from NPM or on Safari
+
 ## [2.5.0] - 2023-05-16
 
 ### Removed
@@ -30,7 +36,7 @@ var initObj = {
 squatch
   .widget(initObj)
   .then(function (response) {
-    const widget = response.widget
+    const widget = response.widget;
   })
   .catch(function (error) {
     console.log(error);
@@ -44,6 +50,7 @@ squatch
 ## [2.4.3] - 2023-04-20
 
 ### Changed
+
 - Updated license copyright to be in line with SaaSquatch open-source policy.
 
 ## [2.4.2] - 2023-04-10
@@ -287,8 +294,9 @@ No release notes.
 
 No release notes.
 
-[unreleased]: https://github.com/saasquatch/squatch-js/compare/@saasquatch%2Fsquatch-js@2.5.0...HEAD
-[2.5.0]: https://github.com/saasquatch/squatch-js/compare/@saasquatch%2Fsquatch-js@2.4.1...@saasquatch%2Fsquatch-js@2.5.0
+[unreleased]: https://github.com/saasquatch/squatch-js/compare/@saasquatch%2Fsquatch-js@2.5.1...HEAD
+[2.5.1]: https://github.com/saasquatch/squatch-js/compare/@saasquatch%2Fsquatch-js@2.5.0...@saasquatch%2Fsquatch-js@2.5.1
+[2.5.0]: https://github.com/saasquatch/squatch-js/compare/@saasquatch%2Fsquatch-js@2.4.3...@saasquatch%2Fsquatch-js@2.5.0
 [2.4.3]: https://github.com/saasquatch/squatch-js/compare/@saasquatch%2Fsquatch-js@2.4.2...@saasquatch%2Fsquatch-js@2.4.3
 [2.4.2]: https://github.com/saasquatch/squatch-js/compare/@saasquatch%2Fsquatch-js@2.4.1...@saasquatch%2Fsquatch-js@2.4.2
 [2.4.1]: https://github.com/saasquatch/squatch-js/compare/@saasquatch%2Fsquatch-js@2.4.0...@saasquatch%2Fsquatch-js@2.4.1

package/dist/squatch.d.ts

@@ -39,7 +39,7 @@ export declare function widget(widgetConfig: WidgetConfig): Promise<WidgetResult
 /**
  * Extracts widget configuration from `_saasquatchExtra` UTM parameter. Initialises `squatch` and renders the widget as a {@link PopupWidget} via static instanct of {@link Widgets}.
  */
-export declare function _auto(configIn: ConfigOptions): Promise<WidgetResult | undefined> | undefined;
+export declare function auto(configIn: ConfigOptions): Promise<WidgetResult | undefined> | undefined;
 /**
  * Initializes the static `squatch` global. This sets up:
  *

package/dist/squatch.esm.js

@@ -1599,21 +1599,21 @@ function _validateTrackOptions(raw) {
 
 /** @hidden */
 function asyncLoad() {
+  var _window$squatch;
+
   const loaded = window.squatch || null;
   const cached = window._squatch || null;
+  const auto = (_window$squatch = window.squatch) == null ? void 0 : _window$squatch.auto;
+  console.log({
+    loaded,
+    cached,
+    auto
+  });
 
-  function auto() {
-    setTimeout(() => {
-      if (typeof window.squatch._auto !== "function") return auto();
-
-      window.squatch._auto();
-    }, 0);
-  }
-
-  if (loaded && cached) {
+  if (loaded && cached && auto) {
     const ready = cached.ready || [];
     ready.forEach(cb => setTimeout(() => cb(), 0));
-    auto(); // @ts-ignore -- intetionally deletes `_squatch` to cleanup initialization
+    setTimeout(() => auto(), 0); // @ts-ignore -- intetionally deletes `_squatch` to cleanup initialization
 
     window._squatch = undefined;
 
@@ -2241,7 +2241,7 @@ function widget(widgetConfig) {
  * Extracts widget configuration from `_saasquatchExtra` UTM parameter. Initialises `squatch` and renders the widget as a {@link PopupWidget} via static instanct of {@link Widgets}.
  */
 
-function _auto(configIn) {
+function auto(configIn) {
   const configs = _getAutoConfig(configIn);
 
   if (configs) {
@@ -2359,5 +2359,5 @@ if (typeof document !== "undefined" && !window.SaaSquatchDoNotAutoDrop) {
 
 if (typeof document !== "undefined") asyncLoad();
 
-export { CtaWidget, EmbedWidget, PopupWidget, WidgetApi, Widgets, _auto, api, autofill, events, help, init, pushCookie, ready, submitEmail, widget, widgets };
+export { CtaWidget, EmbedWidget, PopupWidget, WidgetApi, Widgets, api, auto, autofill, events, help, init, pushCookie, ready, submitEmail, widget, widgets };
 //# sourceMappingURL=squatch.esm.js.map

package/dist/squatch.js

@@ -1626,21 +1626,21 @@ function _validateTrackOptions(raw) {
 
 /** @hidden */
 function asyncLoad() {
+  var _window$squatch;
+
   const loaded = window.squatch || null;
   const cached = window._squatch || null;
+  const auto = (_window$squatch = window.squatch) == null ? void 0 : _window$squatch.auto;
+  console.log({
+    loaded,
+    cached,
+    auto
+  });
 
-  function auto() {
-    setTimeout(() => {
-      if (typeof window.squatch._auto !== "function") return auto();
-
-      window.squatch._auto();
-    }, 0);
-  }
-
-  if (loaded && cached) {
+  if (loaded && cached && auto) {
     const ready = cached.ready || [];
     ready.forEach(cb => setTimeout(() => cb(), 0));
-    auto(); // @ts-ignore -- intetionally deletes `_squatch` to cleanup initialization
+    setTimeout(() => auto(), 0); // @ts-ignore -- intetionally deletes `_squatch` to cleanup initialization
 
     window._squatch = undefined;
 
@@ -2268,7 +2268,7 @@ function widget(widgetConfig) {
  * Extracts widget configuration from `_saasquatchExtra` UTM parameter. Initialises `squatch` and renders the widget as a {@link PopupWidget} via static instanct of {@link Widgets}.
  */
 
-function _auto(configIn) {
+function auto(configIn) {
   const configs = _getAutoConfig(configIn);
 
   if (configs) {
@@ -2391,8 +2391,8 @@ exports.EmbedWidget = EmbedWidget;
 exports.PopupWidget = PopupWidget;
 exports.WidgetApi = WidgetApi;
 exports.Widgets = Widgets;
-exports._auto = _auto;
 exports.api = api;
+exports.auto = auto;
 exports.autofill = autofill;
 exports.events = events;
 exports.help = help;