@eui/tools 4.18.9 → 4.19.3

package/.version.properties

@@ -1 +1 @@
-4.18.9
+4.19.3

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 4.19.3 (2022-02-02)
+
+##### Chores
+
+* **other:**
+  * added pathsMapping replacement for v10 remotes config - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([6e5651cf](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6e5651cfcf2533ced316b5e04650d65f88520185))
+
+* * *
+* * *
+## 4.19.2 (2022-01-25)
+
+##### Bug Fixes
+
+* **other:**
+  * hotfix pipeline metadata issues - added missing v10 pkg skeleton files - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([bb59cdbf](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/bb59cdbf98e13cca49017c6268318c4573bd73b4))
+
+* * *
+* * *
+## 4.19.1 (2022-01-21)
+
+##### Bug Fixes
+
+* **other:**
+  * csdr v13 app config skeleton - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([876f5336](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/876f5336f186d3bb245f132b0269ad38d72a1314))
+
+* * *
+* * *
+## 4.19.0 (2022-01-21)
+
+##### New Features
+
+* **other:**
+  * enabled hotfix branching - added configEnvTarget as pipeline parameter - enhance support/develop flow - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([69d420ed](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/69d420ed77ecd8947ad4801ce2da1ce9e23c1c50))
+
+* * *
+* * *
 ## 4.18.9 (2022-01-17)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.18.9",
+    "version": "4.19.3",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -631,10 +631,22 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 //     tools.logBanner('this is the content of the banner');
 //   })
 
+// return Promise.resolve()
+//   .then(() => {
+//     const prjName = 'eui-showcase-ux';
+//     const prj = configUtils.projects.getCsdrProject(prjName);
+
+//     return compositeUtils.getDeps(prj, 'TST');
+//   })
+
+
+const prjName = 'my-workplace';
+const prj = configUtils.projects.getCsdrProject(prjName);
+
 return Promise.resolve()
+  // .then(() => {
+  //   return injectionUtils.externals.injectExternalAppSources(prj);
+  // })
   .then(() => {
-    const prjName = 'eui-showcase-ux';
-    const prj = configUtils.projects.getCsdrProject(prjName);
-
-    return compositeUtils.getDeps(prj, 'TST');
+    return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'DEV', true);
   })

package/scripts/csdr/cli/skeletons/package/frontend-eui10/src/dummy.spec.ts.TO_REPLACE

@@ -0,0 +1,5 @@
+describe('First test', () => {
+    it('should work', () => {
+        expect(true).toBe(true);
+    });
+});

package/scripts/csdr/cli/skeletons/package/frontend-option-route/src/lib/components/cmp1/cmp1.component.html

@@ -0,0 +1 @@
+Hello from <strong>@module.name@-cmp1</strong>

package/scripts/csdr/cli/skeletons/package/frontend-option-route/src/lib/components/cmp1/cmp1.component.spec.ts.TO_REPLACE

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { Cmp1Component } from './cmp1.component';
+
+describe('ModuleComponent', () => {
+    let component: Cmp1Component;
+    let fixture: ComponentFixture<Cmp1Component>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [Cmp1Component],
+        })
+        .compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(Cmp1Component);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});

package/scripts/csdr/cli/skeletons/package/frontend-option-route/src/lib/components/cmp1/cmp1.component.ts

@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+    selector: '@module.scope.string@-cmp1-component',
+    templateUrl: './cmp1.component.html',
+})
+export class Cmp1Component implements OnInit {
+
+    constructor() { }
+
+    ngOnInit() {
+    }
+
+}

package/scripts/csdr/config/angular.js

@@ -223,6 +223,237 @@ const angularProjectDef = {
   }
 };
 
