Merge branch 'develop'

wcm-io · Mar 21, 2024 · a0d7563 · a0d7563
2 parents ce52e96 + a9713bf
commit a0d7563
Show file tree

Hide file tree

Showing 23 changed files with 74 additions and 60 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -25,7 +25,7 @@ jobs:
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,18 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="3.8.10" date="2024-03-21">
+      <action type="update" dev="sseifert" issue="39">
+        Switch frontend to ES6 modules.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to AEM 6.5 SP20.
+      </action>
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+    </release>
+
     <release version="3.8.8" date="2024-01-26">
       <action type="update" dev="sseifert">
         Update to Handler 2.x.

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.maven.archetypes</groupId>
   <artifactId>io.wcm.maven.archetypes.aem</artifactId>
-  <version>3.8.8</version>
+  <version>3.8.10</version>
   <packaging>maven-archetype</packaging>
 
   <name>wcm.io Maven Archetype for AEM</name>
@@ -40,7 +40,7 @@
 
   <properties>
     <site.url.module.prefix>tooling/maven/archetypes/aem</site.url.module.prefix>
-    <!-- Stick with version 3.1.0 until https://issues.apache.org/jira/browse/ARCHETYPE-584 is solved -->
+    <!-- Stick with version 3.1.0 until https://issues.apache.org/jira/browse/ARCHETYPE-584 is solved, should be fixed in version 3.3.0 -->
     <maven.archetype.version>3.1.0</maven.archetype.version>
   </properties>
 
@@ -125,6 +125,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-archetype-plugin</artifactId>
           <version>${maven.archetype.version}</version>
+          <configuration>
+             <!-- Make sure .git* files can be included as well -->
+             <useDefaultExcludes>false</useDefaultExcludes>
+          </configuration>
         </plugin>
 
         <plugin>

diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -176,7 +176,7 @@
           <directory></directory>
           <includes>
             <include>README.md</include>
-            <include>clientlib.config.js</include>
+            <include>clientlib.config.cjs</include>
             <include>package.json</include>
             <include>src\index.*</include>
           </includes>

diff --git a/...sources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml b/...sources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml
@@ -14,7 +14,7 @@ files:
 
 #if ( $optionAemVersion == '6.5' && $optionAemServicePack == 'y' )
 # AEM Service Pack
-- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.19.0/zip
+- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.20.0/zip
   dir: packages
   modelOptions:
     delayAfterInstallSec: 30

diff --git a/src/main/resources/archetype-resources/frontend/.nvmrc b/src/main/resources/archetype-resources/frontend/.nvmrc
@@ -1 +1 @@
-v16.15.0
+v20.11.1
diff --git a/...pe-resources/frontend/clientlib.config.js → ...e-resources/frontend/clientlib.config.cjs b/...pe-resources/frontend/clientlib.config.js → ...e-resources/frontend/clientlib.config.cjs
diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/base/index.js b/src/main/resources/archetype-resources/frontend/config/webpack/base/index.js
@@ -1,9 +1,9 @@
 import path from "path";
-import merge from "webpack-merge";
+import { merge } from "webpack-merge";
 
