@speedkit/cli 2.19.0 → 2.21.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [2.21.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.20.0...v2.21.0) (2024-04-10)
+
+
+### Features
+
+* **onboarding:** add filePath to all vm.evalCalls) ([cf2ef00](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/cf2ef009283400b9c490f52f47f8c8000005adea))
+* **onboarding:** enable advanced debugging ([96130c1](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/96130c1c7339f991a3c35b2eec7528ba0d26da25))
+
+# [2.20.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.19.0...v2.20.0) (2024-04-10)
+
+
+### Features
+
+* **customer-config:** adjust default lazy loading removal config to keep data attributes ([9db27c3](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/9db27c38fb18b4c90f61665972e6bd298dbd4212))
+
 # [2.19.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.18.0...v2.19.0) (2024-04-09)
 
 

package/README.md

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

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

@@ -2,8 +2,8 @@
   {{#if removeLazyLoading}}
 const lazyLoadDefaultConfig = {
   attributes: [
-    { find: 'data-src', rename: 'src' },
-    { find: 'data-srcset', rename: 'srcset' },
+    { find: 'data-src', set: 'src' },
+    { find: 'data-srcset', set: 'srcset' },
   ],
   lazyClass: 'lazyload',
   lazyLoad: false,

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

@@ -9,6 +9,7 @@ export declare class DocumentHandlerServer {
     private cli;
     private verboseLevel;
     private documentHandlerCode;
+    private documentHandlerConfigCode;
     private database;
     constructor(customerConfig: CustomerConfig, files: FileListInterface, bundler: BundleService, cli: CliService, verboseLevel?: boolean);
     transform(html: string, variation: string, url: string, headers: {
@@ -16,7 +17,7 @@ export declare class DocumentHandlerServer {
     }): Promise<string>;
     private getTransformFunctionWrapper;
     buildDocumentHandler(): Promise<void>;
-    private createDocumentHandlerFile;
+    private createDocumentHandlerConfigFile;
     private getDocumentHandler;
     private getDynamicFetcher;
     private getDynamicFetcherConfig;

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

@@ -18,6 +18,7 @@ class DocumentHandlerServer {
     cli;
     verboseLevel;
     documentHandlerCode;
+    documentHandlerConfigCode;
     database;
     constructor(customerConfig, files, bundler, cli, verboseLevel = false) {
         this.customerConfig = customerConfig;
@@ -44,20 +45,32 @@ class DocumentHandlerServer {
             DYNAMIC_FETCHER: await this.getDynamicFetcher(),
             DYNAMIC_FETCHER_CONFIG: await this.getDynamicFetcherConfig(),
             CUSTOM_STYLES: this.getStyles(),
+            ...this.getContextVars(),
             ...this.createNodeVmContext(),
         };
-        const script = new vm.Script(this.documentHandlerCode + this.getTransformFunctionWrapper());
+        const customDocumentHandlerFile = this.files.getByName(files_1.INTEGRATION_FILES.CUSTOM.DOCUMENT_HANDLER);
+        if (customDocumentHandlerFile.path) {
+            vm.runInNewContext(this.documentHandlerCode, vmContext, {
+                filename: customDocumentHandlerFile.path,
+                displayErrors: true,
+            });
+        }
+        else {
+            vm.runInNewContext(this.documentHandlerCode, vmContext);
+        }
+        const configDocumentHandlerPath = this.files.getByName("config_documentHandler").path;
+        const script = new vm.Script(this.documentHandlerConfigCode + this.getTransformFunctionWrapper(), {
+            filename: configDocumentHandlerPath,
+        });
         try {
             return await (async () => {
                 return await new Promise((resolve, reject) => {
-                    /* eslint-disable @typescript-eslint/ban-ts-comment */
-                    // @ts-expect-error
+                    // @ts-expect-error resolve is unknown
                     vmContext.resolve = resolve;
-                    // @ts-expect-error
+                    // @ts-expect-error reject is unknown
                     vmContext.reject = reject;
-                    /* eslint-enable @typescript-eslint/ban-ts-comment */
                     const context = vm.createContext(vmContext);
-                    script.runInContext(context);
+                    script.runInContext(context, { displayErrors: true });
                 });
             })();
         }
@@ -72,13 +85,13 @@ class DocumentHandlerServer {
         return `\n\ndocumentHandler.transform(db, skInternalRequest).then(result => {resolve(result);}).catch((err)=>{reject(err);});`;
     }
     async buildDocumentHandler() {
-        this.documentHandlerCode = await this.createDocumentHandlerFile();
+        this.documentHandlerCode = await this.getDocumentHandler();
+        this.documentHandlerConfigCode =
+            await this.createDocumentHandlerConfigFile();
         this.cli.writeSuccess("rebuild documentHandler");
     }
-    async createDocumentHandlerFile() {
-        const documentHandler = await this.getDocumentHandler();
-        const documentHandlerConfig = this.getDocumentHandlerConfig().replace("export const post", "const post");
-        return `${this.getContextVars()} ${documentHandler} ${documentHandlerConfig}`;
+    async createDocumentHandlerConfigFile() {
+        return this.getDocumentHandlerConfig().replace("export const post", "const post");
     }
     async getDocumentHandler() {
         return this.files
@@ -113,11 +126,11 @@ class DocumentHandlerServer {
         return documentHandlerFile.getContent();
     }
     getContextVars() {
-        let template = "";
+        const contextVariables = {};
         for (const key in this.customerConfig) {
-            template += `var ${key.toUpperCase()} = '${this.customerConfig[key]}';\n`;
+            contextVariables[key.toUpperCase()] = this.customerConfig[key];
         }
-        return template;
+        return contextVariables;
     }
     async createDataBaseMock() {
         const vmConsole = {

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

@@ -25,11 +25,11 @@ class CustomerConfigHandler extends file_handler_1.default {
     }
     async handle(filePath) {
         const fileContent = await this.fileReader.getContent(filePath);
-        const config = await this.loadConfig(fileContent);
+        const config = await this.loadConfig(fileContent, filePath);
         this.validator.validate(config);
         return new customer_config_file_1.default(this.getFileName(filePath), filePath, fileContent, config, this.configName, this.testApp);
     }
-    async loadConfig(fileContent) {
+    async loadConfig(fileContent, filePath) {
         if ((fileContent.includes("process.env.TEST_APP") && this.testApp === null) ||
             this.testApp.length === 0) {
             throw new customer_config_error_1.default("please specify env TEST_APP in your .env or configFile file");
@@ -40,7 +40,10 @@ class CustomerConfigHandler extends file_handler_1.default {
                 env: { TEST_APP: this.testApp }, // make TEST_APP available for vm
             },
         };
-        vm.runInNewContext(fileContent, customerConfigContext);
+        vm.runInNewContext(fileContent, customerConfigContext, {
+            filename: filePath,
+            displayErrors: true,
+        });
         const configs = customerConfigContext?.module?.exports;
         if (Array.isArray(configs) ||
             typeof configs === "string" ||

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

@@ -25,7 +25,10 @@ class CustomerConfigFile extends file_1.default {
                 env: { TEST_APP: this.testApp }, // make TEST_APP available for vm
             },
         };
-        vm.runInNewContext(this.getContent(), customerConfigContext);
+        vm.runInNewContext(this.getContent(), customerConfigContext, {
+            filename: this.path,
+            displayErrors: true,
+        });
         if (this.configName in customerConfigContext.module.exports) {
             this.config = customer_config_1.default.createFrom(customerConfigContext.module.exports[this.configName], this.configName);
         }

package/oclif.manifest.json

@@ -699,5 +699,5 @@
       ]
     }
   },
-  "version": "2.19.0"
+  "version": "2.21.0"
 }

package/package.json

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