+const angularProjectDefV13 = {
+  "root": "",
+  "sourceRoot": "apps/@project.name@/src",
+  "projectType": "application",
+  "prefix": "app",
+  "schematics": {
+    "@schematics/angular:component": {
+      "style": "scss"
+    },
+    "@schematics/angular:application": {
+      "strict": true
+    }
+  },
+  "architect": {
+      "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+              "outputPath": "apps/@project.name@/dist",
+              "index": "apps/@project.name@/src/index.html",
+              "main": "apps/@project.name@/src/main.ts",
+              "polyfills": "apps/@project.name@/src/polyfills.ts",
+              "tsConfig": "apps/@project.name@/tsconfig.app.json",
+              "assets": [
+                  "apps/@project.name@/src/favicon.ico",
+                  "apps/@project.name@/src/assets",
+                  {
+                      "glob": "**/*",
+                      "input": "node_modules/@eui/core/assets/",
+                      "output": "./assets"
+                  }
+              ],
+              "styles": [
+              ]
+          },
+          "configurations": {
+              "production": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/environments/environment.ts",
+                          "with": "apps/@project.name@/src/environments/environment.prod.ts"
+                      }
+                  ],
+                  "optimization": false,
+                  "outputHashing": "all",
+                  "sourceMap": false,
+                  "namedChunks": true,
+                  "aot": true,
+                  "extractLicenses": true,
+                  "vendorChunk": false,
+                  "buildOptimizer": false,
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "6mb"
+                      }
+                  ]
+              },
+              "production-optimized": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/environments/environment.ts",
+                          "with": "apps/@project.name@/src/environments/environment.prod.ts"
+                      }
+                  ],
+                  "optimization": {
+                    "scripts": true,
+                    "styles": {
+                        "minify": false,
+                        "inlineCritical": true
+                    },
+                    "fonts": true
+                  },
+                  "outputHashing": "all",
+                  "sourceMap": false,
+                  "namedChunks": true,
+                  "aot": true,
+                  "extractLicenses": true,
+                  "vendorChunk": false,
+                  "buildOptimizer": true,
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "6mb"
+                      }
+                  ]
+              },
+              "development": {
+                  "buildOptimizer": false,
+                  "optimization": false,
+                  "vendorChunk": true,
+                  "extractLicenses": false,
+                  "sourceMap": true,
+                  "namedChunks": true
+              }
+          },
+          "defaultConfiguration": "production"
+      },
+      "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+              "browserTarget": "@project.name@:build"
+          },
+          "configurations": {
+              "proxy-mock": {
+                  "browserTarget": "@project.name@:build",
+                  "proxyConfig": "apps/@project.name@/proxy-mock.conf.json"
+              },
+              "production": {
+                  "browserTarget": "@project.name@:build:production"
+              },
+              "development": {
+                "browserTarget": "@project.name@:build:development"
+              }
+          },
+          "defaultConfiguration": "development"
+      }
+  }
+};
+
+const angularProjectLightDef = {
+  "root": "",
+  "sourceRoot": "apps/@project.name@/src",
+  "projectType": "application",
+  "prefix": "app",
+  "schematics": {
+    "@schematics/angular:component": {
+      "styleext": "scss"
+    }
+  },
+  "architect": {
+    "build": {
+      "builder": "ngx-build-plus:build",
+      "options": {
+        "outputPath": "apps/@project.name@/dist",
+        "index": "apps/@project.name@/src/index.html",
+        "main": "apps/@project.name@/src/main.ts",
+        "polyfills": "apps/@project.name@/src/polyfills.ts",
+        "tsConfig": "apps/@project.name@/tsconfig.app.json",
+        "assets": [
+          "apps/@project.name@/src/favicon.ico",
+          "apps/@project.name@/src/assets",
+          {
+            "glob": "**/*",
+            "input": "node_modules/@eui/core/assets/",
+            "output": "./assets"
+          }
+        ],
+        "styles": [
+          "node_modules/@eui/styles/dist/assets/fonts/webfont/Roboto/Roboto.css",
+          "node_modules/@eui/styles/dist/styles/eui-primeng.css",
+          "node_modules/@eui/styles/dist/styles/eui.css",
+          "node_modules/@eui/styles/dist/styles/eui-shell-extended.css",
+          "apps/@project.name@/src/styles.scss"
+        ]
+      },
+      "configurations": {
+        "production": {
+          "fileReplacements": [
+            {
+              "replace": "apps/@project.name@/src/environments/environment.ts",
+              "with": "apps/@project.name@/src/environments/environment.prod.ts"
+            },
+          ],
+          "optimization": false,
+          "outputHashing": "all",
+          "sourceMap": false,
+          "extractCss": true,
+          "namedChunks": true,
+          "aot": true,
+          "extractLicenses": true,
+          "vendorChunk": false,
+          "buildOptimizer": false,
+          "budgets": [
+            {
+              "type": "initial",
+              "maximumWarning": "2mb",
+              "maximumError": "7mb"
+            }
+          ]
+        },
+        "production-optimized": {
+          "fileReplacements": [
+            {
+              "replace": "apps/@project.name@/src/environments/environment.ts",
+              "with": "apps/@project.name@/src/environments/environment.prod.ts"
+            },
+          ],
+          "optimization": true,
+          "outputHashing": "all",
+          "sourceMap": false,
+          "extractCss": true,
+          "namedChunks": true,
+          "aot": true,
+          "extractLicenses": true,
+          "vendorChunk": false,
+          "buildOptimizer": true,
+          "budgets": [
+            {
+              "type": "initial",
+              "maximumWarning": "2mb",
+              "maximumError": "7mb"
+            }
+          ]
+        }
+      }
+    },
+    "serve": {
+      "builder": "@angular-devkit/build-angular:dev-server",
+      "options": {
+        "browserTarget": "@project.name@:build"
+      },
+      "configurations": {
+        "proxy-mock": {
+          "browserTarget": "@project.name@:build",
+          "proxyConfig": "apps/@project.name@/proxy-mock.conf.json"
+        },
+        "production": {
+          "browserTarget": "@project.name@:build:production"
+        }
+      }
+    }
+  }
+};
+
+
+
+
+
+
 
 const angularProjectDefFullSkeleton = {
   "root": "",
@@ -817,7 +1048,15 @@ module.exports.registerAngularProjectDef = (project, build = false) => {
         }
 
       } else {
-        projectDef = JSON.stringify(angularProjectDef);
+        if (project.build && project.build.euiVersion === '13.x') {
+          projectDef = JSON.stringify(angularProjectDefV13);
+        } else {
+          if (project.build && project.build.csdrFileReplacement === true) {
+            projectDef = JSON.stringify(angularProjectLightDef);
+          } else {
+            projectDef = JSON.stringify(angularProjectDef);
+          }
+        }
       }
       let replaceProject = tools.replaceAll(projectDef, '@project.name@', project.name);
       replaceProject = JSON.parse(replaceProject);

