@eui/tools 4.21.2 → 4.21.3

package/.version.properties

@@ -1 +1 @@
-4.21.2
+4.21.3

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.21.3 (2022-03-17)
+
+##### Chores
+
+* **other:**
+  * force yarn.lock updates for v10 ui packages - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([f2dfc5c0](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f2dfc5c0e0119945e8a14b7492b8e458bc0229ed))
+
+* * *
+* * *
 ## 4.21.2 (2022-03-17)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.21.2",
+    "version": "4.21.3",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -696,10 +696,16 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 
 return Promise.resolve()
   .then(() => {
-    const fileContent = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', 'cc-task-centre-eui10-remote-el-ui-versions-metadata.json'));
-    let out = '';
-    const versions = fileContent.versions.filter(v => v.duration !== undefined).map((v) => {
-      out += `${v.date.substring(0,8)},${v.duration/1000}\n`;
-    })
-    tools.writeFileContent(path.join(process.cwd(), 'extract.txt'), out);
+    const versions = configUtils.packages.getLocalPackagesEuiVersion();
+    console.log(versions);
   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const fileContent = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', 'cc-task-centre-eui10-remote-el-ui-versions-metadata.json'));
+//     let out = '';
+//     const versions = fileContent.versions.filter(v => v.duration !== undefined).map((v) => {
+//       out += `${v.date.substring(0,8)},${v.duration/1000}\n`;
+//     })
+//     tools.writeFileContent(path.join(process.cwd(), 'extract.txt'), out);
+//   })

package/scripts/csdr/config/packages.js

@@ -242,22 +242,43 @@ module.exports.getDepGraph = () => {
 
 
 module.exports.getLocalPackagesEuiVersion = () => {
-  tools.logInfo('getting local packages installed eUI version...');
+  tools.logTitle('getting local packages installed eUI version...');
 
   const pkgs = getPackages();
   let versionsFound = [];
 
   pkgs.forEach((p) => {
     if (p.parent !== true && p.tsPackage !== false) {
+      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 {
+        const depsCompositeFile = path.join(p.paths.pkgRootDirectory, 'dependencies-composite.json');
+        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'];
+
+          if (euiDepsBase) {
+            let euiVersion = euiDepsBase.split('.')[0];
+
+            if (euiVersion.substr(0,1) === '^') {
+              euiVersion = euiVersion.substr(1);
+            }
+            version = `${euiVersion}.x`;
+          }
         }
       }
-      tools.logInfo(`checking ${p.name} - version found : ${version}`);
+
+      tools.logInfo(`---- version found : ${version}\n`);
+
       versionsFound.push(version);
     }
   })

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

@@ -193,7 +193,7 @@ module.exports.processLocalEuiVersions = () => {
       const euiVersion = euiVersionsLocal[0];
 
       if (!euiVersion || euiVersion === 'DEFAULT') {
-        tools.logInfo('Default eUI version found or empty, taking default resolutions..skipping');
+        tools.logInfo('Default eUI version found or empty...skipping');
 
       } else {
         tools.logInfo(`Processing resolutions replacement for eUI version found : ${euiVersion}`);
@@ -202,28 +202,41 @@ module.exports.processLocalEuiVersions = () => {
         const rootPackageJson = require(rootPackageJsonFile);
 
         const resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
-        const resolutionsJson = require(resolutionsJsonFile);
 
-        tools.logInfo('Injecting resolutions content');
-        console.log(resolutionsJson);
-        rootPackageJson.resolutions = resolutionsJson;
+        if (tools.isFileExists(resolutionsJsonFile)) {
+          const resolutionsJson = require(resolutionsJsonFile);
 
-        tools.logInfo('Updating root package.json');
-        tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
+          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');
 
-        tools.copy(blResourcesFile, blDestFile);
+        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}`);
+        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');
+        const yResourcesFile = path.join(__dirname, 'resources', euiVersion, 'yarn.lock');
+        const yDestFile = path.join(process.cwd(), 'yarn.lock');
 
-        // tools.copy(yResourcesFile, yDestFile);
+        if (tools.isFileExists(yResourcesFile)) {
+          tools.copy(yResourcesFile, yDestFile);
+        } else {
+          tools.logWarning('Not found...skipping');
+        }
       }
     })
     .catch((e) => {