@eui/tools 6.2.15 → 6.2.17

package/.version.properties

@@ -1 +1 @@
-6.2.15
+6.2.17

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.17 (2022-11-12)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong package name on serve and build for virtual remote - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([5504acc3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5504acc3d6bb9ba4d412ef8c5b8ce1c363e64491))
+
+* * *
+* * *
+## 6.2.16 (2022-11-12)
+
+##### Chores
+
+* **other:**
+  * adapted naming conventions compliant to actual remote name format for virtual remotes - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([ed9b7ffa](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ed9b7ffad457790d49534ea2f5c8832cd4d59a95))
+
+* * *
+* * *
 ## 6.2.15 (2022-11-12)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/config/remotes.js

@@ -6,53 +6,34 @@ const path = require('path');
 // LOCAL
 const tools = require('../../utils/tools');
 
-module.exports.getRemote = (remoteName, euiVersion) => {
+
+module.exports.getRemote = (remoteName) => {
 
   // if not provided as param, we fetch them from the command line (local operations)
   if (!remoteName) {
     remoteName = tools.getArgs().root;
   }
 
-  if (!euiVersion) {
-    euiVersion = tools.getArgs().euiVersion;
-  }
-
-
-  if (!euiVersion) {
-    throw new Error('euiVersion should be provided as parameter');
-  }
-
-  tools.logTitle(`Getting remote config for ${remoteName} version ${euiVersion}`);
+  tools.logTitle(`Getting remote config for ${remoteName}`);
 
   const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
   const remoteConfig = remotesConfig[remoteName];
 
-  if (!remoteConfig.supportedVersions && !remoteConfig.supportedVersions.includes(euiVersion)) {
-    throw new Error(`Version ${euiVersion} cannot be found in the global config of ${remoteName}`);
-
-  } else {
-    tools.logInfo('Global config found');
-    console.log(remoteConfig);
-  }
+  tools.logInfo('Global config found');
+  console.log(remoteConfig);
 
-  const remotePath = path.join(process.cwd(), 'packages', 'csdr-remotes-config', 'assets', remoteName, euiVersion);
+  const remotePath = path.join(process.cwd(), 'packages', 'csdr-remotes-config', 'assets', remoteName);
 
   tools.logInfo(`Getting remote information from ${remotePath}`);
 
   if (!tools.isDirExists(remotePath)) {
-    throw new Error(`Remote ${remoteName} cannot be found in the remotes config global `);
+    throw new Error(`Remote ${remoteName} cannot be found in the remotes global config - check packages/csdr-remotes-config for available remotes`);
   }
 
-
-  const euiVersionNumber = euiVersion.split('.')[0];
-
-  const fullName = `${remoteName}-eui${euiVersionNumber}`;
-  const remoteRootPath = path.join(process.cwd(), 'remotes', fullName);
+  const remoteRootPath = path.join(process.cwd(), 'remotes', remoteName);
 
   const remote = {
     name: remoteName,
-    version: euiVersion,
-    fullName: fullName,
     element: true,
     remote: true,
     virtual: true,
@@ -62,13 +43,13 @@ module.exports.getRemote = (remoteName, euiVersion) => {
       root: remoteRootPath,
       dist: path.join(remoteRootPath, 'dist'),
       publish: path.join(remoteRootPath, 'dist'), // maintain compat with core publish utils
-      fromRoot: `remotes/${fullName}`,
+      fromRoot: `remotes/${remoteName}`,
       repoNodeModules: path.join(remoteRootPath, 'node_modules'),
     },
-    devopsMetadataFile: `${fullName}-build-metadata.json`,
-    devopsVersionsMetadataFile: `${fullName}-versions-metadata.json`,
-    devopsHistoryMetadataFile: `${fullName}-history-metadata.json`,
-    devopsEnvsMetadataFile: `${fullName}-envs-metadata.json`,
+    devopsMetadataFile: `${remoteName}-build-metadata.json`,
+    devopsVersionsMetadataFile: `${remoteName}-versions-metadata.json`,
+    devopsHistoryMetadataFile: `${remoteName}-history-metadata.json`,
+    devopsEnvsMetadataFile: `${remoteName}-envs-metadata.json`,
     ...remoteConfig,
   }
 

package/scripts/csdr/init/init.js

@@ -119,11 +119,7 @@ module.exports.init = () => {
     // Generating virtual remote - experimental
     .then(() => {
       if (finalResponse.remote) {
-        if (finalResponse.euiVersion) {
-          return initUtils.remotes.generateVirtualRemote(finalResponse.remote, finalResponse.euiVersion);
-        } else {
-          throw new Error('When a remote is initialized, an "euiVersion" parameter must be specified');
-        }
+        return initUtils.remotes.generateVirtualRemote(finalResponse.remote);
       }
     })
 

package/scripts/csdr/init/remotes.js

@@ -36,7 +36,7 @@ const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
 
 
 
-module.exports.generateVirtualRemote = (remoteName, euiVersion) => {
+module.exports.generateVirtualRemote = (remoteName) => {
   tools.logTitle('Generating virtual remote');
 
   return Promise.resolve()
@@ -48,18 +48,18 @@ module.exports.generateVirtualRemote = (remoteName, euiVersion) => {
 
     .then(() => {
       // getting the remote config
-      const remote = configUtils.remotes.getRemote(remoteName, euiVersion);
+      const remote = configUtils.remotes.getRemote(remoteName);
 
       if (!remote) {
         throw new Error(`Remote ${remoteName} can't be found in the remotes CSDR configuration OR the remotes configs of the project`);
       }
 
-      tools.logInfo('Remote config gathered:')
+      tools.logInfo('Remote config found: ')
       console.log(remote);
 
       // constructing the remote folder
-      const remotePath = path.join(process.cwd(), 'remotes', remote.fullName);
-      const remoteSkeletonPath = path.join(__dirname, 'remotes', euiVersion);
+      const remotePath = path.join(process.cwd(), 'remotes', remote.name);
+      const remoteSkeletonPath = path.join(__dirname, 'remotes', remote.euiVersion);
 
       tools.logInfo(`Copying angular.json => ${remoteSkeletonPath} ==> ${remotePath}`);
 
@@ -90,14 +90,14 @@ module.exports.generateVirtualRemote = (remoteName, euiVersion) => {
       let angularJson = tools.getJsonFileContent(angularJsonPath);
 
       let angularContent = JSON.stringify(angularJson);
-      angularContent = angularContent.replace('@remote.name@',  remote.fullName);
+      angularContent = angularContent.replace('@remote.name@',  remote.name);
 
       angularJson = JSON.parse(angularContent);
-      angularJson.projects[remote.fullName].architect.build.options.styles = remote.angularConfig.styles;
+      angularJson.projects[remote.name].architect.build.options.styles = remote.angularConfig.styles;
 
       if (remote.angularConfig.scripts) {
-        angularJson.projects[remote.fullName].architect.build.options.scripts = [
-          ...angularJson.projects[remote.fullName].architect.build.options.scripts,
+        angularJson.projects[remote.name].architect.build.options.scripts = [
+          ...angularJson.projects[remote.name].architect.build.options.scripts,
           ...remote.angularConfig.scripts
         ];
       }

package/scripts/csdr/install/local-dev.js

@@ -13,9 +13,7 @@ const innerPackages = require('./packages');
 
 module.exports.installPackage = (pkgName) => {
 
-  const { euiVersion } = tools.getArgs();
-
-  const pkg = configUtils.remotes.getRemote(pkgName, euiVersion);
+  const pkg = configUtils.remotes.getRemote(pkgName);
 
   if (!pkg) {
     pkg = configUtils.packages.getPackage(pkgName, false, true);

package/scripts/csdr/release/package/release-package.js

@@ -12,7 +12,7 @@ module.exports.run = () => {
 
   // TESTING a release pipeline in DRY-RUN mode :
   // virtual remotes
-  // npm run pkg:release mywp-dashboard -- --euiVersion 15.x --dryRun --branch master --remoteBuild true --virtual true --envTarget DEV --skipInstall
+  // npm run pkg:release mywp-dashboard-eui15-remote-el-ui -- --dryRun --branch master --remoteBuild true --virtual true --envTarget DEV --skipInstall
 
   // normal UI package / old style remote
   // npm run pkg:release csdr-core-ui -- --dryRun --branch develop --skipInstall

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

@@ -22,12 +22,7 @@ module.exports.build = (pkg, isMaster) => {
 
   const remoteEuiVersion = configUtils.packages.getRemoteEuiVersion(pkg);
 
-  let pkgName;
-  if (pkg.remote && pkg.virtual) {
-    pkgName = pkg.fullName;
-  } else {
-    pkgName = pkg.name;
-  }
+  const pkgName = pkg.name;
 
   return Promise.resolve()
 

package/scripts/utils/serve/element.js

@@ -21,12 +21,7 @@ module.exports.serve = (remote = false) => {
     pkg = configUtils.packages.getPackage();
   }
 
-  let pkgName;
-  if (pkg.remote && pkg.virtual) {
-    pkgName = pkg.fullName;
-  } else {
-    pkgName = pkg.name;
-  }
+  const pkgName = pkg.name;
 
   const remoteEuiVersion = configUtils.packages.getRemoteEuiVersion(pkg);
   const euiVersionNumber = remoteEuiVersion.split('.')[0];