@eui/tools 5.3.89 → 6.1.0

package/scripts/csdr/init/init.js

@@ -7,7 +7,7 @@ const configUtils = require('../config/config-utils');
 
 // Getting arguments if they are provided for the CI/CD pipeline
 const {
-  project, team, pkg, branch, configOnly, skipClone, reset, pkgOnly, prjOnly,
+  project, team, pkg, branch, configOnly, skipClone, skipInstall, reset, pkgOnly, prjOnly,
   build, containerOnly, skipAppContainers
 } = tools.getArgs();
 
@@ -51,15 +51,27 @@ module.exports.init = () => {
       }
     })
 
-    // Initializing .euirc.json local file - the core of CSDR operations
+    // merge with response found from prompts
     .then((response) => {
-      // merge with response found from prompts
       finalResponse = { ...initialResponse, ...response };
+    })
 
+    // 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(() => {
+      if (finalResponse.project && !build) {
+        return initUtils.cloneHostPackage(finalResponse.project);
+
+      } else if (finalResponse.project && build) {
+        return initUtils.installHostPackage(finalResponse.project);
+      }
+    })
+
     // Initializing .meta based on .euirc.json for local respoisitories cloning
     .then(() => {
       return initUtils.meta.init();
@@ -77,6 +89,13 @@ module.exports.init = () => {
       return initUtils.importPackages(finalResponse);
     })
 
+    // Importing external sources
+    .then(() => {
+      if (finalResponse.project) {
+        return initUtils.importExternalSources();
+      }
+    })
+
     // 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(() => {
@@ -92,8 +111,12 @@ module.exports.init = () => {
     .then(() => {
       // this is only executed for local dev installation,
       // in case of release the initialisation is managed by the application / package themselves
-      if (!build) {
-        return installUtils.localDev.install();
+      if (!build && !skipInstall) {
+        if (finalResponse.pkgOnly) {
+          return installUtils.localDev.install(pkg);
+        } else {
+          return installUtils.localDev.install();
+        }
       }
     })
 
@@ -124,7 +147,7 @@ module.exports.init = () => {
 
     // Attaching external mock repo for project
     .then(() => {
-      if (finalResponse.project && !build) {
+      if (finalResponse.project && !build && !prjOnly) {
         return initUtils.importExternalMock();
       }
     })

package/scripts/csdr/init/meta.js

@@ -2,7 +2,6 @@
 
 // GLOBAL
 const path = require('path');
-const fs = require('fs');
 
 // LOCAL
 const tools = require('../../utils/tools');
@@ -57,8 +56,10 @@ module.exports.init = () => {
 
 
 module.exports.getMetaProjects = () => {
-  const meta = fs.readFileSync(path.join(process.cwd(), '.meta'), 'utf8');
+  const meta = tools.getFileContent(path.join(process.cwd(), '.meta'));
+
   const { projects } = JSON.parse(meta);
+
   return projects;
 }
 

package/scripts/csdr/init/repos.js

@@ -5,6 +5,8 @@ const gitUtils = require('../../utils/git-utils');
 
 const innerMeta = require('./meta');
 
+const { skipEuiToolsClone } = tools.getArgs();
+
 
 const getRepos = (project, pkg, prjOnly, pkgOnly) => {
   const projects = innerMeta.getMetaProjects();
@@ -21,6 +23,8 @@ const getRepos = (project, pkg, prjOnly, pkgOnly) => {
   } else {
     if (prjOnly) {
       return repos.filter((i) => i.folder.indexOf(project) > -1);
+    } else if (skipEuiToolsClone) {
+      return repos.filter((i) => i.folder.indexOf('eui-tools') === -1);
     } else {
       return repos;
     }
@@ -67,37 +71,7 @@ const cloneAndCheckout = (repo, args) => {
 
   return Promise.resolve()
     .then(() => {
-      return gitUtils.cloneRepo(repo.uri, repo.folder);
-    })
-
-    .then(() => {
-      if (!tools.isDirExists(repo.folder)) {
-        return;
-      }
-
-      return Promise.resolve()
-        .then(() => {
-          return gitUtils.checkout(args.branch, repo.folder);
-        })
-        .catch((e) => {
-          tools.logError(`Branch ${args.branch} NOT FOUND, retrying on develop`);
-
-          return Promise.resolve()
-            .then(() => {
-              return gitUtils.checkout('develop', repo.folder);
-            })
-            .catch((e2) => {
-              tools.logError(`Branch develop NOT FOUND, retrying on master`);
-
-              return Promise.resolve()
-                .then(() => {
-                  return gitUtils.checkout('master', repo.folder);
-                })
-                .catch((e3) => {
-                  throw e3;
-                })
-            })
-        })
+      return gitUtils.cloneAndCheckout(repo.uri, repo.folder, args.branch);
     })
 
     .catch((e) => {

package/scripts/csdr/install/common.js

@@ -43,19 +43,24 @@ const installDeps = (deps) => {
 }
 
 
+const getInstallRegistry = () => {
+  const NPM_REGISTRY_INSTALL = configUtils.global.getConfigOptions().NPM_REGISTRY_INSTALL;
+
+  // check if registry has been passed as argument
+  var installRegistry;
+  if (registry) {
+    installRegistry = registry;
+  } else {
+    installRegistry = NPM_REGISTRY_INSTALL;
+  }
+
+  return installRegistry;
+}
+
 const executeInstall = (cwdPath) => {
   return Promise.resolve()
     .then(() => {
-      // getting the default installation registry
-      const NPM_REGISTRY_INSTALL = configUtils.global.getConfigOptions().NPM_REGISTRY_INSTALL;
-
-      // check if registry has been passed as argument
-      var installRegistry;
-      if (registry) {
-        installRegistry = registry;
-      } else {
-        installRegistry = NPM_REGISTRY_INSTALL;
-      }
+      const installRegistry = getInstallRegistry();
 
       tools.logInfo(`Install from : ${installRegistry}`);
       if (!dryRun && !skipInstall) {
@@ -69,6 +74,23 @@ const executeInstall = (cwdPath) => {
 }
 
 
+const executeInstallPackage = (cwdPath, npmPkg) => {
+  return Promise.resolve()
+  .then(() => {
+    const installRegistry = getInstallRegistry();
+
+    tools.logInfo(`Install ${npmPkg} from : ${installRegistry}`);
+    if (!dryRun && !skipInstall) {
+      return execa.shellSync(`yarn add ${npmPkg} --no-lockfile --registry ${installRegistry}`, { cwd: cwdPath, stdio: 'inherit' });
+    }
+  })
+
+  .catch((e) => {
+    throw e;
+  })
+}
+
+
 const getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
   tools.logTitle('Remapping major version carret declared dependencies');
 
@@ -522,6 +544,7 @@ const importLocalProjectsRemotes = (deps) => {
 module.exports = {
   installDeps,
   executeInstall,
+  executeInstallPackage,
   getRemappedDeps,
   getLocalPackageDeps,
   getLocalPackagesDeps,

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

@@ -22,6 +22,11 @@ const { dryRun, skipInstall } = tools.getArgs();
 module.exports.install = (pkg) => {
   let packagesDeps, packagesCompositeDeps, projectsDeps, projectsFixedDeps, finalDeps, snapshotsMetadata;
 
+  // specific if coming from init script and pkgOnly is provided, we only install the remote deps
+  if (pkg && typeof(pkg) === 'string') {
+    pkg = configUtils.packages.getPackage(pkg);
+  }
+
   return Promise.resolve()
 
     // cloning devops metadata repo

package/scripts/csdr/install/projects.js

@@ -86,3 +86,14 @@ module.exports.installDepsStandalone = (prj) => {
       throw e;
     })
 }
+
+module.exports.installPackage = (prj, npmPkg) => {
+  return Promise.resolve()
+    .then(() => {
+      return innerCommon.executeInstallPackage(process.cwd(), npmPkg);
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}

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

@@ -23,7 +23,7 @@ module.exports.run = () => {
 
     // checking if the package can be retrieved from args
     if (!pkg.name) {
-      tools.logError('ERROR : "package" NOT PROVIDED as argument !!!');
+      utils.tools.logError('ERROR : "package" NOT PROVIDED as argument !!!');
       process.exit(1);
     }
 
@@ -54,16 +54,12 @@ module.exports.run = () => {
 
       // FOR UI and REMOTES clone metadata repositories
       .then(() => {
-        if (!pkg.backend) {
-          return innerCommon.cloneMetadataRepos();
-        }
+        return innerCommon.cloneMetadataRepos();
       })
 
       // PRE-RELEASE & COMMON CHECKS
       .then(() => {
-        if (!pkg.backend) {
-          return innerCommon.preReleaseChecks(pkg);
-        }
+        return innerCommon.preReleaseChecks(pkg);
       })
 
       // FETCHING COMMITS METADATA
@@ -94,9 +90,6 @@ module.exports.run = () => {
         if (pkg.remote) {
           return innerRemote.install(pkg, envTarget, compositeType);
 
-        } else if (pkg.backend) {
-          return {};
-
         } else {
           return innerUi.install(pkg, branches.isMaster);
         }
@@ -161,59 +154,36 @@ module.exports.run = () => {
       })
 
 
-      .then(() => {
-        if (pkg.backend) {
 
-          return Promise.resolve()
-            // STORING CENTRALIZED METADATA
-            .then(() => {
-              // get run duration
-              const duration = utils.pipeline.getTimerDuration();
-              return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
-            })
+      // GIT OPERATIONS
+      .then(() => {
+        return innerCommon.runGitOperations(pkg, newVersion);
+      })
 
-            // GIT OPERATIONS
-            .then(() => {
-              return innerCommon.runGitOperations(pkg, newVersion);
-            })
+      // STORING CENTRALIZED METADATA
+      .then(() => {
+        // get run duration
+        const duration = utils.pipeline.getTimerDuration();
+        return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
+      })
 
-            .catch((e) => {
-              throw e;
-            })
+      // STORING PACKAGE HISTORY
+      .then(() => {
+        if (branches.isMaster && pkg.remote) {
+          return innerCommon.generateDiffReport(pkg, newVersion);
+        }
+      })
 
-        } else {
+      // COMMITING METADATA
+      .then(() => {
+        return innerCommon.commitMetadata(pkg, newVersion);
+      })
 
-          return Promise.resolve()
-            // GIT OPERATIONS
-            .then(() => {
-              return innerCommon.runGitOperations(pkg, newVersion);
-            })
-
-            // STORING CENTRALIZED METADATA
-            .then(() => {
-              // get run duration
-              const duration = utils.pipeline.getTimerDuration();
-              return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
-            })
-
-            // STORING PACKAGE HISTORY
-            .then(() => {
-              if (branches.isMaster && pkg.remote) {
-                return innerCommon.generateDiffReport(pkg, newVersion);
-              }
-            })
-
-            // COMMITING METADATA
-            .then(() => {
-              return innerCommon.commitMetadata(pkg, newVersion);
-            })
-
-            .catch((e) => {
-              throw e;
-            })
-        }
+      .catch((e) => {
+        throw e;
       })
 
+
       // EXPORT ADDITIONAL PIPELINE VARIABLES
       .then(() => {
         return innerCommon.exportPipelineVariables(pkg, compositeType);

package/scripts/csdr/version/app-default.js

@@ -3,9 +3,6 @@
 // externals
 const semver = require('semver');
 const path = require('path');
-const execa = require('execa');
-const fs = require('fs');
-const moment = require('moment');
 
 // local
 const tools = require('../../utils/tools');

package/scripts/csdr/version/package-common.js

@@ -1,10 +1,8 @@
 'use strict';
 
 // externals
-const semver = require('semver');
 const path = require('path');
 const execa = require('execa');
-const fs = require('fs');
 
 // local
 const tools = require('../../utils/tools');
@@ -130,10 +128,10 @@ const writePomXml = (pkg, newVersion, isSnapshot, isForceTimestamp = true) => {
         // timestamp file is forced to have at least one file to commit, as snapshot release
         // for backend can keep the same version until its latest
         const tsversionFile = path.resolve(pkg.paths.pkgDirectory, '.tsversion');
-        fs.writeFileSync(tsversionFile, Date.now().toString());
+        tools.writeFileContent(tsversionFile, Date.now().toString());
 
         const versionFile = path.resolve(pkg.paths.pkgDirectory, '.version.properties');
-        fs.writeFileSync(versionFile, newVersion);
+        tools.writeFileContent(versionFile, newVersion);
       }
     })
     .then(() => {

package/scripts/csdr/version/package-remote.js

@@ -1,10 +1,6 @@
 'use strict';
 
 // externals
-const semver = require('semver');
-const path = require('path');
-const execa = require('execa');
-const fs = require('fs');
 
 // local
 const tools = require('../../utils/tools');

package/scripts/index.js

@@ -20,10 +20,8 @@ module.exports.buildPackageUtils = require('./utils/build/package/build-package-
 module.exports.buildPackageUtils = require('./utils/build/package/build-package-utils')
 module.exports.buildPackageElement = require('./utils/build/package/element')
 module.exports.buildPackageMaven = require('./utils/build/package/maven')
-module.exports.buildPackageNestJs = require('./utils/build/package/nestJs')
 module.exports.buildPackageNodeJs = require('./utils/build/package/nodeJs')
 module.exports.buildPackagePostCssConfig = require('./utils/build/package/postcss.config')
-module.exports.buildPackageStencil = require('./utils/build/package/stencil')
 module.exports.buildPackageStyles = require('./utils/build/package/styles')
 
 // utils - clean

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

@@ -11,7 +11,6 @@ const configUtils = require('../../../csdr/config/config-utils');
 
 // INNER MODULES
 const innerNodeJs = require('./nodeJs');
-const innerNestJs = require('./nestJs');
 const innerMaven = require('./maven');
 const innerStyles = require('./styles');
 const innerAngular = require('./angular');
@@ -29,10 +28,7 @@ const buildBackend = (pkg, isMaster) => {
 
   return Promise.resolve()
     .then(() => {
-      if (pkg.build.nestJs) {
-        return innerNestJs.build(pkg, isMaster);
-
-      } else if (pkg.build.nodeJs) {
+      if (pkg.build.nodeJs) {
         return innerNodeJs.build(pkg, isMaster);
 
       } else {
@@ -222,16 +218,12 @@ module.exports.buildSubEntry = (pkg, subEntry) => {
       }
     })
     .then(() => {
-      let packageEuiVersion;
-      if (pkg.build && pkg.build.euiVersion) {
-        packageEuiVersion = pkg.build.euiVersion;
-      } else {
-        packageEuiVersion = configUtils.packages.getPackageEuiVersion(pkg);
-      }
+      let packageEuiVersion = configUtils.packages.getPackageEuiVersion(pkg);
 
-      if(packageEuiVersion === '15.x') {
+      if (packageEuiVersion === '15.x') {
         const { skipTest } = tools.getArgs();
-        if(!skipTest) {
+
+        if (!skipTest) {
           tools.logInfo('Testing...');
           const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
           let args = ['--max_old_space_size=8096', ng, 'test', subEntry, '--code-coverage', '--watch=false'];

package/scripts/utils/build/package/maven.js

@@ -4,9 +4,6 @@ const tools = require('../../tools');
 const mavenUtils = require('../../maven-utils');
 const notificationUtils = require('../../notification/notification-utils');
 
-// FETCH ARGS
-let { deps, skipClean, skipLint, skipTest, skipCompile, skipDoc } = tools.getArgs();
-
 
 module.exports.build = (pkg, isMaster) => {
   tools.logTitle('Building maven backend package...');
@@ -14,15 +11,12 @@ module.exports.build = (pkg, isMaster) => {
   return Promise.resolve()
     .then(() => {
       tools.logInfo('Executing maven build...');
-      // if (isMaster) {
-      //   return mavenUtils.execute(pkg.paths.pkgDirectory, 'clean package -DskipTests');
-      // } else {
-        if (pkg.build && pkg.build.mavenTestCommand) {
-          return mavenUtils.execute(pkg.paths.pkgDirectory, pkg.build.mavenTestCommand);
-        } else {
-          return mavenUtils.execute(pkg.paths.pkgDirectory, 'clean test package');
-        }
-      // }
+
+      if (pkg.build && pkg.build.mavenTestCommand) {
+        return mavenUtils.execute(pkg.paths.pkgDirectory, pkg.build.mavenTestCommand);
+      } else {
+        return mavenUtils.execute(pkg.paths.pkgDirectory, 'clean test package');
+      }
     })
 
     .then(() => {

package/scripts/utils/build/package/nodeJs.js

@@ -24,7 +24,6 @@ module.exports.build = (pkg, isMaster) => {
   return Promise.resolve()
     .then(() => {
       if (!skipTest) {
-        // return testUtils.runJest(pkg);
         return testUtils.runMocha(pkg);
       }
     })

package/scripts/utils/build/package/postcss.config.js

@@ -5,8 +5,6 @@ module.exports = {
           browsers: [
             "> 0.5% in alt-eu",
             "last 2 version",
-            "ie 11",
-            "not dead",
             "not op_mini all"
           ]
       }

package/scripts/utils/build/package/styles.js

@@ -182,6 +182,7 @@ const compileSassFile = (pkg, folder, filename, isNodeSassTildeImporterActive) =
             pkg.build.euiVersion === '15.x'
           )) {
         return compileSassFileDartSass(folder, filename);
+
       } else {
         return compileSassFileNodeSass(folder, filename, isNodeSassTildeImporterActive);
       }

package/scripts/utils/changelog-utils.js

@@ -124,14 +124,15 @@ module.exports.writeChangelog = (changelogContent, outputPath) => {
     .then(() => {
       tools.logInfo('writing changelog markdown...');
 
-      var changelogFile;
+      let changelogFile;
+
       if (!outputPath) {
         changelogFile = path.join(process.cwd(), 'CHANGELOG.md');
       } else {
         changelogFile = path.join(outputPath, 'CHANGELOG.md');
       }
 
-      if (fs.existsSync(changelogFile)) {
+      if (tools.isFileExists(changelogFile)) {
         const data = fs.readFileSync(changelogFile);
         const fd = fs.openSync(changelogFile, 'w+');
         const buffer = new Buffer(changelogContent);
@@ -139,6 +140,7 @@ module.exports.writeChangelog = (changelogContent, outputPath) => {
         fs.writeSync(fd, buffer, 0, buffer.length, 0);
         fs.writeSync(fd, data, 0, data.length, buffer.length);
         fs.close(fd);
+
       } else {
         fs.writeFileSync(changelogFile, changelogContent);
       }

package/scripts/utils/git-utils.js

@@ -362,6 +362,51 @@ const checkout = (branch, folder) => {
 }
 
 
+const cloneAndCheckout = (repoUri, folder, branch) => {
+  tools.logInfo(`cloning ${repoUri} in ${folder} on branch ${branch}`);
+
+  return Promise.resolve()
+    .then(() => {
+      return cloneRepo(repoUri, folder);
+    })
+
+    .then(() => {
+      if (!tools.isDirExists(folder)) {
+        return;
+      }
+
+      return Promise.resolve()
+        .then(() => {
+          return checkout(branch, folder);
+        })
+        .catch((e) => {
+          tools.logError(`Branch ${branch} NOT FOUND, retrying on develop`);
+
+          return Promise.resolve()
+            .then(() => {
+              return checkout('develop', folder);
+            })
+            .catch((e2) => {
+              tools.logError(`Branch develop NOT FOUND, retrying on master`);
+
+              return Promise.resolve()
+                .then(() => {
+                  return checkout('master', folder);
+                })
+                .catch((e3) => {
+                  throw e3;
+                })
+            })
+        })
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+
 const getLastCommitAuthor = (folder) => {
   return Promise.resolve()
     .then(() => {
@@ -393,6 +438,7 @@ module.exports.mergeMasterToDevelop = mergeMasterToDevelop;
 module.exports.mergeSupportToSupportDevelop = mergeSupportToSupportDevelop;
 module.exports.cloneRepo = cloneRepo;
 module.exports.checkout = checkout;
+module.exports.cloneAndCheckout = cloneAndCheckout;
 module.exports.getLastCommitAuthor = getLastCommitAuthor;
 module.exports.isLastCommitAuthorValid = isLastCommitAuthorValid;
 

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

@@ -16,7 +16,7 @@ module.exports.preBuild = (pkg, build = false) => {
 
     .then(() => {
       tools.logInfo('Registering angular project definition...');
-      return configUtils.angular.registerAngularProjectDef(pkg);
+      return configUtils.angular.registerAngularProjectDef(pkg, build, true);
     })
 
     // inject external app sources declaration