@eui/tools 5.3.82 → 5.3.84

package/.version.properties

@@ -1 +1 @@
-5.3.82
+5.3.84

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.84 (2022-10-28)
+
+##### Chores
+
+* **other:**
+  * adapted element serve for v14 - MWP-8915 [MWP-8915](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8915)  ([70b7b254](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/70b7b2544b19b78b44c438ec6bd21f3863c86149))
+
+* * *
+* * *
+## 5.3.83 (2022-10-28)
+
+##### Bug Fixes
+
+* **other:**
+  * routes replacements for v7 MWP - MWP-8915 [MWP-8915](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8915)  ([f705e15c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f705e15cc24e92a3905269cbc2ed8f327189f6ca))
+
+* * *
+* * *
 ## 5.3.82 (2022-10-27)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -954,4 +954,8 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 // })
 
 
+// const pkg = configUtils.packages.getPackage('cc-task-centre-eui14-remote-el-ui', true);
 
+// const version = configUtils.packages.getRemoteEuiVersion(pkg);
+// const versionNumber = version.split('.')[0];
+// console.log(versionNumber);

package/scripts/csdr/config/packages.js

@@ -245,6 +245,60 @@ module.exports.getDepGraph = () => {
 }
 
 
+const getEuiVersionCore = (pkg) => {
+  let version;
+
+  const depsCompositeFile = path.join(pkg.paths.pkgRootDirectory, 'dependencies-composite.json');
+  tools.logInfo(`Try fetching version from ${depsCompositeFile}`);
+
+  if (!tools.isFileExists(depsCompositeFile)) {
+    tools.logInfo('---- no dependencies-composite.json file found');
+  } else {
+    const deps = tools.getJsonFileContent(depsCompositeFile);
+    const euiDepsBase = deps['@eui/deps-base'];
+
+    if (euiDepsBase) {
+      let euiVersion = euiDepsBase.split('.')[0];
+
+      if (euiVersion.substr(0,1) === '^') {
+        euiVersion = euiVersion.substr(1);
+      }
+      version = `${euiVersion}.x`;
+
+      if (version === '7.x') {
+        version = 'DEFAULT';
+      }
+    }
+  }
+
+  return version;
+}
+
+
+module.exports.getRemoteEuiVersion = (pkg) => {
+  if (pkg.parent !== true && pkg.tsPackage !== false) {
+    tools.logInfo(`checking ${pkg.name}`);
+
+    let version;
+
+    if (pkg.build && pkg.build.euiVersion) {
+      version = pkg.build.euiVersion;
+
+    } else {
+      version = getEuiVersionCore(pkg);
+    }
+
+    if (version) {
+      tools.logInfo(`---- version found : ${version}\n`);
+    } else {
+      tools.logInfo('---- version detection skipped');
+    }
+
+    return version;
+  }
+}
+
+
 const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg) => {
   if (pkg.parent !== true && pkg.tsPackage !== false) {
     tools.logInfo(`checking ${pkg.name}`);
@@ -255,28 +309,7 @@ const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg) => {
       version = pkg.build.euiVersion;
 
     } else if (!pkg.remote) {
-      const depsCompositeFile = path.join(pkg.paths.pkgRootDirectory, 'dependencies-composite.json');
-      tools.logInfo(`Try fetching version from ${depsCompositeFile}`);
-
-      if (!tools.isFileExists(depsCompositeFile)) {
-        tools.logInfo('---- no dependencies-composite.json file found');
-      } else {
-        const deps = tools.getJsonFileContent(depsCompositeFile);
-        const euiDepsBase = deps['@eui/deps-base'];
-
-        if (euiDepsBase) {
-          let euiVersion = euiDepsBase.split('.')[0];
-
-          if (euiVersion.substr(0,1) === '^') {
-            euiVersion = euiVersion.substr(1);
-          }
-          version = `${euiVersion}.x`;
-
-          if (version === '7.x') {
-            version = 'DEFAULT';
-          }
-        }
-      }
+      version = getEuiVersionCore(pkg);
     }
 
     if (version) {

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

@@ -255,7 +255,7 @@ const replaceRoutes = (project, envTarget, build, routesFileContent) => {
       finalRouteDefs.forEach((route) => {
         if (debug) tools.logInfo(`====> route : ${route.path}`);
 
-        if (project.build && (project.build.euiVersion === '7.x' || project.build.euiVersion === '10.x')) {
+        if (project.build && (!project.build.euiVersion || project.build.euiVersion === '7.x' || project.build.euiVersion === '10.x')) {
           tools.logInfo('Legacy routes replacement for v7 and v10');
           placeHolderContent += replaceRouteLegacy(route);
         } else {

package/scripts/utils/serve/element.js

@@ -13,6 +13,8 @@ module.exports.serve = () => {
 
   const pkg = configUtils.packages.getPackage();
 
+  const remoteEuiVersion = configUtils.packages.getRemoteEuiVersion(pkg);
+
   const ng = path.resolve(pkg.paths.repoNodeModules, '@angular', 'cli', 'bin', 'ng');
 
 
@@ -38,7 +40,14 @@ module.exports.serve = () => {
 
         const destPath = path.join(process.cwd(), 'apps', project, 'src', 'assets', 'elements', pkg.name, 'bundles');
 
-        args.push(`--outputPath=${destPath}`);
+        const versionNumber = remoteEuiVersion.split('.')[0];
+
+        if (versionNumber <= 10) {
+          args.push(`--outputPath=${destPath}`);
+        } else {
+          args.push(`--output-path=${destPath}`);
+        }
+
         args.push('--watch=true');
         args.push(`--single-bundle=true`);
         args.push(`--output-hashing=none`);