@eui/tools 6.12.37 → 6.12.39

package/scripts/csdr/metadata/stats.js

@@ -467,6 +467,7 @@ module.exports.getRemoteAllStats = () => {
     })
     .then(() => {
       let remotesArray = [
+        ...configUtils.remotes.getCsdrRemotesArray('my-workplace', '17.x'),
         ...configUtils.remotes.getCsdrRemotesArray('my-workplace', '16.x'),
         ...configUtils.remotes.getCsdrRemotesArray('my-workplace', '15.x'),
       ];

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

@@ -217,7 +217,7 @@ module.exports.buildSubEntry = (pkg, subEntry) => {
     .then(() => {
       let packageEuiVersion = configUtils.packages.getPackageEuiVersion(pkg);
 
-      if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x') {
+      if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x' || packageEuiVersion === '17.x') {
         const { skipTest } = tools.getArgs();
 
         if (!skipTest) {

package/scripts/utils/build/package/styles.js

@@ -180,7 +180,8 @@ const compileSassFile = (pkg, folder, filename, isNodeSassTildeImporterActive) =
             pkg.build.euiVersion === '13.x' ||
             pkg.build.euiVersion === '14.x' ||
             pkg.build.euiVersion === '15.x' ||
-            pkg.build.euiVersion === '16.x'
+            pkg.build.euiVersion === '16.x' ||
+            pkg.build.euiVersion === '17.x'
           )) {
         return compileSassFileDartSass(folder, filename);
 

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/skeletons.js

@@ -56,7 +56,7 @@ module.exports.injectCsdrFullSkeletonSources = (project, euiVersion) => {
       // copying skeleton sources
       if (euiVersion === '13.x') {
         tools.copydir(path.join(__dirname, 'app-sources-full-skeleton-eui13'), project.folder, false);
-      } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x') {
+      } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x' || euiVersion === '17.x') {
         tools.copydir(path.join(__dirname, 'app-sources-full-skeleton-eui14'), project.folder, false);
       } else {
         tools.copydir(path.join(__dirname, 'app-sources-full-skeleton'), project.folder, false);

package/scripts/utils/pre-build/projects.js

@@ -76,6 +76,8 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
           return injectionUtils.skeletons.injectCsdrFullSkeletonSources(project, '15.x');
         } else if (project.build && project.build.euiVersion === '16.x') {
           return injectionUtils.skeletons.injectCsdrFullSkeletonSources(project, '16.x');
+        } else if (project.build && project.build.euiVersion === '17.x') {
+          return injectionUtils.skeletons.injectCsdrFullSkeletonSources(project, '17.x');
         } else {
           return injectionUtils.skeletons.injectCsdrFullSkeletonSources(project);
         }

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,

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);