@eui/tools 6.5.6 → 6.6.0

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

@@ -54,53 +54,6 @@ module.exports.prompt = () => {
             }
           }
         },
-        {
-          type: 'list',
-          name: 'pkgFrontendVersion',
-          message: 'Select eUI version target :',
-          choices: [
-            { name: 'v10', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10 },
-            { name: 'v15', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15 },
-          ],
-          default: constants.DEFAULT_CONFIG.pkgFrontendType,
-          when: function (answers) {
-            return (
-              answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
-              answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
-            );
-          },
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          }
-        },
-        {
-          type: 'list',
-          name: 'pkgFrontendVersion',
-          message: 'Select eUI version target :',
-          choices: [
-            { name: 'v10', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10 },
-            // { name: 'v13', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI13 },
-            { name: 'v15', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15 },
-          ],
-          default: constants.DEFAULT_CONFIG.pkgFrontendType,
-          when: function (answers) {
-            return (
-              answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
-              answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.DEFAULT
-            );
-          },
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          }
-        },
-
-
-
-
 
         {
           name: 'pkgScope',
@@ -114,43 +67,6 @@ module.exports.prompt = () => {
           message: 'Enter the package name :',
           default: constants.DEFAULT_CONFIG.pkgName
         },
-        // {
-        //   name: 'isRouteModule',
-        //   type: 'confirm',
-        //   message: 'Is this a ROUTE package ?',
-        //   default: constants.DEFAULT_CONFIG.isRouteModule,
-        //   when: function (answers) {
-        //     return (
-        //       answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
-        //       answers.pkgFrontendType !== constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
-        //     );
-        //   }
-        // },
-        // {
-        //   name: 'isVirtualRemote',
-        //   type: 'confirm',
-        //   message: 'Is this a virtual remote ?',
-        //   default: constants.DEFAULT_CONFIG.isVirtualRemote,
-        //   when: function (answers) {
-        //     return (
-        //       answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
-        //       answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE &&
-        //       answers.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10
-        //     );
-        //   }
-        // },
-        // {
-        //   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

@@ -15,6 +15,66 @@ const buildBackend = require('./package-build-backend');
 const buildFrontend = require('./package-build-frontend');
 
 
+const generateArgs = (args) => {
+  let npmPkgName, repoName;
+  let fullName = args.pkgScope.substring(1) + '-' + args.pkgName;
+
+  if (args.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.DEFAULT) {
+    fullName += '-ui';
+    npmPkgName = `${args.pkgScope}/${args.pkgName}`;
+
+  } else if (args.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE) {
+    if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10) {
+      fullName += '-eui10-remote-el-ui';
+      npmPkgName = `${args.pkgScope}/${args.pkgName}-eui10-remote-el`;
+
+    } else if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15) {
+      fullName += '-eui15-remote-el-ui';
+      npmPkgName = `${args.pkgScope}/${args.pkgName}-eui15-remote-el`;
+    }
+  }
+
+  // generating default git repo
+  if (args.isCsdrRepo) {
+    repoName = `${fullName}.git`;
+  } else {
+    repoName = `${args.externalRepoName}/${fullName}.git`;
+  }
+
+  return {
+    ...args,
+    fullName,
+    npmPkgName,
+    repoName,
+  };
+}
+
+
+module.exports.generateExternal = (args) => {
+  return Promise.resolve()
+    .then(() => {
+      // merging with defaults
+      const answers = { ...constants.DEFAULT_CONFIG, ...args};
+
+      // FRONTEND
+      if (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND) {
+        const args = generateArgs(answers);
+
+        tools.logInfo('Generated options :');
+        console.log(args);
+
+        return buildFrontend.generate(args);
+
+      // BACKEND
+      } else if (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.BACKEND) {
+        return buildBackend.generate(answers.pkgName, answers.pkgScope, answers.pkgGroupId);
+      }
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+
 
 
 module.exports.generate = () => {
@@ -29,28 +89,19 @@ module.exports.generate = () => {
     })
 
     .then((answers) => {
-
       // merging with defaults
       answers = { ...constants.DEFAULT_CONFIG, ...answers};
 
-      // forcing config default for remotes
-      if (
-        answers.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15 &&
-        answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
-      ) {
-        answers.isVirtualRemote = true;
-      }
-
-      if (answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE) {
-        answers.isEnvTargetRemote = true;
-      }
-
       tools.logInfo('Provided options :');
       console.log(answers);
 
+      // FRONTEND
       if (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND) {
-        return buildFrontend.generate(answers);
+        const args = generateArgs(answers);
+
+        return buildFrontend.generate(args);
 
+      // BACKEND
       } else if (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.BACKEND) {
         return buildBackend.generate(answers.pkgName, answers.pkgScope, answers.pkgGroupId);
       }

package/scripts/csdr/config/register.js

@@ -10,151 +10,35 @@ const tools = require('../../utils/tools');
 const innerGlobal = require('./global');
 
 
-// Register new project created
-
-module.exports.registerCsdrProject = (name, isFullSkeleton) => {
-
-  const csdrConfigProject = {
-    "name": "@app.name@",
-    "folder": "apps/@app.name@",
-    "repository": "app-@app.name@.git",
-    "build": {
-      "skipLint": true,
-      "skipTest": true,
-      "maxSpaceSize": true
-    },
-    "packages": [
-    ],
-    "csdrSkeleton": true
-  };
-
-  const csdrConfigProjectFullSkeleton = {
-    "name": "@app.name@",
-    "folder": "apps/@app.name@",
-    "repository": "app-@app.name@.git",
-    "build": {
-      "skipLint": true,
-      "skipTest": true,
-      "maxSpaceSize": true
-    },
-    "packages": [
-    ],
-    "csdrFullSkeleton": true
-  };
-
-
-  // inserting new project into root config
-  let projectDef;
-  if (isFullSkeleton) {
-    projectDef = JSON.stringify(csdrConfigProjectFullSkeleton);
-  } else {
-    projectDef = JSON.stringify(csdrConfigProject);
-  }
-  const replaceModule = tools.replaceAll(projectDef, '@app.name@', name);
-
-  let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json');
-  let jsonFile = require(file);
-  jsonFile[name] = JSON.parse(replaceModule);
-  tools.writeJsonFileSync(file, jsonFile);
-
-  // inserting project entry into local config
-  innerGlobal.updateConfig({ project: name });
-}
-
-
-
-
 // Register newly created package
 
-module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName, euiVersionNumber, isVirtualRemote, isFullVirtualRemote) => {
+module.exports.registerCsdrPackage = (pkg, rootPkgScope, rootPkgName, euiVersionNumber, isRemote, remoteConfig, isBackend) => {
 
   const csdrConfigPackage = {
     "name": "@module.full.name@",
     "npmPkg": "@module.npmPkg.name@",
-    "deps": [
-    ],
-    "repository": "@module.repo.name@",
-    "teams": [
-      "all-frontend"
-    ]
+    "repository": "@module.repo.name@"
   };
 
-  const csdrConfigRemotePackage = {
-    "name": "@module.full.name@",
-    "npmPkg": "@module.npmPkg.name@",
-    "deps": [
-    ],
-    "repository": "@module.repo.name@",
-    "element": true,
-    "remote": true,
-    "hostAppName": "my-workplace",
-    "teams": [
-      "all-frontend"
-    ],
-    "build": {
-      "compiledTranslations": true,
-      "translationScopes": "eui,csdr,cc,mywp",
-      "sonarScanner": false,
-      "envTargetActive": true
-    },
-    "release": {
-       "team": "cc-ui-rm"
-    },
-    "slack": {
-      "channel": "csdr-timeline-mwp-remotes-cc"
-    },
-    "externalSources": {
-      "npmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
-      "folder": "assets/remote-sources"
-    }
-  }
-
-
-  const csdrConfigRemotePackageV10Virtual = {
-    "npmPkg": "@module.npmPkg.name@",
-    "euiVersion": "10.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"
-    },
-    "externalSources": {
-      "npmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
-      "folder": "assets/remote-sources"
-    }
-  }
-
-  const csdrConfigRemotePackageV15Virtual = {
-    "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"
-    },
-    "externalSources": {
-      "npmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
-      "folder": "assets/remote-sources"
-    }
-  }
+  const csdrConfigPackageBackend = {
+      "name": "@module.full.name@",
+      "repository": "@module.repo.name@",
+      "backend": true,
+      "teams": [
+          "cc-backend",
+          "backend"
+      ],
+      "build": {
+          "publish": true
+      },
+      "slack": {
+          "channel": "csdr-timeline-backend"
+      }
+  };
 
-  const csdrConfigRemotePackageV15VirtualFull = {
+  const csdrConfigRemote = {
     "npmPkg": "@module.npmPkg.name@",
-    "euiVersion": "15.x",
+    "euiVersion": "@module.eui.version@.x",
     "build": {
       "compiledTranslations": true,
       "translationScopes": "eui,csdr,cc,mywp",
@@ -162,7 +46,7 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
       "sonarScanner": false
     },
     "release": {
-       "team": "cc-ui-rm"
+       "team": "@module.rmTeam.name@"
     },
     "slack": {
       "channel": "csdr-timeline-mwp-remotes-cc"
@@ -170,60 +54,89 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
     "fullSkeletonSources": true,
     "skeletonConfig": {
         "rootNpmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
-        "rootCommonModule": "CommonModule",
+        "rootCommonModule": "Module",
         "baseUrl": "@module.rootPkg.name@",
         "elementName": "@module.scope.name@",
-        "storeName": "@module.scope.name@",
-        "options": {
-            "userReducers": false,
-            "zipkin": false,
-            "dynatrace": false
-        }
+        "storeName": "@module.scope.name@"
     }
   }
 
+
+
   // inserting package in root config
   let packageDef;
 
   if (isRemote) {
-    if (euiVersionNumber >= 15) {
-      if (isFullVirtualRemote) {
-        packageDef = JSON.stringify(csdrConfigRemotePackageV15VirtualFull);
-      } else {
-        packageDef = JSON.stringify(csdrConfigRemotePackageV15Virtual);
-      }
-    } else if (euiVersionNumber >= 10 && isVirtualRemote) {
-      packageDef = JSON.stringify(csdrConfigRemotePackageV10Virtual);
+    packageDef = JSON.stringify(csdrConfigRemote);
+
+  } else {
+    if (isBackend) {
+      packageDef = JSON.stringify(csdrConfigPackageBackend);
     } else {
-      packageDef = JSON.stringify(csdrConfigRemotePackage);
+      packageDef = JSON.stringify(csdrConfigPackage);
     }
-  } else {
-    packageDef = JSON.stringify(csdrConfigPackage);
   }
 
   // replacing tokens
   let replaceModule = tools.replaceAll(packageDef, '@module.full.name@', pkg.name);
+  replaceModule = tools.replaceAll(replaceModule, '@module.eui.version@', euiVersionNumber);
   replaceModule = tools.replaceAll(replaceModule, '@module.repo.name@', pkg.repoName);
   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}`);
+  if (isRemote && remoteConfig && remoteConfig.rmTeamName) {
+    replaceModule = tools.replaceAll(replaceModule, '@module.rmTeam.name@', remoteConfig.rmTeamName);
+  }
 
-  let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
-  if (isRemote && isVirtualRemote) {
+  let file;
+  if (isRemote) {
     file = path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json');
+  } else {
+    file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
   }
+
+  const moduleJson = JSON.parse(replaceModule);
+
+  if (isRemote && remoteConfig) {
+    if (Object.keys(remoteConfig.options).length !== 0) {
+      moduleJson.skeletonConfig.options = {};
+
+      if (remoteConfig.options.userReducers) {
+        moduleJson.skeletonConfig.options.userReducers = remoteConfig.options.userReducers;
+      }
+      if (remoteConfig.options.zipkin) {
+        moduleJson.skeletonConfig.options.zipkin = remoteConfig.options.zipkin;
+      }
+      if (remoteConfig.options.dynamicForms) {
+        moduleJson.skeletonConfig.options.dynamicForms = remoteConfig.options.dynamicForms;
+      }
+      if (remoteConfig.options.dynatrace) {
+        moduleJson.skeletonConfig.options.dynatrace = remoteConfig.options.dynatrace;
+      }
+
+      if (remoteConfig.options.participant) {
+        moduleJson.skeletonConfig.options.participant = remoteConfig.options.participant;
+        moduleJson.skeletonConfig.blockContainerName = `${rootPkgScope.substr(1)}-${rootPkgName}-ct`;
+      }
+    }
+  }
+
   let jsonFile = require(file);
-  jsonFile[pkg.name] = JSON.parse(replaceModule);
+  jsonFile[pkg.name] = moduleJson;
 
   tools.writeJsonFileSync(file, jsonFile);
 
+  if (isBackend) {
+    return;
+  }
+
   // inserting project entry into local config
   const packages = [];
   packages.push(pkg.name);
 
   // updating euirc.json local config
-  if (isRemote && isVirtualRemote) {
+  if (isRemote) {
     innerGlobal.updateConfig({ remotes: packages });
 
   } else {

package/scripts/index.js

@@ -80,7 +80,6 @@ module.exports.audiStyles = require('./csdr/audit/styles');
 
 // csdr - cli
 module.exports.cliUtils = require('./csdr/cli/cli-utils');
-module.exports.cliApp = require('./csdr/cli/app');
 module.exports.cliPackage = require('./csdr/cli/package');
 module.exports.cliPackageBackend = require('./csdr/cli/package-build-backend');
 module.exports.cliPackageFrontend = require('./csdr/cli/package-build-frontend');