@eui/tools 6.2.33 → 6.2.34

package/scripts/csdr/cli/package.js

@@ -1,471 +1,54 @@
 'use strict';
 
 // GLOBAL
-const inquirer = require('inquirer');
 const path = require('path');
-const replace = require('replace-in-file');
 
 // LOCAL
 const tools = require('../../../scripts/utils/tools');
-const configUtils = require('../config/config-utils');
 
 // CONSTANTS
-const TARGET_ROOT_PATH = path.join(process.cwd(), 'packages');
-const SKELETONS_ROOT_PATH = path.join(__dirname, 'skeletons', 'package');
-const FRONTEND_SKELETON_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend');
-const FRONTEND_SKELETON_EUI10_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-eui10');
-const FRONTEND_SKELETON_EUI14_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-eui14');
-const FRONTEND_SKELETON_EUI15_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-eui15');
-const FRONTEND_SKELETON_REMOTE_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote');
-const FRONTEND_SKELETON_REMOTE_EUI10_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote-eui10');
-const FRONTEND_SKELETON_REMOTE_EUI14_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote-eui14');
-const FRONTEND_SKELETON_REMOTE_EUI15_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-remote-eui15');
-const FRONTEND_OPTION_ROUTE_PATH = path.join(SKELETONS_ROOT_PATH, 'frontend-option-route');
-const BACKEND_SKELETON_PATH = path.join(SKELETONS_ROOT_PATH, 'backend');
+const constants = require('./constants');
 
