@eui/tools 5.3.8 → 5.3.11

package/.version.properties

@@ -1 +1 @@
-5.3.8
+5.3.11

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.3.11 (2022-06-14)
+
+##### Chores
+
+* **other:**
+  * added envTarget delivery option for new remote v10 and up creation - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([6451fcd3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6451fcd3047c344eb64906e6485ee9b855e13c27))
+
+* * *
+* * *
+## 5.3.10 (2022-06-10)
+
+##### Chores
+
+* **other:**
+  * code cleanup MWP-8326 [MWP-8326](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8326)  ([32e3f665](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/32e3f665a91f188e4a7fadfedd9aeec220a657e0))
+
+* * *
+* * *
+## 5.3.9 (2022-06-10)
+
+##### Chores
+
+* **other:**
+  * adapted app release taking care of support/develop merge - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([900f3723](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/900f3723d75b83e03fd5c80f6c9bb17602e9c8c2))
+
+* * *
+* * *
 ## 5.3.8 (2022-06-09)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/cli/package.js

@@ -178,7 +178,12 @@ const prompt = () => {
 
 
 
-const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule, isCsdrRepo, externalRepoName) => {
+const buildFrontend = (
+    name, scope,
+    frontendType, frontendVersion,
+    isRouteModule, isCsdrRepo, externalRepoName, isEnvTargetRemote,
+  ) => {
+
   tools.logTitle('Generating package');
 
   let fullName = scope.substr(1) + '-' + name;
@@ -207,14 +212,23 @@ const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule
     }
   }
 
+  // generating default git repo
   if (isCsdrRepo) {
     repoName = `${fullName}.git`;
-
   } else {
     repoName = `${externalRepoName}/${fullName}.git`;
   }
 
+  // generating target paths
   const targetPath = path.join(TARGET_ROOT_PATH, fullName);
+  const rootPackagePath = path.join(TARGET_ROOT_PATH, `${scope.substr(1)}-${name}-ui`);
+
+  if (!frontendVersion === defaultConfig.pkgFrontendVersion.DEFAULT) {
+    if (frontendType === defaultConfig.pkgFrontendType.REMOTE && !tools.isDirExists(rootPackagePath)) {
+      tools.logError(`${rootPackagePath} NOT FOUND, you must mount the root package ui before creating the remote`);
+      throw 'ROOT_PACKAGE_NOT_FOUND';
+    }
+  }
 
   const pkg = {
     name: fullName,
@@ -322,6 +336,7 @@ const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule
       return configUtils.global.registerCsdrPackage(pkg, frontendType === defaultConfig.pkgFrontendType.REMOTE, scope, name);
     })
 
+
     .then(() => {
       tools.logInfo('Executing post build operations');
       tools.move(path.join(targetPath, 'gitignore_TO_REPLACE'), path.join(targetPath, '.gitignore'));
@@ -335,6 +350,14 @@ const buildFrontend = (name, scope, frontendType, frontendVersion, isRouteModule
       return tools.removeFilesExtension(targetPath, '.TO_REPLACE');
     })
 
+    .then(() => {
+      // envTarget remote type specific
+      if (isEnvTargetRemote) {
+        tools.logInfo('Moving sources from remote to root package for envTarget remote type');
+        tools.move(path.join(targetPath, 'src'), path.join(rootPackagePath, 'assets', 'remote-sources'));
+      }
+    })
+
     .then(() => {
       tools.logSuccess();
     })
@@ -434,6 +457,7 @@ module.exports.generate = () => {
           answers.isRouteModule,
           answers.isCsdrRepo,
           answers.externalRepoName,
+          answers.isEnvTargetRemote,
         );
 
       } else if (answers.pkgType === defaultConfig.pkgType.BACKEND) {

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/dependencies-composite.json

@@ -2,5 +2,7 @@
     "@eui/deps-base": "^10.0.0",
 
     "@csdr/core": "^2.0.0",
-    "@csdr/integration": "^2.0.0"
+    "@csdr/integration": "^2.0.0",
+
+    "@module.scope@/@module.name@": "^1.0.0"
 }

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/fallback.component.ts

@@ -7,5 +7,5 @@ import { Component } from '@angular/core';
         </eui-block-content>
     `,
 })
-export class FallbackComponent{
+export class FallbackComponent {
 }

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.component.ts

@@ -3,8 +3,8 @@ import { Router } from '@angular/router';
 
 import { take } from 'rxjs/operators';
 
-import { CONFIG_TOKEN, I18nService, UserService } from '@eui/core';
-import { ELEMENT_ROUTER_TOKEN, IRouterService, initialization } from '@csdr/integration/element';
+import { CONFIG_TOKEN } from '@eui/core';
+import { ELEMENT_ROUTER_TOKEN, IRouterService, ElementSetupService } from '@csdr/integration/element';
 
 import { appConfig } from '../config/index';
 
@@ -56,8 +56,7 @@ export class ModuleComponent implements OnInit {
     constructor(private router: Router,
                 @Inject(ELEMENT_ROUTER_TOKEN) private routerService: IRouterService,
                 @Inject(CONFIG_TOKEN) public config: any,
-                private i18nService: I18nService,
-                private userService: UserService) {
+                private elementSetupService: ElementSetupService) {
     }
 
     public ngOnInit() {
@@ -68,7 +67,7 @@ export class ModuleComponent implements OnInit {
     private loadData() {
         this.setStatus(ElementStatus.Loading);
         try {
-            initialization(this.i18nService, this.userService)
+            this.elementSetupService.init()
                 .pipe(take(1))
                 .subscribe((loadStatus: { success: boolean, error?: string }) => {
                     if (!loadStatus.success) {

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/environments/environment.ts

@@ -1,15 +1,3 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
-
 export const environment = {
     production: false,
 };
-
-/*
- * In development mode, to ignore zone related error stack frames such as
- * `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
- * import the following file, but please comment it out in production mode
- * because it will have performance impact when throw error
- */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/test.ts.TO_REPLACE

@@ -4,7 +4,7 @@ import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+  platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
 
 declare const require: any;
@@ -12,7 +12,7 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

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

@@ -348,6 +348,11 @@ module.exports.run = () => {
             return utils.git.mergeMasterToDevelop(project, project.folder);
           }
         }
+
+        if (isSupportBranch && project.build && project.build.supportSnapshotBranch) {
+          utils.tools.logInfo('Branch is support / supportSnapshotBranch config detected');
+          return utils.git.mergeSupportToSupportDevelop(project, project.folder, branch, project.build.supportSnapshotBranch);
+        }
       }
     })