@eui/tools 6.16.33 → 6.16.35

package/.version.properties

@@ -1 +1 @@
-6.16.33
+6.16.35

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.16.35 (2024-07-17)
+
+##### Chores
+
+* **other:**
+  * add generic svg sprite generation through generate-sprite script - EUI-9014 [EUI-9014](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9014)  ([b748514a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b748514a86f6f6c650e4d8c6f71d7e3cd968e6f6))
+
+* * *
+* * *
+## 6.16.34 (2024-07-03)
+
+##### Chores
+
+* **other:**
+  * update PREPROD to PPD envTarget for app and remotes - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([3b9106f8](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3b9106f8267da3c44e360686593dc9eb3ff3c60b))
+
+* * *
+* * *
 ## 6.16.33 (2024-07-02)
 
 ##### Chores

package/bin/eui-scripts.js

@@ -29,6 +29,7 @@ const scriptIndex = args.findIndex(
     x === 'publish' ||
     x === 'publish-all' ||
     x === 'generate-translations' ||
+    x === 'generate-sprite' ||
     x === 'test-package' ||
     x === 'csdr-app' ||
     x === 'csdr-app-stats' ||
@@ -78,6 +79,7 @@ switch (script) {
     case 'publish-all':
     case 'test-package':
     case 'generate-translations':
+    case 'generate-sprite':
     case 'csdr-app':
     case 'csdr-app-stats':
     case 'csdr-app-package-init':

package/bin/scripts/generate-sprite.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const tools = require('../../scripts/utils/tools');
+const svgUtils = require('../../scripts/utils/svg-utils');
+
+Promise.resolve()
+  .then(() => {
+    return svgUtils.generateSprite();
+  })
+  .catch((e) => {
+    tools.logError('ERROR');
+    console.error(e);
+    process.exit(1);
+  });

package/package.json

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

package/scripts/csdr/init/remotes.js

@@ -106,7 +106,7 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
       }
 
       // adding dependencies per env
-      const envs = ['INT', 'ACC', 'DLT', 'TRN', 'PREPROD', 'PROD'];
+      const envs = ['INT', 'ACC', 'DLT', 'TRN', 'PPD', 'PROD'];
 
       envs.forEach((env) => {
         if (remote.dependencies[env]) {

package/scripts/csdr/install/composite-core.js

@@ -217,16 +217,16 @@ module.exports.getCompositeDeps = (
       }
 
       /**
-      * For PREPROD, the base versions of packages is
+      * For PPD, the base versions of packages is
       * Default : dependencies of LATEST ACC known composite
       * overridden by : hotfixDependencies if any
       */
-      if (envTarget === 'PREPROD') {
+      if (envTarget === 'PPD') {
         return getCompositeDepsByEnv(
           compositePath,
           envTarget,
           envsMetadata,
-          'ACC', 'PREPROD'
+          'ACC', 'PPD'
         );
       }
 

package/scripts/csdr/version/common.js

@@ -200,12 +200,12 @@ module.exports.getNewVersionDefault = (envTarget, versionsMetadata, envsMetadata
       }
 
       // =====================================================================
-      // PREPROD targets : format : X.Y.Z-envTarget.n
+      // PPD targets : format : X.Y.Z-envTarget.n
       //   - where X.Y.Z is the last root version of ACC env target
       // =====================================================================
 
-      if (envTarget === 'PREPROD') {
-        version = getNewVersionForEnv(versionsMetadata, envsMetadata, 'ACC', 'PREPROD');
+      if (envTarget === 'PPD') {
+        version = getNewVersionForEnv(versionsMetadata, envsMetadata, 'ACC', 'PPD');
       }
 
       // =====================================================================

package/scripts/utils/build/app/build-app-utils.js

@@ -214,7 +214,7 @@ module.exports.angular = (
         args.push(`--configuration=${configuration}`);
       } else {
         let isOptimizedBuild = false;
-        if (envTarget && (envTarget === 'ACC' || envTarget === 'DLT' || envTarget === 'TRN' || envTarget === 'PREPROD' || envTarget === 'PROD')) {
+        if (envTarget && (envTarget === 'ACC' || envTarget === 'DLT' || envTarget === 'TRN' || envTarget === 'PPD' || envTarget === 'PROD')) {
           isOptimizedBuild = true;
         }
 

package/scripts/utils/svg-utils.js

@@ -3,6 +3,7 @@
 const path = require('path');
 const tools = require('./tools');
 
+
 const writeSprite = (srcPath, files, destPath, outputFile) => {
   const SVGSpriter = require('svg-sprite');
 
@@ -39,8 +40,53 @@ const writeSprite = (srcPath, files, destPath, outputFile) => {
 };
 
 
+module.exports.generateSprite = () => {
+  let srcPath, spriteFile;
+
+  Promise.resolve()
+    .then(() => {
+      const args = tools.getArgs();
+
+      if (!args.inFolder) {
+        throw new Error('inFolder argument not provided');
+      }
+
+      srcPath = path.join(process.cwd(), args.inFolder);
+      spriteFile = args.outFile;
+
+      if (!args.outFile) {
+        throw new Error('outFile not provided as argument');
+      } else {
+        if (args.outFile.indexOf('.svg') < 0) {
+          throw new Error('outFile filename should be in svg file format');
+        }
+      }
+
+      spriteFile = args.outFile;
+
+      tools.logInfo(`Building svg sprite from : ${srcPath}`);
+      tools.logInfo(`Generating sprite file output : ${spriteFile}`);
+
+      return tools.getFilesGlob(srcPath, '**/*.svg');
+    })
+
+    .then((svgFiles) => {
+      if (svgFiles.length === 0) {
+        throw new Error('NO_FILES_FOUND');
+      }
+
+      tools.logInfo(`...found ${svgFiles.length} svg files`);
+
+      return generateSvgsSprite(srcPath, path.join(srcPath, 'sprites'), spriteFile);
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
 
-module.exports.generateSvgsSprite = (svgsInPath, svgsSpritePath, svgsSpriteFile) => {
+const generateSvgsSprite = module.exports.generateSvgsSprite = (svgsInPath, svgsSpritePath, svgsSpriteFile) => {
   const imagemin = require('imagemin');
   const imageminSvgo = require('imagemin-svgo');