@eui/tools 4.18.3 → 4.18.7

package/.version.properties

@@ -1 +1 @@
-4.18.3
+4.18.7

package/CHANGELOG.md

@@ -1,3 +1,40 @@
+## 4.18.7 (2022-01-03)
+
+##### Chores
+
+* **other:**
+  * quill cleanup MWP-7583 [MWP-7583](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7583)  ([f0916a9c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f0916a9cda61a182308f55b051d2d523feda21c8))
+  * add host-zone MWP-7583 [MWP-7583](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7583)  ([01cda40d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/01cda40db9d393c3ee8f24aa0a42239ad3f37c7a))
+
+* * *
+* * *
+## 4.18.6 (2021-12-15)
+
+##### Bug Fixes
+
+* **other:**
+  * release app script wrong condition on branch - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([f3745bc1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f3745bc13749503726bfbdd11832e90401f59ba6))
+
+* * *
+* * *
+## 4.18.5 (2021-12-15)
+
+##### Bug Fixes
+
+* **other:**
+  * adapted release-app script taking care of support snapshot builds - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d4ac56bd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d4ac56bdf236fab1e4601d6963df668002d31607))
+
+* * *
+* * *
+## 4.18.4 (2021-12-15)
+
+##### Chores
+
+* **other:**
+  * fix dependencies resolution for support snapshot - enabled prevSnapshot deps fetch from metadata option - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([1e270e30](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1e270e305eacca555fce441366de86a9dc2fa722))
+
+* * *
+* * *
 ## 4.18.3 (2021-12-15)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -633,8 +633,8 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 
 return Promise.resolve()
   .then(() => {
-    const prjName = 'my-workplace';
+    const prjName = 'eui-showcase-ux';
     const prj = configUtils.projects.getCsdrProject(prjName);
 
-    return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'TRN', true);
+    return compositeUtils.getDeps(prj, 'TST');
   })

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