package/scripts/csdr/install/remote.js

@@ -152,9 +152,9 @@ const getDeps = (pkg, isMaster, envTarget = null) => {
         depsComposite = tools.getJsonFileContent(depsCompositeJsonFile);
       }
 
-      if (envTarget) {
-        // TODO - handle dependencies composite per environment => one bamboo plan for each envs to be defined
-      }
+      // TODO - handle dependencies composite per environment => one bamboo plan for each envs to be defined
+      // if (envTarget) {
+      // }
 
       return innerCommon.getRemappedDeps(depsMetadata, { ...depsBase, ...depsComposite});
     })

package/scripts/csdr/metadata/package.js

@@ -57,7 +57,7 @@ module.exports.getPackagesDeps = (depsType) => {
 
 
 module.exports.storeMetadata = (
-    pkg, pkgVersion, pkgMetadata, isSnapshot, isMaster, isSupportBranch, isNextBranch, isSupportSnapshotBranch,
+    pkg, pkgVersion, pkgMetadata, isSnapshot, isMaster, isSupportBranch, isNextBranch, isSupportSnapshotBranch, isHotfixBranch,
     pkgCompositeDeps, duration,
   ) => {
 
@@ -83,6 +83,7 @@ module.exports.storeMetadata = (
       var packagesPrevTag = [];
       var packagesNextTag = [];
       var packagesPrevSnapshotsTag = [];
+      var packagesHotfixTag = [0];
 
       if (tools.isFileExists(metadataFile)) {
         metadata = require(metadataFile);
@@ -91,6 +92,7 @@ module.exports.storeMetadata = (
         packagesPrevTag = metadata.packagesPrevTag;
         packagesNextTag = metadata.packagesNextTag;
         packagesPrevSnapshotsTag = metadata.packagesPrevSnapshotsTag;
+        packagesHotfixTag = metadata.packages.packagesHotfixTag;
       }
 
       const newPackage = {
@@ -209,11 +211,30 @@ module.exports.storeMetadata = (
         }
       }
 
+      if (isHotfixBranch) {
+        var pkgIdxHOTFIX;
+        if (packagesHotfixTag) {
+          pkgIdxHOTFIX = packagesHotfixTag.findIndex(item => item.name === pkg.name);
+        } else {
+          pkgIdxHOTFIX = -1;
+        }
+
+        if (pkgIdxHOTFIX > -1) {
+          packagesHotfixTag[pkgIdxHOTFIX] = newPackage;
+        } else {
+          if (!packagesHotfixTag) {
+            packagesHotfixTag = [];
+          }
+          packagesHotfixTag.push(newPackage);
+        }
+      }
+
       metadata.packages = packages;
       metadata.packagesLatestTag = packagesLatestTag;
       metadata.packagesPrevTag = packagesPrevTag;
       metadata.packagesNextTag = packagesNextTag;
       metadata.packagesPrevSnapshotsTag = packagesPrevSnapshotsTag;
+      metadata.packagesHotfixTag = packagesHotfixTag;
 
       if (!dryRun) {
         tools.writeJsonFileSync(metadataFile, metadata);
@@ -381,6 +402,7 @@ module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
   return Promise.resolve()
     .then(() => {
       const pkgMetadataFile = path.join(pkg.paths.pkgBuild, 'bundles', 'package-metadata.json');
+      const pkgMetadataRootFile = path.join(pkg.paths.pkgDirectory, 'package-metadata.json');
 
       const pkgMetadata = {
         dependencies: pkgCompositeDeps
@@ -390,7 +412,8 @@ module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
       console.log(pkgMetadata);
 
       if (!dryRun) {
-        return tools.writeJsonFileSync(pkgMetadataFile, pkgMetadata);
+        tools.writeJsonFileSync(pkgMetadataFile, pkgMetadata);
+        tools.writeJsonFileSync(pkgMetadataRootFile, pkgMetadata);
       }
     })
 

package/scripts/csdr/release/app/release-app.js

@@ -20,7 +20,7 @@ module.exports.run = () => {
   const project = configUtils.projects.getProject();
 
   // fetching command parameters
-  var { branch, dryRun, envTarget, compositeType } = utils.tools.getArgs();
+  var { branch, dryRun, envTarget, compositeType, configEnvTarget } = utils.tools.getArgs();
 
   // checking branch and envTarget types
   if (branch && typeof (branch) === 'boolean') {
@@ -29,6 +29,9 @@ module.exports.run = () => {
   if (envTarget && typeof (envTarget) === 'boolean') {
     envTarget = null;
   }
+  if (configEnvTarget && typeof (configEnvTarget) === 'boolean') {
+    configEnvTarget = null;
+  }
 
   // globals
   if (!branch && !envTarget) {
@@ -258,7 +261,7 @@ module.exports.run = () => {
     // BUILD ANGULAR APPLICATION
     // *****************************************************************
     .then(() => {
-      return utils.buildApp.angular(envTarget, (isSnapshot || isSupportSnapshotBranch), newVersion);
+      return utils.buildApp.angular(envTarget, (isSnapshot || isSupportSnapshotBranch), newVersion, configEnvTarget);
     })
 
 

package/scripts/csdr/release/package/common.js

@@ -21,7 +21,8 @@ module.exports.getBranches = () => {
   const isMaster =  (branch === 'master');
   const isSupportSnapshot = (!isMaster && !isSnapshot && branch.indexOf('support/develop') > -1);
   const isSupport = (!isMaster && !isSnapshot && !isSupportSnapshot && branch.indexOf('support/') > -1);
-  const isNext = (!isMaster && !isSnapshot && !isSupport && branch.indexOf('next/') > -1);
+  const isHotfix = (!isMaster && !isSnapshot && !isSupportSnapshot && !isSupport && branch.indexOf('hotfix/') > -1);
+  const isNext = (!isMaster && !isSnapshot && !isSupport && !isSupportSnapshot && !isHotfix && branch.indexOf('next/') > -1);
 
   return {
     isSupport: isSupport,
@@ -29,6 +30,7 @@ module.exports.getBranches = () => {
     isNext: isNext,
     isSnapshot: isSnapshot,
     isMaster: isMaster,
+    isHotfix: isHotfix,
     branch: branch
   }
 }
@@ -178,7 +180,7 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
 
   // GET NEW VERSION from VALID commits found in metadata
   .then(() => {
-    return versionUtils.package.getNewVersion(pkg, pkgMetadata.commits, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport);
+    return versionUtils.package.getNewVersion(pkg, pkgMetadata.commits, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport, branches.isHotfix);
   })
 
 
@@ -187,7 +189,7 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
     newVersion = version;
 
     if (!dryRun) {
-      return versionUtils.package.updateVersion(pkg, version, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport);
+      return versionUtils.package.updateVersion(pkg, version, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport, branches.isHotfix);
     }
   })
 
@@ -304,6 +306,13 @@ module.exports.runGitOperations = (pkg, version) => {
     }
   })
 
+  // MERGE BACK ON support/develop for support release for package that has a support/develop branch active
+  .then(() => {
+    if (branches.isSupport && pkg.build && pkg.build.supportDevelopBranch) {
+      return utils.git.mergeSupportToSupportDevelop(pkg, pkg.paths.pkgDirectory, branches.branch, pkg.build.supportDevelopBranch);
+    }
+  })
+
   .catch((e) => {
     throw e;
   })
@@ -318,7 +327,7 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
   .then(() => {
     return metadataUtils.package.storeMetadata(
       pkg, version, pkgMetadata,
-      branches.isSnapshot, branches.isMaster, branches.isSupport, branches.isNext, branches.isSupportSnapshot,
+      branches.isSnapshot, branches.isMaster, branches.isSupport, branches.isNext, branches.isSupportSnapshot, branches.isHotfix,
       pkgCompositeDeps,
       duration
     );

package/scripts/csdr/release/package/release-package.js

@@ -82,13 +82,13 @@ module.exports.run = () => {
       // INSTALL dependencies by type
       .then(() => {
         if (pkg.remote) {
-          return innerRemote.install(pkg, branches.isMaster, envTarget);
+          return innerRemote.install(pkg, branches.isMaster || branches.isHotfix || branches.isSupport, envTarget);
 
         } else if (pkg.backend) {
-          return innerBackend.install(pkg, branches.isMaster);
+          return innerBackend.install(pkg, branches.isMaster || branches.isHotfix || branches.isSupport);
 
         } else {
-          return innerUi.install(pkg, branches.isMaster);
+          return innerUi.install(pkg, branches.isMaster || branches.isHotfix || branches.isSupport);
         }
       })
       .then((compositeDeps) => {

package/scripts/csdr/version/package.js

@@ -62,7 +62,7 @@ const getCurrentVersion = (pkg) => {
 }
 
 
-const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSupportBranch) => {
+const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch) => {
   return Promise.resolve()
     .then(() => {
       const pkgJsonFile = path.resolve(folder, 'package.json');
@@ -91,7 +91,7 @@ const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSu
     })
 }
 
-const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch) => {
+const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch) => {
   return Promise.resolve()
     .then(() => {
       tools.logTitle('updating package version');
@@ -99,11 +99,11 @@ const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBr
       if (!pkg.parent) {
         return Promise.resolve()
           .then(() => {
-            return writePackageJsonCore(newVersion, pkg.paths.pkgDirectory, isSnapshot, isNextBranch, isSupportBranch);
+            return writePackageJsonCore(newVersion, pkg.paths.pkgDirectory, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch);
           })
           .then(() => {
             if (!pkg.element && !pkg.config) {
-              return writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch);
+              return writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch);
             }
           })
           .catch((e) => {
@@ -113,7 +113,7 @@ const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBr
       } else {
         return Promise.resolve()
           .then(() => {
-            return writePackageJsonCore(newVersion, pkg.paths.pkgDirectory, isSnapshot, isNextBranch, isSupportBranch);
+            return writePackageJsonCore(newVersion, pkg.paths.pkgDirectory, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch);
           })
           .then(() => {
             let linkedPackages = Object.keys(pkg.packages)
@@ -128,7 +128,7 @@ const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBr
           .then((linkedPackages) => Promise.resolve().then(() => {
             return linkedPackages.reduce((promise, pkg) => {
               return promise.then(() => (
-                writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch)
+                writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch)
               ));
             }, Promise.resolve());
           }))
@@ -188,7 +188,7 @@ const writePomXml = (pkg, newVersion, isSnapshot, isForceTimestamp = true) => {
 
 // PUBLIC METHODS
 
-module.exports.getNewVersion = (pkg, commits, isSnapshot, isNextBranch, isSupportBranch) => {
+module.exports.getNewVersion = (pkg, commits, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch) => {
   return Promise.resolve()
     .then(() => {
       return getCurrentVersion(pkg);
@@ -264,6 +264,10 @@ module.exports.getNewVersion = (pkg, commits, isSnapshot, isNextBranch, isSuppor
         newVersion = semver.inc(currentVersion, 'prerelease');
       }
 
+      if (isHotfixBranch) {
+        newVersion = semver.inc(currentVersion, 'prerelease');
+      }
+
       tools.logSuccess('new version generated : ' + newVersion);
 
       return newVersion;
@@ -274,11 +278,11 @@ module.exports.getNewVersion = (pkg, commits, isSnapshot, isNextBranch, isSuppor
 }
 
 
-module.exports.updateVersion = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch) => {
+module.exports.updateVersion = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch) => {
   if (pkg.backend) {
     return writePomXml(pkg, newVersion, isSnapshot);
   }
   else {
-    return writePackageJson(pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch);
+    return writePackageJson(pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch);
   }
 }

package/scripts/utils/build/app/build-app-utils.js

@@ -13,7 +13,7 @@ const preBuildUtils = require('../../pre-build/pre-build-utils');
 let {
   skipLint, skipTest, skipCompile, configuration, baseHref,
   watch, dryRun, maxSpaceSize, statsJson, extraWebpackConfig, ci,
-  deployUrl, sourceMap
+  deployUrl, sourceMap, configEnvTarget
 } = tools.getArgs();
 
 
@@ -33,12 +33,18 @@ const getProjectInfos = () => {
 
 
 
-module.exports.angular = (envTarget, isSnapshot, version) => {
+module.exports.angular = (envTarget, isSnapshot, version, configEnvTargetIn) => {
 
   const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
 
   const currentProject = getProjectInfos();
 
+  // checking if configEnvTarget is passed as param, if not take the global script param
+  // as this angular build method can be called in stand-alone (outside of CSDR pipeline flow)
+  if (configEnvTargetIn) {
+    configEnvTarget = configEnvTargetIn;
+  }
+
   // getting param from project config
   if (currentProject.build) {
     if (currentProject.build.skipLint) {
@@ -66,7 +72,7 @@ module.exports.angular = (envTarget, isSnapshot, version) => {
     })
 
     .then(() => {
-      return preBuildUtils.projects.preBuild(currentProject, envTarget, true);
+      return preBuildUtils.projects.preBuild(currentProject, envTarget, true, configEnvTarget);
     })
 
     .then(() => {
@@ -88,11 +94,6 @@ module.exports.angular = (envTarget, isSnapshot, version) => {
       if (!skipLint) {
         tools.logSuccess();
       }
-      // temporary disable for v13 apps
-      // if (!skipLint) {
-      //   tools.logInfo(`Styles Linting application...`);
-      //   return tools.runScript(`stylelint **/*.scss`, currentProject.paths.angularPath);
-      // }
     })
 
 

package/scripts/utils/git-utils.js

@@ -7,6 +7,7 @@ const semver = require('semver');
 // LOCAL
 const tools = require('./tools');
 const configUtils = require('../csdr/config/config-utils');
+const { getPackageConfig } = require('./notification/config');
 // const versionUtils = require('./version-utils');
 
 // FETCH ARGS
@@ -225,10 +226,50 @@ const mergeMasterToDevelop = (pkg, folder, version) => {
         })
     }
   }
+}
+
+
+const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportDevelopBranch) => {
+  if (!supportDevelopBranch) {
+    tools.logWarning('supportDevelopBranch not found in package config...skipping');
+    return Promise.resolve();
+  }
+
+  tools.logTitle(`Merge back on ${supportDevelopBranch}`);
+  tools.logInfo(`Merging release changes into ${supportDevelopBranch} branch...`);
+
+  if (dryRun) {
+    tools.logInfo('DRY-RUN: skipping merge support to supportDevelop');
+    return Promise.resolve();
+
+  } else {
 
+    if (pkg && pkg.build && pkg.build.masterBranchOnly) {
+      tools.logInfo('Merge skipped project config set to master branch only');
+      return Promise.resolve();
+
+    } else {
+      return Promise.resolve()
+        .then(() => {
+          execa.shellSync(`git fetch origin`, { cwd: folder });
+          execa.shellSync(`git checkout ${supportDevelopBranch}`, { cwd: folder });
+          execa.shellSync(`git merge origin/${supportDevelopBranch}`, { cwd: folder });
+          execa.shellSync(`git merge -X theirs ${supportBranch}`, { cwd: folder });
+          execa.shellSync(`git push origin ${supportDevelopBranch}`, { cwd: folder });
+          execa.shellSync(`git checkout ${supportBranch}`, { cwd: folder });
+        })
+        .then(() => {
+          tools.logSuccess();
+        })
+        .catch((e) => {
+          throw new Error(`Error trying merging ${supportBranch} to ${supportDevelopBranch} on ${folder}`);
+        })
+    }
+  }
 }
 
 
+
 const getGitHost = (externalRepo) => {
   const config = configUtils.global.getConfig();
 
@@ -338,6 +379,7 @@ module.exports.hasCommitsSinceLastTag = hasCommitsSinceLastTag;
 module.exports.commitAndPush = commitAndPush;
 module.exports.tagVersion = tagVersion;
 module.exports.mergeMasterToDevelop = mergeMasterToDevelop;
+module.exports.mergeSupportToSupportDevelop = mergeSupportToSupportDevelop;
 module.exports.cloneRepo = cloneRepo;
 module.exports.checkout = checkout;
 module.exports.getLastCommitAuthor = getLastCommitAuthor;

package/scripts/utils/pre-build/injection/externals.js

@@ -256,11 +256,14 @@ module.exports.remapRoutesByEnvConfig = (project, envTarget, build) => {
 
       // get routes file content and replace tokens
       routesRemapping.forEach((route) => {
-        tools.logInfo(`checking replacement for : ${JSON.stringify(route)}`);
+        tools.logInfo(`\nchecking replacement for : ${JSON.stringify(route)}`);
         const tokenToSearch = `./features/${route.featureModule}-lib.module#Module`;
+        tools.logInfo(`Searching token : ${tokenToSearch}`);
         if (routesFileContent.indexOf(tokenToSearch) > -1) {
           tools.logInfo(`token ${tokenToSearch} found...replacing by ${route.routeModuleDef}`);
           routesFileContent = tools.replaceAll(routesFileContent, tokenToSearch, route.routeModuleDef);
+        } else {
+          tools.logWarning(`token ${tokenToSearch} NOT FOUND`);
         }
       })
 
@@ -277,6 +280,54 @@ module.exports.remapRoutesByEnvConfig = (project, envTarget, build) => {
           if (routesFileContent.indexOf(tokenToSearch) > -1) {
             tools.logInfo(`token ${tokenToSearch} found...replacing by ${route.updatedRoute}`);
             routesFileContent = tools.replaceAll(routesFileContent, tokenToSearch, route.updatedRoute);
+          } else {
+            tools.logWarning(`token ${tokenToSearch} NOT FOUND`);
+          }
+        })
+      }
+
+      // checking paths mapping (new method for v10 remotes)
+      const pathsMapping = config.pathsMapping;
+      if (!pathsMapping) {
+        tools.logWarning('No pathsMapping found in current config...skipping');
+
+      } else {
+        tools.logInfo('Paths mappings for v10 remotes activation');
+        pathsMapping.forEach((pathMapping) => {
+          tools.logInfo(`Checking path: ${pathMapping.path}`);
+          const placeholderToSearch = `// ${pathMapping.path}-placeholder`;
+
+          if (routesFileContent.indexOf(placeholderToSearch) > -1) {
+            tools.logInfo(`path placeholder: "${placeholderToSearch}" found...replacing`);
+
+            let placeholderContent = '';
+            if (pathMapping.data) {
+              placeholderContent += 'data:{';
+              if (pathMapping.data.featureName) {
+                placeholderContent += `featureName: "${pathMapping.data.featureName}"`;
+              }
+              if (pathMapping.data.moduleId) {
+                placeholderContent += `, moduleId: "${pathMapping.data.moduleId}"`;
+              }
+              if (pathMapping.data.elementTag) {
+                placeholderContent += `, elementTag: "${pathMapping.data.elementTag}"`;
+              }
+              if (pathMapping.data.iframe) {
+                placeholderContent += `, iframe: ${pathMapping.data.iframe}`;
+              }
+              placeholderContent += '}';
+            }
+            if (pathMapping.loadChildren) {
+              placeholderContent += `, loadChildren: "${pathMapping.loadChildren}"`;
+            }
+
+            tools.logInfo('Generated content for route: ');
+            console.log(placeholderContent);
+
+            routesFileContent = tools.replaceAll(routesFileContent, placeholderToSearch, placeholderContent);
+
+          } else {
+            tools.logWarning(`token ${placeholderToSearch} NOT FOUND`);
           }
         })
       }

package/scripts/utils/pre-build/projects.js

@@ -9,10 +9,10 @@ const translationUtils = require('./translations/translation-utils');
 
 const configUtils = require('../../csdr/config/config-utils');
 
-let { configEnvTarget, openid } = tools.getArgs();
+let { openid } = tools.getArgs();
 
 
-module.exports.preBuild = (project, envTarget, build) => {
+module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
 
   return Promise.resolve()
 
@@ -111,7 +111,7 @@ module.exports.preBuild = (project, envTarget, build) => {
       }
 
       if (configEnvTarget) {
-        return this.injectAppConfig(project, configEnvTarget, build);
+        return this.injectAppConfig(project, configEnvTarget);
       }
     })
 
@@ -122,7 +122,7 @@ module.exports.preBuild = (project, envTarget, build) => {
 
 
 
-module.exports.injectAppConfig = (project, configEnvTarget, build) => {
+module.exports.injectAppConfig = (project, configEnvTarget) => {
   return Promise.resolve()
     .then(() => {
       tools.logInfo(`Executing configuration replacement for : ${configEnvTarget} environment`);

package/scripts/utils/serve/app.js

@@ -10,7 +10,7 @@ const configUtils = require('../../csdr/config/config-utils');
 
 module.exports.serve = () => {
 
-  let { configuration, baseHref, host, proxyConfig, maxSpaceSize, port, disableHostCheck, open, debug } = tools.getArgs();
+  let { configuration, baseHref, host, proxyConfig, maxSpaceSize, port, disableHostCheck, open, debug, configEnvTarget } = tools.getArgs();
 
   const prj = configUtils.projects.getProject();
 
@@ -38,7 +38,7 @@ module.exports.serve = () => {
     })
 
     .then(() => {
-      return preBuildUtils.projects.preBuild(prj, configuration, false);
+      return preBuildUtils.projects.preBuild(prj, configuration, false, configEnvTarget);
     })
 
 

package/scripts/utils/tools.js

@@ -565,8 +565,6 @@ function getSysConfig() {
     infos.httpsProxy = execSync('npm config get https-proxy').toString().trim();
     const registry = execSync('npm config get registry').toString().trim();
 
-    infos.isRegistryEcDevops = registry.indexOf('ecdevops.eu') >= 0;
-
     logSuccess();
 
     return infos;