@eui/tools 5.3.8 → 5.3.9

package/.version.properties

@@ -1 +1 @@
-5.3.8
+5.3.9

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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.9",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

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