@eui/tools 6.20.17 → 6.20.18

package/.version.properties

@@ -1 +1 @@
-6.20.17
+6.20.18

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.20.18 (2024-08-11)
+
+##### Chores
+
+* **other:**
+  * adapted for stanadlone host build - package standalone and within csdr local playground - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([82aae2cb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/82aae2cbeded6602ff7b4812179f4650d91caaa7))
+
+* * *
+* * *
 ## 6.20.17 (2024-08-09)
 
 ##### Chores

package/init.js

@@ -11,7 +11,9 @@ const nmSrcPath = path.join(process.cwd(), 'node_modules');
 
 // for testing purpose standalone mode locally
 // const nmSrcPath = path.join('d:/gitlab/zzz-test-package-ui', 'node_modules');
+// const nmSrcPath = path.join('d:/gitlab/baep-sample-host-shell-ui', 'node_modules');
 // const nmSrcPath = path.join('d:/gitlab/zzz-test-remote-eui18', 'node_modules');
+// const nmSrcPath = path.join('d:/gitlab/baep-playground', 'node_modules');
 
 const euiNmToolsPath = path.join(nmSrcPath, '@eui', 'tools');
 const eUIToolsPath = path.join(process.cwd(), 'packages', 'eui-tools');

package/package.json

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

package/scripts/csdr/config/global.js

@@ -5,18 +5,34 @@ const path = require('path');
 
 // LOCAL
 const tools = require('../../utils/tools');
+const gitUtils = require('../../utils/git-utils');
 
 // INNER MODULES
 const innerPackages = require('./packages');
 const innerProjects = require('./projects');
 
 