-const defaultConfig = {
-  pkgName: 'my-package',
-  pkgScope: '@zzz',
-  pkgType: {
-    FRONTEND: 'frontend',
-    BACKEND: 'backend'
-  },
-  pkgFrontendType: {
-    DEFAULT: 'default',
-    REMOTE: 'remote'
-  },
-  pkgFrontendVersion: {
-    DEFAULT: 'eui7',
-    EUI10: 'eui10',
-    EUI14: 'eui14',
-    EUI15: 'eui15',
-  },
-  isRouteModule: true,
-  isCsdrRepo: true,
-  isEnvTargetRemote: true,
-  externalRepoName: null,
-  pkgGroupId: 'eu.europa.ec.cc'
-};
+// INNER MODULES
+const prompt = require('./package-prompt');
+const buildBackend = require('./package-build-backend');
+const buildFrontend = require('./package-build-frontend');
 
 
-const prompt = () => {
-  return Promise.resolve()
-    .then(() => {
-      return inquirer.prompt([
-        {
-          type: 'list',
-          name: 'pkgType',
-          message: 'Select a package type :',
-          choices: [
-            { name: 'Frontend - Angular library', value: defaultConfig.pkgType.FRONTEND },
-            { name: 'Backend - SpringBoot micro-service', value: defaultConfig.pkgType.BACKEND },
-          ],
-          default: defaultConfig.pkgType.FRONTEND,
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          }
-        },
-        {
-          name: 'pkgGroupId',
-          type: 'input',
-          message: 'Enter the Maven groupId :',
-          default: defaultConfig.pkgGroupId,
-          when: function (answers) {
-            return (answers.pkgType === defaultConfig.pkgType.BACKEND);
-          }
-        },
-        {
-          type: 'list',
-          name: 'pkgFrontendType',
-          message: 'Select a frontend type :',
-          choices: [
-            { name: 'Default Angular library', value: defaultConfig.pkgFrontendType.DEFAULT },
-            { name: 'Remote element micro-frontend', value: defaultConfig.pkgFrontendType.REMOTE },
-          ],
-          default: defaultConfig.pkgFrontendType.DEFAULT,
-          when: function (answers) {
-            return (answers.pkgType === defaultConfig.pkgType.FRONTEND);
-          },
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          }
-        },
-        {
-          type: 'list',
-          name: 'pkgFrontendVersion',
-          message: 'Select eUI version target :',
-          choices: [
-            { name: 'v7', value: defaultConfig.pkgFrontendVersion.DEFAULT },
-            { name: 'v10', value: defaultConfig.pkgFrontendVersion.EUI10 },
-            { name: 'v14', value: defaultConfig.pkgFrontendVersion.EUI14 },
-            { name: 'v15', value: defaultConfig.pkgFrontendVersion.EUI15 },
-          ],
-          default: defaultConfig.pkgFrontendType.DEFAULT,
-          when: function (answers) {
-            return (answers.pkgType === defaultConfig.pkgType.FRONTEND);
-          },
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          }
-        },
-        {
-          name: 'pkgScope',
-          type: 'input',
-          message: 'Enter the package scope :',
-          default: defaultConfig.pkgScope
-        },
-        {
-          name: 'pkgName',
-          type: 'input',
-          message: 'Enter the package name :',
-          default: defaultConfig.pkgName
-        },
-        {
-          name: 'isRouteModule',
-          type: 'confirm',
-          message: 'Is this a ROUTE package ?',
-          default: defaultConfig.isRouteModule,
-          when: function (answers) {
-            return (
-              answers.pkgType === defaultConfig.pkgType.FRONTEND &&
-              answers.pkgFrontendType !== defaultConfig.pkgFrontendType.REMOTE
-            );
-          }
-        },
-        {
-          name: 'isEnvTargetRemote',
-          type: 'confirm',
-          message: 'Is this an envTarget/à la carte remote ? (root package needs to be created first with same scope/name)',
-          default: defaultConfig.isEnvTargetRemote,
-          when: function (answers) {
-            return (
-              answers.pkgType === defaultConfig.pkgType.FRONTEND &&
-              answers.pkgFrontendType === defaultConfig.pkgFrontendType.REMOTE &&
-              answers.pkgFrontendVersion !== defaultConfig.pkgFrontendVersion.DEFAULT
-            );
-          }
-        },
-        {
-          name: 'isCsdrRepo',
-          type: 'confirm',
-          message: 'Is the repository within CSDR git project ?',
-          default: defaultConfig.isCsdrRepo
-        },
-        {
-          name: 'externalRepoName',
-          type: 'input',
-          message: 'Enter the project CITnet project name where the repository is located :',
-          default: defaultConfig.externalRepoName,
-          when: function (answers) {
-            return (
-              answers.isCsdrRepo === false
-            );
-          }
-        },
-      ]);
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-
-const buildFrontend = (
-    name, scope,
-    frontendType, frontendVersion,
-    isRouteModule, isCsdrRepo, externalRepoName, isEnvTargetRemote,
-  ) => {
-
-  tools.logTitle('Generating package');
-
-  let fullName = scope.substr(1) + '-' + name;
-  let npmPkgName, repoName;
-
-  if (frontendType === defaultConfig.pkgFrontendType.DEFAULT) {
-    fullName += '-ui';
-    npmPkgName = `${scope}/${name}`;
-
-  } else if (frontendType === defaultConfig.pkgFrontendType.REMOTE) {
-    if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
-      fullName += '-eui10-remote-el-ui';
-      npmPkgName = `${scope}/${name}-eui10-remote-el`;
-
-    } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI14) {
-      fullName += '-eui14-remote-el-ui';
-      npmPkgName = `${scope}/${name}-eui14-remote-el`;
 
-    } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI15) {
-      fullName += '-eui15-remote-el-ui';
-      npmPkgName = `${scope}/${name}-eui15-remote-el`;
 
-    } else {
-      fullName += '-remote-el-ui';
-      npmPkgName = `${scope}/${name}-remote-el`;
-    }
-  }
-
-  // generating default git repo
-  if (isCsdrRepo) {
-    repoName = `${fullName}.git`;
-  } else {
-    repoName = `${externalRepoName}/${fullName}.git`;
-  }
-
-  // generating target paths
-  const targetPath = path.join(TARGET_ROOT_PATH, fullName);
-  const rootPackagePath = path.join(TARGET_ROOT_PATH, `${scope.substr(1)}-${name}-ui`);
-
-  if (!frontendVersion === defaultConfig.pkgFrontendVersion.DEFAULT) {
-    if (frontendType === defaultConfig.pkgFrontendType.REMOTE && !tools.isDirExists(rootPackagePath)) {
-      tools.logError(`${rootPackagePath} NOT FOUND, you must mount the root package ui before creating the remote`);
-      throw 'ROOT_PACKAGE_NOT_FOUND';
-    }
-  }
-
-  const pkg = {
-    name: fullName,
-    repoName: repoName,
-    npmPkgName: npmPkgName
-  };
+module.exports.generate = () => {
 
   return Promise.resolve()
-
-    // CLEANING TARGET
-
-    .then(() => {
-      tools.logInfo('Cleaning target');
-      return tools.rimraf(targetPath + '/**/*');
-    })
-
-
-    // COPY TO TARGET
-
-    .then(() => {
-      tools.logInfo('Copying skeleton to target');
-      if (frontendType === defaultConfig.pkgFrontendType.REMOTE) {
-        if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
-          return tools.copydir(FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
-
-        } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI14) {
-          tools.copydir(FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
-          return tools.copydir(FRONTEND_SKELETON_REMOTE_EUI14_PATH, targetPath, true);
-
-        } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI15) {
-          tools.copydir(FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
-          return tools.copydir(FRONTEND_SKELETON_REMOTE_EUI15_PATH, targetPath, true);
-
-        } else {
-          return tools.copydir(FRONTEND_SKELETON_REMOTE_PATH, targetPath, true);
-        }
-
-      } else {
-        if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI10) {
-          return tools.copydir(FRONTEND_SKELETON_EUI10_PATH, targetPath, true);
-
-        } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI14) {
-          tools.copydir(FRONTEND_SKELETON_EUI10_PATH, targetPath, true);
-          return tools.copydir(FRONTEND_SKELETON_EUI14_PATH, targetPath, true);
-
-        } else if (frontendVersion === defaultConfig.pkgFrontendVersion.EUI15) {
-          tools.copydir(FRONTEND_SKELETON_EUI10_PATH, targetPath, true);
-          return tools.copydir(FRONTEND_SKELETON_EUI15_PATH, targetPath, true);
-
-        } else {
-          return tools.copydir(FRONTEND_SKELETON_PATH, targetPath, true);
-        }
-      }
-    })
-
     .then(() => {
-      if (isRouteModule) {
-        return tools.copydir(FRONTEND_OPTION_ROUTE_PATH, targetPath, true);
-      }
+      tools.logTitle('Please answer the following questions : ');
     })
 
