@eui/tools 6.3.23 → 6.3.25

package/.version.properties

@@ -1 +1 @@
-6.3.23
+6.3.25

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.25 (2023-02-09)
+
+##### Chores
+
+* **other:**
+  * adapted cli for generation of full virtual remotes v15 - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([f5e9e0a2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f5e9e0a200d53f2299aad561adba2906a9b9f684))
+
+* * *
+* * *
+## 6.3.24 (2023-02-08)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong declaration order for virtual remote generation function - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([16b6590d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/16b6590ddbe4b6f9cfb5db3f2f8a1c08ea46d4ad))
+
+* * *
+* * *
 ## 6.3.23 (2023-02-08)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/cli/constants.js

@@ -40,6 +40,7 @@ module.exports.DEFAULT_CONFIG = {
   isCsdrRepo: true,
   isEnvTargetRemote: false,
   isVirtualRemote: false,
+  isFullVirtualRemote: false,
   externalRepoName: null,
   pkgGroupId: 'eu.europa.ec.cc'
 };

package/scripts/csdr/cli/package-build-frontend.js

@@ -14,12 +14,12 @@ const constants = require('./constants');
 
 
 
-const init = (frontendType, rootPackagePath, targetPath) => {
+const init = (frontendType, rootPackagePath, targetPath, isFullVirtualRemote) => {
   return Promise.resolve()
 
     // CHECKING presence of UI package supporting the remote
     .then(() => {
-      if (frontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE && !tools.isDirExists(rootPackagePath)) {
+      if (frontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE && !isFullVirtualRemote && !tools.isDirExists(rootPackagePath)) {
         tools.logError(`${rootPackagePath} NOT FOUND, you must mount the root package ui before creating the remote`);
         throw new Error('ROOT_PACKAGE_NOT_FOUND');
       }
@@ -84,40 +84,43 @@ const generateVirtualRemote = ({fullName, targetPath, rootPackagePath, pkg, args
   return Promise.resolve()
     // INIT and cleanup
     .then(() => {
-      return init(args.pkgFrontendType, rootPackagePath, targetPath);
+      return init(args.pkgFrontendType, rootPackagePath, targetPath, args.isFullVirtualRemote);
     })
 
     // COPY FIRST THE REMOTE SKELETON TO TARGET
     .then(() => {
       tools.logInfo('Copying skeleton to target');
 
-      // for the moment the virtual remotes are only activated for v15+
-      if (args.pkgFrontendVersion == constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15) {
-        tools.copydir(constants.FRONTEND_SKELETON_REMOTE_EUI15_PATH, targetPath, true);
-      } else if (args.pkgFrontendVersion == constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10) {
-        tools.copydir(constants.FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
-      }
+      if (!args.isFullVirtualRemote) {
+        // for the moment the virtual remotes are only activated for v15+
+        if (args.pkgFrontendVersion == constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15) {
+          tools.copydir(constants.FRONTEND_SKELETON_REMOTE_EUI15_PATH, targetPath, true);
+        } else if (args.pkgFrontendVersion == constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10) {
+          tools.copydir(constants.FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
+        }
 
-      // REPLACING PLACEHOLDERS
-      tools.logInfo('Replace sources content');
-      replaceContent(targetPath, args.pkgName, args.pkgScope, fullName);
+        // REPLACING PLACEHOLDERS
+        tools.logInfo('Replace sources content');
+        replaceContent(targetPath, args.pkgName, args.pkgScope, fullName);
+
+        // REPLACE EXTENSIONS (package.json, .gitignore as the interfere with build of tools if release without name changes)
+        replaceExtensions(targetPath);
+      }
 
       // ADDING CONFIG ENTRY - specific csdr-remotes as of v15+
       tools.logInfo('Adding CSDR config entry');
       configUtils.register.registerCsdrPackage(
         pkg, args.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE,
         args.pkgScope, args.pkgName, args.pkgFrontendVersion,
-        args.isVirtualRemote
+        args.isVirtualRemote,
+        args.isFullVirtualRemote
       );
-
-      // REPLACE EXTENSIONS (package.json, .gitignore as the interfere with build of tools if release without name changes)
-      replaceExtensions(targetPath);
     })
 
     // ENV TARGET / a-la-carte specific (always true as of v15+ remotes) - TRANSFER The sources from current remote sources
     .then(() => {
       // envTarget remote type specific
-      if (args.isEnvTargetRemote) {
+      if (args.isEnvTargetRemote && !args.isFullVirtualRemote) {
         tools.logInfo('Moving sources from remote to root package for envTarget remote type');
         return tools.move(path.join(targetPath, 'src'), path.join(rootPackagePath, 'assets', 'remote-sources'));
       }

package/scripts/csdr/cli/package-prompt.js

@@ -139,6 +139,18 @@ module.exports.prompt = () => {
             );
           }
         },
+        {
+          name: 'isFullVirtualRemote',
+          type: 'confirm',
+          message: 'Is this a virtual remote with full skeleton sources ?',
+          default: constants.DEFAULT_CONFIG.isFullVirtualRemote,
+          when: function (answers) {
+            return (
+              answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
+              answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
+            );
+          }
+        },
         {
           name: 'isCsdrRepo',
           type: 'confirm',

package/scripts/csdr/cli/package.js

@@ -39,6 +39,7 @@ module.exports.generate = () => {
         answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
       ) {
         answers.isVirtualRemote = true;
+        answers.isFullVirtualRemote = true;
       }
 
       if (answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE) {

package/scripts/csdr/config/register.js

@@ -66,7 +66,7 @@ module.exports.registerCsdrProject = (name, isFullSkeleton) => {
 
 // Register newly created package
 
-module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName, euiVersionNumber, isVirtualRemote) => {
+module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName, euiVersionNumber, isVirtualRemote, isFullVirtualRemote) => {
 
   const csdrConfigPackage = {
     "name": "@module.full.name@",
@@ -152,13 +152,47 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
     }
   }
 
+  const csdrConfigRemotePackageV15VirtualFull = {
+    "npmPkg": "@module.npmPkg.name@",
+    "euiVersion": "15.x",
+    "build": {
+      "compiledTranslations": true,
+      "translationScopes": "eui,csdr,cc,mywp",
+      "envTargetActive": true,
+      "sonarScanner": false
+    },
+    "release": {
+       "team": "cc-ui-rm"
+    },
+    "slack": {
+      "channel": "csdr-timeline-mwp-remotes-cc"
+    },
+    "fullSkeletonSources": true,
+    "skeletonConfig": {
+        "rootNpmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
+        "rootCommonModule": "CommonModule",
+        "baseUrl": "@module.rootPkg.name@",
+        "elementName": "@module.scope.name@",
+        "storeName": "@module.scope.name@",
+        "options": {
+            "userReducers": false,
+            "zipkin": false,
+            "dynatrace": false
+        }
+    }
+  }
+
 
   // inserting package in root config
   let packageDef;
 
   if (isRemote) {
     if (euiVersionNumber >= 15) {
-      packageDef = JSON.stringify(csdrConfigRemotePackageV15Virtual);
+      if (isFullVirtualRemote) {
+        packageDef = JSON.stringify(csdrConfigRemotePackageV15VirtualFull);
+      } else {
+        packageDef = JSON.stringify(csdrConfigRemotePackageV15Virtual);
+      }
     } else if (euiVersionNumber >= 10 && isVirtualRemote) {
       packageDef = JSON.stringify(csdrConfigRemotePackageV10Virtual);
     } else {
@@ -173,6 +207,7 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
   replaceModule = tools.replaceAll(replaceModule, '@module.npmPkg.name@', pkg.npmPkgName);
   replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.scope@', rootPkgScope);
   replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.name@', rootPkgName);
+  replaceModule = tools.replaceAll(replaceModule, '@module.scope.name@', `${rootPkgScope.substr(1)}-${rootPkgName}`);
 
   let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
   if (isRemote && isVirtualRemote) {

package/scripts/csdr/init/remotes.js

@@ -39,24 +39,9 @@ const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
 module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
   tools.logTitle('Generating virtual remote');
 
-  // getting the remote config
-  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 found: ')
-  console.log(remote);
-
-  const remotePath = path.join(process.cwd(), 'remotes', remote.name);
-  const remoteSrcPath = path.join(remotePath, 'src');
-  const remoteSkeletonRootPath = path.join(__dirname, 'remotes', remote.euiVersion);
-  const remoteSkeletonPath = path.join(remoteSkeletonRootPath, 'base');
-
+  let remote, remotePath, remoteSrcPath, remoteSkeletonRootPath, remoteSkeletonPath;
 
   return Promise.resolve()
-
     // clone remotes config if first init
     .then(() => {
       if (cloneRemote) {
@@ -64,6 +49,23 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
       }
     })
 
+    // getting remote config
+    .then(() => {
+      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 found: ')
+      console.log(remote);
+
+      remotePath = path.join(process.cwd(), 'remotes', remote.name);
+      remoteSrcPath = path.join(remotePath, 'src');
+      remoteSkeletonRootPath = path.join(__dirname, 'remotes', remote.euiVersion);
+      remoteSkeletonPath = path.join(remoteSkeletonRootPath, 'base');
+    })
+
     .then(() => {
       return tools.rimraf(remoteSrcPath);
     })