@eui/tools 4.16.6 → 4.17.3

package/scripts/csdr/install/build-package.js

@@ -9,7 +9,6 @@ const tools = require('../../utils/tools');
 const configUtils = require('../config/config-utils');
 const compositeUtils = require('./composite-utils');
 const metadataUtils = require('../metadata/metadata-utils');
-const notificationUtils = require('../../utils/notification/notification-utils');
 
 // INNER MODULES
 const innerCommon = require('./common');
@@ -17,7 +16,7 @@ const innerRemote = require('./remote');
 
 
 module.exports.install = (prj, pkg, isMaster) => {
-  let compositeDeps, localPkgDeps, localPkgCompositeDeps, pkgCompositeDeps;
+  let compositeDeps, localPkgDeps, localPkgCompositeDeps;
 
   return Promise.resolve()
     .then(() => {
@@ -86,9 +85,18 @@ module.exports.install = (prj, pkg, isMaster) => {
       }
     })
 
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+
+module.exports.installRemote = (pkg, isMaster, envTarget) => {
+  return Promise.resolve()
     // checking remotes
     .then(() => {
-      return innerRemote.installDeps(null, isMaster);
+      return innerRemote.installDeps(pkg, isMaster, envTarget);
     })
 
     // returning metadata dependencies

package/scripts/csdr/install/common.js

@@ -12,6 +12,8 @@ const metadataUtils = require('../metadata/metadata-utils');
 // FETCH ARGS
 const { dryRun, skipInstall, registry, npm } = tools.getArgs();
 
+
+
 const installDeps = (deps) => {
 
   return Promise.resolve()

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

@@ -11,6 +11,8 @@ const metadataUtils = require('../metadata/metadata-utils');
 // inner modules
 const innerCommon = require('./common');
 
+
+
 const getDeps = (prj, envTarget = 'DEV', compositeType = 'DEFAULT') => {
 
   tools.logTitle(`Fetching composite dependencies for ${envTarget} - composite type : ${compositeType}`);

package/scripts/csdr/install/local-dev.js

@@ -17,6 +17,8 @@ const innerRemote = require('./remote');
 const { dryRun, skipInstall } = tools.getArgs();
 
 
+
+
 module.exports.install = (pkg) => {
   let packagesDeps, packagesCompositeDeps, projectsDeps, projectsFixedDeps, finalDeps;
 

package/scripts/csdr/install/remote.js

@@ -15,15 +15,15 @@ const innerCommon = require('./common');
 const { dryRun } = tools.getArgs();
 
 
-module.exports.installDeps = (pkg, isMaster) => {
+module.exports.installDeps = (pkg, isMaster, envTarget) => {
   tools.logTitle('Remote dependencies installation');
 
   return Promise.resolve()
     .then(() => {
       if (pkg) {
-        return pkgInstall(pkg, isMaster);
+        return pkgInstall(pkg, isMaster, envTarget);
       } else {
-        return allPkgInstall(isMaster);
+        return allPkgInstall(isMaster, envTarget);
       }
     })
 
@@ -33,7 +33,7 @@ module.exports.installDeps = (pkg, isMaster) => {
 }
 
 
-const allPkgInstall = (isMaster) => {
+const allPkgInstall = (isMaster, envTarget) => {
   return Promise.resolve()
 
     // getting packages to be remotely installed
@@ -52,7 +52,7 @@ const allPkgInstall = (isMaster) => {
     .then((packages) => Promise.resolve().then(() => {
       return packages.reduce((promise, pkg) => {
         return promise.then(() => (
-          pkgInstall(pkg, isMaster)
+          pkgInstall(pkg, isMaster, envTarget)
         ));
       }, Promise.resolve());
     }))
@@ -64,7 +64,7 @@ const allPkgInstall = (isMaster) => {
 
 
 
-const pkgInstall = (pkg, isMaster) => {
+const pkgInstall = (pkg, isMaster, envTarget) => {
   tools.logTitle(`Processing installation for : ${pkg.name}`);
 
   var outputDeps;
@@ -72,7 +72,7 @@ const pkgInstall = (pkg, isMaster) => {
   return Promise.resolve()
     .then(() => {
       // fetching deps from dependencies base and composite if any
-      return getDeps(pkg, isMaster);
+      return getDeps(pkg, isMaster, envTarget);
     })
 
     .then((deps) => {
@@ -127,10 +127,10 @@ const pkgInstall = (pkg, isMaster) => {
 }
 
 
-const getDeps = (pkg, isMaster) => {
+const getDeps = (pkg, isMaster, envTarget = null) => {
   return Promise.resolve()
     .then(() => {
-      if (isMaster) {
+      if (isMaster || envTarget !== null) {
         return metadataUtils.package.getPackagesDeps('packagesLatestTag');
       } else {
         return metadataUtils.package.getPackagesDeps('packages');
@@ -152,6 +152,10 @@ const getDeps = (pkg, isMaster) => {
         depsComposite = tools.getJsonFileContent(depsCompositeJsonFile);
       }
 
+      if (envTarget) {
+        // TODO - handle dependencies composite per environment => one bamboo plan for each envs to be defined
+      }
+
       return innerCommon.getRemappedDeps(depsMetadata, { ...depsBase, ...depsComposite});
     })
 

package/scripts/csdr/metadata/app.js

@@ -86,14 +86,34 @@ const storeMetadataAssets = (project, newVersion, packagesDeps, historyMetadata,
   tools.logTitle('Storing app assets metadata');
 
   return Promise.resolve()
+    // getting remotes entries
     .then(() => {
+      let remotes = [];
+
+      if (project.hasRemotes) {
+        remotes = configUtils.packages.getCsdrRemotePackages().filter((p) => {
+                          return p.hostAppName = project.name
+                        }).map((p) => {
+                          return { name: p.name, npmPkg: p.npmPkg }
+                        });
+        if (remotes) {
+          remotes = tools.sortArray(remotes, 'name');
+        }
+      }
+
+      return remotes;
+    })
+
+    // storing metadata file
+    .then((remotes) => {
       tools.logInfo('Storing app metadata into project assets');
 
       const appMetadata = {
         appVersion: newVersion,
         appReleaseDate: appReleaseDate,
         appInfos: appInfos,
-        metadata: packagesDeps
+        metadata: packagesDeps,
+        remotes: remotes,
       };
 
       const metadataFile = path.join(project.folder, 'src', 'assets', 'app-metadata.json');
@@ -131,7 +151,7 @@ const storeMetadataAssetsStandAlone = () => {
 
   // getting project
   const prj = configUtils.projects.getProject();
-  let currentVersion;
+  let currentVersion, packageDeps, remotes = [];
 
   return Promise.resolve()
     // getting current app version
@@ -146,16 +166,36 @@ const storeMetadataAssetsStandAlone = () => {
     .then(() => {
       return compositeUtils.getDeps(prj);
     })
+    .then((deps) => {
+      packageDeps = deps;
+    })
+
+
+    // getting remotes entries
+    .then(() => {
+      if (prj.hasRemotes) {
+        remotes = configUtils.packages.getCsdrRemotePackages().filter((p) => {
+                          return p.hostAppName = prj.name
+                        }).map((p) => {
+                          return { name: p.name, npmPkg: p.npmPkg }
+                        });
+        if (remotes) {
+          remotes = tools.sortArray(remotes, 'name');
+        }
+      }
+    })
+
 
     // storing metadata
-    .then((deps) => {
+    .then(() => {
       tools.logInfo('Storing app metadata into project assets');
 
       const appMetadata = {
         appVersion: currentVersion,
         appReleaseDate: moment(new Date()).format("DD/MM/YYYY HH:mm"),
         appInfos: null,
-        metadata: deps
+        metadata: packageDeps,
+        remotes: remotes
       };
 
       const metadataFile = path.join(prj.folder, 'src', 'assets', 'app-metadata.json');

package/scripts/csdr/metadata/common.js

@@ -7,7 +7,6 @@ const path = require('path');
 const tools = require('../../utils/tools');
 const gitUtils = require('../../utils/git-utils');
 const configUtils = require('../config/config-utils');
-// const confluenceUtils = require('../../utils/confluence-utils');
 
 // fetching command parameters
 const { dryRun, skipClone } = tools.getArgs();
@@ -143,50 +142,3 @@ module.exports.isSonarEnabled = () => {
     throw e;
   })
 }
-
-module.exports.publishMetadata = (project) => {
-
-  tools.logInfo(`publishMetadata...skipping`);
-
-  // var envsTableContent;
-  // var historyTableContent;
-
-  // if (!project.confluencePageId) {
-  //   tools.logWarning(`WARNING - project ${project.name} has NO Confluence page id defined`);
-
-  // } else {
-
-  //   return Promise.resolve()
-
-  //     // generate history metadata table
-  //     .then(() => {
-  //       return innerAppHistory.getMetadata(project);
-  //     })
-  //     .then((historyMetadata) => {
-  //       return innerAppHistory.historyMetadataToTable(historyMetadata);
-  //     })
-  //     .then((tableContent) => {
-  //       historyTableContent = tableContent;
-  //     })
-
-  //     // generate envs metadata table
-  //     .then(() => {
-  //       return innerAppEnvs.getMetadata(project);
-  //     })
-  //     .then((envsMetadata) => {
-  //       return innerAppEnvs.envsMetadataToTable(envsMetadata);
-  //     })
-  //     .then((tableContent) => {
-  //       envsTableContent = tableContent;
-  //     })
-
-  //     .then(() => {
-  //       if (envsTableContent !== '' || historyTableContent !== '') {
-  //         return confluenceUtils.updatePageContent(project.confluencePageId, envsTableContent + '\n' + historyTableContent);
-  //       }
-  //     })
-  //     .catch((e) => {
-  //       throw e;
-  //     })
-  // }
-}

package/scripts/csdr/metadata/package.js

@@ -377,6 +377,29 @@ const storePipelineMetadata = module.exports.storePipelineMetadata = (pkgMetadat
 }
 
 
+module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
+  return Promise.resolve()
+    .then(() => {
+      const pkgMetadataFile = path.join(pkg.paths.pkgBuild, 'bundles', 'package-metadata.json');
+
+      const pkgMetadata = {
+        dependencies: pkgCompositeDeps
+      };
+
+      tools.logInfo(`Creating ${pkgMetadataFile}`);
+      console.log(pkgMetadata);
+
+      if (!dryRun) {
+        return tools.writeJsonFileSync(pkgMetadataFile, pkgMetadata);
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
 module.exports.getPackageVersionsJson = (pkg) => {
   if (!pkg) {
     tools.logWarning('provided pkg is empty...skipping');

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

@@ -360,19 +360,6 @@ module.exports.run = () => {
 
 
 
-    // *****************************************************************
-    // GENERATE VERSION HISTORY PAGE ON CONFLUENCE
-    // *****************************************************************
-    .then(() => {
-      if (envTargetGen !== 'DEV') {
-        return metadataUtils.common.publishMetadata(project);
-      }
-    })
-
-
-
-
-
     // *****************************************************************
     // SEND SLACK SUCCESS
     // *****************************************************************

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

@@ -33,6 +33,13 @@ module.exports.getBranches = () => {
   }
 }
 
+module.exports.getEnvTarget = () => {
+  const { envTarget } = utils.tools.getArgs();
+
+  return envTarget;
+}
+
+
 
 module.exports.init = (pkg) => {
 
@@ -252,6 +259,19 @@ module.exports.postBuild = (pkg, version) => {
 }
 
 
+module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
+  return Promise.resolve()
+    .then(() => {
+      if (pkg.remote) {
+        return metadataUtils.package.storeMetadataAssets(pkg, pkgCompositeDeps);
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
 module.exports.runGitOperations = (pkg, version) => {
 
   const branches = this.getBranches();

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

@@ -31,6 +31,9 @@ module.exports.run = () => {
     // Get branches flags
     const branches = innerCommon.getBranches();
 
+    // Get envTarget (used for remotes)
+    const envTarget = innerCommon.getEnvTarget();
+
     // local saved vars
     var newVersion, pkgMetadata, pkgCompositeDeps;
 
@@ -79,7 +82,7 @@ module.exports.run = () => {
       // INSTALL dependencies by type
       .then(() => {
         if (pkg.remote) {
-          return innerRemote.install(pkg, branches.isMaster);
+          return innerRemote.install(pkg, branches.isMaster, envTarget);
 
         } else if (pkg.backend) {
           return innerBackend.install(pkg, branches.isMaster);
@@ -130,6 +133,12 @@ module.exports.run = () => {
       })
 
 
+      // STORING METADATA ASSETS
+      .then(() => {
+        return innerCommon.storeMetadataAssets(pkg, pkgCompositeDeps);
+      })
+
+
       // PUBLISH PACKAGE
       .then(() => {
         return utils.publish.publish(pkg);

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

@@ -2,42 +2,27 @@
 
 // GLOBAL
 const path = require('path');
-
-// LOCAL
 const installUtils = require('../../install/install-utils');
-const configUtils = require('../../config/config-utils');
-const auditUtils = require('../../audit/audit-utils');
-
 
-module.exports.install = (pkg, isMaster) => {
+module.exports.install = (pkg, isMaster, envTarget) => {
   var pkgCompositeDeps = {};
 
   return Promise.resolve()
 
   // FETCHING CURRENT PACKAGES & INSTALL
   .then(() => {
-    // fetch related project if passed as arguments
-    const prj = configUtils.projects.getProject();
-
     // install the dependencies for current package build
-    return installUtils.buildPackage.install(prj, pkg, isMaster);
+    return installUtils.buildPackage.installRemote(pkg, isMaster, envTarget);
   })
   .then((compositeDeps) => {
     // save composite deps for later exports
     pkgCompositeDeps = compositeDeps;
   })
 
-
-  // AUDIT DEPENDENCIES
-  // .then(() => {
-  //   return auditUtils.audit(pkg);
-  // })
-
   .then(() => {
     return pkgCompositeDeps;
   })
 
-
   .catch((e) => {
     throw e;
   })

package/scripts/csdr/version/package.js

@@ -212,7 +212,7 @@ module.exports.getNewVersion = (pkg, commits, isSnapshot, isNextBranch, isSuppor
         commits.forEach((commit) => {
           if (commit.breakingChange) {
             breakings += commit.body;
-            level = 0;
+            level = 1; // no major bump on "breaking changes"
           } else if (commit.type === 'feat') {
             features += 1;
             if (level === 2) {

package/scripts/utils/build/package/angular.js

@@ -14,19 +14,6 @@ const configUtils = require('../../../csdr/config/config-utils');
 let { deps, skipClean, skipLint, skipTest, skipCompile, skipDoc } = tools.getArgs();
 
 
-
-const preChecks = (pkg) => {
-  return Promise.resolve()
-    .then(() => {
-      return configUtils.angular.generateTsConfigLibProd(pkg);
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
 module.exports.build = (pkg, isMaster) => {
 
   tools.logInfo('Building UI Angular package...');
@@ -43,11 +30,6 @@ module.exports.build = (pkg, isMaster) => {
   }
 
   return Promise.resolve()
-    // disabled only used for injecting tsconfig.lib.prod for disable ivy using '--prod' flag if necessary in later version of angular / node
-    // .then(() => {
-    //   tools.logInfo('Executing pre-checks');
-    //   return preChecks(pkg);
-    // })
     .then(() => {
       if (deps === true) {
         tools.logInfo('Building dependencies...');
@@ -63,13 +45,7 @@ module.exports.build = (pkg, isMaster) => {
     .then(() => {
       if (!skipLint) {
         tools.logInfo('Linting...');
-
-        let tsLintPath;
-        // if (pkg.build && pkg.build.euiVersion && pkg.build.euiVersion === '>7.x') {
-        //   tsLintPath = path.join(pkg.paths.pkgRootDirectory, 'tslint-eui-next.json');
-        // } else {
-          tsLintPath = path.join(pkg.paths.pkgRootDirectory, 'tslint.json');
-        // }
+        const tsLintPath = path.join(pkg.paths.pkgRootDirectory, 'tslint.json');
         const tsConfigPath = path.join(pkg.paths.pkgRootDirectory, 'tsconfig.lib.json');
         tools.logInfo(`running tslint -c ${tsLintPath} -p ${tsConfigPath}`);
         return tools.runScript(`tslint -c ${tsLintPath} -p ${tsConfigPath} -t verbose`);
@@ -82,11 +58,8 @@ module.exports.build = (pkg, isMaster) => {
       if (!skipTest) {
         tools.logInfo('Testing...');
         let args = ['--max_old_space_size=8096', ng, 'test', pkg.name];
-
         args.push('--code-coverage');
-
         tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.pkgRootDirectory}`);
-
         return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
       }
     })
@@ -96,11 +69,9 @@ module.exports.build = (pkg, isMaster) => {
       }
       if (!skipCompile) {
         tools.logInfo('Bundling package...');
-
         let args = ['--max_old_space_size=8096', ng, 'build', pkg.name];
 
         tools.logInfo(`running ng build : with args: ${args} on folder : ${pkg.paths.pkgRootDirectory}`);
-
         return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
       }
     })
@@ -132,14 +103,17 @@ module.exports.build = (pkg, isMaster) => {
       if (!skipCompile) {
         tools.logInfo('Copying assets...');
         tools.copydir(path.join(pkg.paths.pkgRootDirectory, 'assets'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'assets'));
+
         tools.logInfo('Copying config...');
         tools.copydir(path.join(pkg.paths.pkgRootDirectory, 'config'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'config'));
+
         tools.logInfo('Copying license...');
         if (pkg.child) {
           tools.copy(path.join(pkg.paths.pkgRootDirectory, '..', '..', 'LICENSE'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'LICENSE'));
         } else {
           tools.copy(path.join(pkg.paths.pkgRootDirectory, 'LICENSE'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'LICENSE'));
         }
+
         tools.logInfo('Copying readme.md...');
         if (pkg.child) {
           tools.copy(path.join(pkg.paths.pkgRootDirectory, '..', '..', 'README.md'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'README.md'));

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 });
@@ -222,15 +229,23 @@ const mergeMasterToDevelop = (pkg, folder, version) => {
 }
 
 
-const getGitHost = () => {
+const getGitHost = (externalRepo) => {
   const config = configUtils.global.getConfig();
 
   if (config.git) {
     if (git && git === 'local') {
-      return config.git.local;
+      if (externalRepo) {
+        return config.git.externals.local;
+      } else {
+        return config.git.local;
+      }
 
     } else {
-      return config.git.remote;
+      if (externalRepo) {
+        return config.git.externals.remote;
+      } else {
+        return config.git.remote;
+      }
     }
   }
 
@@ -238,7 +253,7 @@ const getGitHost = () => {
 }
 
 
-const cloneRepo = (repoUri, folder, forced = false, noHistory = false) => {
+const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalRepo = false) => {
   return Promise.resolve()
     .then(() => {
       if (tools.isDirExists(folder) && forced) {
@@ -246,12 +261,13 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false) => {
         return tools.rimraf(folder);
       }
     })
+
     .then(() => {
       if (!tools.isDirExists(folder)) {
         tools.logInfo(`Cloning ${repoUri} in folder "${folder}" ...`);
 
         const auth = process.env.gituser && process.env.gitpassword ? `${process.env.gituser}:${process.env.gitpassword}@` : '';
-        const gitHost = getGitHost();
+        const gitHost = getGitHost(externalRepo);
 
         if (noHistory) {
           execa.shellSync(`git clone --depth 1 https://${auth}${gitHost}${repoUri} ${folder}`);
@@ -261,6 +277,7 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false) => {
         tools.logSuccess();
       }
     })
+
     .then(() => {
       tools.logInfo(`Pulling ${repoUri} in folder "${folder}" ...`);
       execa.shellSync(`git pull`, { cwd: folder, stdio: 'inherit' });

package/scripts/utils/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const changelogUtils = require('./changelog-utils');
-// const confluenceUtils = require('./confluence-utils');
 const gitUtils = require('./git-utils');
 const mavenUtils = require('./maven-utils');
 const pipelineUtils = require('./pipeline-utils');
@@ -19,7 +18,6 @@ const sonarUtils = require('./sonar/sonar-utils');
 
 module.exports = {
   changelog: changelogUtils,
-  // confluence: confluenceUtils,
   git: gitUtils,
   maven: mavenUtils,
   pipeline: pipelineUtils,

package/scripts/utils/pre-build/elements.js

@@ -9,9 +9,7 @@ const configUtils = require('../../csdr/config/config-utils');
 
 
 module.exports.preBuild = (pkg, build = false) => {
-
   return Promise.resolve()
-
     .then(() => {
       tools.logTitle('PRE-BUILD : preparing the element...')
     })
@@ -21,7 +19,6 @@ module.exports.preBuild = (pkg, build = false) => {
       return configUtils.angular.registerAngularProjectDef(pkg);
     })
 
-    // generate compiled translation files
     .then(() => {
       tools.logInfo('Checking compiled translations');
       if (pkg.build && pkg.build.compiledTranslations) {
@@ -37,6 +34,13 @@ module.exports.preBuild = (pkg, build = false) => {
       }
     })
 
+    // inject external app sources declaration
+    .then(() => {
+      if (pkg.externalSources) {
+        return injectionUtils.externals.injectElementExternalSources(pkg);
+      }
+    })
+
     .catch((e) => {
       throw e;
     })