@eui/tools 5.3.90 → 6.1.1

package/scripts/csdr/config/global.js

@@ -61,24 +61,24 @@ module.exports.getCsdrConfig = (full = true) => {
 }
 
 
-const migrateConfig = (euircBaseFile) => {
-  tools.logInfo('Upgrading local euirc config to new version');
+// const migrateConfig = (euircBaseFile) => {
+//   tools.logInfo('Upgrading local euirc config to new version');
 
-  const actualConfig = require(euircBaseFile);
-  const updatedConfig = {};
+//   const actualConfig = require(euircBaseFile);
+//   const updatedConfig = {};
 
-  updatedConfig.projects = Object.keys(actualConfig.projects);
-  updatedConfig.packages = Object.keys(actualConfig.packages)
-    .map(p => actualConfig.packages[p])
-    .filter((p) => {
-      return !p.child;
-    })
-    .map(p => p.name);
+//   updatedConfig.projects = Object.keys(actualConfig.projects);
+//   updatedConfig.packages = Object.keys(actualConfig.packages)
+//     .map(p => actualConfig.packages[p])
+//     .filter((p) => {
+//       return !p.child;
+//     })
+//     .map(p => p.name);
 
-  tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), updatedConfig);
+//   tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), updatedConfig);
 
-  return updatedConfig;
-}
+//   return updatedConfig;
+// }
 
 
 const getGeneratedConfig = (euircBaseFile) => {
@@ -87,9 +87,9 @@ const getGeneratedConfig = (euircBaseFile) => {
   let configContent = require(euircBaseFile);
 
   // check if actual generated config file contains new version format
-  if (!Array.isArray(configContent.projects)) {
-    configContent = migrateConfig(euircBaseFile);
-  }
+  // if (!Array.isArray(configContent.projects)) {
+  //   configContent = migrateConfig(euircBaseFile);
+  // }
 
   // fetching global csdr config
   const globalConfig = this.getCsdrConfig();
@@ -171,7 +171,7 @@ module.exports.getConfig = () => {
 
 
 
-module.exports.updateConfig = (project, packages, reset) => {
+module.exports.updateConfig = (project, packages, reset = false) => {
   const configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
 
   let newConfig = {};

package/scripts/csdr/config/packages.js

@@ -2,7 +2,6 @@
 
 // GLOBAL
 const path = require('path');
-const fs = require('fs');
 
 // LOCAL
 const tools = require('../../utils/tools');
@@ -15,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);
@@ -72,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) => {
@@ -133,21 +146,21 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
 
 
 module.exports.getPackagePaths = (pkg) => {
-  const rootDirectory = fs.realpathSync(process.cwd());
+  const rootDirectory = process.cwd();
   const resolvePath = relativePath => path.resolve(rootDirectory, relativePath);
 
   const packagesBasePath = 'packages';
 
   const folder = pkg.folder || pkg.name;
 
-  var packagesPath;
+  let packagesPath;
   if (pkg.child) {
     packagesPath = path.join(packagesBasePath, pkg.parentPkg, packagesBasePath);
   } else {
     packagesPath = packagesBasePath;
   }
 
-  var publishFolder = '';
+  let publishFolder = '';
   if (pkg.tsPackage !== false) {
     publishFolder = '/dist';
   } else {
@@ -158,6 +171,7 @@ module.exports.getPackagePaths = (pkg) => {
     }
   }
 
+  // Remotes specific, to switch install root dir to the remote folder itself (independent dependencies / angular & eUI version, etc...)
   var repoNodeModules, remoteNodeModules = false;
   const depsBaseFile = path.join(resolvePath(packagesPath + '/' + folder), 'dependencies-base.json');
   const depsCompositeFile = path.join(resolvePath(packagesPath + '/' + folder), 'dependencies-composite.json');
@@ -168,19 +182,28 @@ module.exports.getPackagePaths = (pkg) => {
     repoNodeModules = resolvePath('node_modules');
   }
 
+
+  // Central gathering for pkg paths, always refer to this when fetching pkg paths in code, single sources of truth
   const paths = {
     rootDirectory,
-    repoPackageJson: resolvePath('package.json'),
     repoNodeModules: repoNodeModules,
     remoteNodeModules: remoteNodeModules,
     packages: resolvePath(packagesBasePath),
+    root: resolvePath(packagesPath + '/' + folder),
+    dist: resolvePath(packagesPath + '/' + folder + '/dist'),
+    publish: resolvePath(packagesPath + '/' + folder + publishFolder),
+    src: resolvePath(packagesPath + '/' + folder + '/src'),
+    lib: resolvePath(packagesPath + '/' + folder + '/src/lib'),
+    tsConfig: this.getTSConfigPath(resolvePath, packagesPath + '/' + folder),
+
+    // deprecated TODO remove from scripts
+    repoPackageJson: resolvePath('package.json'),
     pkgFromRoot: packagesPath + '/' + folder,
+    pkgBuild: resolvePath(packagesPath + '/' + folder + '/dist'),
     pkgRootDirectory: resolvePath(packagesPath + '/' + folder),
     angularPath: resolvePath(packagesPath + '/' + folder),
     pkgDirectory: resolvePath(packagesPath + '/' + folder),
-    pkgBuild: resolvePath(packagesPath + '/' + folder + '/dist'),
     pkgPublish: resolvePath(packagesPath + '/' + folder + publishFolder),
-    pkgJson: resolvePath(packagesPath + '/' + folder + '/package.json'),
     pkgSrc: resolvePath(packagesPath + '/' + folder + '/src'),
     pkgLibFolder: resolvePath(packagesPath + '/' + folder + '/src/lib'),
     tsConfig: this.getTSConfigPath(resolvePath, packagesPath + '/' + folder),
@@ -206,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 = () => {
@@ -249,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'];
@@ -277,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;
 
@@ -301,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;
 
@@ -344,11 +414,13 @@ module.exports.getLocalPackagesEuiVersion = () => {
 }
 
 module.exports.getTSConfigPath = (resolvePath, packagePath) => {
-  const path = resolvePath(`${packagePath}/tsconfig.json`);
+  const tsPath = resolvePath(`${packagePath}/tsconfig.json`);
   const oldPath = resolvePath(`${packagePath}/tsconfig.lib.json`);
-  return fs.existsSync(path) ? path : oldPath;
+
+  return tools.isDirExists(tsPath) ? tsPath : oldPath;
 }
 
 module.exports.getTSConfigFileName = (tsConfigPath) => {
   return tsConfigPath.split('/')[tsConfigPath.split('/').length - 1];
 }
+

package/scripts/csdr/config/projects.js

@@ -220,21 +220,69 @@ module.exports.getBaseHref = (prj, version, providedBaseHref) => {
 }
 
 
+const getEuiVersionCore = (project) => {
+  let version;
+
+  const depsCompositeFile = path.join(project.folder, 'dependencies-composite.json');
+  tools.logInfo(`---- Try fetching version from ${depsCompositeFile}`);
+
+  if (!tools.isFileExists(depsCompositeFile)) {
+    tools.logInfo('---- no dependencies-composite.json file found');
+
+  } else {
+    const jsonFileContnet = JSON.parse(tools.getFileContent(depsCompositeFile));
+    const deps = jsonFileContnet.dependencies;
+    const euiDepsBase = deps['@eui/deps-base'];
+
+    if (euiDepsBase) {
+      let euiVersion = euiDepsBase.split('.')[0];
+
+      if (euiVersion.substr(0,1) === '^') {
+        euiVersion = euiVersion.substr(1);
+      }
+      version = `${euiVersion}.x`;
+
+      if (version === '7.x') {
+        version = 'DEFAULT';
+      }
+    }
+  }
+
+  return version;
+}
+
+
+module.exports.getProjectEuiVersion = (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) {
-      if (p.build.euiVersion) {
-        version = p.build.euiVersion;
-      }
+    if (p.build && p.build.euiVersion) {
+      version = p.build.euiVersion;
+    } else {
+      version = getEuiVersionCore(p);
     }
-    tools.logInfo(`checking ${p.name} - version found : ${version}`);
+
     versionsFound.push(version);
   })
 

package/scripts/csdr/config/sync.js

@@ -3,7 +3,6 @@
 
 // GLOBAL
 const path = require('path');
-const fs = require('fs');
 
 // LOCAL
 const tools = require('../../utils/tools');
@@ -27,6 +26,7 @@ module.exports.run = () => {
 
   const pkgFolders = tools.getFolders(path.join(process.cwd(), 'packages'));
   const prjFolders = tools.getFolders(path.join(process.cwd(), 'apps'));
+  const hostFolders = tools.getFolders(path.join(process.cwd(), 'hosts'));
 
   const csdrProjects = innerProjects.getCsdrProjects();
 
@@ -36,6 +36,10 @@ module.exports.run = () => {
   tools.logInfo('Project folders found:');
   console.log(prjFolders);
 
+  tools.logInfo('Host projects folders found:');
+  console.log(hostFolders);
+
+
   // for projects, we need to take the known rootName based on the folder from the CSDR global config
   let projects = [];
   prjFolders.forEach((prjFolder) => {
@@ -48,6 +52,16 @@ module.exports.run = () => {
     }
   })
 
+  hostFolders.forEach((hostFolder) => {
+    const csdrPrj = csdrProjects.filter((prj) => {
+      return prj.name === hostFolder;
+    })[0];
+
+    if (csdrPrj) {
+      projects.push(csdrPrj.rootName);
+    }
+  })
+
   tools.logInfo('Project folder remapped to CSDR project config');
   console.log(projects);
 

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