Merge development v1.2.2 into master (#59)

* #49 - Update to latest Core Components & 6.4 UberJAR * Support Server-side rendering requests for Template page paths issue-#50 (PR - #51) * @releng [maven-scm] :prepare release we-retail-journal-1.2.2 * @releng [maven-scm] :prepare for next development iteration
adobe · Nov 5, 2019 · 73fa8bf · 73fa8bf
1 parent 337fb3d
commit 73fa8bf
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 26 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq.sample.spa</groupId>
         <artifactId>we-retail-journal</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
     <!-- ====================================================================== -->
     <artifactId>we-retail-journal-all</artifactId>
     <packaging>content-package</packaging>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <name>We.Retail Journal All-in-One</name>
     <description>All-in-One package for We.Retail Journal</description>

diff --git a/angular-app/DEVELOPMENT.md b/angular-app/DEVELOPMENT.md
@@ -35,7 +35,11 @@ Most probably the images are having relative paths, and because we are not on AE
 Quick fix would be to force the AEM absolute path on the images from the image component
 
 ## Running the local NODE.js Server Side Rendering.  
-In order to get the server side rendering to work run the following commands
+First, Set the API_HOST configuration in [src/environments/environment.ts](https://github.com/adobe/aem-sample-we-retail-journal/blob/master/angular-app/src/environments/environment.ts#L7) pointing to your AEM instance:
+
+```API_HOST: "http://localhost:4502",```
+
+Now, In order to get the server side rendering to work run the following commands
 ```
 npm run build:ssr
 ```
@@ -44,7 +48,7 @@ then
 npm run serve:ssr
 ```
 
-This will open a server on port 4000 so you can navigate to http://localhost:4000/content/we-retail-journal/angular/home.html to see the running example
+This will open a server on port 4200 so you can navigate to http://localhost:4200/content/we-retail-journal/angular/en/home.html to see the running example
 
 ### SSR Setup
 

diff --git a/angular-app/pom.xml b/angular-app/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.adobe.cq.sample.spa</groupId>
     <artifactId>we-retail-journal</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -32,7 +32,7 @@
   <!-- ====================================================================== -->
   <artifactId>we-retail-journal-angular-app</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
 
   <name>We.Retail Journal Angular App</name>
   <description>Angular App for the We.Retail Journal</description>

diff --git a/angular-app/server.ts b/angular-app/server.ts
@@ -22,7 +22,7 @@ enableProdMode();
 // Express server
 const app = express();
 
-const PORT = process.env.PORT || 4000;
+const PORT = process.env.PORT || 4200;
 const DIST_FOLDER = join(process.cwd(), 'dist');
 const APP_ROOT_PATH = environment.APP_ROOT_PATH;
 
@@ -51,7 +51,7 @@ app.get('/api/*', (req, res) => {
 app.get('*.*', express.static(join(DIST_FOLDER, 'browser')));
 
 // All regular routes use the Universal engine
-app.get(`${APP_ROOT_PATH}*.html`, (req, res, next) => {
+app.get([`${APP_ROOT_PATH}*.html`, '/conf/we-retail-journal/angular/settings/wcm/templates*.html'], (req, res, next) => {
   if (!environment.APP_ROOT_PATH) {
     console.error("You have not set any root path for app. Be sure you set the environment variable APP_ROOT_PATH before running the command");
     process.exit(1);
@@ -75,7 +75,7 @@ app.get(`${APP_ROOT_PATH}*.html`, (req, res, next) => {
   });
 });
 
-app.post(`${APP_ROOT_PATH}*.html`, (req, res, next) => {
+app.post([`${APP_ROOT_PATH}*.html`, '/conf/we-retail-journal/angular/settings/wcm/templates*.html'], (req, res, next) => {
   const pageModelRootPath = req.headers['page-model-root-url'] || APP_ROOT_PATH;
   let model = req.body;
   ModelManager.destroy();

diff --git a/bundles/commons/pom.xml b/bundles/commons/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq.sample.spa</groupId>
         <artifactId>we-retail-journal</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
     <!-- ====================================================================== -->
     <artifactId>we-retail-journal-commons</artifactId>
     <packaging>bundle</packaging>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <name>We.Retail Journal Commons</name>
     <description>Bundle for We.Retail Journal Commons</description>

diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq.sample.spa</groupId>
         <artifactId>we-retail-journal</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
     <!-- ====================================================================== -->
     <artifactId>we-retail-journal-core</artifactId>
     <name>We.Retail Journal Core</name>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
     <description>Content package We.Retail Journal SPAs Core bundles</description>
     <packaging>bundle</packaging>
 

diff --git a/bundles/ssr/pom.xml b/bundles/ssr/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq.sample.spa</groupId>
         <artifactId>we-retail-journal</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
     <!-- ====================================================================== -->
     <artifactId>we-retail-journal-ssr</artifactId>
     <name>We.Retail Journal Server Side Rendering</name>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <!-- ====================================================================== -->

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>com.adobe.cq.sample.spa</groupId>
     <artifactId>we-retail-journal</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <name>We.Retail Journal Reactor</name>
     <description>Reactor POM for We.Retail Journal</description>
@@ -600,7 +600,7 @@
             <dependency>
                 <groupId>com.adobe.aem</groupId>
                 <artifactId>uber-jar</artifactId>
-                <version>6.3.1.2</version>
+                <version>6.4.2</version>
                 <classifier>apis</classifier>
                 <scope>provided</scope>
             </dependency>
@@ -730,7 +730,7 @@
             <dependency>
                 <groupId>com.adobe.cq</groupId>
                 <artifactId>core.wcm.components.core</artifactId>
-                <version>2.3.2</version>
+                <version>2.4.0</version>
                 <scope>provided</scope>
             </dependency>
 

diff --git a/react-app/pom.xml b/react-app/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq.sample.spa</groupId>
         <artifactId>we-retail-journal</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
     <!-- ====================================================================== -->
     <artifactId>we-retail-journal-react-app</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <name>We.Retail Journal React App</name>
     <description>React App for the We.Retail Journal</description>

diff --git a/react-app/src/server/index.js b/react-app/src/server/index.js
@@ -70,7 +70,7 @@ function renderModelToHTMLString(model, pagePath, requestUrl, requestPath, pageM
         </script>`;
 }
 
-exapp.get('/content/we-retail-journal/react*.html', (req, res, next) => {
+exapp.get(['/content/we-retail-journal/react*.html', '/conf/we-retail-journal/react/settings/wcm/templates*.html'], (req, res, next) => {
     if (!process.env.API_HOST) {
         console.error("You have not set any api host. Be sure you set the environment variable API_HOST before running the command");
         process.exit(1);
@@ -92,7 +92,7 @@ exapp.get('/content/we-retail-journal/react*.html', (req, res, next) => {
     });
 });
 
-exapp.post("/content/we-retail-journal/react*.html", (req, res, next) => {
+exapp.post(['/content/we-retail-journal/react*.html', '/conf/we-retail-journal/react/settings/wcm/templates*.html'], (req, res, next) => {
     const wcmMode = req.headers['wcm-mode'];
     const isInEditor = wcmMode && wcmMode === 'EDIT' || wcmMode === 'PREVIEW';
     const pageModelRootPath = req.headers['page-model-root-url'] || APP_ROOT_PATH;

diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq.sample.spa</groupId>
         <artifactId>we-retail-journal</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
     <!-- ====================================================================== -->
     <artifactId>we-retail-journal-apps</artifactId>
     <packaging>content-package</packaging>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <name>We.Retail Journal Application</name>
     <description>Application package We.Retail Journal SPAs</description>

diff --git a/ui.content/pom.xml b/ui.content/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq.sample.spa</groupId>
         <artifactId>we-retail-journal</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
     <!-- ====================================================================== -->
     <artifactId>we-retail-journal-content</artifactId>
     <packaging>content-package</packaging>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <name>We.Retail Journal Content</name>
     <description>Content package We.Retail Journal SPAs</description>