@adobe/aem-cli 16.10.13 → 16.10.15

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [16.10.15](https://github.com/adobe/helix-cli/compare/v16.10.14...v16.10.15) (2025-04-07)
+
+
+### Bug Fixes
+
+* always open aem.page ([7c33338](https://github.com/adobe/helix-cli/commit/7c333381af5317bb2c957185aa9357b6bb26007e))
+* Remove accept-encoding in proxy call to use nodejs defaults ([#2513](https://github.com/adobe/helix-cli/issues/2513)) ([f91c8ad](https://github.com/adobe/helix-cli/commit/f91c8adc645a3b70c92efcf0e469c40760ef6f7a))
+
+## [16.10.14](https://github.com/adobe/helix-cli/compare/v16.10.13...v16.10.14) (2025-04-03)
+
+
+### Bug Fixes
+
+* **deps:** update dependency express to v5 ([#2510](https://github.com/adobe/helix-cli/issues/2510)) ([6eeb467](https://github.com/adobe/helix-cli/commit/6eeb4671615c0676d777047f58391012b1ff5ab7))
+
 ## [16.10.13](https://github.com/adobe/helix-cli/compare/v16.10.12...v16.10.13) (2025-03-31)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.10.13",
+  "version": "16.10.15",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",
@@ -13,6 +13,7 @@
     "test": "c8 mocha",
     "test-ci-win": "npx mocha --reporter xunit test --reporter-options output=junit/test.xml -t 5000",
     "lint": "eslint .",
+    "lint:fix": "eslint --fix .",
     "semantic-release": "semantic-release",
     "semantic-release-dry": "semantic-release --dry-run --branches $CI_BRANCH",
     "prepare": "husky"
@@ -50,7 +51,7 @@
     "cookie": "1.0.2",
     "cookie-parser": "1.4.7",
     "dotenv": "16.4.7",
-    "express": "4.21.2",
+    "express": "5.1.0",
     "faye-websocket": "0.11.4",
     "fs-extra": "11.3.0",
     "glob": "11.0.1",

package/src/server/BaseServer.js

@@ -142,6 +142,7 @@ export class BaseServer extends EventEmitter {
       const listenCb = (err) => {
         if (err) {
           reject(new Error(`Error while starting ${this._scheme} server: ${err}`));
+          return;
         }
         this._port = this._server.address().port;
         this._addr = this._server.address().address;

package/src/server/HelixImportServer.js

@@ -105,6 +105,7 @@ export class HelixImportServer extends BaseServer {
     delete headers.connection;
     delete headers.host;
     delete headers.referer;
+    delete headers['accept-encoding'];
     await this._updateHeaders(headers);
 
     const ret = await getFetch(ctx.config.allowInsecure)(url, {
@@ -200,13 +201,13 @@ export class HelixImportServer extends BaseServer {
 
   async setupApp() {
     await super.setupApp();
-    const localFiles = ['/tools/*', '/component-definition.json', '/component-filters.json', '/component-models.json'];
+    const localFiles = [/\/tools\/.*/, '/component-definition.json', '/component-filters.json', '/component-models.json'];
     localFiles.forEach((file) => {
       this.app.get(file, asyncHandler(this.handleToolsRequest.bind(this)));
     });
     const handler = asyncHandler(this.handleProxyModeRequest.bind(this));
-    this.app.get('*', handler);
-    this.app.post('*', handler);
+    this.app.get(/.*/, handler);
+    this.app.post(/.*/, handler);
   }
 
   async doStop() {

package/src/server/HelixServer.js

@@ -227,8 +227,8 @@ export class HelixServer extends BaseServer {
     this.app.options(LOGIN_ACK_ROUTE, asyncHandler(this.handleLoginAck.bind(this)));
 
     const handler = asyncHandler(this.handleProxyModeRequest.bind(this));
-    this.app.get('*', handler);
-    this.app.post('*', handler);
+    this.app.get(/.*/, handler);
+    this.app.post(/.*/, handler);
   }
 
   async doStop() {

package/src/server/RequestContext.js

@@ -35,14 +35,14 @@ export default class RequestContext {
     this._queryString = purl.search || '';
     this._selector = '';
     this._extension = '';
-    this._headers = req.headers || {};
-    this._method = req.method || 'GET';
-    this._params = req.query || {};
+    this._headers = request.headers || {};
+    this._method = request.method || 'GET';
+    this._params = request.query || {};
     this._requestId = utils.randomChars(32);
     this._logger = cfg.log;
 
-    if (req.body && Object.entries(req.body).length > 0) {
-      this._body = req.body;
+    if (request.body && Object.entries(request.body).length > 0) {
+      this._body = request.body;
     }
     const lastSlash = this._path.lastIndexOf('/');
     if (lastSlash === this._path.length - 1) {

package/src/up.cmd.js

@@ -16,7 +16,6 @@ import chokidar from 'chokidar';
 import { HelixProject } from './server/HelixProject.js';
 import GitUtils from './git-utils.js';
 import pkgJson from './package.cjs';
-import { getFetch } from './fetch-utils.js';
 import { AbstractServerCommand } from './abstract-server.cmd.js';
 
 export default class UpCommand extends AbstractServerCommand {
@@ -140,58 +139,17 @@ export default class UpCommand extends AbstractServerCommand {
   }
 
   async verifyUrl(gitUrl, ref) {
-    // check if the site is on helix5
-    // https://admin.hlx.page/sidekick/adobe/www-aem-live/main/config.json
-    // {
-    //   "host": "aem.live",
-    //     "liveHost": "main--www-aem-live--adobe.aem.live",
-    //       "plugins": [
-    //         {
-    //           "id": "doc",
-    //           "title": "Documentation",
-    //           "url": "https://www.aem.live/docs/"
-    //         }
-    //       ],
-    //         "previewHost": "main--www-aem-live--adobe.aem.page",
-    //           "project": "Helix Website (AEM Live)",
-    //             "testProperty": "header";
-    // }
-    let previewHostBase = 'hlx.page';
-    const configUrl = `https://admin.hlx.page/sidekick/${gitUrl.owner}/${gitUrl.repo}/main/config.json`;
-    try {
-      const configResp = await getFetch(this._allowInsecure)(configUrl);
-      if (configResp.ok) {
-      // this is best effort for now
-        const config = await configResp.json();
-        const { previewHost } = config;
-        if (previewHost && previewHost.endsWith('.aem.page')) {
-          previewHostBase = 'aem.page';
-        }
-      }
-      /* c8 ignore start */
-      // this is notoriously hard to test, so we ignore it for now
-      // but if you want to give it a try, set up a local server with a self-signed cert
-      // change, /etc/hosts to point admin.hlx.page to localhost and run the test
-    } catch (e) {
-      if (e.code === 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY' || e.code === 'DEPTH_ZERO_SELF_SIGNED_CERT') {
-        await this.stop();
-        this.log.error(chalk`{yellow ${configUrl}} is using an invalid certificate, please check https://github.com/adobe/helix-cli#troubleshooting for help.`);
-        throw Error(e.message);
-      }
-    }
-    /* c8 ignore stop */
-
     const dnsName = `${ref.replace(/\//g, '-')}--${gitUrl.repo}--${gitUrl.owner}`;
     // check length limit
     if (dnsName.length > 63) {
-      this.log.error(chalk`URL {yellow https://${dnsName}.${previewHostBase}} exceeds the 63 character limit for DNS labels.`);
+      this.log.error(chalk`URL {yellow https://${dnsName}.aem.page} exceeds the 63 character limit for DNS labels.`);
       this.log.error(chalk`Please use a shorter branch name or a shorter repository name.`);
       await this.stop();
       throw Error('branch name too long');
     }
 
     // always proxy to main
-    this._url = `https://main--${gitUrl.repo}--${gitUrl.owner}.${previewHostBase}`;
+    this._url = `https://main--${gitUrl.repo}--${gitUrl.owner}.aem.page`;
   }
 
   /**