@adobe/aem-cli 16.1.5 → 16.2.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [16.2.0](https://github.com/adobe/helix-cli/compare/v16.1.6...v16.2.0) (2024-01-23)
+
+
+### Features
+
+* **up:** check if the site is on helix 5, and use aem.page as preview host if that's the case ([adc2837](https://github.com/adobe/helix-cli/commit/adc2837a242af82582a7d382c966520bcfd90677))
+
+## [16.1.6](https://github.com/adobe/helix-cli/compare/v16.1.5...v16.1.6) (2024-01-21)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([2bab030](https://github.com/adobe/helix-cli/commit/2bab030a6f6c9a087e454a078f1439c0e0761665))
+* **deps:** update external fixes ([e084373](https://github.com/adobe/helix-cli/commit/e08437365493f769ce8062f0c0911c7cab1735d4))
+
 ## [16.1.5](https://github.com/adobe/helix-cli/compare/v16.1.4...v16.1.5) (2023-12-30)
 
 

package/README.md

@@ -3,10 +3,9 @@
 ## Status
 
 [![codecov](https://img.shields.io/codecov/c/github/adobe/helix-cli.svg)](https://codecov.io/gh/adobe/helix-cli)
-[![CircleCI](https://img.shields.io/circleci/project/github/adobe/helix-cli/main.svg)](https://circleci.com/gh/adobe/helix-cli/tree/main)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/adobe/helix-cli/main.yaml)
 [![GitHub license](https://img.shields.io/github/license/adobe/helix-cli.svg)](https://github.com/adobe/helix-cli/blob/master/LICENSE.txt)
 [![GitHub issues](https://img.shields.io/github/issues/adobe/helix-cli.svg)](https://github.com/adobe/helix-cli/issues)
-[![LGTM Code Quality Grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/adobe/helix-cli.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/adobe/helix-cli)
 
 The AEM Command Line Interface allows web developers to create, develop, and deploy digital experiences using the Adobe Experience Manager Sites feature Edge Delivery Services. Some of this functionality was known as Franklin or Project Helix before.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.1.5",
+  "version": "16.2.0",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",
@@ -14,6 +14,7 @@
     "test-ci-win": "npx mocha --reporter xunit test --reporter-options output=junit/test.xml -t 5000",
     "lint": "eslint .",
     "semantic-release": "semantic-release",
+    "semantic-release-dry": "semantic-release --dry-run --branches $CI_BRANCH",
     "prepare": "husky install"
   },
   "mocha": {
@@ -39,16 +40,16 @@
   "dependencies": {
     "@adobe/fetch": "4.1.1",
     "@adobe/helix-log": "6.0.1",
-    "@adobe/helix-shared-config": "10.3.7",
+    "@adobe/helix-shared-config": "10.3.8",
     "@adobe/helix-shared-git": "3.0.4",
-    "@adobe/helix-shared-indexer": "2.0.17",
+    "@adobe/helix-shared-indexer": "2.0.18",
     "camelcase": "8.0.0",
     "chalk-template": "1.1.0",
     "chokidar": "3.5.3",
     "compression": "1.7.4",
     "cookie": "0.6.0",
     "cookie-parser": "1.4.6",
-    "dotenv": "16.3.1",
+    "dotenv": "16.3.2",
     "express": "4.18.2",
     "faye-websocket": "0.11.4",
     "fs-extra": "11.2.0",
@@ -59,10 +60,10 @@
     "https-proxy-agent": "7.0.2",
     "ignore": "5.3.0",
     "ini": "4.1.1",
-    "isomorphic-git": "1.25.2",
+    "isomorphic-git": "1.25.3",
     "livereload-js": "4.0.2",
     "node-fetch": "3.3.2",
-    "open": "10.0.2",
+    "open": "10.0.3",
     "progress": "2.0.3",
     "proxy-agent": "6.3.1",
     "proxy-from-env": "1.1.0",
@@ -75,19 +76,19 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.5",
-    "@adobe/helix-shared-dom": "2.0.1",
+    "@adobe/helix-shared-dom": "2.0.3",
     "@adobe/helix-testutils": "0.4.15",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "c8": "8.0.1",
+    "c8": "9.1.0",
     "eslint": "8.56.0",
-    "esmock": "2.6.0",
+    "esmock": "2.6.2",
     "husky": "8.0.3",
     "junit-report-builder": "3.1.0",
     "lint-staged": "15.2.0",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
-    "nock": "13.4.0",
+    "nock": "13.5.0",
     "semantic-release": "22.0.12",
     "semantic-release-discord-bot": "^1.1.0",
     "sinon": "17.0.1"

package/src/up.cmd.js

@@ -100,11 +100,39 @@ export default class UpCommand extends AbstractServerCommand {
   }
 
   async verifyUrl(gitUrl, inref) {
+    // check if the site is on helix5
+    // https://admin.hlx.page/sidekick/adobe/www-aem-live/main/config.json
+    // {
+    //   "host": "aem.live",
+    //     "liveHost": "main--www-aem-live--adobe.aem.live",
+    //       "plugins": [
+    //         {
+    //           "id": "doc",
+    //           "title": "Documentation",
+    //           "url": "https://www.aem.live/docs/"
+    //         }
+    //       ],
+    //         "previewHost": "main--www-aem-live--adobe.aem.page",
+    //           "project": "Helix Website (AEM Live)",
+    //             "testProperty": "header";
+    // }
+    const configUrl = `https://admin.hlx.page/sidekick/${gitUrl.repo}/${gitUrl.owner}/${inref}/config.json`;
+    const configResp = await getFetch()(configUrl);
+    let previewHostBase = 'hlx.page';
+    if (configResp.ok) {
+      // this is best effort for now
+      const config = await configResp.json();
+      const { previewHost } = config;
+      if (previewHost && previewHost.endsWith('.aem.page')) {
+        previewHostBase = 'aem.page';
+      }
+    }
+
     let ref = inref;
 
     // replace `/` by `-` in ref.
     ref = ref.replace(/\//g, '-');
-    this._url = `https://${ref}--${gitUrl.repo}--${gitUrl.owner}.hlx.page`;
+    this._url = `https://${ref}--${gitUrl.repo}--${gitUrl.owner}.${previewHostBase}`;
     // check length limit
     if (this._url.split('.')
       .map((part) => part.replace(/^https:\/\//, ''))
@@ -125,7 +153,7 @@ export default class UpCommand extends AbstractServerCommand {
         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.`);
-        this._url = `https://main--${gitUrl.repo}--${gitUrl.owner}.hlx.page`;
+        this._url = `https://main--${gitUrl.repo}--${gitUrl.owner}.${previewHostBase}`;
       }
     }
   }