@eui/tools 6.2.25 → 6.2.27

package/.version.properties

@@ -1 +1 @@
-6.2.25
+6.2.27

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.27 (2022-11-15)
+
+##### Bug Fixes
+
+* **other:**
+  * fetching latest fixed deps issue - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([c8c9792d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c8c9792da91db89a46d820dfe465c397c2d920a5))
+
+* * *
+* * *
+## 6.2.26 (2022-11-14)
+
+##### Bug Fixes
+
+* **other:**
+  * adapted remote post build/serve concat for v10 v15 - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([0cfce97e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0cfce97e398c4fed36d3db51a0d276ffab3dbc16))
+
+* * *
+* * *
 ## 6.2.25 (2022-11-14)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -1057,7 +1057,13 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     return injectionUtils.routesReplacement.buildRoutes(project, 'TST', true);
 //   })
 
-const rootDirectory = fs.realpathSync(process.cwd());
-const rootDirectory2 = process.cwd();
-
-console.log(rootDirectory, rootDirectory2);
+Promise.resolve()
+  .then(() => {
+    const prjName = 'my-workplace-host';
+    const prj = configUtils.projects.getCsdrProject(prjName);
+
+    return installUtils.projects.getLocalProjectFixedDeps(prj);
+  })
+  .then((deps) => {
+    console.log(deps);
+  })

package/scripts/csdr/install/projects.js

@@ -79,16 +79,11 @@ module.exports.getLocalProjectsDeps = () => {
 }
 
 
-const getLocalProjectFixedDeps = (prj) => {
+const getLocalProjectFixedDeps = module.exports.getLocalProjectFixedDeps = (prj) => {
   tools.logTitle('Getting project fixed dependencies - not part of the composite');
 
   return Promise.resolve()
     .then(() => {
-      return metadataUtils.package.getPackagesDeps('packages');
-    })
-
-    // extracting the fixed deps versions from metadata
-    .then((pkgDeps) => {
       let deps = {};
 
       if (prj.fixedDependencies) {
@@ -96,7 +91,8 @@ const getLocalProjectFixedDeps = (prj) => {
         console.log(prj.fixedDependencies);
 
         prj.fixedDependencies.forEach((dep) => {
-          const newDep = { [dep]: pkgDeps[dep] };
+          const pkg = configUtils.packages.getPackageByNpmPkg(dep, true);
+          const newDep = { [dep]: metadataUtils.package.getPackageVersionLast(pkg)};
           deps = { ...deps, ...newDep }
         })
       }

package/scripts/csdr/metadata/package.js

@@ -367,6 +367,18 @@ module.exports.getPackageVersionsLatest = (pkg) => {
   return;
 }
 
+module.exports.getPackageVersionLast = (pkg) => {
+  const pkgVersionsJson = this.getPackageVersionsJson(pkg);
+
+
+
+  if (pkgVersionsJson) {
+    return pkgVersionsJson.versions.splice(-1)[0].version;
+  }
+
+  return;
+}
+
 
 module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
   const pkgVersions = this.getPackageVersions(pkg);

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

@@ -194,9 +194,7 @@ module.exports.postBuild = (pkg, version) => {
     })
 
     .then(() => {
-      // if (euiVersionNumber >= 15) {
-        return remotesUtils.concatFiles(path.join(pkg.paths.dist, 'bundles'));
-      // }
+      return remotesUtils.concatFiles(path.join(pkg.paths.dist, 'bundles'), euiVersionNumber);
     })
 
     .then(() => {

package/scripts/utils/remotes/remotes-utils.js

@@ -8,7 +8,7 @@ const concat = require('concat');
 const tools = require('../tools');
 
 
-module.exports.concatFiles = (workingPath) => {
+module.exports.concatFiles = (workingPath, euiVersionNumber = 10) => {
   return Promise.resolve()
     .then(() => {
       tools.logInfo('Concatening JS files to main.js');
@@ -16,7 +16,7 @@ module.exports.concatFiles = (workingPath) => {
       tools.move(path.join(workingPath, 'main.js'), path.join(workingPath, 'main-old.js'));
 
       const files = [
-        'runtime.js',
+        ...(euiVersionNumber >= 15 ? ['runtime.js'] : []),
         'polyfills.js',
         'scripts.js',
         'main-old.js'

package/scripts/utils/serve/element.js

@@ -92,9 +92,7 @@ module.exports.serve = (remote = false) => {
     })
 
     .then(() => {
-      // if (euiVersionNumber >= 15) {
-        return remotesUtils.concatFiles(destPath);
-      // }
+      return remotesUtils.concatFiles(destPath, euiVersionNumber);
     })
 
     .then(() => {
@@ -102,9 +100,7 @@ module.exports.serve = (remote = false) => {
     })
 
     .then(() => {
-      // if (euiVersionNumber >= 15) {
-        return remotesUtils.emptyIndexHtml(destPath);
-      // }
+      return remotesUtils.emptyIndexHtml(destPath);
     })
 
     .catch((e) => {