@speedkit/cli 2.67.0 → 2.68.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [2.68.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.67.0...v2.68.0) (2024-12-11)
+
+
+### Bug Fixes
+
+* do not set forceInstall to true by default ([4cd7138](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/4cd7138e2deb44a8a33920c3fa888a77401dcd2c))
+
+
+### Features
+
+* **onboarding:** add current DBToken to local docHandlerRuntime ([bd7d164](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/bd7d16420dd3bab22f76d34878ddfdfc2a0edc03))
+* **wizard:** remove custom doc-handler creation on lambda server-side rendering usage ([a4f5bff](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/a4f5bff6591e376a089c6f9acb70239fce133eac))
+
 # [2.67.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.66.0...v2.67.0) (2024-12-10)
 
 

package/README.md

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

package/dist/services/customer-config/customer-config-service.d.ts

@@ -23,7 +23,6 @@ export declare class CustomerConfigService {
     private shouldFileBeOverwritten;
     private downloadAndSaveFile;
     private getConfigSettings;
-    handleDocumentHandler({ addPreRendering }: CustomerConfigSettings): Promise<void>;
     logWarnings(configSettings: CustomerConfigSettings): Promise<void>;
     generateConfig(): Promise<void>;
 }

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

@@ -207,7 +207,7 @@ class CustomerConfigService {
         }
         activateImageOptimisation = await this.cli.confirm("Activate Image Optimisation?", false);
         removeLazyLoading = await this.cli.confirm("Remove Lazy-Loading?");