+module.exports.cloneConfig = () => {
+  return Promise.resolve()
+    .then(() => {
+      return gitUtils.cloneRepoStandalone(
+        'csdr-config',
+        path.join(process.cwd(), '.config')
+      );
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
 
 module.exports.getCsdrConfig = (full = true) => {
   let globalConfig, appsConfig, packagesConfig, remotesConfig;
 
   if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
-    globalConfig = require(path.join(process.cwd(), '.config', '.euirc-config.json'));
+    globalConfig = require(path.join(process.cwd(), '.euirc-config.json'));
     appsConfig = require(path.join(process.cwd(), '.config', '.euirc-apps.json'));
     packagesConfig = require(path.join(process.cwd(), '.config', '.euirc-packages.json'));
     remotesConfig = require(path.join(process.cwd(), '.config', 'remotes', '.euirc-remotes.json'));
@@ -576,3 +592,8 @@ module.exports.isSonarEnabled = () => {
 
     return false;
 }
+
+
+module.exports.isCsdr = () => {
+  return tools.isDirExists(path.join(process.cwd(), '.csdr'));
+}

package/scripts/csdr/init/init.js

@@ -20,101 +20,88 @@ const {
 
 
 module.exports.init = () => {
-  // Initializing a common response
-  const initialResponse = {
-    project: project || null,
-    team: team || 'all',
-    pkg: pkg || null,
-    remote: remote || null,
-    virtual: virtual || false,
-    euiVersion: euiVersion || null,
-    branch: branch || 'develop',
-    configOnly: configOnly || false,
-    skipClone: skipClone || false,
-    reset: reset || false,
-    pkgOnly: pkgOnly || false,
-    prjOnly: prjOnly || false,
-    remoteOnly: remoteOnly || false,
-    build: build || false,
-    containerOnly: containerOnly || false,
-    skipAppContainers: skipAppContainers || false,
-    custom: custom || false,
-    projectsGroup: projectsGroup || null,
-  }
-
-  // converting inputs args
-  initialResponse.branch = tools.convertStringArg(initialResponse.branch, 'develop');
-  initialResponse.euiVersion = tools.convertStringArg(initialResponse.euiVersion);
 
-  // setting project to null if forced to NONE
-  if (initialResponse.project === 'NONE') {
-    initialResponse.project = null;
+  // check known init types
+  if (!project && !pkg && !remote && !custom && !projectsGroup ) {
+    tools.logError('****************************************');
+    tools.logError('*************** ERROR ******************');
+    tools.logError('****************************************\n');
+    tools.logError('At least "pkg" or "project" or "remote" type should be used for init, for example :\n');
+    tools.logError('npm run init -- --pkg PKG_NAME [--branch BRANCH_NAME|default develop] [--git local] [--pkgOnly] [--skipInstall]');
+    tools.logError('npm run init -- --project PROJECT_NAME [--branch BRANCH_NAME|default develop] [--git local] [--prjOnly] [--skipInstall]');
+    tools.logError('npm run init -- --remote VIRTUAL_REMOTE_NAME [--remoteOnly] [--skipInstall]');
+    tools.logError('npm run init -- --custom [--skipInstall] [--git local]');
+    process.exit(0);
   }
 
-  // checking if provided PKG (from gitlab) is a virtual remote (new remote kind as of v15 (and sedia v10))
-  const isVirtualRemote = configUtils.remotes.isVirtualRemote(initialResponse.pkg);
-  if (isVirtualRemote) {
-    initialResponse.remote = initialResponse.pkg;
-    initialResponse.virtual = true;
-    initialResponse.pkg = null;
-  }
-
-  // Storing the response for propagation
-  let finalResponse;
-
   return Promise.resolve()
+    // check if csdr default root, if not cloning specific config repo (CSDR v2 2024)
     .then(() => {
-
-      // if no project has been provided we prompt for project and team selection
-      if (!project && !pkg && !remote && !custom && !projectsGroup ) {
-        // TODO refactor to handle dynamic mywp-host-playground install (pre-remotes install etc...)
-        // return initUtils.prompt.start();
-        tools.logError('****************************************');
-        tools.logError('*************** ERROR ******************');
-        tools.logError('****************************************\n');
-        tools.logError('At least "pkg" or "project" or "remote" type should be used for init, for example :\n');
-        tools.logError('npm run init -- --pkg PKG_NAME [--branch BRANCH_NAME|default develop] [--git local] [--pkgOnly] [--skipInstall]');
-        tools.logError('npm run init -- --project PROJECT_NAME [--branch BRANCH_NAME|default develop] [--git local] [--prjOnly] [--skipInstall]');
-        tools.logError('npm run init -- --remote VIRTUAL_REMOTE_NAME [--remoteOnly] [--skipInstall]');
-        tools.logError('npm run init -- --custom [--skipInstall] [--git local]');
-        process.exit(0);
-
-        // if provided, we are on automated mode, we use the initialized response
-      } else {
-        return initialResponse;
+      if (!configUtils.global.isCsdr()) {
+        return configUtils.global.cloneConfig();
       }
     })
 
-    // merge with response found from prompts
-    .then((response) => {
-      finalResponse = { ...initialResponse, ...response };
+    .then(() => {
+      // Initializing a common response
+      const initialResponse = {
+        project: project || null,
+        team: team || 'all',
+        pkg: pkg || null,
+        remote: remote || null,
+        virtual: virtual || false,
+        euiVersion: euiVersion || null,
+        branch: branch || 'develop',
+        configOnly: configOnly || false,
+        skipClone: skipClone || false,
+        reset: reset || false,
+        pkgOnly: pkgOnly || false,
+        prjOnly: prjOnly || false,
+        remoteOnly: remoteOnly || false,
+        build: build || false,
+        containerOnly: containerOnly || false,
+        skipAppContainers: skipAppContainers || false,
+        custom: custom || false,
+        projectsGroup: projectsGroup || null,
+      }
+
+      // converting inputs args
+      initialResponse.branch = tools.convertStringArg(initialResponse.branch, 'develop');
+      initialResponse.euiVersion = tools.convertStringArg(initialResponse.euiVersion);
+
+      // setting project to null if forced to NONE
+      if (initialResponse.project === 'NONE') {
+        initialResponse.project = null;
+      }
+
+      // checking if provided PKG (from gitlab) is a virtual remote (new remote kind as of v15 (and sedia v10))
+      const isVirtualRemote = configUtils.remotes.isVirtualRemote(initialResponse.pkg);
+      if (isVirtualRemote) {
+        initialResponse.remote = initialResponse.pkg;
+        initialResponse.virtual = true;
+        initialResponse.pkg = null;
+      }
 
       tools.logInfo('Configuration generated based on provided args:');
-      console.log(finalResponse);
-    })
+      console.log(initialResponse);
 
-    .then(() => {
-      if (finalResponse.project) {
-        return innerInitProject.init(finalResponse);
+      if (initialResponse.project) {
+        return innerInitProject.init(initialResponse);
 
-      } else if (finalResponse.pkg) {
-        return innerInitPackage.init(finalResponse);
+      } else if (initialResponse.pkg) {
+        return innerInitPackage.init(initialResponse);
 
-      } else if (finalResponse.remote) {
-        return innerInitRemote.init(finalResponse);
+      } else if (initialResponse.remote) {
+        return innerInitRemote.init(initialResponse);
 
-      } else if (finalResponse.custom) {
-        return innerInitCustom.init(finalResponse);
+      } else if (initialResponse.custom) {
+        return innerInitCustom.init(initialResponse);
 
-      } else if (finalResponse.projectsGroup) {
-        return innerInitProjectsGroup.init(finalResponse);
+      } else if (initialResponse.projectsGroup) {
+        return innerInitProjectsGroup.init(initialResponse);
       }
     })
 
-    .then(() => {
-      tools.logSuccess('OK => Project successfully initialized');
-    })
-
     .catch((e) => {
       throw e;
     });

package/scripts/csdr/init/meta.js

@@ -36,7 +36,11 @@ module.exports.init = () => {
       const packages = configUtils.packages.getPackages();
       packages.forEach((pkg) => {
         if (pkg) {
-          content.projects['packages/' + pkg.name] = pkg.repository;
+          if (configUtils.global.isCsdr()) {
+            content.projects['packages/' + pkg.name] = pkg.repository;
+          } else {
+            content.projects['packages/' + pkg.name] = pkg.name;
+          }
         }
       });
 

package/scripts/csdr/init/packages.js

@@ -88,7 +88,11 @@ module.exports.cloneHostPackage = (projectName) => {
       if (!pkg) {
         throw new Error('Invalid host package provided / unknown to CSDR config');
       }
-      return gitUtils.cloneAndCheckout(pkg.repository, path.join(process.cwd(), 'packages', pkg.name), 'master');
+      if (configUtils.global.isCsdr()) {
+        return gitUtils.cloneAndCheckout(pkg.repository, path.join(process.cwd(), 'packages', pkg.name), 'master');
+      } else {
+        return gitUtils.cloneRepoStandalone(pkg.name, path.join(process.cwd(), 'packages', pkg.name));
+      }
     })
 
     .then(() => {

package/scripts/csdr/init/remotes.js

@@ -58,20 +58,6 @@ const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
 }
 
 
-const cloneRemotesConfigStandalone = module.exports.cloneRemotesConfigStandalone = () => {
-  return Promise.resolve()
-    .then(() => {
-      return gitUtils.cloneRepoStandalone(
-        'csdr-config',
-        path.join(process.cwd(), '.config')
-      );
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
 
 
 module.exports.generateVirtualRemote = (remoteName, cloneRemotesConfigFlag = true, standalone = false) => {
@@ -89,7 +75,7 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemotesConfigFlag = tru
     .then(() => {
       if (cloneRemotesConfigFlag) {
         if (standalone) {
-          return cloneRemotesConfigStandalone();
+          return configUtils.global.cloneConfig();
         } else {
           if (tools.isDirExists(path.join(process.cwd(), '.csdr'))) {
             return cloneRemotesConfig();