@eui/tools 5.3.68 → 5.3.70

package/.version.properties

@@ -1 +1 @@
-5.3.68
+5.3.70

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.70 (2022-10-05)
+
+##### Chores
+
+* **other:**
+  * adapt svg sprite generator script for eUI 15 - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([e5f8465e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/e5f8465ea9de6e2204983d45b97349e4439e07c7))
+
+* * *
+* * *
+## 5.3.69 (2022-10-03)
+
+##### Bug Fixes
+
+* **other:**
+  * force svgstore to 2.x for node10 install - MWPv7 - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([29d9cc2e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/29d9cc2e4757619a46a2bdc6aa3ef90ee302f0f3))
+
+* * *
+* * *
 ## 5.3.68 (2022-10-02)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/resources/nodejs-10.x/resolutions.json

@@ -6,5 +6,6 @@
     "lru-cache": "5.1.1",
     "update-notifier": "4.1.3",
     "glob": ">=7.0.0 <8.0.0",
-    "nopt": ">=5.0.0 <6.0.0"
+    "nopt": ">=5.0.0 <6.0.0",
+    "svgstore": "2.0.3"
 }

package/scripts/utils/pre-build/projects.js

@@ -195,10 +195,10 @@ module.exports.processSvgAssets = (project) => {
   return Promise.resolve()
     .then(() => {
       const svgsInPath = path.join(project.paths.rootPath, 'src', 'assets', 'svg');
-      const svgsOutPath = path.join(project.paths.rootPath, 'src', 'assets', 'svg', 'optimized');
-      const svgsSpritePath = path.join(svgsInPath, 'sprite.svg');
+      const svgsSpritePath = path.join(svgsInPath, sprites);
+      const svgsSpriteFile = 'sprite.svg';
 
-      return svgUtils.generateSvgsSprite(svgsInPath, svgsOutPath, svgsSpritePath);
+      return svgUtils.generateSvgsSprite(svgsInPath, svgsSpritePath, svgsSpriteFile);
     })
 
     .catch((e) => {

package/scripts/utils/svg-utils.js

@@ -5,11 +5,13 @@ const path = require('path');
 
 const tools = require('./tools');
 
-module.exports.generateSvgsSprite = (svgsInPath, svgsOutPath, svgsSpritePath) => {
+module.exports.generateSvgsSprite = (svgsInPath, svgsSpritePath, svgsSpriteFile) => {
   const imagemin = require('imagemin');
   const imageminSvgo = require('imagemin-svgo');
   const svgstore = require('svgstore');
 
+  const svgsOutPath = path.join(svgsInPath, 'temp');
+
   let svgFiles;
 
   return Promise.resolve()
@@ -17,7 +19,7 @@ module.exports.generateSvgsSprite = (svgsInPath, svgsOutPath, svgsSpritePath) =>
       return tools.rimraf(svgsOutPath);
     })
     .then(() => {
-      return tools.remove(svgsSpritePath);
+      return tools.remove(path.join(svgsSpritePath, svgsSpriteFile));
     })
     .then(() => {
       return tools.getFilesGlob(svgsInPath, '**/*.svg');
@@ -55,6 +57,7 @@ module.exports.generateSvgsSprite = (svgsInPath, svgsOutPath, svgsSpritePath) =>
 
       const sprites = svgstore();
 
+      // compiling sprite file
       svgFiles.forEach((f) => {
         sprites.add(
           f.substr(0, f.indexOf('.svg')),
@@ -62,7 +65,17 @@ module.exports.generateSvgsSprite = (svgsInPath, svgsOutPath, svgsSpritePath) =>
         );
       });
 
-      tools.writeFileContent(svgsSpritePath, sprites);
+      // generating json output list
+      const outList = svgFiles.map((f) => {
+        return f.substr(0, f.indexOf('.svg'));
+      });
+
+      const svgsSpriteFileJson = svgsSpriteFile.substr(0, svgsSpriteFile.indexOf('.svg')) + '.json';
+      console.log(svgsSpriteFileJson);
+
+      tools.writeJsonFileSync(path.join(svgsSpritePath, svgsSpriteFileJson), outList);
+
+      tools.writeFileContent(path.join(svgsSpritePath, svgsSpriteFile), sprites);
 
       tools.logSuccess(`OK => ${svgsSpritePath} generated`);
     })

package/scripts/utils/tools.js

@@ -350,9 +350,13 @@ function move(from, to) {
 
 function mkdirFilePath(filename) {
   const metadataFilePath = path.dirname(filename);
-
-  if (!this.isDirExists(metadataFilePath)) {
-    fs.mkdirSync(metadataFilePath, { recursive: true })
+  try {
+    if (!this.isDirExists(metadataFilePath)) {
+      fs.mkdirSync(metadataFilePath, { recursive: true })
+    }
+  } catch(e) {
+    if (e.code === 'EEXIST') return;
+    throw e;
   }
 }