@eui/tools 4.19.16 → 4.19.19

package/.version.properties

@@ -1 +1 @@
-4.19.16
+4.19.19

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 4.19.19 (2022-03-10)
+
+##### Bug Fixes
+
+* **other:**
+  * avoid snapshot fetch in TST and up composition for prevSnapshots releases - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([2694274d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2694274d522c9361b430a557a04557b717080614))
+
+* * *
+* * *
+## 4.19.18 (2022-03-09)
+
+##### Bug Fixes
+
+* **other:**
+  * support/develop snapshot carret resolution - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([340146a1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/340146a1237e36eeaec01d3ef9c2c8990772d718))
+
+* * *
+* * *
+## 4.19.17 (2022-03-09)
+
+##### Chores
+
+* **other:**
+  * generated empty index.html for remote post-build bundle - force remove yarn.lock on package release - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([4f3dd96f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4f3dd96fa76bd6e31038e189686d97c8d00b6abd))
+
+* * *
+* * *
 ## 4.19.16 (2022-03-09)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -631,13 +631,7 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 //     tools.logBanner('this is the content of the banner');
 //   })
 
-// return Promise.resolve()
-//   .then(() => {
-//     const prjName = 'eui-showcase-ux';
-//     const prj = configUtils.projects.getCsdrProject(prjName);
 
-//     return compositeUtils.getDeps(prj, 'TST');
-//   })
 
 
 
@@ -667,8 +661,29 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 
 
 
+// return Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.packages.getPackage('eui', true);
+//     console.log(pkg);
+//   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const pkg =  configUtils.packages.getPackageByNpmPkg('@csdr/core', true);
+//     console.log(pkg);
+//     const versions = metadataUtils.package.getPackageVersions(pkg);
+
+//     console.log(
+//       versions.filter((v) => {
+//         return v.version.split('.')[0] === '1'
+//       }).splice(-1)[0]
+//     );
+//   })
+
 return Promise.resolve()
   .then(() => {
-    const pkg = configUtils.packages.getPackage('eui', true);
-    console.log(pkg);
+    const prjName = 'my-workplace';
+    const prj = configUtils.projects.getCsdrProject(prjName);
+
+    return compositeUtils.getDeps(prj, 'DEV');
   })

package/scripts/csdr/install/build-package.js

