@speedkit/cli 3.10.0 → 3.11.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [3.11.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v3.10.0...v3.11.0) (2025-10-16)
+
+
+### Bug Fixes
+
+* broken version reference in updated puppeteer package ([91c474f](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/91c474fcb774e61e772a55734df7fc7a2c0c4811))
+
+
+### Features
+
+* improve default Shopify tracking code ([84496f3](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/84496f3a015587b986fa9394bacd9ddd80c7ff04))
+* integrate new SPA bundle ([8330322](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/8330322a187c8659e84f1946d9f57d507a852842))
+
 # [3.10.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v3.9.1...v3.10.0) (2025-10-15)
 
 

package/README.md

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

package/dist/commands/generate-pop-config.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const cli_1 = require("baqend/cli");
-const promises_1 = require("node:fs/promises");
 const file_helper_1 = require("../helpers/file-helper");
 const cli_parameters_1 = require("../models/cli-parameters");
 const cli_2 = require("../services/cli");
 const config_api_service_1 = tslib_1.__importDefault(require("../services/config-api-service"));
-const diff_service_1 = require("../services/diff-service");
 const pop_config_1 = require("../services/pop-config");
+const diff_1 = require("../services/diff");
+const cli_config_1 = require("../helpers/cli-config");
 const POP_REMAPPING = {
     HHN: "FRA",
 };
@@ -131,16 +131,19 @@ class GeneratePopConfig extends core_1.Command {
         const database = await cli_1.account.login({ app });
         const configService = new config_api_service_1.default(database, app);
         const cliService = new cli_2.CliServiceFactory().getService();
-        const diffService = new diff_service_1.DiffService(cliService);
+        const userConfig = new cli_config_1.CliConfig(this.config).load();
+        const diffService = new diff_1.DiffServiceFactory(new diff_1.DiffContext(userConfig.diffExec, userConfig.diffExecTemplate)).getService();
+        // new DiffService(cliService);
         const popPrewarmingCode = await this.createPopPrewarmingCode(config);
-        const popPrewarmingCodePath = await diffService.writeContentToTemporalFile(`generated_${moduleName}`, popPrewarmingCode);
         const remoteConfig = await configService.getRemoteModule(moduleName);
-        const doDeploy = deploy ??
-            (await diffService.shouldDeployModule(moduleName, remoteConfig, popPrewarmingCodePath));
+        const result = await diffService.diffContent(moduleName, popPrewarmingCode, remoteConfig);
+        const content = result.changedOrigins;
+        const isEqual = result.diff;
+        if (isEqual) {
+            cliService.write(`created config is the same as the deployed one`);
+        }
+        const doDeploy = !isEqual && (deploy ?? (await cliService.confirm("deploy changes?")));
         if (doDeploy) {
-            const content = await (0, promises_1.readFile)(popPrewarmingCodePath, {
-                encoding: "utf8",
-            });
             await configService.saveRemoteModule(content, moduleName);
             this.log(`Changes for module ${moduleName} were updated successfully`);
         }

package/dist/services/customer-config/customer-config-service.js

@@ -173,7 +173,7 @@ class CustomerConfigService {
                 staging = await this.getEnvironmentConfig(customer_config_service_model_1.EnvironmentType.STAGING, production.host.replace("www", "staging"));
             }
         }