@@ -53,6 +53,7 @@ import {
     ELEMENT_ROUTER_TOKEN,
     I18N_SERVICE_HOST_TOKEN,
     I18nServiceMapping,
+    NG_ZONE_HOST_TOKEN,
     PUSH_NOTIFICATION_SERVICE_HOST_TOKEN,
     PushNotificationServiceMapping,
     USER_SERVICE_HOST_TOKEN,
@@ -150,6 +151,7 @@ export function openidConnectInterceptorFactory(config) {
         { provide: USER_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UserService'] },
         { provide: UX_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UxService'] },
         { provide: UX_APP_SHELL_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UxAppShellService'] },
+        { provide: NG_ZONE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['ngZone'] },
         // TODO[REMOTE-SETUP] uncomment if LanguageInterceptor or StorageService is used
         // { provide: StorageService, useFactory: () => window['PROVIDERS']['StorageService'] },
 
@@ -187,10 +189,11 @@ export function openidConnectInterceptorFactory(config) {
                 storeService: StoreService,
                 iI18nService: I18nService,
                 hostUxService: any,
-                hostUxAppShellService: any) => new UxAppShellServiceMapping(
-                config, http, platformId, router, storeService, iI18nService, hostUxService, hostUxAppShellService),
+                hostUxAppShellService: any,
+                hostNgZone) => new UxAppShellServiceMapping(
+                config, http, platformId, router, storeService, iI18nService, hostUxService, hostUxAppShellService, hostNgZone),
             deps: [CONFIG_TOKEN, HttpClient, PLATFORM_ID, Router, StoreService, I18nService,
-                UX_SERVICE_HOST_TOKEN, UX_APP_SHELL_SERVICE_HOST_TOKEN],
+                UX_SERVICE_HOST_TOKEN, UX_APP_SHELL_SERVICE_HOST_TOKEN, NG_ZONE_HOST_TOKEN],
         },
         { provide: ELEMENT_ROUTER_TOKEN, useFactory: () => window['PROVIDERS']['ELEMENT_ROUTER_TOKEN'], deps: [] },
         // TODO[REMOTE-SETUP] uncomment if zipkin is used

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/webpack.extra.js

@@ -4,12 +4,4 @@ module.exports = {
   plugins: [
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
   ],
-
-  // When importing a module whose path matches one of the following, just
-  // assume a corresponding global variable exists and use that instead.
-  // This is important because it allows us to avoid bundling all of our
-  // dependencies, which allows browsers to cache those libraries between builds.
-  externals: {
-    'quill': 'Quill',
-  },
 }

package/scripts/csdr/install/common.js

@@ -130,6 +130,9 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps) => {
 const getResolvedCarretDeps = (deps) => {
   tools.logTitle('Resolving carret for next version packages');
 
+  tools.logInfo('processing dependencies : ');
+  console.log(deps);
+
   return Promise.resolve()
     .then(() => {
 
@@ -148,6 +151,7 @@ const getResolvedCarretDeps = (deps) => {
             const lastMajorVersion = metadataUtils.package.getLastMajorVersion(pkg, version.substr(1).split('.')[0]);
 
             if (lastMajorVersion) {
+              tools.logInfo(`--version found : ${lastMajorVersion}`);
               acc[k] = lastMajorVersion;
 
             } else {

package/scripts/csdr/install/composite-utils.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const { deepStrictEqual } = require('assert');
 // global
 const path = require('path');
 
@@ -60,10 +59,10 @@ const getPackagesDepsByEnv = (prj, envTarget, compositeType) => {
     })
     .then((prjDeps) => {
       if (envTarget === 'DEV') {
-        return getDeps_DEV(prjDeps);
+        return getDeps_DEV(prj, prjDeps);
       }
       if (envTarget === 'TST') {
-        return getDeps_TST(prjDeps);
+        return getDeps_TST(prj, prjDeps);
       }
       if (envTarget === 'INT') {
         return getDeps_INT(prj, compositeType);
@@ -91,10 +90,16 @@ const getPackagesDepsByEnv = (prj, envTarget, compositeType) => {
  * For DEV target, we take the outermost known versions of the packages,
  * including : SNAPSHOTS & LATEST
  */
-const getDeps_DEV = (prjDeps) => {
+const getDeps_DEV = (prj, prjDeps) => {
   return Promise.resolve()
     .then(() => {
-      return metadataUtils.package.getPackagesDeps('packages');
+      if (prj.build && prj.build.prevSnapshotEnabled) {
+        tools.logInfo('project has prevSnapshot enabled, getting deps list from prevSnapshotsTag');
+        return metadataUtils.package.getPackagesDeps('packagesPrevSnapshotsTag');
+      } else {
+        tools.logInfo('getting project deps from snapshots metadata list');
+        return metadataUtils.package.getPackagesDeps('packages');
+      }
     })
 
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
@@ -105,18 +110,24 @@ const getDeps_DEV = (prjDeps) => {
     .catch((e) => {
       throw e;
     })
-}
+  }
 
 
-/**
- * For TST target, we take only the LATEST know versions of the packages,
- * including : LATEST
+  /**
+   * For TST target, we take only the LATEST know versions of the packages,
+   * including : LATEST
  */
-const getDeps_TST = (prjDeps) => {
+const getDeps_TST = (prj, prjDeps) => {
   return Promise.resolve()
-    .then(() => {
+  .then(() => {
+    if (prj.build && prj.build.prevSnapshotEnabled) {
+      tools.logInfo('project has prevSnapshot enabled, getting deps list from prevTag');
+      return metadataUtils.package.getPackagesDeps('packagesPrevTag');
+    } else {
+      tools.logInfo('getting project deps from packagesLatest metadata list');
       return metadataUtils.package.getPackagesDeps('packagesLatestTag');
-    })
+    }
+  })
 
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((pkgDeps) => {

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

@@ -37,11 +37,13 @@ module.exports.run = () => {
   }
 
   // Getting branch flags
+  var isSupportSnapshotBranch;
   var isSupportBranch;
   var isSnapshot;
 
   if (branch) {
-    isSupportBranch = (branch !== 'master' && branch.indexOf('support/') > -1);
+    isSupportSnapshotBranch = (branch !== 'master' && branch.indexOf('support/develop') > -1);
+    isSupportBranch = (branch !== 'master' && !isSupportSnapshotBranch && branch.indexOf('support/') > -1);
     isSnapshot = (branch !== 'master' && !isSupportBranch);
   }
 
@@ -56,7 +58,7 @@ module.exports.run = () => {
 
     // for traditional app build using develop / master branch
   } else {
-    if (isSnapshot) {
+    if (isSnapshot || isSupportSnapshotBranch) {
       envTargetGen = 'DEV';
     } else {
       envTargetGen = 'TST';
@@ -145,7 +147,7 @@ module.exports.run = () => {
     .then(() => {
       utils.tools.logTitle('Getting app new version...');
 
-      return versionUtils.app.getNewVersion(project, isSnapshot, isSupportBranch, envTarget);
+      return versionUtils.app.getNewVersion(project, (isSnapshot || isSupportSnapshotBranch), isSupportBranch, envTarget);
     })
     .then((version) => {
       // set the new version found for later use
@@ -199,7 +201,7 @@ module.exports.run = () => {
     // *****************************************************************
     .then(() => {
       // process v1 - diff report is generated on MASTER / TST release
-      if (!isSnapshot && !envTarget) {
+      if (!isSnapshot && !isSupportSnapshotBranch && !envTarget) {
         return metadataUtils.appHistory.generateDiffReport(project, newVersion, isSupportBranch);
       }
 
@@ -256,7 +258,7 @@ module.exports.run = () => {
     // BUILD ANGULAR APPLICATION
     // *****************************************************************
     .then(() => {
-      return utils.buildApp.angular(envTarget, isSnapshot, newVersion);
+      return utils.buildApp.angular(envTarget, (isSnapshot || isSupportSnapshotBranch), newVersion);
     })
 
 
@@ -285,7 +287,7 @@ module.exports.run = () => {
       if (project.build && project.build.distribution) {
         return Promise.resolve()
           .then(() => {
-            return utils.buildApp.generateProjectDistributionFile(project, isSnapshot);
+            return utils.buildApp.generateProjectDistributionFile(project, (isSnapshot || isSupportSnapshotBranch));
           })
           .catch((e) => {
             throw e;
@@ -338,7 +340,7 @@ module.exports.run = () => {
     .then(() => {
       // for env-target based builds, no need to merge anything back as it only contains a master branch for sources
       if (!envTarget) {
-        if (!isSnapshot && !isSupportBranch) {
+        if (!isSnapshot && !isSupportBranch && !isSupportSnapshotBranch) {
           return utils.git.mergeMasterToDevelop(project, project.folder);
         }
       }