Merge branch 'main' into terragon/research-issue-2414-km0irh

Author: trieloff

.github/workflows/main.yaml

@@ -9,40 +9,41 @@ permissions:
   contents: write  # semantic-release-dry verifies the write permissions
   issues: read # needed by semantic-release
   pull-requests: write # needed by semantic-release
+  id-token: write # needed for npm trusted publishers with OIDC
 
 jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Use Node.js 20.x
-        uses: actions/setup-node@v5
+      - name: Use Node.js 24.x
+        uses: actions/setup-node@v6
         with:
-          node-version: '22.x'
+          node-version: '24.x'
       - run: npm ci
-      
+
       # Sub-project setup and testing (conditional)
       - name: Install browser injectable dependencies
         if: hashFiles('packages/browser-injectables/**') != ''
         run: cd packages/browser-injectables && npm ci
-      
+
       - name: Install Playwright dependencies for browser injectables
         if: hashFiles('packages/browser-injectables/**') != ''
         run: cd packages/browser-injectables && npx playwright install-deps
-      
+
       - run: git config --global user.email "[email protected]" && git config --global user.name "Test Build"
       - run: git config --global protocol.file.allow always
       - run: npm run lint
       - run: npm test
         env:
           CIRCLE_REPOSITORY_URL: dummy-url
-      
+
       # Browser injectable tests (conditional)
       - name: Test browser injectables
         if: hashFiles('packages/browser-injectables/**') != ''
         run: cd packages/browser-injectables && npm test
-      
+
       - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -52,8 +53,7 @@ jobs:
         if: github.actor != 'dependabot[bot]'
         run: npm run semantic-release-dry
         env:
