@adobe/aem-cli 16.18.1 → 16.18.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [16.18.3](https://github.com/adobe/helix-cli/compare/v16.18.2...v16.18.3) (2026-04-21)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#2712](https://github.com/adobe/helix-cli/issues/2712)) ([3cb40a0](https://github.com/adobe/helix-cli/commit/3cb40a07ead3949a29cc12c4ab3c7b595e9941fc))
+
+## [16.18.2](https://github.com/adobe/helix-cli/compare/v16.18.1...v16.18.2) (2026-04-20)
+
+
+### Bug Fixes
+
+* remove if-modified-since from proxy request to ensure that content-type is included ([#2711](https://github.com/adobe/helix-cli/issues/2711)) ([482a618](https://github.com/adobe/helix-cli/commit/482a618deeacfffb4d14d41ce828bd2650c9dc3e))
+
 ## [16.18.1](https://github.com/adobe/helix-cli/compare/v16.18.0...v16.18.1) (2026-04-16)
 
 

package/README.md

@@ -26,8 +26,9 @@ $ aem --help
 Usage: aem <command> [options]
 
 Commands:
-  aem up  Run a AEM development server
-  aem import  Run the AEM import server
+  aem up       Run a AEM development server
+  aem import   Run the AEM import server
+  aem content  Manage local da.live content
 
 Options:
   --version                Show version number                         [boolean]
@@ -203,6 +204,24 @@ $ aem import
 
 Read the full AEM Importer [documentation](https://github.com/adobe/helix-importer-ui).
 
+## Managing content
+
+The `aem content` commands let you check out content from da.live locally, make bulk edits, and push changes back. The local content lives in a `content/` folder in your project.
+
+| Command | Description |
+|---------|-------------|
+| `aem content clone` | Clone da.live content locally into `content/` |
+| `aem content status` | Show locally added, modified, and deleted content files |
+| `aem content diff` | Show diff between local and remote content |
+| `aem content merge` | Merge remote content into local files |
+| `aem content add` | Stage changes in `content/` (like `git add`) |
+| `aem content commit` | Commit staged changes in `content/` (like `git commit`) |
+| `aem content push` | Push committed `content/` changes to da.live (use `content add` & `content commit` first) |
+
+### Local content serving
+
+When a `content/` folder is present, `aem up` automatically serves content from it first, falling back to the proxy for any files not found locally. HTML files in `content/` are wrapped with `head.html` and have their metadata blocks processed, so pages render the same way they would when served from da.live.
+
 # Developing AEM CLI
 
 ## Testing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.18.1",
+  "version": "16.18.3",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",
@@ -55,8 +55,8 @@
     "compression": "1.8.1",
     "cookie": "1.1.1",
     "cookie-parser": "1.4.7",
-    "diff": "8.0.3",
-    "dotenv": "17.3.1",
+    "diff": "8.0.4",
+    "dotenv": "17.4.1",
     "express": "5.2.1",
     "faye-websocket": "0.11.4",
     "fs-extra": "11.3.4",
@@ -68,7 +68,7 @@
     "https-proxy-agent": "8.0.0",
     "ignore": "7.0.5",
     "ini": "6.0.0",
-    "isomorphic-git": "1.37.4",
+    "isomorphic-git": "1.37.5",
     "jose": "6.2.2",
     "mime": "4.1.0",
     "livereload-js": "4.0.2",
@@ -88,7 +88,7 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "3.0.24",
-    "@eslint/config-helpers": "0.5.3",
+    "@eslint/config-helpers": "0.5.4",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "c8": "11.0.0",

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

@@ -13,7 +13,7 @@
       },
       "devDependencies": {
         "@adobe/eslint-config-helix": "^3.0.9",
-        "@eslint/config-helpers": "0.5.3",
+        "@eslint/config-helpers": "0.5.4",
         "@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.5.3",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.3.tgz",
+      "integrity": "sha512-lzGN0onllOZCGroKJmRwY6QcEHxbjBw1gwB8SgRSqK8YbbtEXMvKynsXc3553ckIEBxsbMBU7oOZXKIPGZNeZw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^1.1.1"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
+    "node_modules/@adobe/eslint-config-helix/node_modules/@eslint/core": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz",
+      "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -126,22 +152,22 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.3.tgz",
-      "integrity": "sha512-lzGN0onllOZCGroKJmRwY6QcEHxbjBw1gwB8SgRSqK8YbbtEXMvKynsXc3553ckIEBxsbMBU7oOZXKIPGZNeZw==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.4.tgz",
+      "integrity": "sha512-jJhqiY3wPMlWWO3370M86CPJ7pt8GmEwSLglMfQhjXal07RCvhmU0as4IuUEW5SJeunfItiEetHmSxCCe9lDBg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^1.1.1"
+        "@eslint/core": "^1.2.0"
       },
       "engines": {
         "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/config-helpers/node_modules/@eslint/core": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.1.tgz",
-      "integrity": "sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz",
+      "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {

package/packages/browser-injectables/package.json

@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "^3.0.9",
-    "@eslint/config-helpers": "0.5.3",
+    "@eslint/config-helpers": "0.5.4",
     "@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

@@ -287,6 +287,7 @@ window.LiveReloadOptions = {
     delete headers.connection;
     delete headers['proxy-connection'];
     delete headers.host;
+    delete headers['if-modified-since'];
     const ret = await getFetch(ctx.config.allowInsecure)(url, {
       method: req.method,
       headers,