@adobe/aem-cli 16.5.2 → 16.5.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [16.5.4](https://github.com/adobe/helix-cli/compare/v16.5.3...v16.5.4) (2024-06-22)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-indexer to v2.0.28 ([3d4308c](https://github.com/adobe/helix-cli/commit/3d4308cd60f84d7964fbcd645d4fdb29520c9498))
+
+## [16.5.3](https://github.com/adobe/helix-cli/compare/v16.5.2...v16.5.3) (2024-06-21)
+
+
+### Bug Fixes
+
+* support importing pages with authentication in importer ([aac442d](https://github.com/adobe/helix-cli/commit/aac442d4759a783695b21d41fbc0613177ca8d2d))
+
 ## [16.5.2](https://github.com/adobe/helix-cli/compare/v16.5.1...v16.5.2) (2024-06-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.5.2",
+  "version": "16.5.4",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",
@@ -42,7 +42,7 @@
     "@adobe/helix-log": "6.0.3",
     "@adobe/helix-shared-config": "10.5.3",
     "@adobe/helix-shared-git": "3.0.12",
-    "@adobe/helix-shared-indexer": "2.0.27",
+    "@adobe/helix-shared-indexer": "2.0.28",
     "camelcase": "8.0.0",
     "chalk-template": "1.1.0",
     "chokidar": "3.6.0",
@@ -53,14 +53,14 @@
     "express": "4.19.2",
     "faye-websocket": "0.11.4",
     "fs-extra": "11.2.0",
-    "glob": "10.4.1",
+    "glob": "10.4.2",
     "glob-to-regexp": "0.4.1",
     "hast-util-select": "6.0.2",
     "http-proxy-agent": "7.0.2",
     "https-proxy-agent": "7.0.4",
     "ignore": "5.3.1",
     "ini": "4.1.3",
-    "isomorphic-git": "1.25.10",
+    "isomorphic-git": "1.26.0",
     "livereload-js": "4.0.2",
     "node-fetch": "3.3.2",
     "open": "10.1.0",
@@ -70,7 +70,7 @@
     "rehype-parse": "9.0.0",
     "semver": "7.6.2",
     "shelljs": "0.8.5",
-    "unified": "11.0.4",
+    "unified": "11.0.5",
     "uuid": "10.0.0",
     "yargs": "17.7.2"
   },
@@ -82,7 +82,7 @@
     "@semantic-release/git": "10.0.1",
     "c8": "10.1.2",
     "eslint": "8.57.0",
-    "esmock": "2.6.5",
+    "esmock": "2.6.6",
     "husky": "9.0.11",
     "junit-report-builder": "3.2.1",
     "lint-staged": "15.2.7",

package/src/import.cmd.js

@@ -40,6 +40,11 @@ export default class ImportCommand extends AbstractServerCommand {
     return this;
   }
 
+  withHeadersFile(value) {
+    this._headersFile = value;
+    return this;
+  }
+
   async setupImporterUI() {
     const importerFolder = path.join(this.directory, this._importerSubPath);
     await fse.ensureDir(importerFolder);
@@ -86,7 +91,8 @@ export default class ImportCommand extends AbstractServerCommand {
       .withCwd(this.directory)
       .withLogger(this._logger)
       .withKill(this._kill)
-      .withAllowInsecure(this._allowInsecure);
+      .withAllowInsecure(this._allowInsecure)
+      .withHeadersFile(this._headersFile);
     this.log.info(chalk`{yellow     ___    ________  ___                                __}`);
     this.log.info(chalk`{yellow    /   |  / ____/  |/  /  (_)___ ___  ____  ____  _____/ /____  _____}`);
     this.log.info(chalk`{yellow   / /| | / __/ / /|_/ /  / / __ \`__ \\/ __ \\/ __ \\/ ___/ __/ _ \\/ ___/}`);

package/src/import.js

@@ -74,12 +74,18 @@ export default function up() {
           type: 'string',
           default: undefined,
         })
+        .option('headers-file', {
+          alias: 'headersFile',
+          describe: 'Location of a custom .json file containing headers to be used with all proxy requests',
+          type: 'string',
+          default: undefined,
+        })
         .group(['port', 'addr', 'stop-other', 'tls-cert', 'tls-key'], 'Server options')
         .option('cache', {
           describe: 'Path to local folder to cache the responses',
           type: 'string',
         })
-        .group(['open', 'no-open', 'cache', 'ui-repo', 'skip-ui'], 'AEM Importer Options')
+        .group(['open', 'no-open', 'cache', 'ui-repo', 'skip-ui', 'headers-file'], 'AEM Importer Options')
         .option('allow-insecure', {
           alias: 'allowInsecure',
           describe: 'Whether to allow insecure requests to the server',
@@ -111,6 +117,7 @@ export default function up() {
         .withCache(argv.cache)
         .withSkipUI(argv.skipUI)
         .withUIRepo(argv.uiRepo)
+        .withHeadersFile(argv.headersFile)
         .run();
     },
   };

package/src/server/HelixImportProject.js

@@ -9,6 +9,7 @@
  * 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-extra';
 import { HelixImportServer } from './HelixImportServer.js';
 import { BaseProject } from './BaseProject.js';
 
@@ -28,9 +29,28 @@ export class HelixImportProject extends BaseProject {
     return this._allowInsecure;
   }
 
+  withHeadersFile(value) {
+    this._headersFile = value;
+    return this;
+  }
+
+  get headersFile() {
+    return this._headersFile;
+  }
+
+  get cliHeaders() {
+    return this._cliHeaders;
+  }
+
   async start() {
     this.log.debug('Launching AEM import server for importing content...');
     await super.start();
+    try {
+      this._cliHeaders = (this._headersFile) ? await fs.readJSON(this._headersFile) : {};
+    } catch (error) {
+      this.log.error(`Failed to read headers file: ${error.message}`);
+      await this.doStop();
+    }
     return this;
   }
 

package/src/server/HelixImportServer.js

@@ -63,6 +63,11 @@ export class HelixImportServer extends BaseServer {
     return url.toString();
   }
 
+  async _updateHeaders(headers) {
+    // merge the headers defined with the CLI with those from the request
+    Object.assign(headers, await this._project.cliHeaders);
+  }
+
   async _doProxyRequest(ctx, url, host, req, res) {
     ctx.log.debug(`Proxy ${req.method} request to ${url}`);
 
@@ -100,6 +105,7 @@ export class HelixImportServer extends BaseServer {
     delete headers.connection;
     delete headers.host;
     delete headers.referer;
+    await this._updateHeaders(headers);
 
     const ret = await getFetch(ctx.config.allowInsecure)(url, {
       method: req.method,