@eui/tools 4.16.6 → 4.17.0

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/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) => {
 

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);

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

@@ -3,41 +3,26 @@
 // 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

@@ -222,15 +222,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 +246,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) {
@@ -251,7 +259,7 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false) => {
         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}`);

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;
     })

package/scripts/utils/pre-build/injection/externals.js

@@ -121,6 +121,64 @@ module.exports.injectExternalAppSources = (project) => {
 }
 
 
+module.exports.injectElementExternalSources = (pkg) => {
+
+  tools.logInfo(`Injecting package external sources for : ${pkg.name}`);
+
+  return Promise.resolve()
+    .then(() => {
+      if (!pkg.externalSources) {
+        tools.logInfo('No external sources setup...skipping');
+        return;
+      }
+
+      if (!pkg.externalSources.npmPkg || !pkg.externalSources.folder) {
+        return tools.logWarning('External sources use requires a source [npmPkg] and a [folder] declared');
+
+      } else {
+        // check if package is locally cloned
+        const localPackage = configUtils.packages.getPackages().filter((p) => {
+          return p.npmPkg === pkg.externalSources.npmPkg
+        })[0];
+
+        let externalSourcesSrcPath;
+        const pkgSrcPath = path.join(process.cwd(), pkg.folder, 'src');
+
+        // if local package is found
+        if (localPackage) {
+          tools.logInfo('local pkg found, copying from local');
+          externalSourcesSrcPath = path.join(process.cwd(), 'packages', localPackage.name, pkg.externalSources.folder);
+
+        // if not sources are taken from the npm package def in node_modules
+        } else {
+          tools.logInfo('remote pkg found, copying from remote');
+          const npmPkgScope = pkg.externalSources.npmPkg.substr(0, pkg.externalSources.npmPkg.indexOf('/'));
+          const npmPkgName = pkg.externalSources.npmPkg.substr(pkg.externalSources.npmPkg.indexOf('/') + 1);
+
+          externalSourcesSrcPath = path.join(process.cwd(), 'node_modules', npmPkgScope, npmPkgName, pkg.externalSources.folder);
+        }
+
+        if (!tools.isDirExists(externalSourcesSrcPath)) {
+          tools.logWarning(`External sources location : ${externalSourcesSrcPath} cannot be found in node_modules`);
+          throw new Error('External sources not found');
+
+        } else {
+          tools.logInfo(`Removing ${pkgSrcPath} content`);
+          tools.rmdirFull(pkgSrcPath, false);
+
+          tools.logInfo(`${externalSourcesSrcPath} injecting in ${pkgSrcPath}`);
+          return tools.copydir(externalSourcesSrcPath, pkgSrcPath, true);
+        }
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+
 module.exports.injectExternalMock = (project) => {
 
   tools.logInfo(`Injecting project external mock for : ${project.name}`);
@@ -183,7 +241,7 @@ module.exports.remapRoutesByEnvConfig = (project, envTarget, build) => {
 
       // checking is routes path declared
       if (!project.appSources.routesFilePath) {
-        tools.logError('project appSources.routesFilePath is not declared in apps config');
+        tools.logError('project appSources.routesFilePath is not declared in app config');
         return;
       }
 
@@ -198,7 +256,6 @@ module.exports.remapRoutesByEnvConfig = (project, envTarget, build) => {
       let routesFileContent = tools.getFileContent(routesFilePath);
       routesRemapping.forEach((route) => {
         tools.logInfo(`checking replacement for : ${JSON.stringify(route)}`);
-        // const tokenToSearch = `@${route.featureModule}.routeModuleDef@`;
         const tokenToSearch = `./features/${route.featureModule}-lib.module#Module`;
         if (routesFileContent.indexOf(tokenToSearch) > -1) {
           tools.logInfo(`token ${tokenToSearch} found...replacing`);

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

@@ -88,10 +88,6 @@ module.exports.preBuild = (project, envTarget, build) => {
         tools.logInfo('Executing scripts files replacement for openId Connect');
 
         let rootTargetFolder = 'src';
-        // if (build) {
-        //   rootTargetFolder = 'dist';
-        // }
-
         tools.logInfo(`Copying node_modules/oidc-client/dist/oidc-client.min.js to ${rootTargetFolder}/assets/oidc-client.min.js`);
         tools.copy(
           path.join(process.cwd(), 'node_modules/oidc-client/dist/oidc-client.min.js'),
@@ -140,9 +136,6 @@ module.exports.injectAppConfig = (project, configEnvTarget, build) => {
       }
 
       let rootTargetFolder = 'src';
-      // if (build) {
-      //   rootTargetFolder = 'dist';
-      // }
       tools.logInfo(`Replacing default ${rootTargetFolder}/assets/openid-login-config.json file by ${envFilePath} content`);
       tools.copy(envFilePath, path.join(project.paths.angularPath, `${rootTargetFolder}/assets/openid-login-config.json`));
 

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

@@ -56,12 +56,6 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
           }
       });
 
