@eui/tools 5.3.79 → 5.3.81

package/scripts/csdr/config/packages.js

@@ -245,7 +245,7 @@ module.exports.getDepGraph = () => {
 }
 
 
-const getPackageEuiVersion = module.exports.getPackageEuiVerison = (pkg) => {
+const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg) => {
   if (pkg.parent !== true && pkg.tsPackage !== false) {
     tools.logInfo(`checking ${pkg.name}`);
 

package/scripts/csdr/init/resources/nodejs-10.x/resolutions.json

@@ -7,5 +7,6 @@
     "update-notifier": "4.1.3",
     "glob": ">=7.0.0 <8.0.0",
     "nopt": ">=5.0.0 <6.0.0",
+    "svg-sprite": "1.5.4",
     "winston": "2.4.6"
 }

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

@@ -16,7 +16,7 @@ const innerMaven = require('./maven');
 const innerStyles = require('./styles');
 const innerAngular = require('./angular');
 const innerElement = require('./element');
-const innerPackages = require("../../../csdr/config/packages");
+
 
 // RE-EXPORTS MODULES
 module.exports.element = innerElement;
@@ -25,7 +25,6 @@ module.exports.element = innerElement;
 const { dryRun } = tools.getArgs();
 
 
-
 const buildBackend = (pkg, isMaster) => {
 
   return Promise.resolve()
@@ -227,7 +226,7 @@ module.exports.buildSubEntry = (pkg, subEntry) => {
       if (pkg.build && pkg.build.euiVersion) {
         packageEuiVersion = pkg.build.euiVersion;
       } else {
-        packageEuiVersion = innerPackages.getPackageEuiVerison(pkg);
+        packageEuiVersion = configUtils.packages.getPackageEuiVersion(pkg);
       }
 
       if(packageEuiVersion === '15.x') {

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

@@ -65,7 +65,7 @@ module.exports.injectExternalFeatures = (project) => {
 
 
 
-const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, injectedFolder) => {
+const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, injectedFolder, hasAngularConfig) => {
 
   tools.logInfo(`Injecting : ${injectedNpmPkg} / ${injectedFolder}`);
 
@@ -77,7 +77,8 @@ const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, in
     })[0];
 
     let appSourcesSrcPath;
-    const projectSrcPath = path.join(process.cwd(), project.folder, 'src');
+    const projectRootPath = path.join(process.cwd(), project.folder);
+    const projectSrcPath = path.join(projectRootPath, 'src');
 
     // if local package is found
     if (localPackage) {
@@ -100,10 +101,28 @@ const injectExternalAppSourcesCore = (project, build = false, injectedNpmPkg, in
     } else {
 
       return Promise.resolve()
+        // inject sources from sources to target location in app
         .then(() => {
           tools.logInfo(`${appSourcesSrcPath} injecting in ${projectSrcPath}`);
           return tools.copydir(appSourcesSrcPath, projectSrcPath, true);
         })
+
+        // inject angular-config.json if param known in config
+        .then(() => {
+          if (!hasAngularConfig) {
+            tools.logInfo('Angular config injection flag not detected...skipping');
+
+          } else {
+            tools.logInfo('Angular config injection flag detected...injecting to app root');
+            const angularConfigSrcPath = path.join(projectSrcPath, 'angular-config.json');
+            if (!tools.isFileExists(angularConfigSrcPath)) {
+              tools.logWarning('angular-config.json not found...skipping');
+            } else {
+              tools.move(projectSrcPath, projectRootPath);
+            }
+          }
+        })
+
         .catch((e) => {
           throw e;
         })
@@ -159,7 +178,7 @@ module.exports.injectExternalAppSources = (project, build = false) => {
         return Promise.resolve().then(() => {
           return project.externalSources.reduce((promise, appSource) => {
             return promise.then(() => (
-              injectExternalAppSourcesCore(project, build, appSource.npmPkg, appSource.folder)
+              injectExternalAppSourcesCore(project, build, appSource.npmPkg, appSource.folder, appSource.angularConfig)
             ));
           }, Promise.resolve());
         })
@@ -170,7 +189,11 @@ module.exports.injectExternalAppSources = (project, build = false) => {
           return tools.logWarning('External externalSources use requires a source [npmPkg] and a [folder] declared');
 
         } else {
-          return injectExternalAppSourcesCore(project, build, project.externalSources.npmPkg, project.externalSources.folder);
+          return injectExternalAppSourcesCore(
+            project, build,
+            project.externalSources.npmPkg, project.externalSources.folder,
+            project.externalSources.angularConfig,
+          );
         }
       }
     })

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

@@ -126,6 +126,90 @@ const getRoutesFile = (project) => {
     })
 }
 
+
+const replaceRouteLegacy = (route) => {
+  let routeContent = '{\n';
+
+  routeContent += `  path: '${route.path}',\n`;
+  if (route.data) {
+    routeContent += '  data: {\n';
+
+    if (route.data.id) {
+      routeContent += `    id: '${route.data.id}',\n`;
+    }
+    if (route.data.ids) {
+      routeContent += `    ids: ${route.data.ids},\n`;
+    }
+    if (route.data.featureName) {
+      routeContent += `    featureName: '${route.data.featureName}',\n`;
+    }
+    if (route.data.moduleId) {
+      routeContent += `    moduleId: '${route.data.moduleId}',\n`;
+    }
+    if (route.data.elementTag) {
+      routeContent += `    elementTag: '${route.data.elementTag}',\n`;
+    }
+    if (route.data.iframe) {
+      routeContent += `    iframe: ${route.data.iframe},\n`;
+    }
+    routeContent += '  },\n';
+  }
+  if (route.canActivate) {
+    routeContent += `  canActivate: ${route.canActivate},\n`;
+  }
+  if (route.loadChildren) {
+    routeContent += `  loadChildren: '${route.loadChildren}',\n`
+  }
+  routeContent += '},\n\n';
+
+  return routeContent;
+}
+
+
+
+const replaceRoute = (route) => {
+  let routeContent = '{\n';
+
+  routeContent += `  path: '${route.path}',\n`;
+  if (route.data) {
+    routeContent += '  data: {\n';
+
+    if (route.data.id) {
+      routeContent += `    id: '${route.data.id}',\n`;
+    }
+    if (route.data.ids) {
+      routeContent += `    ids: ${route.data.ids},\n`;
+    }
+    if (route.data.featureName) {
+      routeContent += `    featureName: '${route.data.featureName}',\n`;
+    }
+    if (route.data.moduleId) {
+      routeContent += `    moduleId: '${route.data.moduleId}',\n`;
+    }
+    if (route.data.elementTag) {
+      routeContent += `    elementTag: '${route.data.elementTag}',\n`;
+    }
+    if (route.data.iframe) {
+      routeContent += `    iframe: ${route.data.iframe},\n`;
+    }
+    routeContent += '  },\n';
+  }
+  if (route.canActivate) {
+    routeContent += `  canActivate: ${route.canActivate},\n`;
+  }
+  if (route.loadChildren) {
+    const lcArray = route.loadChildren.split('#');
+    const lcImport = lcArray[0];
+    const lcModule = lcArray[1];
+    routeContent += `  loadChildren: () => import('${lcImport}').then(m => m.${lcModule}),\n`
+  }
+  routeContent += '},\n\n';
+
+  return routeContent;
+}
+
+
+
 const replaceRoutes = (project, envTarget, build, routesFileContent) => {
   tools.logInfo('config.routesRemapping not found...Starting full routes replacement');
 
@@ -164,16 +248,6 @@ const replaceRoutes = (project, envTarget, build, routesFileContent) => {
       const mergedRouteDefs = _.merge(_.keyBy(baseRouteDefsJSON, 'path'), _.keyBy(envRouteDefsJSON, 'path'));
       const finalRouteDefs = _.values(mergedRouteDefs);
 
-      // getting subRoutes if passed as arguments
-      // let subRoutesArray;
-
-      // if (subRoutes) {
-      //   subRoutesArray = subRoutes.split(',');
-
-      //   tools.logInfo('subRoutes arguments foound : ');
-      //   tools.logInfo(subRoutesArray);
-      // }
-
       // processing routes
       let placeHolderContent = '';
 
@@ -181,49 +255,13 @@ const replaceRoutes = (project, envTarget, build, routesFileContent) => {
       finalRouteDefs.forEach((route) => {
         if (debug) tools.logInfo(`====> route : ${route.path}`);
 
-        let routeContent = '{\n';
-
-        routeContent += `  path: '${route.path}',\n`;
-        if (route.data) {
-          routeContent += '  data: {\n';
-
-          if (route.data.id) {
-            routeContent += `    id: '${route.data.id}',\n`;
-          }
-          if (route.data.ids) {
-            routeContent += `    ids: ${route.data.ids},\n`;
-          }
-          if (route.data.featureName) {
-            routeContent += `    featureName: '${route.data.featureName}',\n`;
-          }
-          if (route.data.moduleId) {
-            routeContent += `    moduleId: '${route.data.moduleId}',\n`;
-          }
-          if (route.data.elementTag) {
-            routeContent += `    elementTag: '${route.data.elementTag}',\n`;
-          }
-          if (route.data.iframe) {
-            routeContent += `    iframe: ${route.data.iframe},\n`;
-          }
-          routeContent += '  },\n';
-        }
-        if (route.canActivate) {
-          routeContent += `  canActivate: ${route.canActivate},\n`;
-        }
-        if (route.loadChildren) {
-          routeContent += `  loadChildren: '${route.loadChildren}',\n`
+        if (project.build && (project.build.euiVersion === '7.x' || project.build.euiVersion === '10.x')) {
+          tools.logInfo('Legacy routes replacement for v7 and v10');
+          placeHolderContent += replaceRouteLegacy(route);
+        } else {
+          tools.logInfo('New route replacement for v14+');
+          placeHolderContent += replaceRoute(route);
         }
-        routeContent += '},\n\n';
-
-        placeHolderContent += routeContent;
-
-        // if (subRoutesArray) {
-        //   if (subRoutesArray.includes(route.path)) {
-        //     placeHolderContent += routeContent;
-        //   }
-        // } else {
-        //   placeHolderContent += routeContent;
-        // }
 
         if (debug) tools.logSuccess('======> OK replaced');
       })

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

@@ -22,11 +22,6 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
       tools.logTitle('PRE-BUILD : preparing the project...')
     })
 
-    .then(() => {
-      tools.logInfo('Registering angular project definition...');
-      return configUtils.angular.registerAngularProjectDef(project, build);
-    })
-
     // inject external app sources declaration
     .then(() => {
       if (project.externalSources) {
@@ -34,6 +29,12 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
       }
     })
 
+    .then(() => {
+      tools.logInfo('Registering angular project definition...');
+      return configUtils.angular.registerAngularProjectDef(project, build);
+    })
+
+
     // inject project config if set as external config deps
     .then(() => {
       if (project.config) {