-          GITHUB_TOKEN: ${{ secrets.ADOBE_BOT_GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.ADOBE_BOT_NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DISCORD_WEBHOOK: ${{ secrets.HELIX_RELEASE_DISCORD_WEBHOOK }}
 
   test_win:
@@ -63,10 +63,10 @@ jobs:
     steps:
       - run: git config --global core.autocrlf false
       - uses: actions/checkout@v5
-      - name: Use Node.js 20.x
-        uses: actions/setup-node@v5
+      - name: Use Node.js 24.x
+        uses: actions/setup-node@v6
         with:
-          node-version: '22.x'
+          node-version: '24.x'
       - run: npm ci
       - run: git config --global user.email "[email protected]" && git config --global user.name "Test Build"
       - run: git config --global protocol.file.allow always
@@ -85,11 +85,13 @@ jobs:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - name: Use Node.js 20.x
-        uses: actions/setup-node@v5
+      - name: Use Node.js 24.11 (LTS)
+        uses: actions/setup-node@v6
         with:
-          node-version: '22.x'
+          node-version: '24.11.0'
       - run: npm ci
+      - name: Check npm version
+        run: npm --version
       - run: npm run semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.ADOBE_BOT_GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,91 @@
+## [16.16.4](https://github.com/adobe/helix-cli/compare/v16.16.3...v16.16.4) (2025-11-19)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([#2640](https://github.com/adobe/helix-cli/issues/2640)) ([f9933d2](https://github.com/adobe/helix-cli/commit/f9933d2d35f3b125af208877f4db989149650675))
+
+## [16.16.3](https://github.com/adobe/helix-cli/compare/v16.16.2...v16.16.3) (2025-11-18)
+
+
+### Bug Fixes
+
+* **deps:** update dependency glob to v11.1.0 [security] ([#2639](https://github.com/adobe/helix-cli/issues/2639)) ([7021b7b](https://github.com/adobe/helix-cli/commit/7021b7b049b6e8ff38a45f840cf632e6552be948))
+
+## [16.16.2](https://github.com/adobe/helix-cli/compare/v16.16.1...v16.16.2) (2025-11-14)
+
+
+### Bug Fixes
+
+* **html-folder:** add missing <title> tag for .plain.html files ([c7fe861](https://github.com/adobe/helix-cli/commit/c7fe8619a89acea24c86076cfa17af506a4d257d))
+
+## [16.16.1](https://github.com/adobe/helix-cli/compare/v16.16.0...v16.16.1) (2025-11-14)
+
+
+### Bug Fixes
+
+* **html-folder:** support index files for directory requests with trailing slash ([#2632](https://github.com/adobe/helix-cli/issues/2632)) ([55d782d](https://github.com/adobe/helix-cli/commit/55d782db744a43841fb9da08354a8d22d8d14dd7))
+
+# [16.16.0](https://github.com/adobe/helix-cli/compare/v16.15.13...v16.16.0) (2025-11-13)
+
+
+### Features
+
+* add .plain.html support for HTML folder serving ([#2631](https://github.com/adobe/helix-cli/issues/2631)) ([2186d4c](https://github.com/adobe/helix-cli/commit/2186d4c330f97db86849b9388e119b7d599c9fc1))
+
+## [16.15.13](https://github.com/adobe/helix-cli/compare/v16.15.12...v16.15.13) (2025-11-11)
+
+
+### Bug Fixes
+
+* **deps:** update dependency ini to v6 ([7c37973](https://github.com/adobe/helix-cli/commit/7c37973c45d7d6956bbc3200d46c2015d7e483fe))
+* **deps:** update external fixes ([#2630](https://github.com/adobe/helix-cli/issues/2630)) ([8671a13](https://github.com/adobe/helix-cli/commit/8671a131f4cb1e3d29e318cfb7c3b3326d2cea77))
+
+## [16.15.12](https://github.com/adobe/helix-cli/compare/v16.15.11...v16.15.12) (2025-10-30)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([365d90e](https://github.com/adobe/helix-cli/commit/365d90ec1f5bc85bb2bf68a141c7ae0970b449b8))
+* regenerate package-lock.json with all chokidar v3 dependencies ([7681dad](https://github.com/adobe/helix-cli/commit/7681dad542355edd58de5090e13c8e2a783e79f0))
+* regenerate package-lock.json with all missing dependencies ([d0955fe](https://github.com/adobe/helix-cli/commit/d0955feed8591d8599dff61f65231b1d9af6fbe4))
+* update package-lock.json to sync with package.json dependencies ([6a6f392](https://github.com/adobe/helix-cli/commit/6a6f3922175d8e43833ee9283cb8d7559e4cf495))
+
+## [16.15.11](https://github.com/adobe/helix-cli/compare/v16.15.10...v16.15.11) (2025-10-20)
+
+
+### Bug Fixes
+
+* **deps:** update dependency isomorphic-git to v1.34.0 ([#2621](https://github.com/adobe/helix-cli/issues/2621)) ([f2f4784](https://github.com/adobe/helix-cli/commit/f2f47846f7f3f140d0b1e14b6ddb0825c96fda0d))
+
+## [16.15.10](https://github.com/adobe/helix-cli/compare/v16.15.9...v16.15.10) (2025-10-16)
+
+
+### Bug Fixes
+
+* regenerate package-lock.json to fix npm ci failures ([1a9c885](https://github.com/adobe/helix-cli/commit/1a9c885f4567be03d1a5b7e561eb6350f4007d83))
+* remove NPM_TOKEN to enable OIDC trusted publishing ([2ef8251](https://github.com/adobe/helix-cli/commit/2ef8251755ef423bb35987781a6824e8baa23bdf))
+* upgrade @semantic-release/npm to 13.0.0 for OIDC support ([efcef3d](https://github.com/adobe/helix-cli/commit/efcef3ddc87db5a2da2b665151a007cdd5f68dbf))
+* upgrade to @semantic-release/npm@13.1.0-beta.1 for OIDC ([5331bd5](https://github.com/adobe/helix-cli/commit/5331bd5c2ef87c4a41343996a322bbb58c5768f3))
+* use npm overrides to force @semantic-release/npm@13.1.0-beta.1 ([f33209a](https://github.com/adobe/helix-cli/commit/f33209adac25b40af0e4c541e012318cc99e19cc))
+
+## [16.15.9](https://github.com/adobe/helix-cli/compare/v16.15.8...v16.15.9) (2025-10-16)
+
+
+### Bug Fixes
+
+* enable npm trusted publishers with OIDC ([b5dd177](https://github.com/adobe/helix-cli/commit/b5dd177c4d42c50023bf8681ad96810f18e2bd4b))
+
+## [16.15.8](https://github.com/adobe/helix-cli/compare/v16.15.7...v16.15.8) (2025-10-16)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-config to v11.1.12 ([86729d3](https://github.com/adobe/helix-cli/commit/86729d35c43d5572639a5227ce5c4c077cf6c9f3))
+* **deps:** update external fixes ([d5078f8](https://github.com/adobe/helix-cli/commit/d5078f8fe2ad8b9050af4bfdaf41fc6e5cfefb86))
+* regenerate package-lock.json to fix CI ([7f9daa4](https://github.com/adobe/helix-cli/commit/7f9daa4fa63fffb16c7b9b05b858a9aa20e71da1))
+* regenerate package-lock.json with updated dependencies ([23421da](https://github.com/adobe/helix-cli/commit/23421da7286ddde7e6cef391b2054f161a8a174e))
+
 ## [16.15.7](https://github.com/adobe/helix-cli/compare/v16.15.6...v16.15.7) (2025-10-02)
 
 

README.md

@@ -74,6 +74,26 @@ This feature is especially helpful when:
 - Monitoring client-side behavior during development
 - Working with AI coding assistants that need visibility into both server and client logs
 
+### html folder for content preview
+
+The `--html-folder` option enables serving HTML files without extensions, useful for previewing content changes when you don't have access to the authoring system.
+
+```
+$ aem up --html-folder content
+```
+
+This enables two features:
+
+1. **Extension-less URLs**: Access `/content/page` to serve `content/page.html`
+2. **Plain HTML with metadata**: Create `content/page.plain.html` files that are automatically wrapped with proper HTML structure and metadata processing
+
+#### Plain HTML files (.plain.html)
+
+Plain HTML files contain only the main content and an optional metadata block. The CLI automatically:
+- Wraps content in `<html><head><body><header><main><footer>` structure
+- Merges in `head.html` content
+- The metadata block is removed from the rendered content and converted to meta tags in the `<head>`.
+
 ### setting up a self-signed cert for using https
 
 1. create the certificate
@@ -161,6 +181,7 @@ If present, `ALL_PROXY` is used as fallback if there is no other match.
 | `--livereload`    | `AEM_LIVERELOAD`    | `true`      | Enable automatic reloading of modified sources in browser.  |
 | `--no-livereload` | `AEM_NO_LIVERELOAD` | `false`     | Disable live-reload.                                        |
 | `--forward-browser-logs` | `AEM_FORWARD_BROWSER_LOGS` | `false` | Forward browser console logs to terminal.            |
+| `--html-folder`   | `AEM_HTML_FOLDER`   | undefined   | Serve HTML files from folder without extensions. Supports .html and .plain.html files. |
 | `--open`          | `AEM_OPEN`          | `/`         | Open a browser window at specified path after server start. |
 | `--no-open`       | `AEM_NO_OPEN`       | `false`     | Disable automatic opening of browser window.                |
 | `--tls-key`       | `AEM_TLS_KEY`       | undefined   | Path to .key file (for enabling TLS)                        |