@eui/tools 6.2.34 → 6.2.36

package/.version.properties

@@ -1 +1 @@
-6.2.34
+6.2.36

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 6.2.36 (2022-11-18)
+
+##### Bug Fixes
+
+* **other:**
+  * cli - generation of normal package - translation for virtual remote compilation - MWP-9039 [MWP-9039](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9039)  ([304e85ee](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/304e85ee271da0c1ef1c5f9b63a600c44097da29))
+
+* * *
+* * *
+## 6.2.35 (2022-11-17)
+
+##### Bug Fixes
+
+* **other:**
+  * remote init wrong function call - MWP-9039 [MWP-9039](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9039)  ([ce68b425](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ce68b425f9880f74e180a65c541ed18522d6c7a6))
+  * element v15+ default configuration production build - added routes overrides per env for v7 opsys t3 test alt env - MWP-9040 [MWP-9040](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9040)  ([13770348](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1377034823b8dbad818bdf32edb50c3c20f73a45))
+
+* * *
+* * *
 ## 6.2.34 (2022-11-16)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/cli/constants.js

@@ -36,7 +36,7 @@ module.exports.DEFAULT_CONFIG = {
   pkgScope: '@zzz',
   isRouteModule: true,
   isCsdrRepo: true,
-  isEnvTargetRemote: true,
+  isEnvTargetRemote: false,
   isVirtualRemote: false,
   externalRepoName: null,
   pkgGroupId: 'eu.europa.ec.cc'

package/scripts/csdr/cli/package.js

@@ -33,7 +33,7 @@ module.exports.generate = () => {
       // merging with defaults
       answers = { ...constants.DEFAULT_CONFIG, ...answers};
 
-      // forcing config default if v15 virtual remote only generation
+      // forcing config default for remotes
       if (
         answers.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15 &&
         answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
@@ -41,6 +41,10 @@ module.exports.generate = () => {
         answers.isVirtualRemote = true;
       }
 
+      if (answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE) {
+        answers.isEnvTargetRemote = true;
+      }
+
       tools.logInfo('Provided options :');
       console.log(answers);
 

package/scripts/csdr/config/register.js

@@ -116,7 +116,11 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
     "euiVersion": "15.x",
     "build": {
       "compiledTranslations": true,
-      "translationScopes": "eui,csdr,cc,mywp"
+      "translationScopes": "eui,csdr,cc,mywp",
+      "envTargetActive": true,
+      "skipLint": true,
+      "skipTest": true,
+      "sonarScanner": false
     },
     "release": {
        "team": "cc-ui-rm"

package/scripts/csdr/init/remotes.js

@@ -36,14 +36,14 @@ const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
 
 
 
-module.exports.generateVirtualRemote = (remoteName, cloneRemotesConfig = true) => {
+module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
   tools.logTitle('Generating virtual remote');
 
   return Promise.resolve()
 
     // clone remotes config if first init
     .then(() => {
-      if (cloneRemotesConfig) {
+      if (cloneRemote) {
         return cloneRemotesConfig();
       }
     })

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

@@ -115,6 +115,11 @@ module.exports.build = (pkg, isMaster) => {
     // specific for element
     const versionNumber = remoteEuiVersion.split('.')[0];
 
+    // checking configuration
+    if (!configuration) {
+      configuration = 'production';
+    }
+
     let args;
 
     if (versionNumber <= 10) {
@@ -127,9 +132,7 @@ module.exports.build = (pkg, isMaster) => {
       args.push(`--stats-json`);
     }
 
-    if (configuration) {
-      args.push(`--configuration=${configuration || 'production'}`);
-    }
+    args.push(`--configuration=${configuration}`);
 
     if (baseHref) {
       args.push(`--base-href=${baseHref}`);
@@ -156,7 +159,7 @@ module.exports.build = (pkg, isMaster) => {
       args.push('--source-map');
     }
 
-    tools.logInfo(`ng build for configuration : ${configuration || 'production'}`);
+    tools.logInfo(`ng build for configuration : ${configuration}`);
 
     tools.logInfo(`running Angular BUILD with args: ${args} on`);
     console.log(pkg.paths.root);

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

@@ -293,8 +293,28 @@ const replaceRoutes = (project, envTarget, build, routesFileContent, euiVersion)
       // merging content of base + env
       tools.logInfo(`Merging ${baseRouteDefsPath} with ${envRouteDefsPath}`);
 
-      const mergedRouteDefs = _.merge(_.keyBy(baseRouteDefsJSON, 'path'), _.keyBy(envRouteDefsJSON, 'path'));
-      const finalRouteDefs = _.values(mergedRouteDefs);
+      let mergedRouteDefs = _.merge(_.keyBy(baseRouteDefsJSON, 'path'), _.keyBy(envRouteDefsJSON, 'path'));
+      let finalRouteDefs = _.values(mergedRouteDefs);
+
+      // checking if overrides needs to be applied specific to env + version
+      let euiVersionNumber;
+      if (euiVersion === 'DEFAULT') {
+        euiVersionNumber = '7'
+      } else {
+        euiVersionNumber = euiVersion.split('.')[0];
+      };
+
+      const envRouteVersionOverridesPath = path.join(projectAssetsPath, 'route-defs.' + envTargetFinal + '-overrides-v' + euiVersionNumber + '.json');
+
+      if (!tools.isFileExists(envRouteVersionOverridesPath)) {
+        tools.logInfo('Routes file overrides not found for ' + envTargetFinal + ' ' + euiVersionNumber + '...skipping');
+
+      } else {
+        const euiRoutesOVerridesJSON = require(envRouteVersionOverridesPath);
+        tools.logInfo(`Merging ${envRouteVersionOverridesPath}`);
+        mergedRouteDefs = _.merge(_.keyBy(mergedRouteDefs, 'path'), _.keyBy(euiRoutesOVerridesJSON, 'path'));
+        finalRouteDefs = _.values(mergedRouteDefs);
+      }
 
       // processing routes
       let placeHolderContent = '';

package/scripts/utils/pre-build/translations/elements.js

@@ -22,7 +22,7 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
     pkg = configUtils.packages.getPackage();
   }
 
-  const rootFolder = pkg.paths.pkgRootDirectory;
+  const rootFolder = pkg.paths.root;
   const rootSrcFolder = path.join(rootFolder,'src');
   const destFolder = path.join(rootSrcFolder, 'assets/i18n-compiled');
   const globalTranslationsFolder = path.join(rootSrcFolder, 'assets/i18n-global');