@eui/tools 6.2.4 → 6.2.6

package/.version.properties

@@ -1 +1 @@
-6.2.4
+6.2.6

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 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
+
+* **other:**
+  * check if previous historyMetadata are present for first build on environment - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([e1491afd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/e1491afd94652e56697a6680b9bcbaf54d170c6d))
+
+* * *
+* * *
 ## 6.2.4 (2022-11-10)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.2.4",
+    "version": "6.2.6",
     "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/metadata/app.js

@@ -86,26 +86,8 @@ const storeMetadataAssets = (project, newVersion, packagesDeps, historyMetadata,
   tools.logTitle('Storing app assets metadata');
 
   return Promise.resolve()
-    // getting remotes entries
-    .then(() => {
-      let remotes = [];
-
-      if (project.hasRemotes) {
-        remotes = configUtils.packages.getCsdrRemotePackages().filter((p) => {
-                          return p.hostAppName = project.name
-                        }).map((p) => {
-                          return { name: p.name, npmPkg: p.npmPkg }
-                        });
-        if (remotes) {
-          remotes = tools.sortArray(remotes, 'name');
-        }
-      }
-
-      return remotes;
-    })
-
     // storing metadata file
-    .then((remotes) => {
+    .then(() => {
       tools.logInfo('Storing app metadata into project assets');
 
       const appMetadata = {
@@ -113,7 +95,6 @@ const storeMetadataAssets = (project, newVersion, packagesDeps, historyMetadata,
         appReleaseDate: appReleaseDate,
         appInfos: appInfos,
         metadata: packagesDeps,
-        remotes: remotes,
       };
 
       const metadataFile = path.join(project.folder, 'src', 'assets', 'app-metadata.json');
@@ -130,12 +111,17 @@ const storeMetadataAssets = (project, newVersion, packagesDeps, historyMetadata,
     .then(() => {
       tools.logInfo('Storing app env delta metadata into project assets');
 
-      const metadataFile = path.join(project.folder, 'src', 'assets', 'app-metadata-history.json');
+      if (!historyMetadata) {
+        tools.logInfo('no history metadata found...skipping');
 
-      tools.logInfo(`Creating ${metadataFile}`);
+      } else {
+        const metadataFile = path.join(project.folder, 'src', 'assets', 'app-metadata-history.json');
 
-      if (!dryRun && envTarget && envTarget !== 'DEV') {
-        return tools.writeJsonFileSync(metadataFile, historyMetadata);
+        tools.logInfo(`Creating ${metadataFile}`);
+
+        if (!dryRun && envTarget && envTarget !== 'DEV') {
+          return tools.writeJsonFileSync(metadataFile, historyMetadata);
+        }
       }
     })
 

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