-import { pathConfig } from "../../path.config";
-import { entry, output } from "./setup";
-import { clean, es6, scss, handlebars, html, copy } from "./tasks";
+import { pathConfig } from "../../path.config.js";
+import { entry, output } from "./setup/index.js";
+import { clean, es6, scss, handlebars, html, copy } from "./tasks/index.js";
 
 export const baseConfig = merge(clean, es6, scss, handlebars, html, copy, {
   entry,

diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/base/setup/index.js b/src/main/resources/archetype-resources/frontend/config/webpack/base/setup/index.js
@@ -1,2 +1,2 @@
-export * from "./entryConfig";
-export * from "./outputConfig";
+export * from "./entryConfig.js";
+export * from "./outputConfig.js";
diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/base/setup/outputConfig.js b/src/main/resources/archetype-resources/frontend/config/webpack/base/setup/outputConfig.js
@@ -1,5 +1,5 @@
 import path from "path";
-import { pathConfig } from "../../../path.config";
+import { pathConfig } from "../../../path.config.js";
 
 export const output = {
   path: path.resolve(pathConfig.paths.target),

diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/clean.js b/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/clean.js
@@ -1,6 +1,6 @@
 import path from "path";
 import { CleanWebpackPlugin } from "clean-webpack-plugin";
-import { pathConfig } from "../../../path.config";
+import { pathConfig } from "../../../path.config.js";
 
 const pathsToClean = [pathConfig.paths.target];
 

diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/copy.js b/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/copy.js
@@ -1,6 +1,6 @@
 import path from "path";
 import CopyWebpackPlugin from "copy-webpack-plugin";
-import { pathConfig } from "../../../path.config";
+import { pathConfig } from "../../../path.config.js";
 
 export const copy = {
   plugins: [

diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/handlebars.js b/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/handlebars.js
@@ -1,5 +1,5 @@
 import path from "path";
-import { pathConfig } from "../../../path.config";
+import { pathConfig } from "../../../path.config.js";
 
 export const handlebars = {
   module: {

diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/index.js b/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/index.js
@@ -1,6 +1,6 @@
-export * from "./es6";
-export * from "./handlebars";
-export * from "./scss";
-export * from "./html";
-export * from "./clean";
-export * from "./copy";
+export * from "./es6.js";
+export * from "./handlebars.js";
+export * from "./scss.js";
+export * from "./html.js";
+export * from "./clean.js";
+export * from "./copy.js";
diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/scss.js b/src/main/resources/archetype-resources/frontend/config/webpack/base/tasks/scss.js
@@ -1,5 +1,5 @@
 import MiniCssExtractPlugin from "mini-css-extract-plugin";
-import { pathConfig } from "../../../path.config";
+import { pathConfig } from "../../../path.config.js";
 
 export const scss = {
   plugins: [

diff --git a/src/main/resources/archetype-resources/frontend/config/webpack/dev/index.js b/src/main/resources/archetype-resources/frontend/config/webpack/dev/index.js
@@ -1,7 +1,7 @@
-import webpackMerge from "webpack-merge";
-import { devServer } from "./server";
+import { merge } from "webpack-merge";
+import { devServer } from "./server.js";
 
-export const devConfig = webpackMerge(devServer, {
+export const devConfig = merge(devServer, {
   devtool: "source-map",
   bail: true
 });
diff --git a/src/main/resources/archetype-resources/frontend/package.json b/src/main/resources/archetype-resources/frontend/package.json
@@ -4,11 +4,12 @@
   "version": "1.0.0",
   "description": "Frontend build pipeline for AEM projects",
   "main": "index.js",
+  "type": "module",
   "scripts": {
     "start": "webpack-dev-server --mode development --open",
     "build:dev": "webpack --mode development",
     "build:prod": "webpack --mode production",
-    "build:clientlibs": "npm run build:prod && clientlib"
+    "build:clientlibs": "npm run build:prod && clientlib clientlib.config.cjs"
   },
   "dependencies": {
     "bootstrap": "4.6.2",
@@ -17,25 +18,25 @@
   },
   "devDependencies": {
     "aem-clientlib-generator": "1.8.0",
-    "@babel/core": "7.23.6",
+    "@babel/core": "7.24.1",
     "babel-loader": "9.1.3",
     "babel-plugin-transform-class-properties": "6.24.1",
     "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-    "@babel/preset-env": "7.23.6",
-    "@babel/register": "7.22.15",
+    "@babel/preset-env": "7.24.1",
+    "@babel/register": "7.23.7",
     "clean-webpack-plugin": "4.0.0",
-    "copy-webpack-plugin": "11.0.0",
-    "css-loader": "6.8.1",
+    "copy-webpack-plugin": "12.0.2",
+    "css-loader": "6.10.0",
     "handlebars": "4.7.8",
     "handlebars-loader": "1.7.3",
     "html-webpack-plugin": "5.6.0",
-    "mini-css-extract-plugin": "2.7.6",
+    "mini-css-extract-plugin": "2.8.1",
     "node-sass": "9.0.0",
-    "postcss-loader": "7.3.3",
-    "sass-loader": "13.3.2",
-    "webpack": "5.89.0",
-    "webpack-cli": "4.10.0",
-    "webpack-dev-server": "4.15.1",
+    "postcss-loader": "8.1.1",
+    "sass-loader": "14.1.1",
+    "webpack": "5.90.3",
+    "webpack-cli": "5.1.4",
+    "webpack-dev-server": "5.0.4",
     "webpack-merge": "5.10.0"
   }
 }
diff --git a/src/main/resources/archetype-resources/frontend/pom.xml b/src/main/resources/archetype-resources/frontend/pom.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-#set( $nodeJsVersion = "20.9.0" )
-#set( $npmVersion = "10.1.0" )
+#set( $nodeJsVersion = "20.11.1" )
 
   <parent>
     <groupId>${groupId}</groupId>
@@ -76,8 +75,6 @@
             <phase>process-resources</phase>
             <configuration>
               <nodeVersion>v${nodeJsVersion}</nodeVersion>
-## Explicitly define NPM version for frontend-maven-plugin to avoid build problems on Jenkins
-              <npmVersion>${npmVersion}</npmVersion>
             </configuration>
           </execution>
           <execution>

diff --git a/...in/resources/archetype-resources/frontend/src/components/customcarousel/customcarousel.js b/...in/resources/archetype-resources/frontend/src/components/customcarousel/customcarousel.js
@@ -1,5 +1,5 @@
 import $ from "jquery";
-import "bootstrap/js/dist/carousel";
+import "bootstrap/js/dist/carousel.js";
 
 export default () => {
   $(".carousel").carousel();

diff --git a/src/main/resources/archetype-resources/frontend/src/index.js b/src/main/resources/archetype-resources/frontend/src/index.js
@@ -1,5 +1,5 @@
 import $ from "jquery";
-import CustomCarousel from "./components/customcarousel/customcarousel";
+import CustomCarousel from "./components/customcarousel/customcarousel.js";
 
 // Document Ready
 $(() => {

diff --git a/src/main/resources/archetype-resources/frontend/webpack.config.babel.js b/src/main/resources/archetype-resources/frontend/webpack.config.babel.js
@@ -1,8 +1,8 @@
-import webpackMerge from "webpack-merge";
+import { merge } from "webpack-merge";
 
-import { baseConfig } from "./config/webpack/base";
-import { devConfig } from "./config/webpack/dev";
-import { prodConfig } from "./config/webpack/prod";
+import { baseConfig } from "./config/webpack/base/index.js";
+import { devConfig } from "./config/webpack/dev/index.js";
+import { prodConfig } from "./config/webpack/prod/index.js";
 
 /**
  * Get the configuration file based on webpacks `mode` parameter.
@@ -27,5 +27,5 @@ export default (_, argv) => {
   const runMode = argv.mode ? argv.mode : "production";
   const runModeConfig = getConfig(runMode);
 
-  return webpackMerge(baseConfig, runModeConfig);
+  return merge(baseConfig, runModeConfig);
 };
diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml
@@ -35,7 +35,7 @@
     <core.wcm.components.version>2.23.4</core.wcm.components.version>
 #end
 #if( $optionAcsCommons == "y" )
-    <acs.aem.commons.version>6.3.6</acs.aem.commons.version>
+    <acs.aem.commons.version>6.4.0</acs.aem.commons.version>
 #end
 
     <!-- Enable reproducible builds -->
@@ -163,12 +163,12 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.parsys</artifactId>
-        <version>1.7.2</version>
+        <version>1.7.4</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.ui.granite</artifactId>
-        <version>1.10.2</version>
+        <version>1.10.4</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -183,17 +183,17 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.url</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.media</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.link</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -203,7 +203,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.core.components</artifactId>
-        <version>2.0.0-2.23.2</version>
+        <version>2.0.2-2.23.2</version>
       </dependency>
 #end
       <dependency>
@@ -273,7 +273,7 @@
       <dependency>
         <groupId>io.wcm.maven</groupId>
         <artifactId>io.wcm.maven.aem-dependencies</artifactId>
-        <version>#if($optionAemServicePack=="y" || $optionAemServicePackAPI=="y")6.5.19.0000#{else}6.5.0.0005#end</version>
+        <version>#if($optionAemServicePack=="y" || $optionAemServicePackAPI=="y")6.5.20.0000#{else}6.5.0.0005#end</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -321,11 +321,11 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.10.1</version>
+        <version>5.10.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-#set( $mockitoVersion = "5.10.0" )
+#set( $mockitoVersion = "5.11.0" )
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>