@adobe/aem-cli 16.0.5 → 16.0.7

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [16.0.7](https://github.com/adobe/helix-cli/compare/v16.0.6...v16.0.7) (2023-11-16)
+
+
+### Bug Fixes
+
+* defer loading of head.html to allow inclusion of request cookie  ([1a8d2ac](https://github.com/adobe/helix-cli/commit/1a8d2ac65af58f07e2ad8911f8e9c3619f83ac7b)), closes [#2274](https://github.com/adobe/helix-cli/issues/2274)
+
+## [16.0.6](https://github.com/adobe/helix-cli/compare/v16.0.5...v16.0.6) (2023-11-13)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#2273](https://github.com/adobe/helix-cli/issues/2273)) ([2f74d4d](https://github.com/adobe/helix-cli/commit/2f74d4d425ad32f199b5940d96c33c08395502be))
+
 ## [16.0.5](https://github.com/adobe/helix-cli/compare/v16.0.4...v16.0.5) (2023-10-31)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.0.5",
+  "version": "16.0.7",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",
@@ -46,7 +46,7 @@
     "chalk-template": "1.1.0",
     "chokidar": "3.5.3",
     "compression": "1.7.4",
-    "cookie": "0.5.0",
+    "cookie": "0.6.0",
     "cookie-parser": "1.4.6",
     "dotenv": "16.3.1",
     "express": "4.18.2",
@@ -54,12 +54,12 @@
     "fs-extra": "11.1.1",
     "glob": "10.3.10",
     "glob-to-regexp": "0.4.1",
-    "hast-util-select": "6.0.1",
+    "hast-util-select": "6.0.2",
     "http-proxy-agent": "7.0.0",
     "https-proxy-agent": "7.0.2",
     "ignore": "5.2.4",
     "ini": "4.1.1",
-    "isomorphic-git": "1.24.5",
+    "isomorphic-git": "1.25.0",
     "livereload-js": "4.0.2",
     "node-fetch": "3.3.2",
     "open": "9.1.0",
@@ -80,16 +80,16 @@
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "c8": "8.0.1",
-    "eslint": "8.52.0",
-    "esmock": "2.5.8",
+    "eslint": "8.53.0",
+    "esmock": "2.6.0",
     "husky": "8.0.3",
     "junit-report-builder": "3.1.0",
-    "lint-staged": "15.0.2",
+    "lint-staged": "15.1.0",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
-    "nock": "13.3.6",
-    "semantic-release": "22.0.5",
-    "sinon": "17.0.0"
+    "nock": "13.3.8",
+    "semantic-release": "22.0.7",
+    "sinon": "17.0.1"
   },
   "lint-staged": {
     "*.js": "eslint"

package/src/server/HeadHtmlSupport.js

@@ -81,6 +81,7 @@ export default class HeadHtmlSupport {
     this.remoteStatus = 0;
     this.localHtml = '';
     this.localStatus = 0;
+    this.cookie = '';
     this.url = new URL(proxyUrl);
     this.url.pathname = '/head.html';
     this.filePath = resolve(directory, 'head.html');
@@ -89,8 +90,13 @@ export default class HeadHtmlSupport {
 
   async loadRemote() {
     // load head from server
+    const headers = {};
+    if (this.cookie) {
+      headers.cookie = this.cookie;
+    }
     const resp = await getFetch()(this.url, {
       cache: 'no-store',
+      headers,
     });
     this.remoteStatus = resp.status;
     if (resp.ok) {
@@ -103,6 +109,18 @@ export default class HeadHtmlSupport {
     }
   }
 
+  setCookie(cookie) {
+    if (this.cookie !== cookie) {
+      this.log.trace('registering head-html cookie to ', cookie);
+      this.cookie = cookie;
+      this.remoteStatus = 0;
+    }
+  }
+
+  invalidateLocal() {
+    this.localStatus = 0;
+  }
+
   async loadLocal() {
     try {
       this.localHtml = (await fs.readFile(this.filePath, 'utf-8')).trim();
@@ -114,7 +132,7 @@ export default class HeadHtmlSupport {
     }
   }
 
-  async init() {
+  async update() {
     if (!this.localStatus) {
       await this.loadLocal();
     }
@@ -127,6 +145,7 @@ export default class HeadHtmlSupport {
   }
 
   async replace(source) {
+    await this.update();
     if (!this.isModified) {
       this.log.trace('head.html ignored: not modified locally.');
       return source;

package/src/server/HelixProject.js

@@ -78,15 +78,13 @@ export class HelixProject extends BaseProject {
         log: this.log,
         proxyUrl: this.proxyUrl,
       });
-      await this._headHtml.init();
 
       // register local head in live-reload
       if (this.liveReload) {
         this.liveReload.registerFiles([this._headHtml.filePath], '/');
         this.liveReload.on('modified', async (modified) => {
           if (modified.indexOf('/') >= 0) {
-            await this._headHtml.loadLocal();
-            await this._headHtml.init();
+            this._headHtml.invalidateLocal();
           }
         });
       }

package/src/server/utils.js

@@ -289,7 +289,7 @@ window.LiveReloadOptions = {
 
     const isHTML = ret.status === 200 && contentType.indexOf('text/html') === 0;
     const livereload = isHTML && opts.injectLiveReload;
-    const replaceHead = isHTML && opts.headHtml && opts.headHtml.isModified;
+    const replaceHead = isHTML && opts.headHtml;
     const doIndex = isHTML && opts.indexer && url.indexOf('.plain.html') < 0;
 
     if (isHTML) {
@@ -322,6 +322,7 @@ window.LiveReloadOptions = {
         ctx.log.trace(lines.join('\n'));
       }
       if (replaceHead) {
+        await opts.headHtml.setCookie(req.headers.cookie);
         textBody = await opts.headHtml.replace(textBody);
       }
       if (livereload) {

package/src/up.cmd.js

@@ -119,7 +119,9 @@ export default class UpCommand extends AbstractServerCommand {
     const resp = await getFetch()(fstabUrl);
     await resp.buffer();
     if (!resp.ok) {
-      if (ref === 'main') {
+      if (resp.status === 401) {
+        this.log.warn(chalk`Unable to verify {yellow ${ref}} branch via {blue ${fstabUrl}} for authenticated sites.`);
+      } else if (ref === 'main') {
         this.log.warn(chalk`Unable to verify {yellow main} branch via {blue ${fstabUrl}} (${resp.status}). Maybe not pushed yet?`);
       } else {
         this.log.warn(chalk`Unable to verify {yellow ${ref}} branch on {blue ${fstabUrl}} (${resp.status}). Fallback to {yellow main} branch.`);