@@ -63,7 +63,7 @@ module.exports.install = (prj, pkg, isMaster) => {
     })
 
     .then((depsMetadata) => {
-      return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps);
+      return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps, false);
     })
 
     .then((remappedLocalPkgCompositeDeps) => {

package/scripts/csdr/install/common.js

@@ -72,7 +72,7 @@ const executeInstall = (cwdPath) => {
 }
 
 
-const getRemappedDeps = (pkgDeps, pkgDefaultDeps) => {
+const getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
 
   return Promise.resolve()
     .then(() => {
@@ -114,7 +114,7 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps) => {
     })
 
     .then((remappedDeps) => {
-      return getResolvedCarretDeps(remappedDeps);
+      return getResolvedCarretDeps(remappedDeps, isMaster);
     })
 
 
@@ -127,7 +127,7 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps) => {
 
 
 
-const getResolvedCarretDeps = (deps) => {
+const getResolvedCarretDeps = (deps, isMaster) => {
   tools.logTitle('Resolving carret for next version packages');
 
   tools.logInfo('processing dependencies : ');
@@ -148,7 +148,7 @@ const getResolvedCarretDeps = (deps) => {
             const pkg =  configUtils.packages.getPackageByNpmPkg(npmPkg, true);
 
             // getting last major version from metadata history for pkg found
-            const lastMajorVersion = metadataUtils.package.getLastMajorVersion(pkg, version.substr(1).split('.')[0]);
+            const lastMajorVersion = metadataUtils.package.getLastMajorVersion(pkg, version.substr(1).split('.')[0], isMaster);
 
             if (lastMajorVersion) {
               tools.logInfo(`--version found : ${lastMajorVersion}`);
@@ -275,7 +275,7 @@ const getLocalPackagesCompositeDepsRemapped = () => {
     .then((depsMetadata) => {
       const compositeDeps = getLocalPackagesCompositeDeps();
 
-      return getRemappedDeps(depsMetadata, compositeDeps);
+      return getRemappedDeps(depsMetadata, compositeDeps, false);
     })
 
     .then((remappedDeps) => {

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

@@ -104,7 +104,7 @@ const getDeps_DEV = (prj, prjDeps) => {
 
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((pkgDeps) => {
-      return innerCommon.getRemappedDeps(pkgDeps, prjDeps);
+      return innerCommon.getRemappedDeps(pkgDeps, prjDeps, false);
     })
 
     .catch((e) => {
@@ -131,7 +131,7 @@ const getDeps_TST = (prj, prjDeps) => {
 
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((pkgDeps) => {
-      return innerCommon.getRemappedDeps(pkgDeps, prjDeps);
+      return innerCommon.getRemappedDeps(pkgDeps, prjDeps, true);
     })
 
     .catch((e) => {

package/scripts/csdr/install/local-dev.js

@@ -85,7 +85,7 @@ module.exports.install = (pkg) => {
       tools.logInfo('Packages composite deps found : ');
       console.log(packagesCompositeDeps);
 
-      return innerCommon.getRemappedDeps(depsMetadata, configDeps);
+      return innerCommon.getRemappedDeps(depsMetadata, configDeps, false);
     })
 
 

package/scripts/csdr/install/remote.js

@@ -156,7 +156,7 @@ const getDeps = (pkg, isMaster, envTarget = null) => {
       // if (envTarget) {
       // }
 
-      return innerCommon.getRemappedDeps(depsMetadata, { ...depsBase, ...depsComposite});
+      return innerCommon.getRemappedDeps(depsMetadata, { ...depsBase, ...depsComposite}, isMaster || envTarget !== null);
     })
 
     .catch((e) => {

package/scripts/csdr/metadata/package.js

@@ -459,19 +459,21 @@ module.exports.getPackageVersionsLatest = (pkg) => {
 }
 
 
-module.exports.getPackageVersionsByMajor = (pkg, major) => {
+module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
   const pkgVersions = this.getPackageVersions(pkg);
 
   if (pkgVersions) {
     return pkgVersions.filter((v) => {
       return (v.version.split('.')[0] === major && v.version.indexOf('snapshot') === -1) ||
-             (v.version.split('.')[0] === major && pkg.build && pkg.build.isNextMajorSnapshotAllowed);
+             (v.version.split('.')[0] === major && pkg.build && pkg.build.isNextMajorSnapshotAllowed) ||
+             (v.version.split('.')[0] === major && pkg.build && pkg.build.supportSnapshotBranch) ||
+             (v.version.split('.')[0] === major && v.version.indexOf('snapshot') === -1 && isMaster);
     })
   }
 }
 
-module.exports.getLastMajorVersion = (pkg, major) => {
-  const pkgVersionsMajor = this.getPackageVersionsByMajor(pkg, major);
+module.exports.getLastMajorVersion = (pkg, major, isMaster) => {
+  const pkgVersionsMajor = this.getPackageVersionsByMajor(pkg, major, isMaster);
 
   if (pkgVersionsMajor && pkgVersionsMajor.length !== 0) {
     return pkgVersionsMajor.splice(-1)[0].version;

package/scripts/csdr/release/package/common.js

@@ -1,6 +1,7 @@
 'use strict';
 
 // GLOBAL
+const path = require('path');
 
 // UTILS
 const utils = require('../../../utils');
@@ -81,6 +82,12 @@ module.exports.init = (pkg) => {
     return metadataUtils.common.cloneMetadataRepo();
   })
 
+  // REMOVE YARN.LOCK
+  .then(() => {
+    utils.tools.logInfo('Removing yarn.lock');
+    return utils.tools.remove(path.join(process.cwd(), 'yarn.lock'));
+  })
+
   .catch((e) => {
     throw e;
   })

package/scripts/utils/build/package/element.js

@@ -179,6 +179,16 @@ module.exports.postBuild = (pkg, version) => {
       tools.logInfo('Copying package.json to dist');
       return tools.copy(path.join(pkg.paths.pkgRootDirectory, 'package.json'), path.join(pkg.paths.pkgBuild, 'package.json'));
     })
+    .then(() => {
+      try {
+        tools.logInfo('Set empty index.html');
+        const emptyIndexHtmlFile = path.join(__dirname, 'skeletons', 'elements', 'index.html');
+        const outputIndexHmtlFile = path.join(pkg.paths.pkgBuild, 'bundles', 'index.html');
+        return tools.copy(emptyIndexHtmlFile, outputIndexHmtlFile);
+      } catch(e) {
+        console.log(e);
+      }
+    })
     .catch((e) => {
       throw e;
     })

package/scripts/utils/build/package/skeletons/elements/index.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <base href="/">
+</head>
+<body>
+</body>
+</html>