@adobe/aem-cli 16.16.6 → 16.16.8

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [16.16.8](https://github.com/adobe/helix-cli/compare/v16.16.7...v16.16.8) (2025-12-01)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#2643](https://github.com/adobe/helix-cli/issues/2643)) ([7e571e2](https://github.com/adobe/helix-cli/commit/7e571e218eadfff67fb1e40480a91b0a45991d2c))
+
+## [16.16.7](https://github.com/adobe/helix-cli/compare/v16.16.6...v16.16.7) (2025-11-28)
+
+
+### Bug Fixes
+
+* **server:** transform plain text 401/403 to Chrome-compatible HTML for sidekick ([#2414](https://github.com/adobe/helix-cli/issues/2414)) ([a261c6d](https://github.com/adobe/helix-cli/commit/a261c6dfa7a44ae44cd68bcf65f1a3473e1607cb)), closes [#2601](https://github.com/adobe/helix-cli/issues/2601)
+
 ## [16.16.6](https://github.com/adobe/helix-cli/compare/v16.16.5...v16.16.6) (2025-11-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.16.6",
+  "version": "16.16.8",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",
@@ -66,7 +66,7 @@
     "ignore": "7.0.5",
     "ini": "6.0.0",
     "isomorphic-git": "1.35.0",
-    "jose": "6.1.1",
+    "jose": "6.1.2",
     "livereload-js": "4.0.2",
     "node-fetch": "3.3.2",
     "open": "10.2.0",
@@ -78,11 +78,12 @@
     "shelljs": "0.10.0",
     "unified": "11.0.5",
     "uuid": "13.0.0",
+    "xdg-basedir": "5.1.0",
     "yargs": "18.0.0"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "3.0.14",
-    "@eslint/config-helpers": "0.4.2",
+    "@eslint/config-helpers": "0.5.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "c8": "10.1.3",

package/packages/browser-injectables/package-lock.json

@@ -13,7 +13,7 @@
       },
       "devDependencies": {
         "@adobe/eslint-config-helix": "^3.0.9",
-        "@eslint/config-helpers": "0.4.2",
+        "@eslint/config-helpers": "0.5.0",
         "@esm-bundle/chai": "4.3.4-fix.0",
         "@web/test-runner": "0.20.2",
         "@web/test-runner-junit-reporter": "0.8.0",
@@ -39,6 +39,32 @@
         "eslint": "^9.0.0"
       }
     },
+    "node_modules/@adobe/eslint-config-helix/node_modules/@eslint/config-helpers": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+      "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.17.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@adobe/eslint-config-helix/node_modules/@eslint/core": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+      "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -122,29 +148,29 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
-      "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.0.tgz",
+      "integrity": "sha512-OCt2pY98qw68AXjNDGn+9q3vnqvBh4OFTZWmzaWH2thEpAugBZCBDRMHZa7oGsX+/ZybKOiKjJ6XX1E8hxcxGg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.17.0"
+        "@eslint/core": "^1.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/config-helpers/node_modules/@eslint/core": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
-      "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.0.0.tgz",
+      "integrity": "sha512-PRfWP+8FOldvbApr6xL7mNCw4cJcSTq4GA7tYbgq15mRb0kWKO/wEB2jr+uwjFH3sZvEZneZyCUGTxsv4Sahyw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/core": {
@@ -2988,6 +3014,32 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/@eslint/config-helpers": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+      "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.17.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/eslint/node_modules/@eslint/config-helpers/node_modules/@eslint/core": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+      "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/espree": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",

package/packages/browser-injectables/package.json

@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "^3.0.9",
-    "@eslint/config-helpers": "0.4.2",
+    "@eslint/config-helpers": "0.5.0",
     "@esm-bundle/chai": "4.3.4-fix.0",
     "@web/test-runner": "0.20.2",
     "@web/test-runner-playwright": "0.11.1",

package/src/server/utils.js

@@ -412,15 +412,15 @@ window.LiveReloadOptions = {
         return;
       }
 
-      let textBody = await ret.text();
-      textBody = `<html>
-  <head><meta property="hlx:proxyUrl" content="${url}"></head>
-  <body>
-    <pre>${textBody}</pre>
-    <p>Click <b><a href="${opts.loginPath}">here</a></b> to login.</p>
-  </body>
-</html>
-`;
+      // Transform plain text 401/403 responses into Chrome-compatible HTML
+      // This allows the sidekick to recognize the error page and enable login
+      const statusText = ret.status === 401 ? '401 Unauthorized' : '403 Forbidden';
+      const escapedUrl = url
+        .replace(/&/g, '&amp;')
+        .replace(/"/g, '&quot;');
+
+      const textBody = `<html><head><meta name="color-scheme" content="light dark"><meta property="hlx:proxyUrl" content="${escapedUrl}"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">${statusText}</pre></body></html>`;
+
       respHeaders['content-type'] = 'text/html';
       res
         .set(respHeaders)

package/src/up.cmd.js

@@ -17,6 +17,7 @@ import { HelixProject } from './server/HelixProject.js';
 import GitUtils from './git-utils.js';
 import pkgJson from './package.cjs';
 import { AbstractServerCommand } from './abstract-server.cmd.js';
+import { checkForUpdates } from './update-check.js';
 
 export default class UpCommand extends AbstractServerCommand {
   withLiveReload(value) {
@@ -121,6 +122,11 @@ export default class UpCommand extends AbstractServerCommand {
     this.log.info(chalk`{yellow /_/  |_/_____/_/  /_/  /____/_/_/ /_/ /_/\\__,_/_/\\__,_/\\__/\\____/_/}`);
     this.log.info('');
 
+    // Check for updates asynchronously (non-blocking)
+    checkForUpdates('@adobe/aem-cli', pkgJson.version, this.log).catch(() => {
+      // Silently ignore errors
+    });
+
     const ref = await GitUtils.getBranch(this.directory);
     this._gitUrl = await GitUtils.getOriginURL(this.directory, { ref });
     if (!this._gitUrl) {

package/src/update-check.js

@@ -0,0 +1,125 @@
+/*
+ * Copyright 2025 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+import fs from 'fs/promises';
+import path from 'path';
+import os from 'os';
+import semver from 'semver';
+import chalk from 'chalk-template';
+import { xdgCache } from 'xdg-basedir';
+import { getFetch } from './fetch-utils.js';
+
+/**
+ * Gets the path to the update check cache file using XDG base directories.
+ * @returns {string} Path to the cache file
+ */
+function getUpdateCheckCacheFile() {
+  const cacheDir = xdgCache || path.join(os.homedir(), '.cache');
+  return path.join(cacheDir, 'aem-cli', 'last-update-check');
+}
+
+/**
+ * Checks if we should skip the update check based on the last check time.
+ * @returns {Promise<boolean>} True if we should skip the check
+ */
+async function shouldSkipUpdateCheck() {
+  try {
+    const cacheFile = getUpdateCheckCacheFile();
+    const stats = await fs.stat(cacheFile);
+    const lastCheck = stats.mtime.getTime();
+    const now = Date.now();
+    const oneDayInMs = 24 * 60 * 60 * 1000;
+
+    return (now - lastCheck) < oneDayInMs;
+  } catch (error) {
+    // If file doesn't exist or any other error, we should check
+    return false;
+  }
+}
+
+/**
+ * Updates the last update check timestamp.
+ */
+async function updateLastCheckTime() {
+  try {
+    const cacheFile = getUpdateCheckCacheFile();
+    const cacheDir = path.dirname(cacheFile);
+
+    // Ensure cache directory exists
+    await fs.mkdir(cacheDir, { recursive: true });
+
+    // Touch the file to update its mtime
+    await fs.writeFile(cacheFile, Date.now().toString());
+  } catch (error) {
+    // Silently ignore errors - this is not critical
+  }
+}
+
+/**
+ * Checks if a newer version of the package is available on npm.
+ * @param {string} packageName - The npm package name to check
+ * @param {string} currentVersion - The current version of the package
+ * @param {object} logger - Logger instance for outputting messages
+ * @returns {Promise<void>}
+ */
+export async function checkForUpdates(packageName, currentVersion, logger) {
+  try {
+    // Check if we should skip the update check (rate limiting)
+    if (await shouldSkipUpdateCheck()) {
+      return;
+    }
+
+    const fetch = getFetch();
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 5000); // 5 second timeout
+
+    const response = await fetch(`https://registry.npmjs.org/${packageName}`, {
+      signal: controller.signal,
+    });
+    clearTimeout(timeoutId);
+
+    if (!response.ok) {
+      // Silently fail if we can't check for updates
+      return;
+    }
+
+    const data = await response.json();
+    const latestVersion = data['dist-tags']?.latest;
+
+    if (latestVersion && semver.gt(latestVersion, currentVersion)) {
+      const boxWidth = 61;
+      const updateMsg = `Update available! ${currentVersion} → ${latestVersion}`;
+      const installMsg = `Run npm install -g ${packageName} to update`;
+
+      // Use String.padEnd() instead of manual padding calculation
+      const updatePadded = `   ${updateMsg}`.padEnd(boxWidth - 1);
+      const installPadded = `   ${installMsg}`.padEnd(boxWidth - 1);
+
+      logger.warn('');
+      logger.warn(chalk`{yellow ╭─────────────────────────────────────────────────────────────╮}`);
+      logger.warn(chalk`{yellow │                                                             │}`);
+      logger.warn(chalk`{yellow │${updatePadded} │}`);
+      logger.warn(chalk`{yellow │${installPadded} │}`);
+      logger.warn(chalk`{yellow │                                                             │}`);
+      logger.warn(chalk`{yellow ╰─────────────────────────────────────────────────────────────╯}`);
+      logger.warn('');
+    }
+
+    // Update the last check time after a successful check
+    await updateLastCheckTime();
+  } catch (error) {
+    // Silently fail - don't block the command if update check fails
+    // Only log in debug mode if available
+    if (logger.level === 'debug' || logger.level === 'silly') {
+      logger.debug(`Update check failed: ${error.message}`);
+    }
+  }
+}