-      // configUtils.packages.getPackages().forEach((pkg) => {
-      //   const localPath = configUtils.packages.getPackagePaths(pkg).pkgRootDirectory;
-      //   console.log(localPath);
-      //   packages.push(localPath);
-      // })
-
       tools.logInfo(`langs: ${langs}`);
       tools.logInfo(`dest folder: ${destFolder}`);
       tools.logInfo(`total packages: ${packages.length}`);

package/scripts/utils/confluence-utils.js

@@ -1,126 +0,0 @@
-// 'use strict';
-
-// var Confluence = require("confluence-api");
-
-// const tools = require('./tools');
-// const configUtils = require('../csdr/config/config-utils');
-
-// const { jiraUser, jiraPassword, dryRun } = tools.getArgs();
-
-// const updatePageContent = (pageId, pageContent) => {
-
-//   const config = configUtils.global.getConfig();
-
-//   const confluenceHost = config.confluence && config.confluence.host;
-//   const confluenceProjectName = config.confluence && config.confluence.projectName;
-
-//   const confluenceConfig = {
-//     username: jiraUser,
-//     password: jiraPassword,
-//     baseUrl: confluenceHost,
-//     version: 6 // Confluence major version, optional
-//   };
-
-//   tools.logTitle('Update confluence DEVOPS page...');
-
-//   if (dryRun) {
-//     return Promise.resolve();
-//   }
-
-//   var confluence = new Confluence(confluenceConfig);
-
-//   return Promise.resolve()
-//     .then(() => {
-//       return new Promise((resolve, reject) => {
-//         confluence.getContentById(
-//           pageId
-//           , function (err, response) {
-//             if (err) {
-//               return reject(err);
-//             } else {
-//               return resolve(response);
-//             }
-//           })
-//       })
-//     })
-//     .then((content) => {
-//       const newVersion = content.version.number + 1;
-
-//       return new Promise((resolve, reject) => {
-//         confluence.putContent(
-//           confluenceProjectName,
-//           pageId,
-//           newVersion,
-//           content.title,
-//           pageContent
-//           , function (err, response) {
-//             if (err) {
-//               return reject(err);
-//             } else {
-//               return resolve(response);
-//             }
-//           })
-//       })
-//     })
-//     .then(() => {
-//       tools.logSuccess();
-//     })
-//     .catch((e) => {
-//       // error is not thrown as this failure to update is just a side-effect of the pipeline
-//       tools.logError('ERROR!!! error encountered while trying to publish on Confluence');
-//       console.log(e);
-//     })
-// }
-
-
-// const getContentByPageTitle = (pageTitle) => {
-
-//   const config = configUtils.global.getConfig();
-
-//   const confluenceHost = config.confluence && config.confluence.host;
-//   const confluenceProjectName = config.confluence && config.confluence.projectName;
-
-//   const confluenceConfig = {
-//     username: jiraUser,
-//     password: jiraPassword,
-//     baseUrl: confluenceHost,
-//     version: 6 // Confluence major version, optional
-//   };
-
-//   var confluence = new Confluence(confluenceConfig);
-
-//   return Promise.resolve()
-//     .then(() => {
-//       return new Promise((resolve, reject) => {
-//         confluence.getContentByPageTitle(
-//           confluenceProjectName,
-//           pageTitle
-//           , function (err, response) {
-//             if (err) {
-//               return reject(err);
-//             } else {
-//               return resolve(response);
-//             }
-//           })
-//       })
-//     })
-// }
-
-
-
-// const updatePackagesHistoryPageContent = (tableContent) => {
-//   const config = configUtils.global.getConfig();
-//   const confluencePackagesHistoryPageId = config.confluence && config.confluence.packagesHistoryPageId;
-
-//   return updatePageContent(confluencePackagesHistoryPageId, tableContent);
-// }
-
-
-
-// // EXPORTS
-
-// module.exports = {
-//   getContentByPageTitle,
-//   updatePageContent,
-//   updatePackagesHistoryPageContent,
-// }