@adobe/aem-cli 16.19.11 → 16.19.12

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [16.19.12](https://github.com/adobe/helix-cli/compare/v16.19.11...v16.19.12) (2026-06-03)
+
+
+### Bug Fixes
+
+* extract main innerHTML for .plain.html fallback and improve test fixture ([e49ca05](https://github.com/adobe/helix-cli/commit/e49ca059f67da164ff20ad549dbd40590797f911))
+* **lint:** fix curly brace style and install missing dependencies ([e138bf0](https://github.com/adobe/helix-cli/commit/e138bf00f1da5c2c8f542fe56a3a8a86ee63a70c))
+* properly serve .plain.html requests for documents in local content directory ([89d12d5](https://github.com/adobe/helix-cli/commit/89d12d574e7e8a143f32973c4f319f814d814099))
+
 ## [16.19.11](https://github.com/adobe/helix-cli/compare/v16.19.10...v16.19.11) (2026-05-26)
 
 

package/package.json

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

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

@@ -18,7 +18,8 @@
         "@web/test-runner": "0.20.2",
         "@web/test-runner-junit-reporter": "0.8.0",
         "@web/test-runner-mocha": "0.9.0",
-        "@web/test-runner-playwright": "0.11.1"
+        "@web/test-runner-playwright": "0.11.1",
+        "playwright": "1.60.0"
       }
     },
     "node_modules/@adobe/eslint-config-helix": {
@@ -5420,13 +5421,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.56.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.0.tgz",
-      "integrity": "sha512-X5Q1b8lOdWIE4KAoHpW3SE8HvUB+ZZsUoN64ZhjnN8dOb1UpujxBtENGiZFE+9F/yhzJwYa+ca3u43FeLbboHA==",
+      "version": "1.60.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.60.0.tgz",
+      "integrity": "sha512-hheHdokM8cdqCb0lcE3s+zT4t4W+vvjpGxsZlDnikarzx8tSzMebh3UiFtgqwFwnTnjYQcsyMF8ei2mCO/tpeA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.56.0"
+        "playwright-core": "1.60.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -5439,9 +5440,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.56.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.0.tgz",
-      "integrity": "sha512-1SXl7pMfemAMSDn5rkPeZljxOCYAmQnYLBTExuh6E8USHXGSX3dx6lYZN/xPpTz1vimXmPA9CDnILvmJaB8aSQ==",
+      "version": "1.60.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.60.0.tgz",
+      "integrity": "sha512-9bW6zvX/m0lEbgTKJ6YppOKx8H3VOPBMOCFh2irXFOT4BbHgrx5hPjwJYLT40Lu+4qtD36qKc/Hn56StUW57IA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {

package/packages/browser-injectables/package.json

@@ -8,7 +8,7 @@
     "lint": "eslint .",
     "test": "web-test-runner",
     "test:watch": "web-test-runner --watch",
-    "postinstall": "npm run copy-vendor && npx playwright install",
+    "postinstall": "npm run copy-vendor",
     "copy-vendor": "node scripts/copy-vendor.js"
   },
   "devDependencies": {
@@ -18,7 +18,8 @@
     "@web/test-runner": "0.20.2",
     "@web/test-runner-playwright": "0.11.1",
     "@web/test-runner-junit-reporter": "0.8.0",
-    "@web/test-runner-mocha": "0.9.0"
+    "@web/test-runner-mocha": "0.9.0",
+    "playwright": "1.60.0"
   },
   "dependencies": {
     "livereload-js": "4.0.2"

package/src/server/HelixServer.js

@@ -459,7 +459,26 @@ export class HelixServer extends BaseServer {
         try {
           if (contentFilePath.endsWith('.html')) {
             // readFile throws EISDIR for directories and ENOENT for missing files
-            let htmlContent = await readFile(contentFilePath, 'utf-8');
+            // .plain.html is a virtual URL convention — AEM never stores .plain.html files,
+            // so always read the corresponding .html file and serve the <main> fragment.
+            const isPlainFallback = contentFilePath.endsWith('.plain.html');
+            const servedFilePath = isPlainFallback
+              ? `${contentFilePath.slice(0, -'.plain.html'.length)}.html`
+              : contentFilePath;
+            let htmlContent = await readFile(servedFilePath, 'utf-8');
+            if (isPlainFallback) {
+              if (liveReload) {
+                liveReload.registerFile(ctx.requestId, servedFilePath);
+              }
+              const fragment = utils.extractMainContent(htmlContent);
+              res.set({
+                'content-type': 'text/html; charset=utf-8',
+                'access-control-allow-origin': '*',
+              });
+              res.send(fragment);
+              log.debug(`${pfx}served from ${CONTENT_DIR}/: ${ctx.path}`);
+              return;
+            }
             const absolutePageUrl = absolutePageUrlFromRequest(req, ctx);
             if (this._project.metadataSheet) {
               this._project.metadataSheet.setCookie(req.headers.cookie || '');

package/src/server/utils.js

@@ -19,11 +19,14 @@ import { fileURLToPath } from 'url';
 import cookie from 'cookie';
 import { unified } from 'unified';
 import rehypeParse from 'rehype-parse';
+import { select } from 'hast-util-select';
+import { toHtml } from 'hast-util-to-html';
 import { getFetch } from '../fetch-utils.js';
 
 // Load console interceptor script at startup
 // eslint-disable-next-line no-underscore-dangle
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const htmlParser = unified().use(rehypeParse);
 const CONSOLE_INTERCEPTOR = readFileSync(
   path.join(__dirname, '../../packages/browser-injectables/src/console-interceptor.js'),
   'utf-8',
@@ -787,6 +790,21 @@ window.LiveReloadOptions = {
     const fullHead = headHtml + metaTags;
     return `<html><head>${fullHead}</head><body><header></header><main>${content}</main><footer></footer></body></html>`;
   },
+
+  /**
+   * Extracts the innerHTML of the <main> element from a full HTML document.
+   * Returns the original content unchanged if no <main> is found.
+   * @param {string} html full HTML document
+   * @returns {string} innerHTML of <main>, or original html if no <main> present
+   */
+  extractMainContent(html) {
+    const ast = htmlParser.parse(html);
+    const main = select('main', ast);
+    if (!main) {
+      return html;
+    }
+    return main.children.map((child) => toHtml(child)).join('');
+  },
 };
 
 export default Object.freeze(utils);