@eui/tools 6.12.38 → 6.12.40

package/.version.properties

@@ -1 +1 @@
-6.12.38
+6.12.40

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.40 (2023-08-11)
+
+##### Chores
+
+* **other:**
+  * route-replacement allow static route import - EUO-7860 [EUO-7860](https://webgate.ec.europa.eu/CITnet/jira/browse/EUO-7860)  ([45263ee5](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/45263ee59e90a466f7bbf438ac55071109460940))
+
+* * *
+* * *
+## 6.12.39 (2023-08-10)
+
+##### Chores
+
+* **other:**
+  * added capabilities for stand-alone generic portal for CBAM PoC - EUI-7860 [EUI-7860](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7860)  ([0453e5bd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0453e5bda0ffb6b4b4c42d485b76ba0317d59be0))
+
+* * *
+* * *
 ## 6.12.38 (2023-08-07)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -1306,15 +1306,23 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //   })
 
 
+// Promise.resolve()
+//   .then(() => {
+//     const prjName = 'my-workplace-host-playground-custom';
+//     const project = configUtils.projects.getCsdrProject(prjName);
+//     const envTarget = 'cdn-dev-local';
 
+//     return preBuildUtils.routesReplacement.buildRoutes(project, envTarget);
+//   })
+
+//   .catch((e) => {
+//     console.log(e);
+//   })
 
 Promise.resolve()
   .then(() => {
-    const prjName = 'my-workplace-host-playground-custom';
-    const project = configUtils.projects.getCsdrProject(prjName);
-    const envTarget = 'cdn-dev-local';
-
-    return preBuildUtils.routesReplacement.buildRoutes(project, envTarget);
+    const pkgs = configUtils.packages.getPackages();
+    console.log(pkgs);
   })
 
   .catch((e) => {

package/scripts/csdr/config/angular.js

@@ -278,7 +278,7 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
       }
 
       tools.logInfo('Processing scripts injection...');
-      if (angularConfigFile.build.scripts.length > 0) {
+      if (angularConfigFile.build.scripts && angularConfigFile.build.scripts.length > 0) {
         jsonFile['projects'][project.name].architect.build.options.scripts = angularConfigFile.build.scripts;
       }
 

package/scripts/csdr/init/repos.js

@@ -64,7 +64,6 @@ module.exports.init = (args) => {
 
 
 const cloneAndCheckout = (repo, args) => {
-
   if (repo.folder.indexOf('apps/') > -1 && args.skipAppContainers) {
     return Promise.resolve();
   }

package/scripts/utils/git-utils.js

@@ -268,6 +268,11 @@ const getGitHost = (externalRepo) => {
 
 
 const cloneRepo = (repoUri, folder, forced = false, shallow = false, externalRepo = false) => {
+  if (!repoUri) {
+    tools.logWarning('Repository not set -- bypassing clone...');
+    return;
+  }
+
   return Promise.resolve()
     .then(() => {
       if (tools.isDirExists(folder) && forced) {
@@ -346,6 +351,11 @@ const checkout = (branch, folder, shallow = false) => {
 
 
 const cloneAndCheckout = (repoUri, folder, branch, forced, shallow) => {
+  if (!repoUri) {
+    tools.logWarning('Repository set to false -- clone deactivated');
+    return;
+  }
+
   tools.logInfo(`cloning ${repoUri} in ${folder} on branch ${branch}`);
 
   return Promise.resolve()

package/scripts/utils/pre-build/injection/externals.js

@@ -6,7 +6,7 @@ const tools = require('../../tools');
 const gitUtils = require('../../git-utils');
 const configUtils = require('../../../csdr/config/config-utils');
 
-
+const { skipPull } = tools.getArgs();
 
 const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, injectedFolder, euiVersion) => {
 
@@ -379,6 +379,9 @@ module.exports.injectExternalFeatures = (project) => {
 
 
 module.exports.injectExternalMock = (project) => {
+  if (skipPull) {
+    return;
+  }
 
   tools.logTitle(`Injecting project external mock for : ${project.name}`);
 

package/scripts/utils/pre-build/routes-replacement/routes-replacement.js

@@ -112,10 +112,11 @@ const injectRoutesConfig = (project) => {
   tools.logInfo(`${routesConfigPath} - injecting in ${project.paths.assetsPath}`);
   tools.copydir(routesConfigPath, project.paths.assetsPath);
 
-  const workspacesConfigPath = path.join(pkgAssetsPath, project.externalRoutesSources.workspacesConfigAssetsPath);
-  tools.logInfo(`${workspacesConfigPath} - injecting in ${project.paths.assetsPath}`);
-  tools.copydir(workspacesConfigPath, project.paths.assetsPath);
-
+  if (project.externalRoutesSources.workspacesConfigAssetsPath) {
+    const workspacesConfigPath = path.join(pkgAssetsPath, project.externalRoutesSources.workspacesConfigAssetsPath);
+    tools.logInfo(`${workspacesConfigPath} - injecting in ${project.paths.assetsPath}`);
+    tools.copydir(workspacesConfigPath, project.paths.assetsPath);
+  }
 };
 
 
@@ -501,7 +502,11 @@ const generateLinks = (project, routes, envTargetFinal) => {
   const routeDefsBaseFilename = 'route-defs-base.json';
   const routeDefsBaseJSON = require(path.join(project.paths.assetsPath, routeDefsBaseFilename));
   const workspaceDefsBaseFilename = 'workspace-defs-base.json';
-  const workspaceDefsBaseJSON = require(path.join(project.paths.assetsPath, workspaceDefsBaseFilename));
+
+  let workspaceDefsBaseJSON;
+  if (tools.isFileExists(path.join(project.paths.assetsPath, workspaceDefsBaseFilename))) {
+    workspaceDefsBaseJSON = require(path.join(project.paths.assetsPath, workspaceDefsBaseFilename));
+  }
 
   const getRouteMenuDef = (link) => {
     let routeDef = null;
@@ -565,18 +570,20 @@ const generateLinks = (project, routes, envTargetFinal) => {
 
   // Combining workspaces definitions with base links definitions
 
-  workspaceDefsBaseJSON.forEach((wp) => {
-    if (wp.baseLinkDefs) {
-      wp.baseLinkDefs.forEach((wpLink) => {
-        workspaceLinks.push({
-          ...wpLink,
-          workspace: wp.id
+  if (workspaceDefsBaseJSON) {
+    workspaceDefsBaseJSON.forEach((wp) => {
+      if (wp.baseLinkDefs) {
+        wp.baseLinkDefs.forEach((wpLink) => {
+          workspaceLinks.push({
+            ...wpLink,
+            workspace: wp.id
+          });
         });
-      });
-    }
-  });
+      }
+    });
 
-  tools.logInfo(`Workspaces links generated : ${workspaceLinks.length}`);
+    tools.logInfo(`Workspaces links generated : ${workspaceLinks.length}`);
+  }
 
   const globalLinks = [
     ...routeDefsBaseLinksJSON,
@@ -624,7 +631,7 @@ const generateLinks = (project, routes, envTargetFinal) => {
           if (project.name.indexOf('playground') > 0) {
             const routePathInInputRoutes = routes.filter(r => r.angularRouteDef.path === defRoute.path)[0];
 
-            if (!routePathInInputRoutes) {
+            if (!routePathInInputRoutes && !link.static) {
               defRoute.disabled = true;
             } else {
               tools.logInfo(`[${defRoute.url}] --> route found in input routes - enabled`);

package/scripts/utils/tools.js

@@ -763,7 +763,7 @@ const log = (msg, type) => {
   if (type === 4) {
       prefix = figures.pointer.repeat(6);
       msgContent = `\n${currentDateTime} - ${prefix} ${msg}\n`;
-      console.info(chalk.keyword('orange')(msgContent));
+      console.info(chalk.keyword('yellow')(msgContent));
   }
   if (type === 5) {
       prefix = figures.star.repeat(3);