@adobe/aem-cli 16.15.6 → 16.15.7

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [16.15.7](https://github.com/adobe/helix-cli/compare/v16.15.6...v16.15.7) (2025-10-02)
+
+
+### Bug Fixes
+
+* preserve logger this context in browser log forwarding ([#2608](https://github.com/adobe/helix-cli/issues/2608)) ([7e8f6bc](https://github.com/adobe/helix-cli/commit/7e8f6bcbd101af92cba3cacd6080013386ab09bf))
+
 ## [16.15.6](https://github.com/adobe/helix-cli/compare/v16.15.5...v16.15.6) (2025-09-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.15.6",
+  "version": "16.15.7",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",

package/src/server/HelixServer.js

@@ -188,11 +188,15 @@ export class HelixServer extends BaseServer {
     }
 
     // Build the HTML file path - only support .html extension
-    const htmlFile = path.join(this._project.directory, this._htmlFolder, `${relativePath}.html`);
+    const htmlFile = path.resolve(this._project.directory, this._htmlFolder, `${relativePath}.html`);
 
     // Security check: ensure the file is within the project directory
-    const relPath = path.relative(this._project.directory, htmlFile);
-    if (relPath.startsWith('..') || path.isAbsolute(relPath)) {
+    // Use resolve to normalize both paths before comparing
+    const resolvedProjectDir = path.resolve(this._project.directory);
+    const relPath = path.relative(resolvedProjectDir, htmlFile);
+
+    // Only check for path traversal - remove the incorrect isAbsolute check
+    if (relPath.startsWith('..')) {
       return next();
     }
 
@@ -217,7 +221,10 @@ export class HelixServer extends BaseServer {
     }
 
     // Serve the file
-    await sendFile(htmlFile, {
+    // Use the root option to specify the base directory for sendFile
+    // This prevents issues with worktrees in subdirectories
+    await sendFile(path.basename(htmlFile), {
+      root: path.dirname(htmlFile),
       dotfiles: 'deny',
       headers: {
         'access-control-allow-origin': '*',

package/src/server/LiveReload.js

@@ -100,9 +100,12 @@ class ClientConnection extends EventEmitter {
       }
     }).join(' ');
 
-    // Use appropriate log level
-    const logMethod = this.log[level] || this.log.info;
-    logMethod(`${prefix} ${message}`);
+    // Use appropriate log level, preserving this context
+    if (this.log[level]) {
+      this.log[level](`${prefix} ${message}`);
+    } else {
+      this.log.info(`${prefix} ${message}`);
+    }
   }
 
   _send(data) {