@eui/tools 4.21.7 → 4.21.10

package/.version.properties

@@ -1 +1 @@
-4.21.7
+4.21.10

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 4.21.10 (2022-03-26)
+
+##### Chores
+
+* **other:**
+  * forced resolutions to isbinary 4.0.8 due to wrong release of that package - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([f3026223](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f3026223144d8a493800dcd9bb834b62df64509c))
+
+* * *
+* * *
+## 4.21.9 (2022-03-25)
+
+##### Chores
+
+* **other:**
+  * enabled debug on git commit stage - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([39692e79](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/39692e7992573e4f9cf41c7c1675b7fb524b2489))
+
+* * *
+* * *
+## 4.21.8 (2022-03-24)
+
+##### Chores
+
+* **other:**
+  * added eUI 14 for dart sass compilation of styles - EUI-5739 [EUI-5739](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5739)  ([a4f2f772](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a4f2f772bdfc4f7e4ddcc21245172f7c8e5e6f97))
+
+* * *
+* * *
 ## 4.21.7 (2022-03-22)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/resources/13.x/resolutions.json

@@ -1,5 +1,6 @@
 {
     "@types/node": ">=14.14.10",
     "https-proxy-agent": ">=2.2.3",
-    "mem": ">=4.3.0 <=8.1.1"
+    "mem": ">=4.3.0 <=8.1.1",
+    "isbinaryfile": "4.0.8"
 }

package/scripts/utils/build/package/styles.js

@@ -169,7 +169,7 @@ const compileSassFileDartSass = (folder, filename) => {
 const compileSassFile = (pkg, folder, filename, isNodeSassTildeImporterActive) => {
   return Promise.resolve()
     .then(() => {
-      if (pkg.build && pkg.build.euiVersion === '13.x') {
+      if (pkg.build && (pkg.build.euiVersion === '13.x' || pkg.build.euiVersion === '14.x')) {
         return compileSassFileDartSass(folder, filename);
       } else {
         return compileSassFileNodeSass(folder, filename, isNodeSassTildeImporterActive);

package/scripts/utils/git-utils.js

@@ -11,7 +11,7 @@ const { getPackageConfig } = require('./notification/config');
 // const versionUtils = require('./version-utils');
 
 // FETCH ARGS
-const { dryRun, git } = tools.getArgs();
+const { dryRun, git, debug } = tools.getArgs();
 
 
 const getLastTag = (folder) => {
@@ -105,15 +105,19 @@ const commitAndPush = (branch, message, folder) => {
     } catch (e2) {
       tools.logError('ERROR');
       console.log('ERROR!!!');
+      if (debug) {
+        console.log(e2);
+      }
 
       try {
         tools.logInfo('Commit and push - second try - retrying pull push');
-        // setTimeout(() => {
-          execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
-          execa.sync('git', ['push', 'origin', branch], { cwd: folder });
-        // }, 8000);
+        execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
+        execa.sync('git', ['push', 'origin', branch], { cwd: folder });
 
       } catch (e3) {
+        if (debug) {
+          console.log(e3);
+        }
         throw new Error(`Failed to push ${message} to ${folder}`);
       }
     }