@eui/tools 4.19.0 → 4.19.4

package/.version.properties

@@ -1 +1 @@
-4.19.0
+4.19.4

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 4.19.4 (2022-02-03)
+
+##### Chores
+
+* **other:**
+  * added pwa injection in angular config - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d36f21fd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d36f21fd0c80a10daed260f09d79b03917ce1322))
+
+* * *
+* * *
+## 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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.19.0",
+    "version": "4.19.4",
     "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,7 +223,126 @@ 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": "",
@@ -929,10 +1048,14 @@ module.exports.registerAngularProjectDef = (project, build = false) => {
         }
 
       } else {
-        if (project.build && project.build.csdrFileReplacement === true) {
-          projectDef = JSON.stringify(angularProjectLightDef);
+        if (project.build && project.build.euiVersion === '13.x') {
+          projectDef = JSON.stringify(angularProjectDefV13);
         } else {
-          projectDef = JSON.stringify(angularProjectDef);
+          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);
@@ -997,6 +1120,13 @@ module.exports.registerAngularProjectDef = (project, build = false) => {
           jsonFile['projects'][project.name].architect.serve.configurations[confKey] = serveConf;
         })
       }
+
+      // checking pwa additional injection
+      if (project.build && project.build.pwa) {
+        jsonFile['projects'][project.name].architect.build.options.serviceWorker = true;
+        jsonFile['projects'][project.name].architect.build.options.ngswConfigPath = "ngsw-config.json";
+        jsonFile['projects'][project.name].architect.build.options.assets.push("src/manifest.webmanifest");
+      }
     }
 
     tools.writeJsonFileSync(file, jsonFile);

package/scripts/csdr/metadata/package.js

@@ -222,7 +222,7 @@ module.exports.storeMetadata = (
         if (pkgIdxHOTFIX > -1) {
           packagesHotfixTag[pkgIdxHOTFIX] = newPackage;
         } else {
-          if (!packagesNextTag) {
+          if (!packagesHotfixTag) {
             packagesHotfixTag = [];
           }
           packagesHotfixTag.push(newPackage);

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`);
           }
         })
       }