-
-    // REPLACING PLACEHOLDERS
-
     .then(() => {
-      tools.logInfo('Replacing placeholders');
-
-      return Promise.resolve()
-        .then(() => {
-          return tools.replaceInPath(targetPath, '@module.name@', name);
-        })
-        .then(() => {
-          return tools.replaceInPath(targetPath, '@module.full.name@', fullName);
-        })
-        .then(() => {
-          return tools.replaceInPath(targetPath, '@module.scope@', scope);
-        })
-        .then(() => {
-          return tools.replaceInPath(targetPath, '@module.scope-name@', `${scope.substr(1)}-${name}`);
-        })
-        .then(() => {
-          return tools.replaceInPath(targetPath, '@module.scope.string@', scope.substr(1));
-        })
-        .then(() => {
-          return tools.replaceInPath(targetPath, '@module.class.name@', tools.camelCaseString(name, '-', true));
-        })
-        .catch((e) => {
-          throw e;
-        })
+      return prompt.prompt();
     })
 
+    .then((answers) => {
 
-    // REGISTERING PACKAGE in CSDR GLOBAL CONFIG
-    .then(() => {
-      tools.logInfo('Registering package');
-
-      if (frontendType === 'DEFAULT') {
-        return configUtils.angular.registerAngularPackage(pkg);
-      }
-    })
-    .then(() => {
-      return configUtils.angular.registerModulePaths(pkg);
-    })
-    .then(() => {
-      return configUtils.global.registerCsdrPackage(pkg, frontendType === defaultConfig.pkgFrontendType.REMOTE, scope, name);
-    })
-
+      // merging with defaults
+      answers = { ...constants.DEFAULT_CONFIG, ...answers};
 
-    .then(() => {
-      tools.logInfo('Executing post build operations');
-      tools.move(path.join(targetPath, 'gitignore_TO_REPLACE'), path.join(targetPath, '.gitignore'));
-      if (tools.isFileExists(path.join(targetPath, 'package.json_TO_REPLACE'))) {
-        tools.move(path.join(targetPath, 'package.json_TO_REPLACE'), path.join(targetPath, 'package.json'));
+      // forcing config default if v15 virtual remote only generation
+      if (
+        answers.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15 &&
+        answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
+      ) {
+        answers.isVirtualRemote = true;
       }
-    })
-
-    .then(() => {
-      tools.logInfo('Replace extensions');
-      return tools.removeFilesExtension(targetPath, '.TO_REPLACE');
-    })
 
-    .then(() => {
-      // envTarget remote type specific
-      if (isEnvTargetRemote) {
-        tools.logInfo('Moving sources from remote to root package for envTarget remote type');
-        tools.move(path.join(targetPath, 'src'), path.join(rootPackagePath, 'assets', 'remote-sources'));
-      }
-    })
-
-    .then(() => {
-      tools.logSuccess();
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-
-
-const buildBackend = (name, scope, groupId) => {
-  tools.logTitle('Generating package');
-
-  const artifactId = scope.substr(1, scope.length) + '-' + name + '-backend';
-
-  const targetPath = path.join(TARGET_ROOT_PATH, artifactId);
-
-
-  return Promise.resolve()
-
-    // CLEANING TARGET
-
-    .then(() => {
-      tools.logInfo('Cleaning target');
-      return tools.rimraf(targetPath + '/**/*');
-    })
-
-
-    // COPY TO TARGET
-
-    .then(() => {
-      tools.logInfo('Copying skeleton to target');
-      return tools.copydir(BACKEND_SKELETON_PATH, targetPath, true);
-    })
-
-
-    // REPLACING PLACEHOLDERS
-
-    .then(() => {
-      tools.logInfo('Replacing placeholders');
-
-      return Promise.resolve()
-        .then(() => {
-          return tools.replaceInPath(targetPath, '@groupId@', groupId);
-        })
-        .then(() => {
-          return tools.replaceInPath(targetPath, '@artifactId@', artifactId);
-        })
-        .catch((e) => {
-          throw e;
-        })
-    })
-
-    .then(() => {
-      tools.logInfo('Executing post build operations');
-      return tools.move(path.join(targetPath, 'gitignore_TO_REPLACE'), path.join(targetPath, '.gitignore'));
-    })
-
-    .then(() => {
-      tools.logSuccess();
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-
-
-
-
-
-module.exports.generate = () => {
-
-  return Promise.resolve()
-    .then(() => {
-      tools.logTitle('Please answer the following questions : ');
-    })
-
-    .then(() => {
-      return prompt();
-    })
-
-    .then((answers) => {
       tools.logInfo('Provided options :');
       console.log(answers);
 
-      if (answers.pkgType === defaultConfig.pkgType.FRONTEND) {
-        return buildFrontend(
-          answers.pkgName,
-          answers.pkgScope,
-          answers.pkgFrontendType,
-          answers.pkgFrontendVersion,
-          answers.isRouteModule,
-          answers.isCsdrRepo,
-          answers.externalRepoName,
-          answers.isEnvTargetRemote,
-        );
+      if (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND) {
+        return buildFrontend.generate(answers);
 
-      } else if (answers.pkgType === defaultConfig.pkgType.BACKEND) {
-        return buildBackend(
-          answers.pkgName,
-          answers.pkgScope,
-          answers.pkgGroupId,
-        );
+      } else if (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.BACKEND) {
+        return buildBackend.generate(answers);
       }
     })
 

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/app/eui-components.ts

@@ -1,9 +1,9 @@
-import { EuiBlockContentComponentModule } from '@eui/components/eui-block-content';
+import { EuiBlockContentModule } from '@eui/components/eui-block-content';
 import { EuiButtonModule } from '@eui/components/eui-button';
-import { EuiLabelModule } from '@eui/components/atoms';
+import { EuiLabelModule } from '@eui/components/eui-label';
 
 export const EUI_COMPONENTS_MODULES = [
-    EuiBlockContentComponentModule,
+    EuiBlockContentModule,
     EuiButtonModule,
     EuiLabelModule,
 ];

package/scripts/csdr/cli/skeletons/virtual-remote/15.x/angular-config.json

@@ -0,0 +1,8 @@
+{
+    "styles": [
+        "node_modules/@eui/styles/dist/styles/eui.css",
+        "node_modules/@eui/styles/dist/styles/eui-extra-utilities.css",
+        "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap.css",
+        "node_modules/@eui/styles/dist/styles/eui-legacy-icons-font.css"
+    ]
+}

package/scripts/csdr/cli/skeletons/virtual-remote/15.x/dependencies.json

@@ -0,0 +1,20 @@
+{
+    "base": {
+    },
+    "composite": {
+        "@eui/deps-base": "^15.0.0",
+        "@module.scope@/@module.name@": "^1.0.0",
+        "@csdr/core": "^4.0.0",
+        "@csdr/integration": "^3.0.0"
+    },
+    "INT": {
+    },
+    "ACC": {
+    },
+    "DLT": {
+    },
+    "TRN": {
+    },
+    "PROD": {
+    }
+}

package/scripts/csdr/config/config-utils.js

@@ -8,3 +8,4 @@ module.exports.projects = require('./projects');
 module.exports.init = require('./init');
 module.exports.sync = require('./sync');
 module.exports.remotes = require('./remotes');
+module.exports.register = require('./register');