@eui/tools 5.3.69 → 5.3.71

package/.version.properties

@@ -1 +1 @@
-5.3.69
+5.3.71

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.71 (2022-10-06)
+
+##### Chores
+
+* **other:**
+  * refactored sprite generator based on ECL builder using svg-sprite adapted config - EUI-6557 [EUI-6557](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6557)  ([aec93722](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/aec9372277ff41b2004b9c4a4d796c3201dc9d94))
+
+* * *
+* * *
+## 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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.3.69",
+    "version": "5.3.71",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -45,6 +45,6 @@
         "sendmail": "1.6.1",
         "imagemin": "7.0.1",
         "imagemin-svgo": "9.0.0",
-        "svgstore": "3.0.1"
+        "svg-sprite": "1.5.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

@@ -2,13 +2,50 @@
 
 const fs = require('fs');
 const path = require('path');
-
 const tools = require('./tools');
 
-module.exports.generateSvgsSprite = (svgsInPath, svgsOutPath, svgsSpritePath) => {
+const writeSprite = (srcPath, files, destPath, outputFile) => {
+  const SVGSpriter = require('svg-sprite');
+
+  const spriter = new SVGSpriter({
+    destPath,
+    svg: { dimensionAttributes: true },
+    mode: {
+      symbol: {
+        dest: '',
+        sprite: outputFile,
+      },
+    },
+  });
+
+  files.forEach((file) => {
+    const filePath = path.resolve(srcPath, file);
+    spriter.add(
+      filePath,
+      file,
+      fs.readFileSync(filePath, { encoding: 'utf-8' })
+    );
+  });
+
+  spriter.compile((error, result) => {
+    Object.keys(result).forEach((mode) => {
+      Object.keys(result[mode]).forEach((resource) => {
+        fs.writeFileSync(
+          path.join(destPath, outputFile),
+          result[mode][resource].contents
+        );
+      });
+    });
+  });
+};
+
+
+
+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;
 
@@ -17,7 +54,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');
@@ -53,16 +90,18 @@ module.exports.generateSvgsSprite = (svgsInPath, svgsOutPath, svgsSpritePath) =>
 
       tools.logInfo('Creating svg sprite');
 
-      const sprites = svgstore();
 
-      svgFiles.forEach((f) => {
-        sprites.add(
-          f.substr(0, f.indexOf('.svg')),
-          fs.readFileSync(path.join(svgsOutPath, f), 'utf8')
-        );
+      writeSprite(svgsOutPath, svgFiles, svgsSpritePath, svgsSpriteFile);
+
+      // generating json output list
+      const outList = svgFiles.map((f) => {
+        return f.substr(0, f.indexOf('.svg'));
       });
 
-      tools.writeFileContent(svgsSpritePath, sprites);
+      const svgsSpriteFileJson = svgsSpriteFile.substr(0, svgsSpriteFile.indexOf('.svg')) + '.json';
+      console.log(svgsSpriteFileJson);
+
+      tools.writeJsonFileSync(path.join(svgsSpritePath, svgsSpriteFileJson), outList);
 
       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;
   }
 }