Merge branch 'main' into perf/1381-use-re-usable-objectwriter

.github/codecov.yml

@@ -0,0 +1,25 @@
+coverage:
+  status:
+    project:
+      default: off
+      unittests:
+        enabled: true
+        target: 80%
+        threshold: 10%
+        base: auto
+        flags:
+          - unittests
+    patch:
+      default: off
+      unittests:
+        enabled: true
+        target: 80%
+        threshold: 10%
+        base: auto
+        flags:
+          - unittests
+  range: 70..90
+flags:
+  unittests:
+    paths:
+      - bundles/core/

.github/pull_request_template.md

@@ -2,8 +2,7 @@
 Before making a PR please make sure to read our contributing guidelines
 https://github.com/adobe/aem-core-wcm-components/blob/master/CONTRIBUTING.md
 
-IMPORTANT: Please base your pull request on the **development** branch! The maintainers will cherry-pick the change to
- master after it's successfully integrated and tested.
+IMPORTANT: Please base your pull request on the **main** branch and make sure to check you have incorporated or merged the latest changes!
 
 For issue references: Add a comma-separated list of a [closing word](https://help.github.com/articles/closing-issues-via-commit-messages/)
 followed by the ticket number fixed by the PR. It should be underlined in the preview if done correctly.

.github/workflows/codeql.yml

@@ -0,0 +1,43 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: "9 3 * * 2"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ javascript, java ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+          paths-ignore:
+              - '**/jcr_root/apps/system/config/**'
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

.github/workflows/maven-deploy-it-content.yml

@@ -21,7 +21,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             # Checkout this project into a sub folder
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               with:
                   ref:  ${{ github.event.inputs.source_branch }}
                   path: sub

.github/workflows/maven-deploy-to-library.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       # Checkout this project into a sub folder
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           path: sub
       # Cleanup sub project
@@ -48,6 +48,8 @@ jobs:
           mv sub main/${PROJECT_DIR}
       - name: Commit Changes
         run: |
-          git -C main add ${PROJECT_DIR}
-          git -C main commit -F ../commit.txt
-          git -C main push
+          pushd main
+          git add ${PROJECT_DIR}
+          git commit -F ../commit.txt
+          git push
+          popd

.github/workflows/maven-deploy.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Check out Git repository
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Set up environment with Java and Maven
       - name: Set up JDK

.github/workflows/maven-release.yml

@@ -35,7 +35,7 @@ jobs:
     if: startsWith(github.ref, 'refs/heads/release/')
     steps:
       # Check out Git repository
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Set up environment with Java and Maven
       - name: Set up JDK

.github/workflows/maven-test.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       # Check out Git repository
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Set up environment with Java and Maven
       - name: Setup JDK
@@ -56,3 +56,26 @@ jobs:
       # Run code coverage check
       - name: Run core coverage check
         run: bash <(curl -s https://codecov.io/bash)
+  build-js:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: content
+    strategy:
+      matrix:
+        node-version: [ 14 ]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+          cache-dependency-path: content/package-lock.json
+      - name: Install dependencies
+        run: npm install
+      - name: Run lint
+        run: npm run eslint
+      - name: Run tests
+        run: npm test -- --no-watch --no-progress --browsers=ChromeHeadlessCI --singleRun=true

.gitignore

@@ -17,6 +17,10 @@ jcr.log
 atlassian-ide-plugin.xml
 .vlt-sync.log
 .vlt-sync-config.properties
-node
-node_modules
+
 core.wcm.components.commons.datalayer.*
+
+# JS items
+**/coverage/**
+node
+**/node_modules/**

DATA_LAYER_INTEGRATION.md

@@ -28,6 +28,16 @@ To enable the data layer for your site:
 1. Add the `enabled` boolean property and set it to `true`.
 1. Add a `sling:configRef` property to the `jcr:content` node of your site below `/content` (e.g. `/content/<my-site>/jcr:content`) and set it to `/conf/<my-site>`
 
+## Preventing the Data Layer client library from being included
+
+The data layer client library is included by default by the Page component. As there are other ways to include this library (e.g. through Adobe Launch), it might be needed to prevent its inclusion through the Page component.
+
+To prevent the data layer client library from being included by the Page component:
+1. Create the following structure below the `/conf` node:
+   `/conf/<my-site>/sling:configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig`
+1. Add the `skipClientlibInclude` boolean property and set it to `true`.
+1. Add a `sling:configRef` property to the `jcr:content` node of your site below `/content` (e.g. `/content/<my-site>/jcr:content`) and set it to `/conf/<my-site>`
+
 ## Data Layer State Structure
 
 When the data layer is enabled, the javascript `adobeDataLayer` object is available on the page and is populated with the components and their properties that are used on the page.

README.md

@@ -53,7 +53,7 @@ Set of standardized Web Content Management (WCM) components for [Adobe Experienc
 8. [Image](content/src/content/jcr_root/apps/core/wcm/components/image/v3/image)
 9. [Button](content/src/content/jcr_root/apps/core/wcm/components/button/v2/button)
 10. [Teaser](content/src/content/jcr_root/apps/core/wcm/components/teaser/v2/teaser)
-11. [List](content/src/content/jcr_root/apps/core/wcm/components/list/v3/list)
+11. [List](content/src/content/jcr_root/apps/core/wcm/components/list/v4/list)
 12. [Download](content/src/content/jcr_root/apps/core/wcm/components/download/v2/download)
 13. [PDF Viewer](content/src/content/jcr_root/apps/core/wcm/components/pdfviewer/v1/pdfviewer)
 14. [Embed](content/src/content/jcr_root/apps/core/wcm/components/embed/v2/embed)
@@ -91,9 +91,9 @@ For existing projects, take example from the [AEM Project Archetype](https://git
 
 ### System Requirements
 
-Core Components | AEM as a Cloud Service | AEM 6.5       | Java SE | Maven
-----------------|------------------------|---------------|---------|---------
-[2.20.6](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.20.6) | Continual | 6.5.13.0+ (*) | 8, 11 | 3.3.9+
+Core Components | AEM as a Cloud Service | AEM 6.5   | Java SE | Maven
+----------------|------------------------|-----------|---------|---------
+[2.23.5+](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.23.4) | Continual | 6.5.19.0+ | 8, <br/>11 | 3.3.9+
 
 For the requirements from previous Core Component releases, see [Historical System Requirements](VERSIONS.md).
 
@@ -117,7 +117,7 @@ With AEM as a Cloud Service SDK, use the `cloud` profile as follows to deploy th
 
 Note that:
 * `-pl/-projects` option specifies the list of projects that you want to install
-* `-am/-also-make` options specifies that dependencies should also be built
+* `-am/-also-make` option specifies the dependencies that should also be built
 
 For detailed informations see [BUILDING.md](BUILDING.md).