@eui/tools 5.3.67 → 5.3.69

package/.version.properties

@@ -1 +1 @@
-5.3.67
+5.3.69

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 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
+
+* **other:**
+  * generated eui icon set - sprite generator script - cleanup ECL import script - cleanup - EUI-6562 [EUI-6562](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6562)  ([c610a9e9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c610a9e9b5c6d216bd6adc8b9951f92bcf1383fe))
+  * added svg sprite generator utils - EUI-6427 [EUI-6427](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6427)  ([89127a7d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/89127a7dbcd72fa20a1a04478c79ee733ccac5e6))
+
+* * *
+* * *
 ## 5.3.67 (2022-09-30)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.3.67",
+    "version": "5.3.69",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -42,6 +42,9 @@
         "chai": "4.3.6",
         "nyc": "15.1.0",
         "node-fetch": "2.6.7",
-        "sendmail": "1.6.1"
+        "sendmail": "1.6.1",
+        "imagemin": "7.0.1",
+        "imagemin-svgo": "9.0.0",
+        "svgstore": "3.0.1"
     }
 }

package/sandbox.js

@@ -15,6 +15,7 @@ const injectionUtils = require('./scripts/utils/pre-build/injection/injection-ut
 const installUtils = require('./scripts/csdr/install/install-utils');
 const notificationUtils = require('./scripts/utils/notification/notification-utils');
 const translationUtils = require('./scripts/utils/pre-build/translations/translation-utils');
+const preBuildUtils = require('./scripts/utils/pre-build/pre-build-utils');
 const apiUtils = require('./scripts/utils/api-utils');
 const versionUtils = require('./scripts/csdr/version/version-utils');
 
@@ -881,7 +882,7 @@ const project = configUtils.projects.getProject('pmo-mobile');
 // let versionsMetadata;
 // let envsMetadata;
 
-return Promise.resolve()
+// return Promise.resolve()
   // .then(() => {
   //   return metadataUtils.appVersions.getMetadata(project);
   // })
@@ -897,11 +898,17 @@ return Promise.resolve()
   // .then(() => {
   //   return versionUtils.common.getNewVersionDTAP('DEV', versionsMetadata, envsMetadata);
   // })
+  // .then(() => {
+  //   return versionUtils.appEnvTarget.getNewVersion(project, 'DEV');
+  // })
+  // .then((version) => {
+  //   console.log(version);
+  // })
+
+return Promise.resolve()
   .then(() => {
-    return versionUtils.appEnvTarget.getNewVersion(project, 'DEV');
-  })
-  .then((version) => {
-    console.log(version);
+    const project = configUtils.projects.getProject('eui-sample');
+    return preBuildUtils.projects.processSvgAssets(project);
   })
 
 

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

@@ -9,6 +9,7 @@ const injectionUtils = require('./injection/injection-utils');
 const translationUtils = require('./translations/translation-utils');
 
 const configUtils = require('../../csdr/config/config-utils');
+const svgUtils = require('../svg-utils');
 
 let { openid, dryRun } = tools.getArgs();
 
@@ -153,12 +154,11 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
 module.exports.injectAppConfig = (project, configEnvTarget) => {
   return Promise.resolve()
     .then(() => {
-      tools.logInfo(`Executing configuration replacement for : ${configEnvTarget} environment`);
-
       // set default if not envTarget provided
       let envFilePath = path.join(project.paths.angularPath, 'src/assets/config', `env-json-config.json`);;
 
       if (configEnvTarget) {
+        tools.logInfo(`Executing configuration replacement for : ${configEnvTarget} environment`);
         envFilePath = path.join(project.paths.angularPath, 'src/assets/config', `env-json-config-${configEnvTarget}.json`);
       }
 
@@ -190,3 +190,18 @@ module.exports.injectAppConfig = (project, configEnvTarget) => {
     })
 }
 
+
+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');
+
+      return svgUtils.generateSvgsSprite(svgsInPath, svgsOutPath, svgsSpritePath);
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/utils/svg-utils.js

@@ -0,0 +1,81 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const tools = require('./tools');
+
+module.exports.generateSvgsSprite = (svgsInPath, svgsOutPath, svgsSpritePath) => {
+  const imagemin = require('imagemin');
+  const imageminSvgo = require('imagemin-svgo');
+  const svgstore = require('svgstore');
+
+  let svgFiles;
+
+  return Promise.resolve()
+    .then(() => {
+      return tools.rimraf(svgsOutPath);
+    })
+    .then(() => {
+      return tools.remove(svgsSpritePath);
+    })
+    .then(() => {
+      return tools.getFilesGlob(svgsInPath, '**/*.svg');
+    })
+    .then((files) => {
+      svgFiles = files;
+
+      tools.logInfo('Optimizing svg files');
+      tools.logInfo('Found :');
+      console.log(svgFiles);
+
+      const filesPaths = svgFiles.map(f => path.join(svgsInPath, f));
+
+      return imagemin(filesPaths, {
+        glob: false,
+        destination: svgsOutPath,
+        plugins: [
+          imageminSvgo({
+            plugins: [
+              { name: 'cleanupIDs', remove: false },
+              { name: 'cleanupNumericValues', floatPrecision: 2 },
+              { name: 'removeStyleElement', remove: true },
+              { name: 'removeTitle', remove: true },
+            ],
+            multipass: true
+          })
+        ]
+      })
+    })
+
+    .then((files) => {
+      tools.logSuccess(`${files.length} processed`);
+
+      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')
+        );
+      });
+
+      tools.writeFileContent(svgsSpritePath, sprites);
+
+      tools.logSuccess(`OK => ${svgsSpritePath} generated`);
+    })
+
+    .then(() => {
+      return tools.rimraf(svgsOutPath);
+    })
+
+    .then(() => {
+      tools.logSuccess(`${svgsOutPath} cleaned up`);
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}