@eui/tools 5.2.11 → 5.3.0

package/.version.properties

@@ -1 +1 @@
-5.2.11
+5.3.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.3.0 (2022-05-31)
+
+##### New Features
+
+* **other:**
+  * add standalone projects build capability - EUI-5917 [EUI-5917](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5917)  ([05dfe5cb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/05dfe5cbc8d5079b57d760f2d56945fb2d3490c0))
+
+* * *
+* * *
 ## 5.2.11 (2022-05-21)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -842,22 +842,22 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 // METADATA ESTING
 // --------------------
-const pkg = configUtils.packages.getPackage('cc-task-details-eui10-remote-el-ui');
-const envTarget = 'INT';
+// const pkg = configUtils.packages.getPackage('cc-task-details-eui10-remote-el-ui');
+// const envTarget = 'INT';
 
-let versionsMetadata, envsMetadata;
+// let versionsMetadata, envsMetadata;
 
-Promise.resolve()
+// Promise.resolve()
   // .then(() => {
   //   return installUtils.remotes.getDeps(pkg, envTarget, 'regio');
   // })
   // .then((deps) => {
   //   console.log(deps);
   // })
-  .then(() => {
-    // return versionUtils.packageRemote.getNewVersion(pkg, envTarget);
-    return metadataUtils.packageHistory.generateDiffReport(pkg, envTarget);
-  })
+  // .then(() => {
+  //   // return versionUtils.packageRemote.getNewVersion(pkg, envTarget);
+  //   return metadataUtils.packageHistory.generateDiffReport(pkg, envTarget);
+  // })
 
 
 
@@ -872,3 +872,11 @@ Promise.resolve()
 //   .then((versions) => {
 //     console.log(versions);
 //   })
+
+
+
+Promise.resolve()
+  .then(() => {
+    const prj = configUtils.projects.getProject('rsp-starter-kit');
+    console.log(prj);
+  })

package/scripts/csdr/config/projects.js

@@ -35,10 +35,30 @@ const getProjectOptions = (prj) => {
   return { options: options };
 }
 
+const getProjectPaths = (prj) => {
+  const rootPath = path.join(process.cwd(), prj.folder);
+  let angularPath = rootPath;
+  if (prj.build && prj.build.maven) {
+    angularPath = path.join(rootPath, 'src/main/angular');
+  }
+  const elementsPath = path.join(angularPath, 'src', 'assets', 'elements');
 
-const getProjects = module.exports.getProjects = () => {
-  const projects = innerGlobal.getConfig().projects;
-  return Object.keys(projects).map(p => this.getProject(p));
+  let installPath = process.cwd();
+  let nodeModulesPath = path.join(process.cwd(), 'node_modules');
+  if (prj.standalone) {
+    installPath = path.join(rootPath);
+    nodeModulesPath = path.join(rootPath, 'node_modules');
+  }
+
+  const paths = {
+    rootPath: rootPath,
+    angularPath: angularPath,
+    elementsPath: elementsPath,
+    installPath: installPath,
+    nodeModulesPath: nodeModulesPath,
+  };
+
+  return { paths: paths };
 }
 
 
@@ -66,21 +86,10 @@ module.exports.getProject = (projectName) => {
 
   if (prj) {
     prj.rootName = projectName;
-    const rootPath = path.join(process.cwd(), prj.folder);
-    let angularPath = rootPath;
-    if (prj.build && prj.build.maven) {
-      angularPath = path.join(rootPath, 'src/main/angular');
-    }
-    const elementsPath = path.join(angularPath, 'src', 'assets', 'elements');
-
-    prj.paths = {
-      rootPath: rootPath,
-      angularPath: angularPath,
-      elementsPath: elementsPath
-    };
 
     return {
       ...prj,
+      ...getProjectPaths(prj),
       ...getProjectMetadataDefs(projectName),
       ...getProjectOptions(prj)
     }
@@ -93,30 +102,21 @@ module.exports.getCsdrProject = (projectName) => {
   const prj = innerGlobal.getCsdrConfig(false).projects[projectName];
 
   if (prj) {
-
     prj.rootName = projectName;
-    const rootPath = path.join(process.cwd(), prj.folder);
-    let angularPath = rootPath;
-    if (prj.build && prj.build.maven) {
-      angularPath = path.join(rootPath, 'src/main/angular');
-    }
-    const elementsPath = path.join(angularPath, 'src', 'assets', 'elements');
-
-    prj.paths = {
-      rootPath: rootPath,
-      angularPath: angularPath,
-      elementsPath: elementsPath
-    };
 
     return {
       ...prj,
+      ...getProjectPaths(prj),
       ...getProjectMetadataDefs(projectName),
       ...getProjectOptions(prj)
     }
   }
 }
 
-
+const getProjects = module.exports.getProjects = () => {
+  const projects = innerGlobal.getConfig().projects;
+  return Object.keys(projects).map(p => this.getProject(p));
+}
 
 module.exports.getCsdrProjects = () => {
 

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

@@ -11,7 +11,11 @@ module.exports.install = (prj, envTarget, compositeType) => {
   return Promise.resolve()
     // checking remotes
     .then(() => {
-      return innerProjects.installDeps(prj, envTarget, compositeType);
+      if (prj.standAlone) {
+        return innerProjects.installDepsStandalone(prj);
+      } else {
+        return innerProjects.installDeps(prj, envTarget, compositeType);
+      }
     })
 
     // returning metadata dependencies

package/scripts/csdr/install/projects.js

@@ -75,3 +75,14 @@ module.exports.installDeps = (prj, envTarget, compositeType) => {
       throw e;
     })
 }
+
+module.exports.installDepsStandalone = (prj) => {
+  return Promise.resolve()
+    .then(() => {
+      return innerCommon.executeInstall(prj.paths.installPath);
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/utils/build/app/build-app-utils.js

@@ -35,10 +35,10 @@ const getProjectInfos = () => {
 
 module.exports.angular = (envTarget, isSnapshot, version, configEnvTargetIn) => {
 
-  const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
-
   const currentProject = getProjectInfos();
 
+  const ng = path.resolve(currentProject.paths.nodeModulesPath, '@angular', 'cli', 'bin', 'ng');
+
   // checking if configEnvTarget is passed as param, if not take the global script param
   // as this angular build method can be called in stand-alone (outside of CSDR pipeline flow)
   if (configEnvTargetIn) {

package/scripts/utils/tools.js

@@ -127,9 +127,11 @@ function relativeCopyEol(fileGlob, from, to) {
 function copydir(from, to, overwrite = true, globPattern = '**/*') {
   logInfo('----->copydir from : ' + from + ' ====> to : ' + to );
   var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
+  console.log(files);
   files.forEach(file => {
       const origin = path.join(from, file);
       const dest = path.join(to, file);
+      console.logt(origin, dest);
       _recursiveMkDir(path.dirname(dest));
       fse.copySync(origin, dest, { overwrite: overwrite });
   });