@eui/tools 6.2.20 → 6.2.22

package/.version.properties

@@ -1 +1 @@
-6.2.20
+6.2.22

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.22 (2022-11-14)
+
+##### Bug Fixes
+
+* **other:**
+  * virtual host building issue - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([4e158dbf](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4e158dbf0995cd9e5cf6b83ac51f0999ceab2b87))
+
+* * *
+* * *
+## 6.2.21 (2022-11-14)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong pkg gathered on normal package installation - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([84a6147d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/84a6147da6a3c13a4f4a638fba0990c8a070ed02))
+
+* * *
+* * *
 ## 6.2.20 (2022-11-12)
 
 ##### Bug Fixes

package/bin/scripts/lint-app.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const lintAppUtils = require('../../scripts/utils/lint/app/lint-app-utils');
+
+Promise.resolve()
+  .then(() => {
+    return lintAppUtils.run();
+  })
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  });

package/package.json

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

package/scripts/csdr/init/init.js

@@ -87,12 +87,15 @@ module.exports.init = () => {
 
     // clone or install linked host package to project if any
     .then(() => {
-      if (finalResponse.project && !build) {
+      // TODO
+      // if (finalResponse.project && !build) {
+      if (finalResponse.project) {
         return initUtils.packages.cloneHostPackage(finalResponse.project);
-
-      } else if (finalResponse.project && build) {
-        return initUtils.packages.installHostPackage(finalResponse.project);
       }
+      // TODO
+      // } else if (finalResponse.project && build) {
+      //   return initUtils.packages.installHostPackage(finalResponse.project);
+      // }
     })
 
     // Initializing .meta based on .euirc.json for local respoisitories cloning

package/scripts/csdr/init/packages.js

@@ -92,7 +92,7 @@ module.exports.cloneHostPackage = (projectName) => {
     return;
   }
 
-  tools.logTitle('Installing host package');
+  tools.logTitle('Initializing host package');
 
   let pkg;
 
@@ -102,7 +102,7 @@ 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), 'develop');
+      return gitUtils.cloneAndCheckout(pkg.repository, path.join(process.cwd(), 'packages', pkg.name), 'master');
     })
 
     .then(() => {

package/scripts/csdr/install/local-dev.js

@@ -12,12 +12,7 @@ const innerProjects = require('./projects');
 const innerPackages = require('./packages');
 
 module.exports.installPackage = (pkgName) => {
-
-  const pkg = configUtils.remotes.getRemote(pkgName);
-
-  if (!pkg) {
-    pkg = configUtils.packages.getPackage(pkgName, false, true);
-  }
+  pkg = configUtils.packages.getPackage(pkgName, false, true);
 
   return Promise.resolve()
     .then(() => {

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

@@ -0,0 +1,87 @@
+'use strict';
+
+const path = require('path');
+
+const tools = require('../../tools');
+const configUtils = require('../../../csdr/config/config-utils');
+
+let {
+  skipLint, skipTest, baseHref, maxSpaceSize, sourceMap,
+} = tools.getArgs();
+
+
+const getProjectInfos = () => {
+  // getting the project from installed config
+  const prj = configUtils.projects.getProject();
+
+  // exit if project can't be found in the local installed config
+  if (!prj) {
+    tools.logError('ERROR!!! Unable to find project to be used');
+    tools.logInfo('usage : eui-scripts build-app <project-name>');
+    throw new Error('PROJECT_NOT_FOUND');
+  }
+
+  return prj;
+};
+
+
+module.exports.run = () => {
+
+  const currentProject = getProjectInfos();
+
+  const ng = path.resolve(currentProject.paths.nodeModulesPath, '@angular', 'cli', 'bin', 'ng');
+
+  // getting param from project config
+  if (currentProject.build) {
+    if (currentProject.build.skipLint) {
+      skipLint = true;
+    }
+    if (currentProject.build.skipTest) {
+      skipTest = true;
+    }
+    if (currentProject.build.maxSpaceSize) {
+      maxSpaceSize = true;
+    }
+    if (currentProject.build.sourceMap) {
+      sourceMap = true;
+    }
+    // getting baseHref from project config, dynamic or staticly defined
+    baseHref = configUtils.projects.getBaseHref(currentProject, version, baseHref);
+    tools.logInfo(`base-href found : ${baseHref}`);
+  }
+
+
+  return Promise.resolve()
+    .then(() => {
+      if (!skipLint) {
+        tools.logInfo(`TS Linting application...`);
+        let tsLintPath = currentProject.paths.tslintPath;
+        let esLintPath = currentProject.paths.eslintPath;
+
+        // TODO: remove TSLint since it's deprecated and should not be used by projects in the future
+        if(tsLintPath) {
+          tsLintPath = path.join(tsLintPath);
+          let tsConfigPath = path.join(currentProject.paths.angularPath, 'tsconfig.app.json');
+          tools.logWarning('TSLint is deprecated and will be removed in the future. Consider migrating to ESLint')
+          if (!tools.isFileExists(tsConfigPath)) {
+            tsConfigPath = path.join(currentProject.paths.angularPath, 'src', 'tsconfig.app.json');
+          }
+          if (tools.isFileExists(tsConfigPath)) {
+            tools.logInfo(`running tslint -c ${tsLintPath} -p ${tsConfigPath}`);
+            return tools.runScript(`tslint -c ${tsLintPath} -p ${tsConfigPath}`);
+          }
+        } else if (esLintPath) {
+          // the project path information are located inside the .eslintrc.json
+          tools.logInfo(`running ng lint ${currentProject.name}`);
+          return tools.runScript(`ng lint ${currentProject.name}`);
+        } else {
+          tools.logError(`No ESLint or TSLint configuration found for the project`);
+        }
+
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}