@eui/tools 6.14.8 → 6.14.10

package/.version.properties

@@ -1 +1 @@
-6.14.8
+6.14.10

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 6.14.10 (2023-12-06)
+
+##### Chores
+
+* **other:**
+  * transfer cli args to internal function for angular app build - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([eac5c2c1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/eac5c2c169bb945a6b699a62f88c81632a9f7357))
+
+* * *
+* * *
+## 6.14.9 (2023-12-06)
+
+##### Chores
+
+* **other:**
+  * adapted distribution list fetch for app-group release - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([0e75bc2b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0e75bc2be61e0f1b2c997616e5ccb9bcfc7e5c6a))
+  * added debugging for baseHref fetch - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([5fb6a07e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5fb6a07edc9e5410fe8be768b53e44cbd55f6c41))
+
+* * *
+* * *
 ## 6.14.8 (2023-12-06)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const moment = require('moment');
 const execa = require('execa');
 const glob = require('glob');
+const utils = require('./scripts/utils');
 const tools = require('./scripts/utils/tools');
 const semver = require('semver');
 const gitUtils = require('./scripts/utils/git-utils');
@@ -1354,13 +1355,29 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //     console.log(e);
 //   })
 
+// Promise.resolve()
+//   .then(() => {
+//     const prj = configUtils.projects.getCsdrProject('my-workplace-host');
+//     const envTarget = 'INT';
+//     return installUtils.projects.getDeps(prj, envTarget);
+//   })
+
+//   .then((compositeDeps) => {
+//     console.log(compositeDeps);
+//   })
+
+const prj = configUtils.projects.getCsdrProject('eui-showcase-ux-components');
+
 Promise.resolve()
   .then(() => {
-    const prj = configUtils.projects.getCsdrProject('my-workplace-host');
-    const envTarget = 'INT';
-    return installUtils.projects.getDeps(prj, envTarget);
+    return utils.buildApp.generateProjectDistributionList(prj, true);
   })
 
-  .then((compositeDeps) => {
-    console.log(compositeDeps);
+  .then((output) => {
+    console.log(output);
+
+    const { baseHrefIn } = tools.getArgs();
+    const baseHref = configUtils.projects.getBaseHref(prj, '17.0.2-snapshot-1701859601406', baseHrefIn);
+
+    console.log(baseHref);
   })

package/scripts/csdr/config/projects.js

@@ -192,12 +192,18 @@ module.exports.getTeamsProject = (projects, project) => {
 };
 
 module.exports.getBaseHref = (prj, version, providedBaseHref) => {
+  tools.logInfo('Contructing baseHref :');
+  tools.logInfo('provided args : ');
+  console.log(version, providedBaseHref);
+
   if (providedBaseHref) {
+    tools.logInfo(`---> provided baseHref: ${providedBaseHref}`);
     return providedBaseHref;
   }
 
   if (prj.build) {
     if (prj.build.baseHref) {
+      tools.logInfo(`---> prj.build.baseHref: ${prj.build.baseHref}`);
       return prj.build.baseHref;
     } else {
       if (prj.build.distribution) {
@@ -207,16 +213,20 @@ module.exports.getBaseHref = (prj, version, providedBaseHref) => {
           let baseHref = distOptions.folder;
           if (distOptions.includeMajorVersion && version) {
             baseHref = '/' + baseHref + '-' + version.split('.')[0] + '.x' + '/';
+            tools.logInfo(`---> distribution and includeMajorVersion and version found: ${baseHref}`);
           } else {
             if (distOptions.folder === '/') {
               baseHref = '/';
+              tools.logInfo(`---> distribution folder is '/': ${baseHref}`);
             } else {
+              tools.logInfo(`---> distribution folder is not '/': ${baseHref}`);
               baseHref = '/' + baseHref + '/';
             }
           }
 
           return baseHref;
         } else {
+          tools.logInfo(`---> ${baseHref}`);
           return null;
         }
       }

package/scripts/csdr/release/app/release-app-group.js

@@ -208,7 +208,7 @@ const releaseProject = (projectName, isSnapshot, isSupportBranch, branch) => {
       // generate distribution for s3
       .then(() => {
         utils.tools.logTitle('Generate distribution list');
-        return utils.buildApp.generateProjectDistributionList(project, isSnapshot);
+        return utils.buildApp.generateProjectDistributionList(project, isSnapshot || isSupportSnapshotBranch);
       })
       .then((distJson) => {
         utils.tools.logInfo('Distribution list for project :');

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

@@ -10,23 +10,6 @@ const versionUtils = require('../../../csdr/version/version-utils');
 
 const preBuildUtils = require('../../pre-build/pre-build-utils');
 
-let {
-  skipLint,
-  skipTest,
-  skipCompile,
-  configuration,
-  baseHref,
-  watch,
-  dryRun,
-  maxSpaceSize,
-  statsJson,
-  extraWebpackConfig,
-  ci,
-  deployUrl,
-  sourceMap,
-  configEnvTarget,
-} = tools.getArgs();
-
 const getProjectInfos = () => {
   // getting the project from installed config
   const prj = configUtils.projects.getProject();
@@ -50,6 +33,23 @@ module.exports.angular = (
     configEnvTargetIn: null,
   }
 ) => {
+  let {
+    skipLint,
+    skipTest,
+    skipCompile,
+    configuration,
+    baseHref,
+    watch,
+    dryRun,
+    maxSpaceSize,
+    statsJson,
+    extraWebpackConfig,
+    ci,
+    deployUrl,
+    sourceMap,
+    configEnvTarget,
+  } = tools.getArgs();
+
   let currentProject;
 
   if (args.project) {
@@ -68,6 +68,9 @@ module.exports.angular = (
   tools.logInfo('With build params : ');
   console.log(envTarget, isSnapshot, version, configEnvTargetIn);
 
+  tools.logInfo('With CLI args provided :');
+  console.log(tools.getArgs());
+
   const ng = path.resolve(currentProject.paths.nodeModulesPath, '@angular', 'cli', 'bin', 'ng');
 
   // checking if configEnvTarget is passed as param, if not take the global script param
@@ -300,6 +303,8 @@ module.exports.maven = () => {
 };
 
 module.exports.postBuild = (project) => {
+  const { dryRun } = tools.getArgs();
+
   tools.logTitle('Executing project post-build script');
 
   return Promise.resolve()