-        activateScopedDeployments = await this.cli.confirm("[Scoping] Is the shop using (locale-based) sub-routes, like e.g. /de-de, on the basis of which scoped deployments should to be activated to prevent local-based changes from triggering a global deployment job?", false);
+        activateScopedDeployments = await this.cli.confirm("[Scoping] Is the shop using (locale-based) sub-resources, like e.g. /de-de/main.js, on the basis of which scoped deployments should to be activated to prevent local-based changes from triggering a global deployment job?", false);
         if (activateScopedDeployments &&
             (await this.cli.confirm("[Scoping] Should SK only be active on specific sub-routes? (e.g. /de-de)", false))) {
             subRouteScope = await this.cli.prompt("[Scoping] Enter one exemplary sub-route to scope SK to (without leading/trailing slashes):", { defaultAnswer: "de-de" });

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

@@ -1,6 +1,6 @@
 import { BaseBundle } from 'rum/BaseBundle';
 {{#if hasSoftNavigations}}
-import { HistoryApiPlugin } from 'rum/HistoryApiPlugin';
+import { SpaBundle } from 'rum/SpaBundle';
 {{/if}}
 {{#if useGATracking}}
 import { GAEcommerceTrackingPlugin } from 'rum/GAEcommerceTrackingPlugin';
@@ -16,12 +16,6 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
   if (window !== window.top) {
     return;
   }
-{{#if hasSoftNavigations}}
-
-  // Soft Navigation Handling:
-  var softLcpPending = false;
-  var latestUrl = location.href;
-{{/if}}
 {{#if isOxid}}
 
   var pageTypeSent = false;
@@ -52,7 +46,7 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
       }
     {{/if}}),
 {{#if hasSoftNavigations}}
-    new HistoryApiPlugin(), // Soft Navigation Tracking using History API
+    new SpaBundle(), // Soft Navigation Tracking using History API
 {{/if}}
 {{#if useGATracking}}
     new GAEcommerceTrackingPlugin({
@@ -67,9 +61,27 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
     new UserFrictionPlugin(),
     new ClickPlugin(),
   {{/if}}
+{{#if isShopify}}
+    {
+      key: "loggedIn",
+      type: "PiDimension",
+      on: "window.ShopifyAnalytics",
+      set: function () {
+        return !!window.ShopifyAnalytics?.meta?.page?.customerId;
+      },
+    },
+    {
+      key: "pageType",
+      type: "PiDimension",
+      on: "window.ShopifyAnalytics",
+      set: function () {
+        return window.ShopifyAnalytics?.meta?.page?.pageType;
+      },
+    },
+{{else}}
     {
       key: 'loggedIn',
-      type: 'SessionDimension',
+      type: 'PiDimension',
 {{#if useGATracking}}
       on: 'dataLayer',
       set: function(pushedEvent) {
@@ -85,24 +97,6 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
     {
       key: 'pageType',
       type: 'PiDimension',
-{{#if isShopify}}
-      on: 'window.ShopifyAnalytics',
-      set: function() {
-        var pathname = window.location.pathname;
-        // TODO: verify pathname patterns
-        if (pathname.indexOf('/checkouts/') > -1) {
-          return 'checkout';
-        } if (pathname.indexOf('/account/login') > -1) {
-          return 'login';
-        } if (pathname.indexOf('/account/register') > -1) {
-          return 'register';
-        } if (pathname.indexOf('/account') > -1) {
-          return 'account';
-        } else {
-          return window.ShopifyAnalytics?.meta?.page?.pageType;
-        }
-      },
-{{else}}
   {{#if useGATracking}}
       on: 'dataLayer',
       set: function (pushedEvent) {
@@ -131,7 +125,6 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
       {{/if}}
       },
   {{/if}}
-{{/if}}
     },
 {{#if isOxid}}
     // OXID eShop specific fallback tracking for page type using URL:
@@ -160,6 +153,7 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
       },
     },
 {{/if}}
+{{/if}}
 {{#if useGATracking}}
 
     // TODO: remove or adapt if events are not properly covered by GAEcommerceTrackingPlugin
@@ -218,36 +212,25 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
     // },
 {{else}}
   {{#if isShopify}}
-
-    // {
-    //   key: 'ecAddToCart',
-    //   on: onAddToCartClick,
-    //   append: function () {
-    //     if (window.ShopifyAnalytics?.lib) {
-    //       var shopifyData = window.ShopifyAnalytics.lib;
-    //       var product;
-    //
-    //       if (shopifyData && shopifyData.length) {
-    //         shopifyData.forEach(item => {
-    //           if (item[1] === "Viewed Product Variant") {
-    //             if(item.length > 2){
-    //               product = item[2];
-    //             }
-    //           }
-    //         });
-    //
-    //         if (product) {
-    //           return {
-    //             id: product.productId + '_' + product.variantId, // optional – remove if no id is available
-    //             price: Number(product.price),
-    //             currencyCode: product.currency || defaultCurrency,
-    //             quantity: 1,
-    //           }
-    //         }
-    //       }
-    //     }
-    //   },
-    // },
+    {
+      key: "ecAddToCart",
+      // TODO depending on the used theme different events are in use variant:added, product-ajax:added, product:added
+      // TODO the correct event can easily spotted by search for the initiator of the /cart/add request after doing a addToCart
+      on: (callback) => document.addEventListener("product-ajax:added", callback),
+      append: function (event) {
+        // TODO depending on the used event the product is exposed under a different property
+        var product = event.detail.product;
+
+        if (product) {
+          return {
+            id: product.product_id,
+            price: (product.discounted_price ?? product.price) / 100, // price is in cents
+            currencyCode: window.Shopify?.currency?.active || defaultCurrency,
+            quantity: product.quantity,
+          };
+        }
+      },
+    },
 
     // No custom ecConversion tracking event as it is already handled by the Speed Kit Extension for Shopify
   {{else}}
@@ -286,106 +269,6 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
     },
   {{/if}}
 {{/if}}
-{{#if hasSoftNavigations}}
-    {
-      on: "softNavigation",
-      track: (controller) => {
-        var onlyHashChanged =
-          latestUrl.split("#")[0] === location.href.split("#")[0];
-        latestUrl = location.href;
-
-        if (onlyHashChanged) {
-          controller.trackCustomEvent("hashChanged", location.href, Date.now());
-          return;
-        }
-
-        controller.trackCustomEvent("softNav", location.href, Date.now());
-
-        // Only capture soft LCP on following pages/page types:
-        // TODO: update to match the resp. page types to capture
-        var isProduct = location.href.indexOf("/p/") !== -1;
-        var isCategory = location.href.indexOf("/c/") !== -1;
-
-        if (!isCategory && !isProduct) return;
-
-        var navStartMark = "soft-nav_" + location.pathname;
-        performance.mark(navStartMark);
-
-        softLcpPending = true;
-
-        var softNavigationPerformanceObserver = new PerformanceObserver(
-          (entries, observer) => {
-            // TODO: update exemplary selectors within this block
-
-            // Wait for product image resources to be loaded:
-            var imageEntries = Array.from(entries.getEntries()).filter(
-              (item) => item.name.indexOf("/product/image/") !== -1,
-            );
-
-            // Ensure product images can be found in requested resources list:
-            if (!imageEntries || imageEntries.length < 1) {
-              return;
-            }
-
-            // Wait for product hero image / first product image in list to be referenced in DOM:
-            var imageElementSelector = isProduct
-              ? ".product-details .slick-slide.slick-active img" // PDP hero image
-              : ".product-list .product-image img"; // PLP list image(s)
-
-            var imageElement = document.querySelector(imageElementSelector);
-
-            // Ensure image element can be found in document:
-            if (!imageElement) {
-              return;
-            }
-            var imageUrl = imageElement.currentSrc || imageElement.srcset || "";
-
-            var imageMatchingRequestedResource = imageEntries.filter(
-              (entry) => {
-                var urlObj = new URL(entry.name);
-                return imageUrl.indexOf(urlObj.pathname) > -1;
-              },
-            )[0];
-
-            // Ensure the resp. image source referenced in the document can be found in requested resources list:
-            if (!imageMatchingRequestedResource) {
-              return;
-            }
-
-            // Ensure Soft LCP is still pending:
-            if (!softLcpPending) {
-              return;
-            }
-
-            var measure = performance.measure("lcp_" + location.pathname, {
-              start: navStartMark,
-              end: imageMatchingRequestedResource.responseEnd,
-            });
-
-            var timing = {
-              start: measure.startTime,
-              duration: measure.duration,
-              image: imageMatchingRequestedResource.name,
-              url: window.location.href,
-            };
-            controller.trackCustomEvent(
-              "softNavLcp",
-              JSON.stringify(timing),
-              Date.now(),
-            );
-
-            softNavigationPerformanceObserver.disconnect();
-            softLcpPending = false;
-          },
-        );
-
-        softNavigationPerformanceObserver.observe({
-          buffered: true,
-          type: "resource",
-        });
-      },
-    },
-{{/if}}
 {{#if isPlentymarkets}}
   {
     on: "domInteractive",
@@ -396,20 +279,6 @@ import { PredictivePreloading } from 'predictive-preloading/predictivePreloading
   },
 {{/if}}
   );
-{{#if isShopify}}
-  // Shopify specific:
-
-  // function onAddToCartClick(cb, controller) {
-  //   controller.onDOMInteractive(function() {
-  //     var addToCartBtn = document.querySelector('.button--add-to-cart');
-  //     if(addToCartBtn) {
-  //       addToCartBtn.addEventListener('click', function (t) {
-  //         cb(controller);
-  //       }, true);
-  //     }
-  //   })
-  // }
-{{/if}}
 {{#if isPlentymarkets}}
 
   /* ==== */

package/dist/services/onboarding/browser/executable/executable-validator.js

@@ -4,7 +4,7 @@ exports.ExecutableValidator = void 0;
 const tslib_1 = require("tslib");
 // import CLI from puppeteer to use function as sames as `npx puppeteer browsers install`
 const browsers_1 = require("@puppeteer/browsers");
-const version_js_1 = require("puppeteer-core/internal/generated/version.js");
+const version_js_1 = require("puppeteer-core/lib/cjs/puppeteer/util/version.js");
 const node_fs_1 = require("node:fs");
 const application_error_1 = tslib_1.__importDefault(require("../../../error-handling/error/application-error"));
 const browsers_2 = require("@puppeteer/browsers");

package/oclif.manifest.json

@@ -732,5 +732,5 @@
       ]
     }
   },
-  "version": "3.10.0"
+  "version": "3.11.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"
@@ -95,7 +95,7 @@
     "nypm": "^0.6.2",
     "parse5": "7.1",
     "parse5-htmlparser2-tree-adapter": "7.0.0",
-    "puppeteer": "^24.16.0",
+    "puppeteer": "^24.25.0",
     "puppeteer-extra": "^3.3.6",
     "semver": "^7.6.3",
     "strip-comments": "^2.0.1",