-        if (await this.cli.confirm("Add Pre-Rendering? This requires a set-up Lambda function to work. Also requires a DOM-based DocumentHandler.", false)) {
+        if (await this.cli.confirm("Add Pre-Rendering? This requires a set-up Lambda function to work. Also requires usage of the DOM-based DocumentHandler.", false)) {
             addPreRendering = true;
             if (await this.cli.confirm("Does the customer utilize Shadow DOMs? If so additional handling for this will be added.", false)) {
                 supportShadowDomInPreRendering = true;
@@ -250,31 +250,6 @@ class CustomerConfigService {
             shopifyId,
         };
     }
-    async handleDocumentHandler({ addPreRendering }) {
-        /*
-          TODO:
-           remove this custom DocumentHandler handling as soon as the DOM-parsing DocumentHandler has been released
-           and can be controlled/activated by the DocumentHandler Config properly
-         */
-        if (addPreRendering) {
-            const documentHandlerBranchName = "dom-parser/develop";
-            const customDocumentHandlerOutputPath = path.join(this.outputDirPath, "custom_documentHandler.js");
-            this.cli.writeWarning(`
-      ⚠️ MANUAL ACTION NEEDED ⚠️
-
-      Your config needs the DOM-parsing DocumentHandler which has not been publicly released yet.
-
-      Working Branch: ${this.cli.codeStyle(documentHandlerBranchName)} (https://gitlab.orestes.info/baqend/document-handler/-/tree/${documentHandlerBranchName})
-
-      Please add it to your newly created config directory manually:
-
-      1. ${this.cli.codeStyle(`git clone -b ${documentHandlerBranchName} git@vm.orestes.info:baqend/document-handler.git`)}
-      2. ${this.cli.codeStyle(`cd ./document-handler`)}
-      3. ${this.cli.codeStyle(`npm ci && npm run build`)}
-      4. ${this.cli.codeStyle(`cp ./dist/DocumentHandler.js ${customDocumentHandlerOutputPath}`)}
-    `);
-        }
-    }
     async logWarnings(configSettings) {
         if (configSettings.useScrapingBee) {
             this.cli.writeWarning(`
@@ -293,7 +268,6 @@ class CustomerConfigService {
             this.templates.push("downtimeDetection.js.hbs");
         }
         await this.compileHandlebarsFiles(configSettings);
-        await this.handleDocumentHandler(configSettings);
         await this.logWarnings(configSettings);
         this.cli.writeSuccess("\nConfig generation completed 👏\n");
     }

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

@@ -172,7 +172,7 @@ const config = {
   {{/unless}}
 }
 
-const documentHandler = new DocumentHandler({
+const documentHandler = new {{#if addPreRendering}}DomDocumentHandler{{else}}DocumentHandler{{/if}}({
   ...config,
   app: APP,
   dynamicFetcher: DYNAMIC_FETCHER,

package/dist/services/document-handler-runtime/document-handler-server.d.ts

@@ -1,6 +1,7 @@
 import { BundleService } from "../bundler";
 import { CliService } from "../cli";
 import { CustomerConfig, FileListInterface } from "../integration-api";
+import { EntityManager } from "baqend";
 import { DocumentHandlerResponse } from "./server/document-handler-response";
 export declare class DocumentHandlerServer {
     private customerConfig;
@@ -8,10 +9,11 @@ export declare class DocumentHandlerServer {
     private bundler;
     private cli;
     private verboseLevel;
+    private entityManager?;
     private documentHandlerCode;
     private documentHandlerConfigCode;
     private database;
-    constructor(customerConfig: CustomerConfig, files: FileListInterface, bundler: BundleService, cli: CliService, verboseLevel?: boolean);
+    constructor(customerConfig: CustomerConfig, files: FileListInterface, bundler: BundleService, cli: CliService, verboseLevel?: boolean, entityManager?: EntityManager);
     transform(html: string, variation: string, url: string, headers: {
         [name: string]: string;
     }): Promise<DocumentHandlerResponse>;

package/dist/services/document-handler-runtime/document-handler-server.js

@@ -21,15 +21,17 @@ class DocumentHandlerServer {
     bundler;
     cli;
     verboseLevel;
+    entityManager;
     documentHandlerCode;
     documentHandlerConfigCode;
     database;
-    constructor(customerConfig, files, bundler, cli, verboseLevel = false) {
+    constructor(customerConfig, files, bundler, cli, verboseLevel = false, entityManager) {
         this.customerConfig = customerConfig;
         this.files = files;
         this.bundler = bundler;
         this.cli = cli;
         this.verboseLevel = verboseLevel;
+        this.entityManager = entityManager;
     }
     async transform(html, variation, url, headers) {
         if (!this.documentHandlerCode) {
@@ -160,6 +162,9 @@ class DocumentHandlerServer {
             const vmContext = { console: vmConsole, module: { exports: {} } };
             vm.runInNewContext(databaseCode, vmContext);
             this.database = vmContext.module.exports;
+            if (this.entityManager) {
+                this.database.token = this.entityManager.token;
+            }
         }
         return this.database;
     }

package/dist/services/document-handler-runtime/factory/document-handler-runtime-service-factory.js

@@ -8,6 +8,8 @@ const cli_1 = require("../../cli");
 const required_file_not_found_error_1 = tslib_1.__importDefault(require("../error/required-file-not-found-error"));
 const document_handler_server_1 = require("../document-handler-server");
 const bundler_1 = require("../../bundler");
+const entity_manager_factory_1 = require("../../config-api/entity-manager-factory");
+const safe_1 = require("../../../helpers/safe");
 class DocumentHandlerRuntimeServiceFactory {
     context;
     cliConfig;
@@ -35,7 +37,8 @@ class DocumentHandlerRuntimeServiceFactory {
         const customerConfig = this.getCustomerConfig(files);
         const bundler = new bundler_1.BundleServiceFactory().buildService();
         const cliService = new cli_1.CliServiceFactory().getService();
-        return new document_handler_server_1.DocumentHandlerServer(customerConfig, files, bundler, cliService, this.context.verboseLevel);
+        const entityManagerResult = await (0, safe_1.safe)(new entity_manager_factory_1.EntityManagerFactory().getEntityManager(customerConfig.app));
+        return new document_handler_server_1.DocumentHandlerServer(customerConfig, files, bundler, cliService, this.context.verboseLevel, entityManagerResult.success ? entityManagerResult.data : null);
     }
     prepareIntegrationApi() {
         const integrationApiContext = new integration_api_1.IntegrationApiContext(this.context.customerPath, this.context.configName, this.context.fileDependencies, [".git", ".idea", "node_modules"]);

package/dist/services/integration-api/struct/customer-config.js

@@ -33,7 +33,7 @@ class CustomerConfig {
     static createFrom(configFile, configName) {
         const { app, origins, domain, swPath, scope, appDomain, installPath, installParams, name, forceInstall, chromeFlags, dependencies, } = configFile;
         return new CustomerConfig(new RequiredParameter("app", app).isString().getValue(), new RequiredParameter("origins", origins).isArray().getValue(), domain, new RequiredParameter("swPath", swPath).isString().getValue(), new RequiredParameter("scope", scope).isString().getValue(), appDomain || `${app}.app.baqend.com`, installPath ||
-            `https://${app}.app.baqend.com/v1/speedkit/install.js?d=${name || configName}`, installParams || 'async="" crossorigin="anonymous"', name, forceInstall || true, chromeFlags, dependencies || {});
+            `https://${app}.app.baqend.com/v1/speedkit/install.js?d=${name || configName}`, installParams || 'async="" crossorigin="anonymous"', name, forceInstall || false, chromeFlags, dependencies || {});
     }
 }
 exports.CustomerConfig = CustomerConfig;

package/oclif.manifest.json

@@ -712,5 +712,5 @@
       ]
     }
   },
-  "version": "2.67.0"
+  "version": "2.68.0"
 }

package/package.json

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