@adobe/aem-cli 16.10.44 → 16.10.45

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [16.10.45](https://github.com/adobe/helix-cli/compare/v16.10.44...v16.10.45) (2025-08-26)
+
+
+### Bug Fixes
+
+* make logger compatible with helix-log v7.0.0 ([#2574](https://github.com/adobe/helix-cli/issues/2574)) ([3b937c5](https://github.com/adobe/helix-cli/commit/3b937c5bee112eadd3f5bb7b4e12b1a2651e0c03))
+* preserve --pagesUrl as proxy with git changes ([#2573](https://github.com/adobe/helix-cli/issues/2573)) ([b5f0dfc](https://github.com/adobe/helix-cli/commit/b5f0dfca2d63c2fbccce6f15f2a241a636940b7a))
+
 ## [16.10.44](https://github.com/adobe/helix-cli/compare/v16.10.43...v16.10.44) (2025-08-25)
 
 

package/package.json

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

package/src/log-common.js

@@ -100,21 +100,21 @@ export function getOrCreateLogger(config = 'cli') {
     ? config.logFile
     : ['-', (config && config.logFile) || path.join(logsDir, `${categ}-server.log`)];
 
-  const loggers = new Map();
+  const loggers = {};
   logFiles.forEach((logFile) => {
-    const name = loggers.has('default') ? logFile : 'default';
+    const name = loggers.default ? logFile : 'default';
     if (logFile === '-') {
-      loggers.set(name, new ConsoleLogger({
+      loggers[name] = new ConsoleLogger({
         filter: categ === 'cli' ? suppressProgress : filterProgress,
         level,
         formatter: categoryAwareMessageFormatConsole,
-      }));
+      });
     } else {
       fs.ensureDirSync(path.dirname(logFile));
-      loggers.set(name, new FileLogger(logFile, {
+      loggers[name] = new FileLogger(logFile, {
         level: 'debug',
         formatter: /\.json/.test(logFile) ? messageFormatJsonString : messageFormatTechnical,
-      }));
+      });
     }
   });
 

package/src/up.cmd.js

@@ -25,7 +25,7 @@ export default class UpCommand extends AbstractServerCommand {
   }
 
   withUrl(value) {
-    this._url = value;
+    this._originalUrl = value;
     return this;
   }
 
@@ -90,13 +90,7 @@ export default class UpCommand extends AbstractServerCommand {
     if (!this._gitUrl) {
       throw Error('No git remote found. Make sure you have a remote "origin" configured.');
     }
-    if (!this._url) {
-      await this.verifyUrl(this._gitUrl, ref);
-    } else if (/\{\{(owner|repo)+\}\}/.test(this._url)) {
-      this._url = this._url
-        .replace(/\{\{owner\}\}/, this._gitUrl.owner)
-        .replace(/\{\{repo\}\}/, this._gitUrl.repo);
-    }
+    await this.initUrl(this._gitUrl, ref);
     this._project.withProxyUrl(this._url);
     const { site, org } = this.extractSiteAndOrg(this._url);
     if (site && org) {
@@ -138,7 +132,7 @@ export default class UpCommand extends AbstractServerCommand {
     return { site, org };
   }
 
-  async verifyUrl(gitUrl, ref) {
+  async initUrl(gitUrl, ref) {
     const dnsName = `${ref.replace(/\//g, '-')}--${gitUrl.repo}--${gitUrl.owner}`;
     // check length limit
     if (dnsName.length > 63) {
@@ -148,8 +142,8 @@ export default class UpCommand extends AbstractServerCommand {
       throw Error('branch name too long');
     }
 
-    // always proxy to main
-    this._url = `https://main--${gitUrl.repo}--${gitUrl.owner}.aem.page`;
+    const url = this._originalUrl || 'https://main--{{repo}}--{{owner}}.aem.page';
+    this._url = url.replace(/\{\{(owner|repo)\}\}/g, (_, key) => gitUrl[key]);
   }
 
   /**
@@ -182,7 +176,7 @@ export default class UpCommand extends AbstractServerCommand {
             if (gitUrl.toString() !== this._gitUrl.toString()) {
               this.log.info('git HEAD or remotes changed, reconfiguring server...');
               this._gitUrl = gitUrl;
-              await this.verifyUrl(gitUrl, ref);
+              await this.initUrl(gitUrl, ref);
               this._project.withProxyUrl(this._url);
               await this._project.initHeadHtml();
               this.log.info(`Updated proxy to ${this._url}`);