@eui/tools 4.16.2 → 4.16.6

package/.version.properties

@@ -1 +1 @@
-4.16.2
+4.16.6

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 4.16.6 (2021-11-08)
+
+##### Chores
+
+* **other:**
+  * added browserslistrc resources patching for eui v13 csdr init - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([b9f8498f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b9f8498fa7eac879e4135f7c214925428ac81da0))
+
+* * *
+* * *
+## 4.16.5 (2021-11-08)
+
+##### Bug Fixes
+
+* **other:**
+  * enable eUI version scanning of local projects and packages - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([83112806](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/83112806b51969ed6672dbec1e2423b86983f45d))
+
+* * *
+* * *
+## 4.16.4 (2021-11-08)
+
+##### Chores
+
+* **other:**
+  * generated spec files for non-src folder - issue with sub-entries eui-components - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d72c570a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d72c570a42f268c6b8f8118af9988ffc18ea789a))
+
+* * *
+* * *
+## 4.16.3 (2021-11-03)
+
+##### Bug Fixes
+
+* **other:**
+  * revert jest upgrade - failing app build - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([51a13fcd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/51a13fcd2b412fbe8620037fd3586f268f8c6cf2))
+
+* * *
+* * *
 ## 4.16.2 (2021-11-03)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.16.2",
+    "version": "4.16.6",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -28,9 +28,9 @@
         "figures": "3.2.0",
         "xml2js": "0.4.23",
         "https-proxy-agent": "2.2.3",
-        "jest": "27.3.1",
-        "supertest": "6.1.6",
-        "memfs": "3.3.0",
+        "jest": "26.6.3",
+        "supertest": "4.0.2",
+        "memfs": "3.2.4",
         "json-server": "0.16.3",
         "faker": "5.5.3",
         "nodemon": "2.0.12",

package/sandbox.js

@@ -589,22 +589,22 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 
 //   })
 
-// return Promise.resolve()
-//   .then(() => {
-//     console.log(tools.isDirEmpty(process.cwd()));
-//   })
-
 return Promise.resolve()
   .then(() => {
-    tools.logBigTitle('BIG TITLE');
-    tools.logTitle('TITLE');
-    tools.logInfo('test log info');
-    tools.logInfo('test log info');
-    tools.logInfo('test log info');
-    tools.logSuccess('test log success');
-    tools.logError('test log error');
-    tools.logWarning('test log warning');
-    tools.logAccent('test log accent');
-    tools.logBanner('this is the content of the banner');
+    initUtils.processLocalEuiVersions();
   })
 
+// return Promise.resolve()
+//   .then(() => {
+//     tools.logBigTitle('BIG TITLE');
+//     tools.logTitle('TITLE');
+//     tools.logInfo('test log info');
+//     tools.logInfo('test log info');
+//     tools.logInfo('test log info');
+//     tools.logSuccess('test log success');
+//     tools.logError('test log error');
+//     tools.logWarning('test log warning');
+//     tools.logAccent('test log accent');
+//     tools.logBanner('this is the content of the banner');
+//   })
+

package/scripts/csdr/config/angular.js

@@ -975,8 +975,8 @@ module.exports.registerModulePaths = (pkg, isReset) => {
     jsonFileDev['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/*`];
     jsonFileBuild['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}/dist`];
     jsonFileBuild['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/dist/*`];
-    jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}/dist`];
-    jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/dist/*`];
+    jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}`];
+    jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/*`];
   }
 
 

package/scripts/csdr/config/packages.js

@@ -6,7 +6,6 @@ const fs = require('fs');
 
 // LOCAL
 const tools = require('../../utils/tools');
-const configUtils = require('./config-utils');
 
 // INNER MODULES
 const innerGlobal = require('./global');
@@ -32,7 +31,7 @@ module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
   return outputPackages;
 }
 
-module.exports.getPackages = () => {
+const getPackages = module.exports.getPackages = () => {
   const packages = innerGlobal.getConfig().packages;
   const packagesKeys = Object.keys(packages);
 
@@ -237,9 +236,9 @@ module.exports.getDepGraph = () => {
 
 
 module.exports.getLocalPackagesEuiVersion = () => {
-  tools.logInfo('getting local installed eUI version...');
+  tools.logInfo('getting local packages installed eUI version...');
 
-  const pkgs = configUtils.packages.getPackages();
+  const pkgs = getPackages();
   let versionsFound = [];
 
   pkgs.forEach((p) => {

package/scripts/csdr/config/projects.js

@@ -5,7 +5,6 @@ const path = require('path');
 
 // LOCAL
 const tools = require('../../utils/tools');
-const versionUtils = require('../version/version-utils');
 
 // INNER MODULES
 const innerGlobal = require('./global');
@@ -36,12 +35,8 @@ const getProjectOptions = (prj) => {
   return { options: options };
 }
 
-const getProjectPaths = (prj) => {
 
-
-}
-
-module.exports.getProjects = () => {
+const getProjects = module.exports.getProjects = () => {
   const projects = innerGlobal.getConfig().projects;
   return Object.keys(projects).map(p => this.getProject(p));
 }
@@ -214,3 +209,26 @@ module.exports.getBaseHref = (prj, version, providedBaseHref) => {
   return null;
 }
 
+
+module.exports.getLocalProjectsEuiVersion = () => {
+  tools.logInfo('getting local projects installed eUI version...');
+
+  const prjs = getProjects();
+  let versionsFound = [];
+
+  prjs.forEach((p) => {
+    let version = 'DEFAULT';
+
+    if (p.build) {
+      if (p.build.euiVersion) {
+        version = p.build.euiVersion;
+      }
+    }
+    tools.logInfo(`checking ${p.name} - version found : ${version}`);
+    versionsFound.push(version);
+  })
+
+  versionsFound = tools.removeArrayDuplicates(versionsFound);
+
+  return versionsFound;
+}

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

@@ -178,9 +178,15 @@ module.exports.processLocalEuiVersions = () => {
 
   return Promise.resolve()
     .then(() => {
-      const euiVersionsLocal = configUtils.packages.getLocalPackagesEuiVersion();
+      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');
       }
 
@@ -204,6 +210,13 @@ module.exports.processLocalEuiVersions = () => {
 
         tools.logInfo('Updating root package.json');
         tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
+
+        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');
+
+        tools.copy(blResourcesFile, blDestFile);
       }
     })
     .catch((e) => {

package/scripts/csdr/init/resources/13.x/browserslistrc

@@ -0,0 +1,6 @@
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR