@eui/tools 6.2.5 → 6.2.7

package/.version.properties

@@ -1 +1 @@
-6.2.5
+6.2.7

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.7 (2022-11-10)
+
+##### Chores
+
+* **other:**
+  * adapted remotes serve and build for v15+ - MWP-8946 [MWP-8946](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8946)  ([3d7d0b73](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3d7d0b73540b18802773bb7780505142302c0bdc))
+
+* * *
+* * *
+## 6.2.6 (2022-11-10)
+
+##### Chores
+
+* **other:**
+  * add exclude non compatible routes per environment on dynamic replacement for MWP - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([bdaf38b4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/bdaf38b478b797e454abdc1b73d3cc9ecae071b0))
+
+* * *
+* * *
 ## 6.2.5 (2022-11-10)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -934,12 +934,12 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 // STYLES AUDIT TESTS
 
-Promise.resolve()
-  .then(() => {
-    const { pkg } = tools.getArgs();
-    const p = configUtils.packages.getPackage(pkg, true);
-    return auditUtils.styles.audit(p);
-  })
+// Promise.resolve()
+//   .then(() => {
+//     const { pkg } = tools.getArgs();
+//     const p = configUtils.packages.getPackage(pkg, true);
+//     return auditUtils.styles.audit(p);
+//   })
 
 // const installPackages = async packages => {
 //   const promises = packages.map(async p => {
@@ -1027,3 +1027,32 @@ Promise.resolve()
 //     // })
 
 //   })
+
+// Promise.resolve()
+//   .then(() => {
+//     const dev = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'mywp-routes-config', 'assets', 'route-defs.dev.json'));
+//     const tst = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'mywp-routes-config', 'assets', 'route-defs.test.json'));
+
+//     const devPaths = dev.map((p) => {
+//       return p.path;
+//     })
+//     const tstPaths = tst.map((p) => {
+//       return p.path;
+//     })
+
+//     console.log(devPaths);
+//     console.log(tstPaths);
+
+
+//     console.log(devPaths.filter(n => !tstPaths.includes(n)))
+//     console.log(tstPaths.filter(n => !devPaths.includes(n)))
+//   })
+
+
+Promise.resolve()
+  .then(() => {
+    const prjName = 'my-workplace-host';
+    const project = configUtils.projects.getCsdrProject(prjName);
+
+    return injectionUtils.routesReplacement.buildRoutes(project, 'TST', true);
+  })

package/scripts/csdr/config/remotes.js

@@ -58,6 +58,7 @@ module.exports.getRemote = (remoteName, euiVersion) => {
     dependencies: tools.getJsonFileContent(path.join(remotePath, 'dependencies.json')),
     paths: {
       root: remoteRootPath,
+      dist: path.join(remoteRootPath, 'dist'),
       fromRoot: `remotes/${fullName}`,
       repoNodeModules: path.join(remoteRootPath, 'node_modules'),
     },

package/scripts/index.js

@@ -62,6 +62,9 @@ module.exports.publishNpm = require('./utils/publish/npm');
 module.exports.publishAll = require('./utils/publish/publish-all');
 module.exports.publishUtils = require('./utils/publish/publish-utils');
 
+// utils - remotes
+module.exports.remotesUtils = require('./utils/remotes/remotes-utils');
+
 // utils - serve - test
 module.exports.serveApp = require('./utils/serve/app');
 module.exports.serveElement = require('./utils/serve/element');
@@ -90,9 +93,13 @@ module.exports.configSync = require('./csdr/config/sync');
 
 // csdr -init
 module.exports.init = require('./csdr/init/init');
+module.exports.initGlobal = require('./csdr/init/global');
 module.exports.initUtils = require('./csdr/init/init-utils');
 module.exports.initMeta = require('./csdr/init/meta');
+module.exports.initPackages = require('./csdr/init/packages');
+module.exports.initProjects = require('./csdr/init/projects');
 module.exports.initPrompt = require('./csdr/init/prompt');
+module.exports.initRemotes = require('./csdr/init/remotes');
 module.exports.initRepos = require('./csdr/init/repos');
 
 // csdr - install

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

@@ -8,6 +8,7 @@ const execa = require('execa');
 const tools = require('../../tools');
 const configUtils = require('../../../csdr/config/config-utils');
 const preBuildUtils = require('../../pre-build/pre-build-utils');
+const remotesUtils = require('../../remotes/remotes-utils');
 
 let {
   skipLint, skipTest, configuration, baseHref, watch, dryRun, maxSpaceSize, statsJson,
@@ -181,6 +182,9 @@ module.exports.build = (pkg, isMaster) => {
 module.exports.postBuild = (pkg, version) => {
   tools.logInfo('Executing element post-build...');
 
+  const remoteEuiVersion = configUtils.packages.getRemoteEuiVersion(pkg);
+  const euiVersionNumber = remoteEuiVersion.split('.')[0];
+
   if (dryRun) {
     tools.logInfo('DRY-RUN...skipping');
     return;
@@ -190,27 +194,29 @@ module.exports.postBuild = (pkg, version) => {
     .then(() => {
       tools.logTitle('ELEMENT POST build');
       tools.logInfo('Copying dist to bundles folder');
-      tools.mkdir(path.join(pkg.paths.pkgBuild, 'bundles'));
-      return tools.copydir(path.join(pkg.paths.pkgBuild), path.join(pkg.paths.pkgBuild, 'bundles'));
+      tools.mkdir(path.join(pkg.paths.dist, 'bundles'));
+      return tools.copydir(path.join(pkg.paths.pkgBuild), path.join(pkg.paths.dist, 'bundles'));
     })
+
     .then(() => {
-      tools.logInfo(`Renaming main.js file to current version : ${version}`);
-      return tools.move(path.join(pkg.paths.pkgBuild, 'bundles', 'main.js'), path.join(pkg.paths.pkgBuild, 'bundles', 'main-' + version + '.js'));
+      if (euiVersionNumber >= 15) {
+        return remotesUtils.concatFiles(path.join(pkg.paths.dist, 'bundles'));
+      }
     })
+
     .then(() => {
-      tools.logInfo('Copying package.json to dist');
-      return tools.copy(path.join(pkg.paths.pkgRootDirectory, 'package.json'), path.join(pkg.paths.pkgBuild, 'package.json'));
+      return remotesUtils.copyPackageJson(pkg.paths.root, pkg.paths.dist, remoteEuiVersion);
     })
+
     .then(() => {
-      try {
-        tools.logInfo('Set empty index.html');
-        const emptyIndexHtmlFile = path.join(__dirname, 'skeletons', 'elements', 'index.html');
-        const outputIndexHmtlFile = path.join(pkg.paths.pkgBuild, 'bundles', 'index.html');
-        return tools.copy(emptyIndexHtmlFile, outputIndexHmtlFile);
-      } catch(e) {
-        console.log(e);
-      }
+      tools.logInfo(`Renaming main.js file to current version : ${version}`);
+      return tools.move(path.join(pkg.paths.dist, 'bundles', 'main.js'), path.join(pkg.paths.dist, 'bundles', 'main-' + version + '.js'));
+    })
+
+    .then(() => {
+      return remotesUtils.emptyIndexHtml(path.join(pkg.paths.dist, 'bundles'));
     })
+
     .catch((e) => {
       throw e;
     })

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

@@ -304,16 +304,23 @@ const replaceRoutes = (project, envTarget, build, routesFileContent, euiVersion)
       finalRouteDefs.forEach((route) => {
         if (debug) tools.logInfo(`====> route : ${route.path}`);
 
-        if (euiVersion === 'DEFAULT' || euiVersion === '10.x') {
-          tools.logInfo(`Legacy routes replacement for v7 and v10 => replacing ${route.path}`);
-          placeHolderContent += replaceRouteLegacy(route);
+        if (!route.loadChildren) {
+          tools.logInfo('Loadchildren does not exist for route...skipping');
+          tools.logInfo('Route excluded:');
+          console.log(route);
 
         } else {
-          tools.logInfo(`New route replacement for v14+ => replacing ${route.path}`);
-          placeHolderContent += replaceRoute(route);
-        }
+          if (euiVersion === 'DEFAULT' || euiVersion === '10.x') {
+            tools.logInfo(`Legacy routes replacement for v7 and v10 => replacing ${route.path}`);
+            placeHolderContent += replaceRouteLegacy(route);
+
+          } else {
+            tools.logInfo(`New route replacement for v14+ => replacing ${route.path}`);
+            placeHolderContent += replaceRoute(route);
+          }
 
-        if (debug) tools.logSuccess('======> OK replaced');
+          if (debug) tools.logSuccess('======> OK replaced');
+        }
       })
 
       const placeHolderToken = '// routes-placeholder';

package/scripts/utils/remotes/remotes-utils.js

@@ -0,0 +1,77 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+const concat = require('concat');
+
+// LOCAL
+const tools = require('../tools');
+
+
+module.exports.concatFiles = (workingPath) => {
+  return Promise.resolve()
+    .then(() => {
+      tools.logInfo('Concatening JS files to main.js');
+
+      tools.move(path.join(workingPath, 'main.js'), path.join(workingPath, 'main-old.js'));
+
+      const files = [
+        'runtime.js',
+        'polyfills.js',
+        'scripts.js',
+        'main-old.js'
+      ].map(f => path.join(workingPath, f));
+
+      const outFilePath = path.join(workingPath, 'main.js');
+
+      return concat(files, outFilePath);
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+module.exports.copyPackageJson = (srcPath, destPath, euiVersion) => {
+  return Promise.resolve()
+    .then(() => {
+      tools.logInfo('Copying package.json to dist');
+
+      tools.copy(path.join(srcPath, 'package.json'), path.join(destPath, 'package.json'));
+
+      if (euiVersion) {
+        const packageJsonFile = path.join(destPath, 'package.json');
+        const packageJson = require(packageJsonFile);
+
+        packageJson.euiVersion = euiVersion;
+
+        tools.writeJsonFileSync(packageJsonFile, packageJson);
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+module.exports.emptyIndexHtml = (destPath) => {
+  return Promise.resolve()
+    .then(() => {
+      try {
+        tools.logInfo('Set empty index.html');
+
+        const emptyIndexHtmlFile = path.join(__dirname, 'skeletons', 'elements', 'index.html');
+        const outputIndexHmtlFile = path.join(destPath, 'index.html');
+        return tools.copy(emptyIndexHtmlFile, outputIndexHmtlFile);
+
+      } catch(e) {
+        console.log(e);
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/utils/serve/element.js

@@ -2,9 +2,9 @@
 
 const path = require('path');
 const execa = require('execa');
-const concat = require('concat');
 
 const tools = require('../tools');
+const remotesUtils = require('../remotes/remotes-utils');
 
 const preBuildUtils = require('../pre-build/pre-build-utils');
 const configUtils = require('../../csdr/config/config-utils');
@@ -28,8 +28,8 @@ module.exports.serve = (remote = false) => {
     pkgName = pkg.name;
   }
 
-
   const remoteEuiVersion = configUtils.packages.getRemoteEuiVersion(pkg);
+  const euiVersionNumber = remoteEuiVersion.split('.')[0];
 
   const ng = path.resolve(pkg.paths.repoNodeModules, '@angular', 'cli', 'bin', 'ng');
 
@@ -67,16 +67,14 @@ module.exports.serve = (remote = false) => {
         destPath = path.join(process.cwd(), 'apps', project, 'src', 'assets', 'elements', pkgName, 'bundles');
       }
 
-      const versionNumber = remoteEuiVersion.split('.')[0];
-
-      if (versionNumber <= 10) {
+      if (euiVersionNumber <= 10) {
         args.push(`--outputPath=${destPath}`);
         args.push(`--single-bundle=true`);
+        args.push('--watch=true');
       } else {
         args.push(`--output-path=${destPath}`);
       }
 
-      args.push('--watch=true');
       args.push(`--output-hashing=none`);
 
       if (configuration) {
@@ -98,23 +96,21 @@ module.exports.serve = (remote = false) => {
       }
     })
 
-    // activate in case concat is needed
-    // .then(() => {
-    //   const destPath = path.join(process.cwd(), 'hosts', project, 'src', 'assets', 'elements', pkg.name, 'bundles');
-
-    //   tools.move(path.join(destPath, 'main.js'), path.join(destPath, 'main-old.js'));
-
-    //   const files = [
-    //     'runtime.js',
-    //     'polyfills.js',
-    //     'scripts.js',
-    //     'main-old.js'
-    //   ].map(f => path.join(destPath, f));
+    .then(() => {
+      if (euiVersionNumber >= 15) {
+        return remotesUtils.concatFiles(destPath);
+      }
+    })
 
-    //   const outFilePath = path.join(destPath, 'main.js');
+    .then(() => {
+      return remotesUtils.copyPackageJson(pkg.paths.root, destPath, remoteEuiVersion);
+    })
 
-    //   return concat(files, outFilePath);
-    // })
+    .then(() => {
+      if (euiVersionNumber >= 15) {
+        return remotesUtils.emptyIndexHtml(destPath);
+      }
+    })
 
     .catch((e) => {
       throw e;

package/scripts/utils/test/test-utils.js

@@ -65,7 +65,7 @@ module.exports.runMocha = (pkg) => {
       if (timeout) {
         args.push(`--timeout ${timeout}`);
       } else {
-        args.push('--timeout 5000');
+        args.push('--timeout 20000');
       }
 
       return execa('node', args, { cwd: process.cwd(), stdio: 'inherit' });