@eui/tools 6.1.0 → 6.1.2

package/scripts/csdr/config/packages.js

@@ -14,6 +14,15 @@ module.exports.getCsdrPackages = () => {
   return innerGlobal.getCsdrConfig(false).packages;
 }
 
+module.exports.getCsdrPackagesArray = () => {
+  const pkgs = this.getCsdrPackages();
+  const pkgsArray = Object.keys(this.getCsdrPackages()).map((p) => {
+    return pkgs[p];
+  });
+
+  return pkgsArray;
+}
+
 module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
   const packages = innerGlobal.getCsdrConfig(flattenChildren).packages;
   const packagesKeys = Object.keys(packages);
@@ -71,6 +80,11 @@ module.exports.getPackageByNpmPkg = (npmPkg, fromCsdrConfig) => {
   return;
 }
 
+module.exports.isLocalPackage = (npmPkg) => {
+  return getPackages().filter((p) => {
+    return p.npmPkg === npmPkg
+  })[0] !== null;
+}
 
 
 module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
@@ -215,10 +229,56 @@ module.exports.getRemotePackages = () => {
   })
 }
 
-module.exports.getCsdrRemotePackages = () => {
-  return this.getCsdrPackagesFull().filter(pkg => {
+module.exports.getCsdrRemotePackages = (euiVersionNumber, hostNameTarget) => {
+
+  const euiVersionFilterFn = (r) => {
+    return r.name.indexOf(`eui${euiVersionNumber}`) > -1;
+  }
+
+  const appTargetFilterFn = (r) => {
+    if (r.build) {
+      if (!r.build.appTarget || r.build.appTarget === 'MWP_ONLY') {
+        if (hostNameTarget === 'my-workplace') {
+          return true;
+        }
+      } else if (r.build.appTarget === 'SEDIA_ONLY') {
+        if (hostNameTarget === 'sedia') {
+          return true;
+        }
+      } else if (r.build.appTarget === 'MWP_SEDIA') {
+        if (hostNameTarget === 'my-workplace' || hostNameTarget === 'sedia') {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    }
+  }
+
+  const remotes = this.getCsdrPackagesArray().filter(pkg => {
     return pkg.remote;
   })
+
+  if (!euiVersionNumber && !hostNameTarget) {
+    return remotes;
+
+  } else if (euiVersionNumber && !hostNameTarget) {
+    return remotes.filter((r) => {
+      return euiVersionFilterFn(r);
+    });
+
+  } else if (!euiVersionNumber && hostNameTarget) {
+    return remotes.filter((r) => {
+      return appTargetFilterFn(r);
+    });
+
+  } else {
+    return remotes.filter((r) => {
+      return euiVersionFilterFn(r);
+    }).filter((r) => {
+      return appTargetFilterFn(r);
+    })
+  }
 }
 
 module.exports.getBuildablePackagesWithDeps = () => {
@@ -258,10 +318,11 @@ const getEuiVersionCore = (pkg) => {
   let version;
 
   const depsCompositeFile = path.join(pkg.paths.pkgRootDirectory, 'dependencies-composite.json');
-  tools.logInfo(`Try fetching version from ${depsCompositeFile}`);
+  tools.logInfo(`---- Try fetching version from ${depsCompositeFile}`);
 
   if (!tools.isFileExists(depsCompositeFile)) {
     tools.logInfo('---- no dependencies-composite.json file found');
+
   } else {
     const deps = tools.getJsonFileContent(depsCompositeFile);
     const euiDepsBase = deps['@eui/deps-base'];
@@ -286,7 +347,7 @@ const getEuiVersionCore = (pkg) => {
 
 module.exports.getRemoteEuiVersion = (pkg) => {
   if (pkg.parent !== true && pkg.tsPackage !== false) {
-    tools.logInfo(`checking ${pkg.name}`);
+    tools.logInfo(`checking --> ${pkg.name} <--`);
 
     let version;
 
@@ -310,7 +371,7 @@ module.exports.getRemoteEuiVersion = (pkg) => {
 
 const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg) => {
   if (pkg.parent !== true && pkg.tsPackage !== false) {
-    tools.logInfo(`checking ${pkg.name}`);
+    tools.logInfo(`checking --> ${pkg.name} <--`);
 
     let version;
 
@@ -362,3 +423,4 @@ module.exports.getTSConfigPath = (resolvePath, packagePath) => {
 module.exports.getTSConfigFileName = (tsConfigPath) => {
   return tsConfigPath.split('/')[tsConfigPath.split('/').length - 1];
 }
+

package/scripts/csdr/config/projects.js

@@ -224,7 +224,7 @@ const getEuiVersionCore = (project) => {
   let version;
 
   const depsCompositeFile = path.join(project.folder, 'dependencies-composite.json');
-  tools.logInfo(`Try fetching version from ${depsCompositeFile}`);
+  tools.logInfo(`---- Try fetching version from ${depsCompositeFile}`);
 
   if (!tools.isFileExists(depsCompositeFile)) {
     tools.logInfo('---- no dependencies-composite.json file found');
@@ -253,17 +253,28 @@ const getEuiVersionCore = (project) => {
 
 
 module.exports.getProjectEuiVersion = (project) => {
-  return getEuiVersionCore(project);
+
+  const version = getEuiVersionCore(project);
+
+  if (version) {
+    tools.logInfo(`---- version found : ${version}\n`);
+  } else {
+    tools.logInfo('---- version detection skipped');
+  }
+
+  return version;
 }
 
 
 module.exports.getLocalProjectsEuiVersion = () => {
-  tools.logInfo('getting local projects installed eUI version...');
+  tools.logInfo('Getting local projects installed eUI version...');
 
   const prjs = getProjects();
   let versionsFound = [];
 
   prjs.forEach((p) => {
+    tools.logInfo(`checking ${p.name}`);
+
     let version = 'DEFAULT';
 
     if (p.build && p.build.euiVersion) {
@@ -272,7 +283,6 @@ module.exports.getLocalProjectsEuiVersion = () => {
       version = getEuiVersionCore(p);
     }
 
-    tools.logInfo(`checking ${p.name} - version found : ${version}`);
     versionsFound.push(version);
   })
 

package/scripts/csdr/config/sync.js

@@ -52,7 +52,6 @@ module.exports.run = () => {
     }
   })
 
-  // for projects, we need to take the known rootName based on the folder from the CSDR global config
   hostFolders.forEach((hostFolder) => {
     const csdrPrj = csdrProjects.filter((prj) => {
       return prj.name === hostFolder;

package/scripts/csdr/init/global.js

@@ -0,0 +1,122 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+
+// LOCAL
+const tools = require('../../utils/tools');
+const configUtils = require('../config/config-utils');
+
+
+
+module.exports.processLocalEuiVersions = () => {
+ tools.logTitle('Processing injections for local installed eUI versions if needed');
+
+  return Promise.resolve()
+    .then(() => {
+      let euiVersionsLocal = [
+        ...configUtils.packages.getLocalPackagesEuiVersion(),
+        ...configUtils.projects.getLocalProjectsEuiVersion(),
+      ];
+      euiVersionsLocal = tools.removeArrayDuplicates(euiVersionsLocal);
+
+      if (euiVersionsLocal.length > 1) {
+        tools.logError('Multiple versions of eUI found in local CSDR...aborting');
+        tools.logError(`Ensure tha you've not installed packages that differs in versions, check the log above to identify which one is problematic`);
+        console.log(euiVersionsLocal);
+        throw new Error('MULTIPLE_LOCAL_EUI_VERSIONS_FOUND');
+
+      } else {
+        tools.logSuccess('eUI version checked OK');
+      }
+
+      const euiVersion = euiVersionsLocal[0];
+
+      if (!euiVersion || euiVersion === 'DEFAULT') {
+        tools.logInfo('Default eUI version found or empty...skipping');
+
+      } else {
+        tools.logInfo(`Processing resolutions replacement for eUI version found : ${euiVersion}`);
+
+        const rootPackageJsonFile = path.join(process.cwd(), 'package.json');
+        const rootPackageJson = require(rootPackageJsonFile);
+
+        const resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
+
+        if (tools.isFileExists(resolutionsJsonFile)) {
+          const resolutionsJson = require(resolutionsJsonFile);
+
+          tools.logInfo('Injecting resolutions content');
+          console.log(resolutionsJson);
+          rootPackageJson.resolutions = resolutionsJson;
+
+          tools.logInfo('Updating root package.json');
+          tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
+        } else {
+          tools.logInfo('Not found...skipping');
+        }
+
+        tools.logInfo(`Processing .browserlistrc replacement for eUI version found : ${euiVersion}`);
+
+        const blResourcesFile = path.join(__dirname, 'resources', euiVersion, 'browserslistrc');
+        const blDestFile = path.join(process.cwd(), '.browserslistrc');
+
+        if (tools.isFileExists(blResourcesFile)) {
+          tools.copy(blResourcesFile, blDestFile);
+        } else {
+          tools.logInfo('Not found...skipping');
+        }
+
+        tools.logInfo(`Processing yarn.lock replacement for eUI version found : ${euiVersion}`);
+
+        const yResourcesFile = path.join(__dirname, 'resources', euiVersion, 'yarn.lock');
+        const yDestFile = path.join(process.cwd(), 'yarn.lock');
+
+        if (tools.isFileExists(yResourcesFile)) {
+          tools.copy(yResourcesFile, yDestFile);
+        } else {
+          tools.logInfo('Not found...skipping');
+        }
+      }
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+module.exports.processResolutionsForNodeVersion = () => {
+  return Promise.resolve()
+    .then(() => {
+      tools.logTitle('Processing injections for detected nodeJS version');
+
+      let nodeVersion = process.versions.node;
+      nodeVersion = `${nodeVersion.split('.')[0]}.x`;
+
+      const rootPackageJsonFile = path.join(process.cwd(), 'package.json');
+      const rootPackageJson = require(rootPackageJsonFile);
+
+      const nodeVersionResource = `nodejs-${nodeVersion}`;
+
+      const resolutionsJsonFile = path.join(__dirname, 'resources', nodeVersionResource, 'resolutions.json');
+
+      tools.logInfo(`Checking nodejsResolution resource for path: ${resolutionsJsonFile}`);
+
+      if (tools.isFileExists(resolutionsJsonFile)) {
+        const resolutionsJson = require(resolutionsJsonFile);
+
+        tools.logInfo('Injecting resolutions content');
+        console.log(resolutionsJson);
+        rootPackageJson.resolutions = resolutionsJson;
+
+        tools.logInfo('Updating root package.json');
+        tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
+
+      } else {
+        tools.logInfo('Not found...skipping');
+      }
+    })
+    .catch((e) => {
+      throw e;
+    })
+}

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

@@ -1,361 +1,11 @@
 'use strict';
 
-// GLOBAL
-const path = require('path');
-
-// LOCAL
-const tools = require('../../utils/tools');
-const injectionUtils = require('../../utils/pre-build/injection/injection-utils');
-const configUtils = require('../config/config-utils');
-const gitUtils = require('../../utils/git-utils');
-const installUtils = require('../install/install-utils');
-
-// INNER MODULES
-const innerPrompt = require('./prompt');
-const innerMeta = require('./meta');
-const innerRepos = require('./repos');
-
 // INNER MODULES - RE-EXPORTS
-module.exports.prompt = innerPrompt;
-module.exports.meta = innerMeta;
-module.exports.repos = innerRepos;
-
-
-const importPackage = (pkg, args) => {
-  tools.logTitle(`importing package ${pkg.name}`);
-
-  if (pkg.parent) {
-    tools.logInfo('Parent package ... skipping import');
-    return Promise.resolve();
-
-  } else {
-    if (pkg.tsPackage !== false) {
-      return Promise.resolve()
-      .then(() => {
-        if (!pkg.element) {
-          return configUtils.angular.registerAngularPackage(pkg, args.reset);
-        } else if (pkg.element) {
-          return configUtils.angular.registerAngularProjectDef(pkg, args.reset, true);
-        } else {
-          return configUtils.angular.registerAngularProjectDef(pkg, args.reset);
-        }
-      })
-      .then(() => {
-        if (pkg.pathInclude !== false && !pkg.element) {
-          return configUtils.angular.registerModulePaths(pkg, args.reset);
-        }
-      })
-
-      .then(() => {
-        tools.logSuccess('OK => package imported');
-      })
-
-      .catch((e) => {
-        throw e;
-      })
-
-    } else {
-      tools.logInfo('Non TS package... skipping registration');
-      return Promise.resolve();
-    }
-  }
-}
-
-
-
-
-
-module.exports.importPackages = (args = {}) => {
-
-  tools.logTitle('Importing configuration of packages');
-
-  const packages = configUtils.packages.getPackages();
-
-  return Promise.resolve()
-    .then(() => {
-      configUtils.angular.checkConfigFiles(args.reset);
-    })
-    .then(() => Promise.resolve().then(() => {
-      return packages.reduce((promise, pkg) => {
-        return promise.then(() => (
-          importPackage(pkg, args)
-        ));
-      }, Promise.resolve());
-    }))
-
-    .then(() => {
-      tools.logSuccess('OK => all packages successfully imported');
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-module.exports.cloneHostPackage = (projectName) => {
-  tools.logTitle('Installing host package');
-
-  let pkg;
-
-  return Promise.resolve()
-    .then(() => {
-      const project = configUtils.projects.getProject(projectName);
-
-      if (!project.hostPackage) {
-        tools.logInfo('project hostPackage not defined...skipping');
-
-      } else {
-        pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
-        if (!pkg) {
-          throw new Error('Invalid host package provided / unknown to CSDR config');
-        }
-        return gitUtils.cloneAndCheckout(pkg.repository, path.join(process.cwd(), 'packages', pkg.name), 'develop');
-      }
-    })
-
-    .then(() => {
-      const newPackages = [];
-      newPackages.push(pkg.name);
-      return configUtils.global.updateConfig(null, newPackages);
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-module.exports.installHostPackage = (projectName) => {
-  tools.logTitle('Installing host package');
-
-  return Promise.resolve()
-    .then(() => {
-      const project = configUtils.projects.getProject(projectName);
-
-      if (!project.hostPackage) {
-        tools.logInfo('project hostPackage not defined...skipping');
-
-      } else {
-        const pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
-        if (!pkg) {
-          throw new Error('Invalid host package provided / unknown to CSDR config');
-        }
-        return installUtils.projects.installHostPackage(project, pkg.npmPkg);
-      }
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-module.exports.importScripts = () => {
-  return Promise.resolve()
-    .then(() => {
-      tools.logTitle("Init scripts for local projects");
-      const projects = configUtils.projects.getProjects();
-
-      const rootPackageJsonFile = path.join(process.cwd(), 'package.json')
-      const rootPackageJson = require(rootPackageJsonFile);
-
-      projects.forEach((p) => {
-        tools.logInfo(`Project :  ${p.name}`);
-
-        const scriptsFile = path.join(process.cwd(), p.folder, 'scripts.json');
-        if (!tools.isFileExists(scriptsFile)) {
-          tools.logInfo('no scripts.json file found - skipping');
-        } else {
-          tools.logInfo('Processing scripts.json file');
-          const scriptsJson = require(scriptsFile);
-          rootPackageJson.scripts = { ...rootPackageJson.scripts, ...scriptsJson };
-        }
-      });
-
-      tools.logInfo('Updating root package.json');
-      tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-module.exports.importExternalFeatures = () => {
-  return Promise.resolve()
-    .then(() => {
-      tools.logTitle("Import external features for local projects");
-
-      return configUtils.projects.getProjects().reduce((promise, prj) => {
-        return promise.then(() => (
-          injectionUtils.externals.injectExternalFeatures(prj)
-        ));
-      }, Promise.resolve());
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-module.exports.importExternalSources = () => {
-  return Promise.resolve()
-    .then(() => {
-      tools.logTitle("Import external sources for local projects");
-
-      return configUtils.projects.getProjects().reduce((promise, prj) => {
-        return promise.then(() => (
-          injectionUtils.externals.injectExternalAppSources(prj)
-        ));
-      }, Promise.resolve());
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-
-module.exports.importExternalMock = () => {
-  return Promise.resolve()
-    .then(() => {
-      tools.logTitle("Import external mock for local projects");
-
-      return configUtils.projects.getProjects().reduce((promise, prj) => {
-        return promise.then(() => (
-          injectionUtils.externals.injectExternalMock(prj)
-        ));
-      }, Promise.resolve());
-
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-
-module.exports.importExtraTsConfig = () => {
-  tools.logTitle("Init extra ts config for local projects");
-
-  return Promise.resolve()
-    .then(() => {
-
-      configUtils.projects.getProjects().forEach((p) => {
-        tools.logInfo(`Check extra tsconfig for project :  ${p.name}`);
-        configUtils.angular.registerProjectExtraPaths(p);
-      })
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-module.exports.processLocalEuiVersions = () => {
- tools.logTitle('Processing injections for local installed eUI versions if needed');
-
-  return Promise.resolve()
-    .then(() => {
-      let euiVersionsLocal = [
-        ...configUtils.packages.getLocalPackagesEuiVersion(),
-        ...configUtils.projects.getLocalProjectsEuiVersion(),
-      ];
-      euiVersionsLocal = tools.removeArrayDuplicates(euiVersionsLocal);
-
-      if (euiVersionsLocal.length > 1) {
-        tools.logError('Multiple versions of eUI found in local CSDR...aborting');
-        console.log(euiVersionsLocal);
-        throw new Error('MULTIPLE_LOCAL_EUI_VERSIONS_FOUND');
-      }
-
-      const euiVersion = euiVersionsLocal[0];
-
-      if (!euiVersion || euiVersion === 'DEFAULT') {
-        tools.logInfo('Default eUI version found or empty...skipping');
-
-      } else {
-        tools.logInfo(`Processing resolutions replacement for eUI version found : ${euiVersion}`);
-
-        const rootPackageJsonFile = path.join(process.cwd(), 'package.json');
-        const rootPackageJson = require(rootPackageJsonFile);
-
-        const resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
-
-        if (tools.isFileExists(resolutionsJsonFile)) {
-          const resolutionsJson = require(resolutionsJsonFile);
-
-          tools.logInfo('Injecting resolutions content');
-          console.log(resolutionsJson);
-          rootPackageJson.resolutions = resolutionsJson;
-
-          tools.logInfo('Updating root package.json');
-          tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
-        } else {
-          tools.logWarning('Not found...skipping');
-        }
-
-        tools.logInfo(`Processing .browserlistrc replacement for eUI version found : ${euiVersion}`);
-
-        const blResourcesFile = path.join(__dirname, 'resources', euiVersion, 'browserslistrc');
-        const blDestFile = path.join(process.cwd(), '.browserslistrc');
-
-        if (tools.isFileExists(blResourcesFile)) {
-          tools.copy(blResourcesFile, blDestFile);
-        } else {
-          tools.logWarning('Not found...skipping');
-        }
-
-        tools.logInfo(`Processing yarn.lock replacement for eUI version found : ${euiVersion}`);
-
-        const yResourcesFile = path.join(__dirname, 'resources', euiVersion, 'yarn.lock');
-        const yDestFile = path.join(process.cwd(), 'yarn.lock');
-
-        if (tools.isFileExists(yResourcesFile)) {
-          tools.copy(yResourcesFile, yDestFile);
-        } else {
-          tools.logWarning('Not found...skipping');
-        }
-      }
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-module.exports.processResolutionsForNodeVersion = () => {
-  return Promise.resolve()
-    .then(() => {
-      tools.logTitle('Processing injections for detected nodeJS version');
-
-      let nodeVersion = process.versions.node;
-      nodeVersion = `${nodeVersion.split('.')[0]}.x`;
-
-      const rootPackageJsonFile = path.join(process.cwd(), 'package.json');
-      const rootPackageJson = require(rootPackageJsonFile);
-
-      const nodeVersionResource = `nodejs-${nodeVersion}`;
-
-      const resolutionsJsonFile = path.join(__dirname, 'resources', nodeVersionResource, 'resolutions.json');
-
-      tools.logInfo(`Checking nodejsResolution resource for path: ${resolutionsJsonFile}`);
-
-      if (tools.isFileExists(resolutionsJsonFile)) {
-        const resolutionsJson = require(resolutionsJsonFile);
-
-        tools.logInfo('Injecting resolutions content');
-        console.log(resolutionsJson);
-        rootPackageJson.resolutions = resolutionsJson;
-
-        tools.logInfo('Updating root package.json');
-        tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
-      } else {
-        tools.logWarning('Not found...skipping');
-      }
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
+module.exports.global = require('./global');
+module.exports.init = require('./init');
+module.exports.meta = require('./meta');
+module.exports.packages = require('./packages');
+module.exports.projects = require('./projects');
+module.exports.prompt = require('./prompt');
+module.exports.remotes = require('./remotes');
+module.exports.repos = require('./repos');