@eui/tools 4.19.12 → 4.19.15

package/.version.properties

@@ -1 +1 @@
-4.19.12
+4.19.15

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 4.19.15 (2022-03-07)
+
+##### Chores
+
+* **other:**
+  * updated resolutions for v13 - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([a76d7cae](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a76d7cae87e74c31665b29f6863163043ae4875a))
+
+* * *
+* * *
+## 4.19.14 (2022-02-22)
+
+##### Chores
+
+* **other:**
+  * minor changes MWP-7583 [MWP-7583](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7583)  ([2a344a9d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2a344a9d5af0f60eedddf265c54acb54b76d4dfd))
+
+* * *
+* * *
+## 4.19.13 (2022-02-22)
+
+##### Chores
+
+* **other:**
+  * added appTarget pipeline variable output for remote - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([3b0a5c83](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3b0a5c83c834a00ee9871ac4ab731c6cf29ab15f))
+
+* * *
+* * *
 ## 4.19.12 (2022-02-22)
 
 ##### Bug Fixes

package/package.json

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

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

@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+    template: `
+        <eui-block-content [isBlocked]="true">
+            <div style="height: 100%"></div>
+        </eui-block-content>
+    `,
+})
+export class FallbackComponent{
+}

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

@@ -61,7 +61,7 @@ export class ModuleComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.router.navigate([this.routerService.getUrl()], { replaceUrl: true });
+        this.router.navigateByUrl(this.routerService.getUrl(), { replaceUrl: true });
         this.loadData();
     }
 

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

@@ -64,6 +64,7 @@ import {
 } from '@csdr/integration';
 import { RoutingModule } from './routing.module';
 
+import { FallbackComponent } from './fallback.component';
 import { ModuleComponent } from './module.component';
 
 export function openidConnectInterceptorFactory(config) {
@@ -92,9 +93,11 @@ export function openidConnectInterceptorFactory(config) {
         RoutingModule,
     ],
     declarations: [
+        FallbackComponent,
         ModuleComponent,
     ],
     entryComponents: [
+        FallbackComponent,
         ModuleComponent,
     ],
     providers: [

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

@@ -8,15 +8,17 @@ import { CCRoute, ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration
 // TODO[REMOTE-SETUP] adapt to wrapped package import
 // import { routes } from '@cc/task-manager';
 import { appConfig } from '../config/index';
+import { FallbackComponent } from './fallback.component';
 import { ModuleComponent } from './module.component';
 
 const prefixedRoutes: Routes = [
+    { path: '', component: ModuleComponent },
     {
         path: appConfig.global.baseUrl,
         // TODO[REMOTE-SETUP] adapt to wrapped package import
         // children: routes,
     },
-    { path: '**', component: ModuleComponent },
+    { path: '**', component: FallbackComponent },
 ];
 
 // @dynamic

package/scripts/csdr/init/resources/13.x/resolutions.json

@@ -1,15 +1,5 @@
 {
-    "lodash": ">=4.17.21",
-    "handlebars": ">=4.7.7",
-    "mem": ">=4.3.0 <=8.1.1",
-    "https-proxy-agent": ">=2.2.3",
-    "minimatch": ">=3.0.4",
-    "acorn-globals": ">=6.0.0",
-    "open": ">=7.0.3",
-    "dot-prop": "6.0.1",
-    "serialize-javascript": ">=3.1.0",
-    "socket.io": ">=2.4.0",
-    "ssri": ">=8.0.1",
     "@types/node": ">=14.14.10",
-    "hosted-git-info": ">=3.0.8"
+    "https-proxy-agent": ">=2.2.3",
+    "mem": ">=4.3.0 <=8.1.1"
 }

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

@@ -359,6 +359,41 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
 }
 
 
+module.exports.exportPipelineVariables = (pkg) => {
+  utils.tools.logBanner('EXPORT PIPELINE VARIABLES');
+
+  return Promise.resolve()
+  .then(() => {
+    if (pkg.remote) {
+      utils.tools.logTitle('Exporting pkg remote variables');
+
+      utils.tools.logInfo('Exporting APP_TARGET');
+
+      let appTarget = 'MWP_ONLY';
+
+      if (pkg.build && pkg.build.appTarget) {
+        appTarget = pkg.build.appTarget;
+      }
+
+      utils.tools.logInfo(`appTarget generated : ${appTarget}`);
+
+      if (dryRun) {
+        utils.tools.logWarning('dryRun...skipping export');
+      } else {
+        utils.tools.logInfo('Exporting appTarget variable');
+        return utils.pipeline.setVariables(pkg.paths.rootDirectory, `export APP_TARGET=${pkg.build.appTarget}\n`);
+      }
+    }
+  })
+
+  .catch((e) => {
+    throw e;
+  })
+}
+
+
+
+
 module.exports.generateDiffReport = (pkg, newVersion) => {
   utils.tools.logBanner('GENERATE DIFF REPORT');
 

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

@@ -173,6 +173,12 @@ module.exports.run = () => {
       })
 
 
+      // EXPORT ADDITIONAL PIPELINE VARIABLES
+      .then(() => {
+        return innerCommon.exportPipelineVariables(pkg);
+      })
+
+
       // SEND SUCCESS NOTIFICATION
       .then(() => {
         return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)