@eui/tools 4.17.2 → 4.17.3

package/.version.properties

@@ -1 +1 @@
-4.17.2
+4.17.3

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 4.17.3 (2021-11-24)
+
+##### Chores
+
+* **other:**
+  * update comments for setup on remote v7  ([00b827d7](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/00b827d72f0ce558e6b854ac9ebe9a8a2a9005fc))
+##### Bug Fixes
+
+* **other:**
+  * remote package metadata location - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([ca8e4e5a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ca8e4e5a8d94a98c42e8e14e2eb0a21f8010aa91))
+
+* * *
+* * *
 ## 4.17.2 (2021-11-23)
 
 ##### Chores

package/package.json

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

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

@@ -43,7 +43,8 @@ import { CustomSerializer } from './reducers/custom-route-serializer';
 
 import { environment } from '../environments/environment';
 
-// import { TaskMgrCommonModule } from '@cc/task-manager'; // TODO import from package
+// TODO[REMOTE-SETUP] - import from wrapped package
+// import { TaskMgrCommonModule } from '@cc/task-manager';
 import { ELEMENT_ROUTER_TOKEN, PushNotificationMapping, UxServiceMapping } from '@csdr/integration';
 import { RoutingModule } from './routing.module';
 
@@ -66,7 +67,8 @@ export function openidConnectInterceptorFactory(config) {
         TranslateModule,
 
         UxAllModule,
-        // TaskMgrCommonModule, // TODO import from package
+         // TODO import from package
+        // TaskMgrCommonModule,
         RoutingModule,
     ],
     declarations: [

package/scripts/csdr/metadata/package.js

@@ -380,7 +380,7 @@ const storePipelineMetadata = module.exports.storePipelineMetadata = (pkgMetadat
 module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
   return Promise.resolve()
     .then(() => {
-      const pkgMetadataFile = path.join(pkg.paths.pkgBuild, 'package-metadata.json');
+      const pkgMetadataFile = path.join(pkg.paths.pkgBuild, 'bundles', 'package-metadata.json');
 
       const pkgMetadata = {
         dependencies: pkgCompositeDeps

package/scripts/utils/git-utils.js

@@ -107,8 +107,10 @@ const commitAndPush = (branch, message, folder) => {
 
       try {
         tools.logInfo('Commit and push - second try - retrying pull push');
-        execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
-        execa.sync('git', ['push', 'origin', branch], { cwd: folder });
+        // setTimeout(() => {
+          execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
+          execa.sync('git', ['push', 'origin', branch], { cwd: folder });
+        // }, 8000);
 
       } catch (e3) {
         throw new Error(`Failed to push ${message} to ${folder}`);
@@ -139,6 +141,11 @@ const tagVersion = (version, branch, message, folder) => {
       })
       .catch((e) => {
         return Promise.resolve()
+        // .then(() => {
+        //   return new Promise((resolve) => {
+        //     setTimeout(resolve, 8000);
+        //   });
+        // })
         .then(() => {
           execa.sync('git', ['tag', '-a', `v${version}b`, '-m', message], { cwd: folder });
           execa.sync('git', ['push', '--follow-tags', 'origin', branch], { cwd: folder });
@@ -254,6 +261,7 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalR
         return tools.rimraf(folder);
       }
     })
+
     .then(() => {
       if (!tools.isDirExists(folder)) {
         tools.logInfo(`Cloning ${repoUri} in folder "${folder}" ...`);
@@ -269,6 +277,7 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalR
         tools.logSuccess();
       }
     })
+
     .then(() => {
       tools.logInfo(`Pulling ${repoUri} in folder "${folder}" ...`);
       execa.shellSync(`git pull`, { cwd: folder, stdio: 'inherit' });