@eui/tools 6.15.14 → 6.15.16

package/.version.properties

@@ -1 +1 @@
-6.15.14
+6.15.16

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.15.16 (2024-02-21)
+
+##### Chores
+
+* **other:**
+  * removing TRACE_MODULE_CONFIGURATION provider injection at remote level when zipkin metadata is set MWP-10614 [MWP-10614](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-10614)  ([c48f6709](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c48f6709333e5bde5dd9c41de536d9da91d75155))
+
+* * *
+* * *
+## 6.15.15 (2024-02-19)
+
+##### Chores
+
+* **other:**
+  * adds serve-path angular CLI support - EUI-8867 [EUI-8867](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-8867)  ([d58dba31](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d58dba3118651fdf040fbd52ed0a361fb38a4847))
+
+* * *
+* * *
 ## 6.15.14 (2024-02-06)
 
 ##### Refactors

package/package.json

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

package/scripts/csdr/config/projects.js

@@ -236,6 +236,19 @@ module.exports.getBaseHref = (prj, version, providedBaseHref) => {
   return null;
 };
 
+module.exports.getServePath = (prj, version, providedServePath) => {
+  tools.logInfo('Constructing servePath:');
+  tools.logInfo('provided args: ');
+  console.log(version, providedServePath);
+
+  if (providedServePath) {
+    tools.logInfo(`---> provided servePath: ${providedServePath}`);
+    return providedServePath;
+  }
+
+  return null;
+};
+
 const getEuiVersionCore = (project) => {
   let version;
 

package/scripts/csdr/init/remotes/17.x/full/options/definitions/zipkin.json

@@ -1,5 +1,4 @@
 {
-    "imports": "import { getZipkinConfig, TRACE_MODULE_CONFIGURATION, ZipkinModule } from '@csdr/zipkin-tracing';",
-    "definitions": "ZipkinModule.forRoot()",
-    "providers": "{ provide: TRACE_MODULE_CONFIGURATION, useFactory: getZipkinConfig, deps: [CONFIG_TOKEN] }"
+    "imports": "import { ZipkinModule } from '@csdr/zipkin-tracing';",
+    "definitions": "ZipkinModule.forRoot()"
 }

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

@@ -39,6 +39,7 @@ module.exports.angular = (
     skipCompile,
     configuration,
     baseHref,
+    servePath,
     watch,
     dryRun,
     maxSpaceSize,
@@ -104,9 +105,12 @@ module.exports.angular = (
     if (currentProject.build.sourceMap) {
       sourceMap = true;
     }
-    // getting baseHref from project config, dynamic or staticly defined
+    // getting baseHref from project config, dynamic or statically defined
     baseHref = configUtils.projects.getBaseHref(currentProject, version, baseHref);
     tools.logInfo(`base-href found : ${baseHref}`);
+    // getting servePath from project config, dynamic or statically defined
+    servePath = configUtils.projects.getServePath(currentProject, version, servePath);
+    tools.logInfo(`serve-path found : ${servePath}`);
   }
 
   return Promise.resolve()
@@ -249,6 +253,10 @@ module.exports.angular = (
         args.push(`--base-href=${baseHref}`);
       }
 
+      if (servePath) {
+        args.push(`--serve-path=${servePath}`);
+      }
+
       if (deployUrl) {
         args.push(`--deploy-url=${deployUrl}`);
       }
@@ -338,10 +346,11 @@ const generateProjectDistributionList = module.exports.generateProjectDistributi
 
       tools.logInfo(`Current project version : ${version}`);
       const baseHref = configUtils.projects.getBaseHref(project, version);
+      const servePath = configUtils.projects.getServePath(project, version);
 
       tools.logInfo(`Distribution folder : ${baseHref}`);
 
-      // getting buckeName if provided
+      // getting bucketName if provided
       let bucketName;
       if (project.build && project.build.distribution) {
         // PROD bucket is taken as a default

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

@@ -10,7 +10,7 @@ const configUtils = require('../../../csdr/config/config-utils');
 const preBuildUtils = require('../../pre-build/pre-build-utils');
 const remotesUtils = require('../../remotes/remotes-utils');
 
-let { configuration, baseHref, dryRun, statsJson, sourceMap, build, skipCompile } = tools.getArgs();
+let { configuration, baseHref, servePath, dryRun, statsJson, sourceMap, build, skipCompile } = tools.getArgs();
 
 
 module.exports.build = (pkg, isMaster) => {
@@ -55,6 +55,10 @@ module.exports.build = (pkg, isMaster) => {
         args.push(`--base-href=${baseHref}`);
       }
 
+      if (servePath) {
+        args.push(`--serve-path=${servePath}`);
+      }
+
       if (versionNumber <= 10) {
         const webpackExtraFile = path.join(pkg.paths.root, 'webpack.extra.js');
         if (tools.isFileExists(webpackExtraFile)) {

package/scripts/utils/serve/app.js

@@ -10,7 +10,7 @@ const configUtils = require('../../csdr/config/config-utils');
 
 module.exports.serve = () => {
 
-  let { configuration, baseHref, host, proxyConfig, maxSpaceSize, port, disableHostCheck, open, debug, configEnvTarget } = tools.getArgs();
+  let { configuration, baseHref, servePath, host, proxyConfig, maxSpaceSize, port, disableHostCheck, open, debug, configEnvTarget } = tools.getArgs();
 
   const prj = configUtils.projects.getProject();
 
@@ -61,6 +61,10 @@ module.exports.serve = () => {
         args.push(`--base-href=${baseHref}`);
       }
 
+      if (servePath) {
+        args.push(`--serve-path=${servePath}`);
+      }
+
       if (host) {
         args.push(`--host=${host}`);
       }

package/scripts/utils/serve/element.js

@@ -12,7 +12,7 @@ const configUtils = require('../../csdr/config/config-utils');
 
 module.exports.serve = (remote = false) => {
 
-  let { project, configuration, baseHref, host, proxyConfig, maxSpaceSize, port } = tools.getArgs();
+  let { project, configuration, baseHref, servePath, host, proxyConfig, maxSpaceSize, port } = tools.getArgs();
 
   let pkg;
   if (remote) {