@eui/tools 6.9.4 → 6.9.6

package/.prettierrc.json

@@ -12,7 +12,7 @@
     "requirePragma": false,
     "semi": true,
     "singleQuote": false,
-    "tabWidth": 4,
+    "tabWidth": 2,
     "trailingComma": "es5",
     "useTabs": false,
     "vueIndentScriptAndStyle": false

package/.version.properties

@@ -1 +1 @@
-6.9.4
+6.9.6

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.9.6 (2023-03-21)
+
+##### Chores
+
+* **other:**
+  * routes config v2 - added multiple remote entries based on eUI version for multiple envs targets - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([fb5b9b9f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/fb5b9b9f768c727374d0cd0a463097de00fcbcb0))
+
+* * *
+* * *
+## 6.9.5 (2023-03-20)
+
+##### Chores
+
+* **other:**
+  * check internally for virtual remotes pkg type build - added skipLock for progressively remove locking of build pkg - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([be418e4a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/be418e4acd732c8b251f93423cbf837d62b2ec80))
+
+* * *
+* * *
 ## 6.9.4 (2023-03-16)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -1212,11 +1212,22 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(config);
 //   })
 
+// Promise.resolve()
+//   .then(() => {
+//     const prjName = 'my-workplace-host-playground';
+//     const project = configUtils.projects.getCsdrProject(prjName);
+//     return preBuildUtils.projects.preBuild(project, 'TST', true, 'TST');
+//   })
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
 Promise.resolve()
   .then(() => {
-    const prjName = 'my-workplace-host-playground';
-    const project = configUtils.projects.getCsdrProject(prjName);
-    return preBuildUtils.projects.preBuild(project, 'TST', true, 'TST');
+    const pkgName = 'ppgms-core-eui10-remote-el-ui-not';
+    const remote = configUtils.remotes.isVirtualRemote(pkgName);
+
+    console.log(remote);
   })
   .catch((e) => {
     console.log(e);

package/scripts/csdr/config/remotes.js

@@ -58,6 +58,16 @@ module.exports.getRemote = (remoteName) => {
 }
 
 
+module.exports.isVirtualRemote = (remoteName) => {
+  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  const remoteConfig = remotesConfig[remoteName];
+
+  return remoteConfig !== undefined;
+}
+
+
+
+
 module.exports.getCsdrRemotes = (hostName, euiVersion) => {
 
   const hostNameFilterFn = (r) => {

package/scripts/csdr/init/init.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const tools = require('../../utils/tools');
+const configUtils = require('../../csdr/config/config-utils');
 
 // inner modules
 const innerInitProject = require('./init-project');
@@ -12,7 +13,7 @@ const innerInitCustom = require('./init-custom');
 // Getting arguments if they are provided for the CI/CD pipeline
 const {
   project, team, pkg, branch, configOnly, skipClone, skipInstall, reset, pkgOnly, prjOnly,
-  build, containerOnly, skipAppContainers, remote, euiVersion, remoteOnly, remoteBuild, virtual, custom
+  build, containerOnly, skipAppContainers, remote, euiVersion, remoteOnly, virtual, custom
 } = tools.getArgs();
 
 
@@ -23,7 +24,6 @@ module.exports.init = () => {
     team: team || 'all',
     pkg: pkg || null,
     remote: remote || null,
-    remoteBuild: remoteBuild || false,
     virtual: virtual || false,
     euiVersion: euiVersion || null,
     branch: branch || 'develop',
@@ -42,18 +42,17 @@ module.exports.init = () => {
   // converting inputs args
   initialResponse.branch = tools.convertStringArg(initialResponse.branch, 'develop');
   initialResponse.euiVersion = tools.convertStringArg(initialResponse.euiVersion);
-  initialResponse.remoteBuild = tools.convertBooleanArg(initialResponse.remoteBuild);
-  initialResponse.virtual = tools.convertBooleanArg(initialResponse.virtual);
-
 
   // setting project to null if forced to NONE
   if (initialResponse.project === 'NONE') {
     initialResponse.project = null;
   }
 
-  // swapping to remote build if virtual remote is pass to default gitlab call
-  if (initialResponse.remoteBuild && initialResponse.pkg && initialResponse.virtual) {
+  // checking if provided PKG (from gitlab) is a virtual remote (new remote kind as of v15 (and sedia v10))
+  const isVirtualRemote = configUtils.remotes.isVirtualRemote(initialResponse.pkg);
+  if (isVirtualRemote) {
     initialResponse.remote = initialResponse.pkg;
+    initialResponse.virtual = true;
     initialResponse.pkg = null;
   }
 

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

@@ -134,7 +134,7 @@ module.exports.init = (pkg, envTarget, compositeType) => {
 }
 
 
-module.exports.cloneMetadataRepos = () => {
+module.exports.cloneMetadataRepos = (pkg) => {
   utils.tools.logBanner('CLONE METADATA REPOS');
 
   return Promise.resolve()
@@ -144,7 +144,12 @@ module.exports.cloneMetadataRepos = () => {
   })
   // CLONE METADATA LOCKS REPO
   .then(() => {
-    return metadataUtils.common.cloneMetadataLocksRepo();
+    if (pkg.build && pkg.build.skipLock) {
+      utils.tools.logInfo('Package has lock de-activated...skipping cloning of devops-metadata-locks repository');
+
+    } else {
+      return metadataUtils.common.cloneMetadataLocksRepo();
+    }
   })
   .catch((e) => {
     throw e;
@@ -182,14 +187,20 @@ module.exports.preReleaseChecks = (pkg) => {
     if (!pkg.backend) {
       utils.tools.logTitle('Checking package lock state');
 
-      // if package is locked, exception is thrown, check this specific exception handling in the global catch
-      if (metadataUtils.package.isPackageLocked(pkg)) {
-        utils.tools.logInfo('Package is locked ==> throwing exception');
-        throw 'PACKAGE_LOCKED';
 
-        // if package is not locked, we lock it
+      if (pkg.build && pkg.build.skipLock) {
+        utils.tools.logInfo('lock package de-activated...skipping');
+
       } else {
-        return metadataUtils.package.lockPackage(pkg);
+        // if package is locked, exception is thrown, check this specific exception handling in the global catch
+        if (metadataUtils.package.isPackageLocked(pkg)) {
+          utils.tools.logInfo('Package is locked ==> throwing exception');
+          throw 'PACKAGE_LOCKED';
+
+          // if package is not locked, we lock it
+        } else {
+          return metadataUtils.package.lockPackage(pkg);
+        }
       }
     }
   })
@@ -656,7 +667,11 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
       if (!pkg.backend) {
         return Promise.resolve()
         .then(() => {
-          return metadataUtils.package.unlockPackage(pkg);
+          if (pkg.build && pkg.build.skipLock) {
+            utils.tools.logInfo('lock package de-activated...skipping');
+          } else {
+            return metadataUtils.package.unlockPackage(pkg);
+          }
         })
         .catch((e) => {
           utils.tools.logError('ERROR UNLOCKING PACKAGE');
@@ -695,7 +710,11 @@ module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
         if (exception !== 'PACKAGE_LOCKED') {
           return Promise.resolve()
           .then(() => {
-            return metadataUtils.package.unlockPackage(pkg);
+            if (pkg.build && pkg.build.skipLock) {
+              utils.tools.logInfo('lock package de-activated...skipping');
+            } else {
+              return metadataUtils.package.unlockPackage(pkg);
+            }
           })
           .catch((e) => {
             utils.tools.logError('ERROR UNLOCKING PACKAGE');

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

@@ -2,6 +2,7 @@
 
 // UTILS
 const tools = require('../../../utils/tools');
+const configUtils = require('../../config/config-utils');
 
 // INNER MODULES
 const innerReleaseVirtualRemote = require('./release-virtual-remote');
@@ -12,7 +13,7 @@ module.exports.run = () => {
 
   // TESTING a release pipeline in DRY-RUN mode :
   // virtual remotes
-  // npm run pkg:release mywp-dashboard-eui15-remote-el-ui -- --dryRun --branch master --remoteBuild true --virtual true --envTarget DEV --skipInstall
+  // npm run pkg:release mywp-dashboard-eui15-remote-el-ui -- --dryRun --branch master --envTarget DEV --skipInstall
 
   // normal UI package / old style remote
   // npm run pkg:release eui-tools -- --dryRun --branch develop --skipLint --skipInstall --skipTest --skipDoc --skipClone --debug --build
@@ -26,11 +27,10 @@ module.exports.run = () => {
 
     // CHECKING if release is for virtual remote or normal UI package (including normal remote)
     .then(() => {
-      let { remoteBuild, virtual } = tools.getArgs();
-      remoteBuild = tools.convertBooleanArg(remoteBuild);
-      virtual = tools.convertBooleanArg(virtual);
+      const pkgName = tools.getArgs().root;
+      const isVirtualRemote = configUtils.remotes.isVirtualRemote(pkgName);
 
-      if (remoteBuild && virtual) {
+      if (isVirtualRemote) {
         return innerReleaseVirtualRemote.run();
       } else {
         return innerReleaseUi.run();

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

@@ -52,7 +52,7 @@ module.exports.run = () => {
 
       // FOR UI and REMOTES clone metadata repositories
       .then(() => {
-        return innerCommon.cloneMetadataRepos();
+        return innerCommon.cloneMetadataRepos(pkg);
       })
 
       // PRE-RELEASE & COMMON CHECKS

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

@@ -51,7 +51,7 @@ module.exports.run = () => {
 
       // FOR UI and REMOTES clone metadata repositories
       .then(() => {
-        return innerCommon.cloneMetadataRepos();
+        return innerCommon.cloneMetadataRepos(pkg);
       })
 
 

package/scripts/utils/git-utils.js

@@ -105,9 +105,9 @@ const commitAndPush = (branch, message, folder) => {
     } catch (e2) {
       tools.logError('ERROR');
       console.log('ERROR!!!');
-      if (debug) {
-        console.log(e2);
-      }
+      // if (debug) {
+      //   console.log(e2);
+      // }
 
       try {
         tools.logInfo('Commit and push - second try - retrying pull & push');
@@ -115,9 +115,9 @@ const commitAndPush = (branch, message, folder) => {
         execa.sync('git', ['push', 'origin', branch], { cwd: folder });
 
       } catch (e3) {
-        if (debug) {
-          console.log(e3);
-        }
+        // if (debug) {
+        //   console.log(e3);
+        // }
         throw new Error(`Failed to push ${message} to ${folder}`);
       }
     }

package/scripts/utils/pre-build/injection/routes-replacement.js

@@ -474,10 +474,19 @@ const processRoutesConfigV2 = (project, envTarget, build, routesFileContent, eui
           }
 
           if (route.remote) {
-            newAppRoute.data.featureName = defRoute.remoteDef.featureName;
-            newAppRoute.data.moduleId = defRoute.remoteDef.moduleId;
-            newAppRoute.data.elementTag = defRoute.remoteDef.elementTag;
-            newAppRoute.data.iframe = defRoute.remoteDef.iframe;
+            const remoteDef = defRoute.remoteDefs.filter((r) => {
+              return r.euiVersion === route.euiVersion
+            })[0];
+            if (remoteDef) {
+              newAppRoute.data.moduleId = remoteDef.moduleId;
+              newAppRoute.data.elementTag = remoteDef.elementTag;
+              newAppRoute.data.iframe = remoteDef.iframe;
+
+            } else {
+              tools.logError('Remote route not found for: ');
+              console.log(route);
+              throw 'REMOTE_ROUTE_DEF_NOT_FOUND';
+            }
           }
 
           appRoutes.push(newAppRoute);

package/scripts/csdr/init/init-old.js

@@ -1,210 +0,0 @@
-'use strict';
-
-const tools = require('../../utils/tools');
-const initUtils = require('./init-utils');
-const installUtils = require('../install/install-utils');
-const configUtils = require('../config/config-utils');
-
-// Getting arguments if they are provided for the CI/CD pipeline
-const {
-  project, team, pkg, branch, configOnly, skipClone, skipInstall, reset, pkgOnly, prjOnly,
-  build, containerOnly, skipAppContainers, remote, euiVersion, remoteOnly, remoteBuild, virtual, custom
-} = tools.getArgs();
-
-
-module.exports.init = () => {
-  // Initializing a common response
-  const initialResponse = {
-    project: project || null,
-    team: team || 'all',
-    pkg: pkg || null,
-    remote: remote || null,
-    remoteBuild: remoteBuild || false,
-    virtual: virtual || false,
-    euiVersion: euiVersion || null,
-    branch: branch || 'develop',
-    configOnly: configOnly || false,
-    skipClone: skipClone || false,
-    reset: reset || false,
-    pkgOnly: pkgOnly || false,
-    prjOnly: prjOnly || false,
-    remoteOnly: remoteOnly || false,
-    build: build || false,
-    containerOnly: containerOnly || false,
-    skipAppContainers: skipAppContainers || false,
-    custom: custom || false
-  }
-
-  // converting inputs args
-  initialResponse.branch = tools.convertStringArg(initialResponse.branch, 'develop');
-  initialResponse.euiVersion = tools.convertStringArg(initialResponse.euiVersion);
-  initialResponse.remoteBuild = tools.convertBooleanArg(initialResponse.remoteBuild);
-  initialResponse.virtual = tools.convertBooleanArg(initialResponse.virtual);
-
-
-  // setting project to null if forced to NONE
-  if (initialResponse.project === 'NONE') {
-    initialResponse.project = null;
-  }
-
-  // swapping to remote build if virtual remote is pass to default gitlab call
-  if (initialResponse.remoteBuild && initialResponse.pkg && initialResponse.virtual) {
-    initialResponse.remote = initialResponse.pkg;
-    initialResponse.pkg = null;
-  }
-
-
-  // Storing the response for propagation
-  let finalResponse;
-
-  return Promise.resolve()
-    .then(() => {
-
-      // if no project has been provided we prompt for project and team selection
-      if (!project && !pkg && !remote && !custom ) {
-        // TODO refactor to handle dynamic mywp-host-playground install (pre-remotes install etc...)
-        // return initUtils.prompt.start();
-        tools.logError('****************************************');
-        tools.logError('*************** ERROR ******************');
-        tools.logError('****************************************\n');
-        tools.logError('At least "pkg" or "project" or "remote" type should be used for init, for example :\n');
-        tools.logError('npm run init -- --pkg PKG_NAME [--branch BRANCH_NAME|default develop] [--git local] [--pkgOnly] [--skipInstall]');
-        tools.logError('npm run init -- --project PROJECT_NAME [--branch BRANCH_NAME|default develop] [--git local] [--prjOnly] [--skipInstall]');
-        tools.logError('npm run init -- --remote VIRTUAL_REMOTE_NAME [--remoteOnly] [--skipInstall]');
-        tools.logError('npm run init -- --custom [--skipInstall] [--git local]');
-        process.exit(0);
-
-        // if provided, we are on automated mode, we use the initialized response
-      } else {
-        return initialResponse;
-      }
-    })
-
-    // merge with response found from prompts
-    .then((response) => {
-      finalResponse = { ...initialResponse, ...response };
-
-      tools.logInfo('Configuration generated based on provided args:');
-      console.log(finalResponse);
-    })
-
-    // Initializing .euirc.json local file - the core of CSDR operations
-    .then(() => {
-      // Initialize config
-      return configUtils.init.run(finalResponse);
-    })
-
-    // clone or install linked host package to project if any
-    .then(() => {
-      // TODO
-      // if (finalResponse.project && !build) {
-      if (finalResponse.project) {
-        return initUtils.packages.cloneHostPackage(finalResponse.project);
-      }
-      // TODO
-      // } else if (finalResponse.project && build) {
-      //   return initUtils.packages.installHostPackage(finalResponse.project);
-      // }
-    })
-
-    // Initializing .meta based on .euirc.json for local respoisitories cloning
-    .then(() => {
-      if (!finalResponse.remote) {
-        return initUtils.meta.init();
-      }
-    })
-
-    // Cloning repositories based on the .meta file generated
-    .then(() => {
-      if (!skipClone && !finalResponse.remote) {
-        return initUtils.repos.init(finalResponse);
-      }
-    })
-
-    // Importing external sources
-    .then(() => {
-      if (finalResponse.project) {
-        return initUtils.projects.importExternalSources(true);
-      }
-    })
-
-    // Generating virtual remote - experimental
-    .then(() => {
-      if (finalResponse.remote) {
-        return initUtils.remotes.generateVirtualRemote(finalResponse.remote);
-      }
-    })
-
-    // Importing packages and generating definitions
-    .then(() => {
-      return initUtils.packages.importPackages(finalResponse);
-    })
-
-    // adapt and inject particular root data/config for eUI version detected on project
-    // if multiple versions of eUI are detected on the same project, an exception is thrown
-    .then(() => {
-      return initUtils.global.processLocalEuiVersions();
-    })
-
-    // specific resolution injection based on NodeJS (recent failure of nodejs10.x for MWP v7)
-    .then(() => {
-      return initUtils.global.processResolutionsForNodeVersion();
-    })
-
-    // Install deps based on current config generated => take last know snapshots
-    .then(() => {
-      // this is only executed for local dev installation,
-      // in case of release the initialisation is managed by the application / package themselves
-      if (!build && !skipInstall) {
-        if (finalResponse.pkgOnly || finalResponse.remoteOnly) {
-          if (finalResponse.remote) {
-            return installUtils.localDev.installRemote(finalResponse.remote);
-          } else {
-            return installUtils.localDev.installPackage(finalResponse.pkg);
-          }
-        } else {
-          return installUtils.localDev.install();
-        }
-      }
-    })
-
-    // Attaching app scripts to root package.json
-    .then(() => {
-      if (finalResponse.project) {
-        return initUtils.projects.importScripts();
-      }
-    })
-
-
-    // Attaching extra tsconfig from project
-    .then(() => {
-      if (finalResponse.project) {
-        return initUtils.projects.importExtraTsConfig();
-      }
-    })
-
-
-    // Attaching external features from project
-    .then(() => {
-      if (finalResponse.project && !build) {
-        return initUtils.projects.importExternalFeatures();
-      }
-    })
-
-
-    // Attaching external mock repo for project
-    .then(() => {
-      if (finalResponse.project && !build && !finalResponse.prjOnly) {
-        return initUtils.projects.importExternalMock();
-      }
-    })
-
-
-    .then(() => {
-      tools.logSuccess('OK => Project successfully initialized');
-    })
-
-    .catch((e) => {
-      throw e;
-    });
-}