@speedkit/cli 2.87.0 → 2.89.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [2.89.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.88.0...v2.89.0) (2025-07-04)
+
+
+### Features
+
+* **wizard:** ssr custom element handling ([ef8a297](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/ef8a297d7dd094a5b1f5614b1ccaed817e35574e))
+
+# [2.88.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.87.0...v2.88.0) (2025-06-19)
+
+
+### Features
+
+* **customer-config:** suppress ecConversion tracking event for Shopify customers ([bad89dd](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/bad89ddaeca4e535c37ca1f36ab490d03eb2813e))
+
 # [2.87.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.86.0...v2.87.0) (2025-06-04)
 
 

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @speedkit/cli
 $ sk COMMAND
 running command...
 $ sk (--version)
-@speedkit/cli/2.87.0 linux-x64 node-v20.19.2
+@speedkit/cli/2.89.0 linux-x64 node-v20.19.3
 $ sk --help [COMMAND]
 USAGE
   $ sk COMMAND

package/dist/services/customer-config/templates/config_documentHandler.js.hbs

@@ -419,6 +419,8 @@ export const post = async (db, req, res) => {
      * Overrides the window.customElements.define method to add custom code before calling the original function.
      */
     function overrideDefine() {
+      /* global HTMLElement, window, customElements */
+
       // Store the original function
       // eslint-disable-next-line no-undef
       let originalDefine = window.customElements.define;
@@ -426,59 +428,89 @@ export const post = async (db, req, res) => {
       // Create new function
       // eslint-disable-next-line no-undef
       window.customElements.define = function (e, o, options) {
-        // Execute your custom code
-        // Create a class for the element
-        let skProxy = class extends o {
-          constructor() {
-            super();
-          }
+        if (options?.is && options?.is.length > 0) {
+          // eslint-disable-next-line no-undef
+          return originalDefine.call(window.customElements, e, o, options);
+        }
 
-          connectedCallback() {
-            if (this.hasAttribute("data-sk-static")) {
-              return;
-            }
-            // normal functionality
-            super.connectedCallback();
+        const lifeCycleCallbacks = [
+          "connectedCallback",
+          "disconnectedCallback",
+          "adoptedCallback",
+          "connectedMoveCallback",
+          "attributeChangedCallback",
+          "formAssociatedCallback",
+          "formResetCallback",
+          "formDisabledCallback",
+          "formStateRestoreCallback",
+        ];
+
+        let preventInit = false;
+        let skProxy = function () {
+          // This constructor is invoked for every custom element.
+          // However, we can return a new instance in this constructor which is then used for upgrading the element.
+          // We are using the Reflect.construct method to prevent invoking the original constructor
+          // initialization code if we are in the static rendered DOM tree of Speed Kit
+          let instance;
+          if (preventInit) {
+            instance = Reflect.construct(HTMLElement, arguments, skProxy);
+            instance.__skStatic = preventInit;
+          } else {
+            instance = Reflect.construct(o, arguments, skProxy);
           }
 
-          disconnectedCallback() {
-            // for sk-shadow-root don't do anything
-            if (this.hasAttribute("data-sk-static")) {
-              return;
-            }
-            // normal functionality
-            super.disconnectedCallback();
-          }
+          return instance;
+        };
 
-          adoptedCallback() {
-            // for sk-shadow-root don't do anything
-            if (this.hasAttribute("data-sk-static")) {
-              return;
-            }
-            // normal functionality
-            super.adoptedCallback();
-          }
+        // create a dynamic proxy class which si overwriting all lifecycle hooks of the original class
+        skProxy.prototype = Object.create(o.prototype, {
+          constructor: {
+            value: skProxy,
+            writable: true,
+            configurable: true,
+          },
+          ...Object.fromEntries(
+            lifeCycleCallbacks
+              .map((callbackName) => [callbackName, o.prototype[callbackName]])
+              .filter(([, hasCallback]) => hasCallback)
+              .map(([callbackName, callback]) => {
+                return [
+                  callbackName,
+                  {
+                    value: function () {
+                      if (!this.__skStatic) {
+                        return callback.apply(this, arguments);
+                      }
+                    },
+                    writable: true,
+                    configurable: true,
+                  },
+                ];
+              }),
+          ),
+        });
 
-          attributeChangedCallback(name, oldValue, newValue) {
-            // for sk-shadow-root don't do anything
-            if (this.hasAttribute("data-sk-static")) {
-              return;
-            }
-            // normal functionality
-            super.attributeChangedCallback(name, oldValue, newValue);
-          }
+        Object.setPrototypeOf(skProxy, o);
 
-          attachShadow(mode) {
-            if (this.hasAttribute("data-sk-static")) {
-              return null;
-            }
-            return super.attachShadow(mode);
-          }
-        };
+        const skContainer = document.querySelector(".speed-kit-shadow-app-root");
+        let skContainerParentNode;
+        let skContainerNextNode;
+        if (skContainer) {
+          skContainerParentNode = skContainer.parentNode;
+          skContainerNextNode = skContainer.nextSibling;
+          skContainer.remove();
+        }
 
-        // Call the original function with modified arguments
-        // eslint-disable-next-line no-undef
+        // Control the upgrade of the sk static dom tree by temporary removing the tree while
+        // defining the new custom element. Do then a controlled upgrade of the sk dom tree by
+        // preventing the constructor invocation of the custom element class
         originalDefine.call(window.customElements, e, skProxy, options);
+        if (skContainer) {
+          preventInit = true;
+          skContainerParentNode.insertBefore(skContainer, skContainerNextNode);
+          customElements.upgrade(skContainer);
+          preventInit = false;
+        }
       };
     }
 

package/dist/services/customer-config/templates/config_loadHandler.js.hbs

@@ -34,7 +34,10 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
 {{/if}}
 {{#if useGATracking}}
     new GAEcommerceTrackingPlugin({
-      defaultCurrency: defaultCurrency
+      defaultCurrency: defaultCurrency,
+  {{#if isShopify}}
+      trackConfirmation: false, // No ecConversion tracking as it is already handled by the Speed Kit Extension for Shopify
+  {{/if}}
     }),
 {{/if}}
 
@@ -341,27 +344,8 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
     //     }
     //   },
     // },
-    {
-      key: 'ecConversion',
-      on: ShopifyReady,
-      set: function() {
-        var confirmationPage = location.pathname.indexOf('/thank_you') > -1;
-        if (
-          confirmationPage &&
-          window.Shopify?.checkout
-        ) {
-          var orderId = window.Shopify.checkout.order_id;
-          var orderCurrency = window.Shopify.checkout.currency;
-          var orderValue = window.Shopify.checkout.total_price;
-
-          return {
-            id: orderId,
-            currencyCode: orderCurrency || defaultCurrency,
-            revenue: Number(orderValue),
-          };
-        }
-      },
-    },
+
+    // No custom ecConversion tracking event as it is already handled by the Speed Kit Extension for Shopify
   {{else}}
 
     {

package/oclif.manifest.json

@@ -712,5 +712,5 @@
       ]
     }
   },
-  "version": "2.87.0"
+  "version": "2.89.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.87.0",
+  "version": "2.89.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"