@eui/tools 6.20.19 → 6.20.21

package/.version.properties

@@ -1 +1 @@
-6.20.19
+6.20.21

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.20.21 (2024-08-12)
+
+##### Chores
+
+* **other:**
+  * adapted for standalone host build - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([84678f01](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/84678f01882846865c233fc6ff3366cca8793efc))
+
+* * *
+* * *
+## 6.20.20 (2024-08-12)
+
+##### Chores
+
+* **other:**
+  * release script for standalone host app - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([133ab589](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/133ab5895547a9d23eb7acdced74c1afbbe58ba1))
+
+* * *
+* * *
 ## 6.20.19 (2024-08-11)
 
 ##### Chores

package/bin/eui-scripts.js

@@ -43,6 +43,7 @@ const scriptIndex = args.findIndex(
     x === 'release-backend' ||
     x === 'release-app' ||
     x === 'release-app-group' ||
+    x === 'release-app-standalone' ||
     x === 'generate-translations' ||
     x === 'csdr-sync' ||
     x === 'csdr-cli' ||
@@ -94,6 +95,7 @@ switch (script) {
     case 'release-backend':
     case 'release-app':
     case 'release-app-group':
+    case 'release-app-standalone':
     case 'csdr-sync':
     case 'csdr-cli':
     case 'csdr-stats':

package/bin/scripts/release-app-standalone.js

@@ -0,0 +1,6 @@
+'use strict';
+
+const releaseApp = require('../../scripts/csdr/release/app/release-app-standalone');
+
+releaseApp.run();
+

package/init.js

@@ -14,6 +14,7 @@ const nmSrcPath = path.join(process.cwd(), '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 nmSrcPath = path.join('d:/gitlab/app-baep-sample-host', '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.19",
+    "version": "6.20.21",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

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

@@ -2100,3 +2100,56 @@ module.exports = function (config) {
   });
 };
 `;
+
+
+module.exports.virtualProjectConfig = {
+  "host": true,
+  "virtual": true,
+  "build": {
+    "skipLint": true,
+    "skipTest": true,
+    "maxSpaceSize": true,
+    "snapshotBuildOptimized": true,
+    "compiledTranslations": true,
+    "translationScopes": "PLACEHOLDER",
+    "openid": true,
+    "envOpenidPrefix": "openid-login-config.",
+    "openidConfigAssetsFolder": "assets",
+    "customEnvJsonConfigInjection": false
+  },
+  "mock": {
+    "external": true,
+    "npmPkg": "PLACEHOLDER",
+    "folder": "assets/mock"
+  },
+  "config": {
+    "npmPkg": "PLACEHOLDER",
+    "folder": "assets/config"
+  },
+  "externalSourcesOnInit": true,
+  "externalSources": [
+    {
+      "npmPkg": "PLACEHOLDER",
+      "folder": "app-sources"
+    }
+  ],
+  "externalRootFiles": [
+    {
+      "npmPkg": "PLACEHOLDER",
+      "folder": "app-root"
+    },
+    {
+      "npmPkg": "PLACEHOLDER",
+      "folder": "app-root"
+    }
+  ],
+  "externalRoutesSources": {
+    "routesConfigNpmPkg": "@baep/sample-host",
+    "routesConfigAssetsPath": "routes",
+    "routesFileSource": "app-sources/app/app.routes-base.ts",
+    "routesFilePath": "src/app/app.routes.ts",
+    "routesFilenameTemplate": "route-defs-base-v@eui.version@-playground.json",
+    "workspacesConfigAssetsPath": "workspaces",
+    "generateLinks": true
+  }
+}

package/scripts/csdr/config/init.js

@@ -110,7 +110,7 @@ const getInputPackages = (project, pkg, team, prjOnly, containerOnly) => {
   // when project or project and team are provided
   } else {
     if (!containerOnly && !prjOnly) {
-      tools.logTitle(`Creating packages entries for project:${project} / team:${team}`);
+      tools.logTitle(`Creating packages entries for project:${project}`);
 
       const prj = innerProjects.getCsdrProject(project);
 

package/scripts/csdr/config/projects.js

@@ -46,7 +46,7 @@ const getProjectPaths = (prj) => {
 
   let installPath = process.cwd();
   let nodeModulesPath = path.join(process.cwd(), 'node_modules');
-  if (prj.standalone) {
+  if (prj.standalone && !prj.host) {
     installPath = path.join(rootPath);
     nodeModulesPath = path.join(rootPath, 'node_modules');
   }
@@ -84,10 +84,6 @@ module.exports.getProject = (projectName) => {
 
   const config = innerGlobal.getConfig();
 
-  // console.log('TEST TEST TEST');
-  // console.log(projectName);
-  // console.log(config.projects[projectName]);
-
   if (!config.projects[projectName]) {
     return null;
   }
@@ -100,9 +96,36 @@ module.exports.getProject = (projectName) => {
 
   if (prj) {
     prj.rootName = projectName;
+    prj.csdr = true;
+    prj.standalone = false;
+
+    let prjVirtualSkeleton = {};
+
+    if (prj.virtual && !innerGlobal.isCsdr()) {
+      const { virtualProjectConfig } = require('./config-skeletons');
+      prjVirtualSkeleton = virtualProjectConfig;
+
+      prj.csdr = false;
+      prj.standalone = true;
+
+      prjVirtualSkeleton.build.translationScopes = prj.scopes;
+      prjVirtualSkeleton.mock.npmPkg = prj.hostPackage;
+      prjVirtualSkeleton.config.npmPkg = prj.hostPackage;
+      prjVirtualSkeleton.externalSources[0].npmPkg = prj.hostPackage;
+      prjVirtualSkeleton.externalRootFiles[0].npmPkg = prj.hostPackage;
+      prjVirtualSkeleton.externalRootFiles[1].npmPkg = prj.hostPackage;
+      prjVirtualSkeleton.externalRoutesSources.routesConfigNpmPkg = prj.hostPackage;
+
+      if (prj.playground) {
+        prjVirtualSkeleton.externalRootFiles[1].folder = 'app-root-playground';
+      } else {
+        prjVirtualSkeleton.externalRoutesSources.routesFilenameTemplate = 'route-defs.@env.target@.json';
+      }
+    }
 
     return {
       ...prj,
+      ...prjVirtualSkeleton,
       ...getProjectPaths(prj),
       ...getProjectMetadataDefs(projectName),
       ...getProjectOptions(prj),

package/scripts/csdr/init/init-project.js

@@ -6,10 +6,18 @@ const installUtils = require('../install/install-utils');
 const configUtils = require('../config/config-utils');
 const injectionUtils = require('../../utils/pre-build/injection/injection-utils');
 
-const { skipClone, skipInstall, build } = tools.getArgs();
+const { skipClone, skipInstall } = tools.getArgs();
+let { build } = tools.getArgs();
 
 
 module.exports.init = (finalResponse) => {
+  let prj;
+
+  // if build is passed through programatic init (standalone build)
+  if (finalResponse.build) {
+    build = finalResponse.build;
+  }
+
   return Promise.resolve()
     // Initializing .euirc.json local file - the core of CSDR operations
     .then(() => {
@@ -17,9 +25,17 @@ module.exports.init = (finalResponse) => {
       return configUtils.init.run(finalResponse);
     })
 
+    .then(() => {
+      // get project object from config
+      prj = configUtils.projects.getProject(finalResponse.project);
+
+      tools.logInfo('Project object constructed : ');
+      console.log(prj);
+    })
+
     // clone or install linked host package to project if any
     .then(() => {
-      return initUtils.packages.cloneHostPackage(finalResponse.project);
+      return initUtils.packages.cloneHostPackage(prj);
     })
 
     // Initializing .meta based on .euirc.json for local respoisitories cloning
@@ -36,9 +52,7 @@ module.exports.init = (finalResponse) => {
 
     // Importing external sources
     .then(() => {
-      const prj = configUtils.projects.getProject(finalResponse.project);
       return injectionUtils.externals.injectExternalAppSources(prj, false, true, finalResponse.euiVersion);
-      // return initUtils.projects.importExternalSources(true);
     })
 
     // Importing packages and generating definitions

package/scripts/csdr/init/packages.js

@@ -69,11 +69,8 @@ module.exports.importPackages = (args = {}) => {
 }
 
 
-module.exports.cloneHostPackage = (projectName) => {
-
-  const project = configUtils.projects.getProject(projectName);
-
-  if (!project.hostPackage || project.externalSourcesOnInit === false) {
+module.exports.cloneHostPackage = (prj) => {
+  if (!prj.hostPackage || prj.externalSourcesOnInit === false) {
     return;
   }
 
@@ -83,8 +80,8 @@ module.exports.cloneHostPackage = (projectName) => {
 
   return Promise.resolve()
     .then(() => {
-      tools.logInfo(`Fetching host package info : ${project.hostPackage}`);
-      pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
+      tools.logInfo(`Fetching host package info : ${prj.hostPackage}`);
+      pkg = configUtils.packages.getPackageByNpmPkg(prj.hostPackage, true);
       if (!pkg) {
         throw new Error('Invalid host package provided / unknown to CSDR config');
       }

package/scripts/csdr/install/build-app.js

@@ -8,10 +8,12 @@ const innerProjects = require('./projects');
 
 
 module.exports.install = (prj, envTarget) => {
+  tools.logInfo('install.buildApp.install');
+
   return Promise.resolve()
     // checking remotes
     .then(() => {
-      if (prj.standalone) {
+      if (prj.standalone && !envTarget) {
         return innerProjects.installDepsStandalone(prj);
       } else {
         return innerProjects.installDeps(prj, envTarget);

package/scripts/csdr/install/projects.js

@@ -16,6 +16,8 @@ const innerCompositeCore = require('./composite-core');
 const { remotesImport } = tools.getArgs();
 
 const getDeps = (module.exports.getDeps = (prj, envTarget) => {
+  tools.logInfo('install.projects.getDeps');
+
   return Promise.resolve()
     .then(() => {
       return metadataUtils.appEnvs.getMetadata(prj);
@@ -25,6 +27,7 @@ const getDeps = (module.exports.getDeps = (prj, envTarget) => {
         prj.folder,
         envsMetadata,
         envTarget,
+        prj.standalone
       );
     })
 
@@ -114,6 +117,8 @@ module.exports.getLocalProjectsFixedDeps = async (_) => {
 };
 
 module.exports.installDeps = (prj, envTarget) => {
+  tools.logInfo('install.projects.installDeps');
+
   let finalDeps, compositeDeps;
 
   return Promise.resolve()

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

@@ -0,0 +1,240 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+
+// UTILS
+const utils = require('../../../utils');
+
+// CSDR RELATED
+const initUtils = require('../../init/init-utils');
+const installUtils = require('../../install/install-utils');
+const metadataUtils = require('../../metadata/metadata-utils');
+const versionUtils = require('../../version/version-utils');
+const configUtils = require('../../config/config-utils');
+
+// LOCAL TEST :
+// - symlink eUI tools sources to node_modules of standalone pkg folder node_modules to test
+// - execute this command on the standalone pkg folder :
+// npx @eui/tools release-app-standalone --prjName baep-sample-host --euiVersion 18.x --envTarget DEV --configEnvTarget cdn-dev --debug --debugNotification --skipNotification --skipGitUpdates --skipInstall
+
+module.exports.run = () => {
+  const { prjName, euiVersion, envTarget, configEnvTarget } = utils.tools.getArgs();
+
+  if (!prjName) {
+    throw new Error('prjName not provided as pipeline argument');
+  }
+
+  if (!euiVersion) {
+    throw new Error('euiVersion not provided as pipeline argument');
+  }
+
+  if (!envTarget) {
+    throw new Error('envTarget OR configEnvTarget not provided as pipeline argument');
+  }
+
+  let project, packagesDeps, newVersion;
+
+  return Promise.resolve()
+    // START PIPELINE
+    .then(() => {
+      utils.tools.logVersion();
+    })
+
+    // CLONING CONFIG
+    .then(() => {
+      return configUtils.global.cloneConfig();
+    })
+
+    // INITIALIZE HOST, REPOSITORIES and sources injections
+    .then(() => {
+      return initUtils.initProject.init({
+        project: prjName, prjOnly: true, euiVersion: euiVersion, build: true,
+      });
+    })
+
+    // GETTING THE PROJECT DATA
+    .then(() => {
+      project = configUtils.projects.getProject(prjName);
+    })
+
+    // INIT MESSAGE STACK
+    .then(() => {
+      // start mailStack
+      utils.notification.messageStack.startStack();
+
+      return utils.notification.project.sendProjectMessage({
+        project: project,
+        text: `:arrow_forward: :arrow_forward: :arrow_forward: :arrow_forward: :arrow_forward: Launching *${project.name}* release for *${envTarget}* environment`,
+      });
+    })
+
+    // CLONE METADATA REPO
+    .then(() => {
+      return metadataUtils.common.cloneMetadataRepoStandalone();
+    })
+
+    // INSTALL DEPS based on envTarget
+    .then(() => {
+      // installing the dependencies by composite definition, it's outputting the app package dependencies declared
+      // in the dependencies-composite.json file of the project, remapped with the composite declaration per env.
+      return installUtils.buildApp.install(project, envTarget);
+    })
+    .then((deps) => {
+      packagesDeps = deps;
+    })
+
+    // GETTING NEW VERSION
+    .then(() => {
+      utils.tools.logTitle('Getting app new version...');
+      return versionUtils.app.getNewVersion(project, false, false, envTarget);
+    })
+    .then((version) => {
+      // set the new version found for later use
+      newVersion = version;
+      utils.tools.logSuccess('New version : ' + newVersion);
+    })
+
+    // STORE METADATA
+    .then(() => {
+      // storing project build metadata
+      return metadataUtils.app.storeMetadata(project, newVersion, packagesDeps, envTarget);
+    })
+    .then(() => {
+      return metadataUtils.appEnvs.storeMetadata(project, newVersion, packagesDeps, envTarget);
+    })
+    .then(() => {
+      return metadataUtils.appVersions.storeMetadata(project, newVersion, envTarget);
+    })
+
+      // // *****************************************************************
+      // // GENERATE MAJOR DIFF REPORT
+      // // *****************************************************************
+      // .then(() => {
+      //   // process v1 - diff report is generated on MASTER / TST release
+      //   if (!isSnapshot && !isSupportSnapshotBranch && !envTarget) {
+      //     return metadataUtils.appHistory.generateDiffReport(project, newVersion, isSupportBranch);
+      //   }
+
+      //   // process v2 - diff report is generated on TST and up
+      //   if (envTarget && envTarget !== 'DEV') {
+      //     return metadataUtils.appHistory.generateDiffReport(project, newVersion, isSupportBranch, envTarget);
+      //   }
+      // })
+
+      // // *****************************************************************
+      // // STORE APP HISTORY METADATA
+      // // *****************************************************************
+      // .then((diffMetadata) => {
+      //   if (diffMetadata) {
+      //     return Promise.resolve()
+      //       .then(() => {
+      //         return metadataUtils.appHistory.flattenDiffMetadata(diffMetadata);
+      //       })
+
+      //       .then((flatDiffMetadata) => {
+      //         return utils.notification.project.sendProjectDiffReportMessage(project, flatDiffMetadata);
+      //       })
+      //   }
+      // })
+
+      // // *****************************************************************
+      // // STORE APP ASSETS METADATA
+      // // *****************************************************************
+      // .then((historyMetadata) => {
+      //   return metadataUtils.app.storeMetadataAssets(project, newVersion, packagesDeps, historyMetadata, envTargetGen);
+      // })
+
+
+
+
+    // BUILD ANGULAR APPLICATION
+    .then(() => {
+      return utils.buildApp.angular({
+        project,
+        envTarget,
+        isSnapshot: false,
+        version: newVersion,
+        configEnvTargetin: configEnvTarget,
+      });
+    })
+
+
+    // POST BUILD
+    .then(() => {
+      return utils.buildApp.postBuild(project);
+    })
+
+    // DISTRIBUTION OPTIONAL STEP to dynamic S3 buckets
+    .then(() => {
+      if (project.build && project.build.distribution) {
+        return Promise.resolve()
+          .then(() => {
+            return utils.buildApp.generateProjectDistributionFile(project, false, envTarget);
+          })
+          .catch((e) => {
+            throw e;
+          });
+      }
+    })
+
+
+
+    // COMMIT AND PUSH METADATA
+    .then(() => {
+      const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
+      const message = `chore: update metadata for ${project.name}-${newVersion}`;
+
+      return utils.git.commitAndPush('master', message, DEVOPS_METADATA_PATH);
+    })
+
+    // PIPELINE NOTIFICATIONS
+    .then(() => {
+      return (
+        utils.notification.project
+          .sendProjectMessage({
+            project: project,
+            version: newVersion,
+            title: '[APPLICATION BUILD SUCCESS]',
+            subtitle: 'Successful build of the application! :)',
+          })
+
+          // store package config in the root folder to send config to gitlab
+          .then(() => {
+            return utils.notification.config.storeProjectConfig(project);
+          })
+
+          .then(() => {
+            utils.notification.messageStack.endStack();
+          })
+      );
+    })
+
+    .catch((e) => {
+      utils.tools.logError(`ERROR!!!! - ${e.message}`);
+      console.log(e);
+
+      return (
+        utils.notification.project
+          .sendProjectMessage({
+            project: project,
+            exception: e,
+            title: '[APPLICATION BUILD FAILED]',
+            subtitle: 'Error building the App container application! :(',
+          })
+
+          // store package config in the root folder to send config to gitlab
+          .then(() => {
+            return utils.notification.config.storeProjectConfig(project);
+          })
+          .then(() => {
+            utils.notification.messageStack.endStack();
+            return utils.notification.messageStack.sendProjectMessage(project);
+          })
+
+          .then(() => {
+            process.exit(1);
+          })
+      );
+    })
+};

package/scripts/utils/pre-build/routes-replacement/routes-replacement.js

@@ -718,7 +718,9 @@ module.exports.extractRemotesMetadata = (project) => {
 
   return Promise.resolve()
     .then(() => {
-      return initUtils.remotes.cloneRemotesConfig();
+      if (!project.standalone) {
+        return initUtils.remotes.cloneRemotesConfig();
+      }
     })
 
     .then(() => {