@eui/tools 6.16.3 → 6.16.5

package/.version.properties

@@ -1 +1 @@
-6.16.3
+6.16.5

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 6.16.5 (2024-03-25)
+
+##### Chores
+
+* **other:**
+  * force eUI 17 sub-pkg install for remotes - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([54c78a37](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/54c78a37a0e916995cfe9c21628232d16b9904ce))
+
+* * *
+* * *
+## 6.16.4 (2024-03-25)
+
+##### Chores
+
+* **other:**
+  * remove svg-sprite deps - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([36b2fd88](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/36b2fd88452a5356813595c6ca17225af0516179))
+  * force eUI 17.x sub-packages installation - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([3346935f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3346935ff5c29f2500dbb45241a362fbeb33d4f2))
+  * upgrade svg-sprite - EUI-8913 [EUI-8913](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-8913)  ([b3a95f22](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b3a95f224ec0e7868fdfdcad81f7cea849605a0e))
+##### Bug Fixes
+
+* **other:**
+  * rimraf sync - EUI-8913 [EUI-8913](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-8913)  ([d60a3223](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d60a3223a516953cb5b755e2b468ce465797645b))
+
+* * *
+* * *
 ## 6.16.3 (2024-03-24)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.16.3",
+    "version": "6.16.5",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -19,7 +19,7 @@
         "semver": "7.4.0",
         "cross-spawn": "6.0.5",
         "eol": "0.9.1",
-        "rimraf": "^5.0.0",
+        "rimraf": "3.0.2",
         "ncp": "2.0.0",
         "moment": "2.29.4",
         "moment-timezone": "0.5.43",
@@ -42,7 +42,6 @@
         "chai": "4.3.10",
         "nyc": "15.1.0",
         "node-fetch": "2.6.9",
-        "svg-sprite": "2.0.2",
         "imagemin": "7.0.1",
         "imagemin-svgo": "9.0.0",
         "concat": "1.0.3",

package/scripts/csdr/install/common.js

@@ -29,6 +29,21 @@ const getInstallRegistry = () => {
 module.exports.installDeps = (deps) => {
   return (
     Promise.resolve()
+
+      // parse eUI deps and explode the sub-packages (v17 issues)
+      .then(() => {
+        const euiVersion = configUtils.global.getLocalEuiVersion();
+
+        if (euiVersion === '17.x') {
+          Object.keys(deps).forEach((dep) => {
+            if (dep === '@eui/deps-base') {
+              deps['@eui/components'] = deps[dep];
+              deps['@eui/showcase'] = deps[dep];
+            }
+          });
+        }
+      })
+
       // Install dependencies
       .then(() => {
         tools.logTitle('Package dependencies to install : ');

package/scripts/csdr/install/remotes.js

@@ -77,6 +77,21 @@ const pkgInstall = (pkg, envTarget) => {
       // merging base+composite
       deps = { ...baseDeps, ...compositeDeps };
 
+
+      // parse eUI deps and explode the sub-packages (v17 issues)
+      // getting package eUI version
+      const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
+
+      // add sub-eUI packages for v17
+      if (euiVersion === '17.x') {
+        Object.keys(deps).forEach((dep) => {
+          if (dep === '@eui/deps-base') {
+            deps['@eui/components'] = deps[dep];
+            deps['@eui/showcase'] = deps[dep];
+          }
+        });
+      }
+
       // updating package json file before installation
       const pkgJsonFile = path.resolve(pkg.paths.root, 'package.json');
       const pkgJson = require(pkgJsonFile);
@@ -86,9 +101,6 @@ const pkgInstall = (pkg, envTarget) => {
       // store dependencies metadata for later fetch of remote deps installed for a particular version published
       pkgJson.remoteDependencies = deps;
 
-      // getting package eUI version
-      const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
-
       // checking for resolution updates according to eUI version used
       initUtils.global.initRemoteFilesAndResolutions(pkg.paths.root, euiVersion);
 

package/scripts/utils/tools.js

@@ -17,7 +17,6 @@ const execa = require('execa');
 const replace = require('replace-in-file');
 const xml2js = require('xml2js');
 const moment = require('moment');
-const { rimrafSync } = require('rimraf');
 
 const isTestRunning = process.env._TEST;
 
@@ -207,7 +206,12 @@ function rmdir(path) {
 
 function rimraf(inputPath) {
   this.logInfo(`Removing ${inputPath}...`);
-  return rimrafSync(inputPath);
+  let exec = path.resolve(process.cwd(), 'node_modules', 'rimraf', 'bin.js');
+  if (!isFileExists(exec)) {
+      // special location when used within eUI CLI
+      exec = path.resolve(__dirname, '../../../..', 'rimraf', 'bin.js');
+  }
+  return execa.sync('node', [exec, inputPath], { cwd: process.cwd(), stdio: 'inherit' })
 }
 
 function rmdirFull(dirPath, removeSelf) {