@eui/tools 5.3.33 → 5.3.36

package/.version.properties

@@ -1 +1 @@
-5.3.33
+5.3.36

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+## 5.3.36 (2022-07-14)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong tslint call on package build - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([c2651cb0](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c2651cb0f6262e2c38e3b46e0c66787cbc8e7d92))
+
+* * *
+* * *
+## 5.3.35 (2022-07-14)
+
+##### Chores
+
+* **other:**
+  * minor - EUI-6231 [EUI-6231](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6231)  ([f0c7b31b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f0c7b31bbc6c30daef688f5b4bdbf38a7470ebc5))
+##### Bug Fixes
+
+* **other:**
+  * incorrect tsconfig filename  ([6c65019b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6c65019b150736f2a6bd5d1b9801bbfafe3a5a5b))
+
+* * *
+* * *
+## 5.3.34 (2022-07-14)
+
+##### Chores
+
+* **other:**
+  * support esLint for apps - EUI-6231 [EUI-6231](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6231)  ([6d211c50](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6d211c50cd08ec43d1d129fca64ec0bf010dec1c))
+
+* * *
+* * *
 ## 5.3.33 (2022-07-14)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -877,6 +877,6 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 Promise.resolve()
   .then(() => {
-    const prj = configUtils.projects.getProject('my-workplace-host-playground');
-    console.log(prj);
+    const pkg = configUtils.packages.getPackage('eui', true);
+    console.log(pkg);
   })

package/scripts/csdr/config/packages.js

@@ -107,7 +107,7 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
 
   // additional pkg infos
   pkg.paths = this.getPackagePaths(pkg);
-  pkg.tsConfigFileName = path.parse(pkg.paths.tsConfig).name;
+  pkg.tsConfigFileName = `${path.parse(pkg.paths.tsConfig).name}.json` ;
 
   // devops file location
   if (pkg.child) {

package/scripts/csdr/config/projects.js

@@ -58,6 +58,17 @@ const getProjectPaths = (prj) => {
     nodeModulesPath: nodeModulesPath,
   };
 
+  // locate and find the TSLint or ESLint configuration files
+  if(tools.isFileExists(path.join(rootPath, 'src', 'tslint.json'))) {
+    tools.logWarning('TSLint is deprecated and will be removed in the future. Consider migrating to ESLint')
+    paths.tslintPath = path.join(rootPath, 'src', 'tslint.json');
+  } else if(tools.isFileExists(path.join(rootPath, '.tslint.json'))) {
+    tools.logWarning('TSLint is deprecated and will be removed in the future. Consider migrating to ESLint')
+    paths.tslintPath = path.join(rootPath, '.tslint.json');
+  } else if(tools.isFileExists(path.join(rootPath, 'src', '.eslintrc.json'))) {
+    paths.eslintPath = path.join(rootPath, 'src', '.eslintrc.json');
+  }
+
   return { paths: paths };
 }
 
@@ -156,7 +167,6 @@ module.exports.getCsdrProjects = () => {
 
 
 
-
 module.exports.getTeamsProject = (projects, project) => {
   let teams = [];
 

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

@@ -83,15 +83,29 @@ module.exports.angular = (envTarget, isSnapshot, version, configEnvTargetIn) =>
     .then(() => {
       if (!skipLint) {
         tools.logInfo(`TS Linting application...`);
-        const tsLintPath = path.join(currentProject.paths.angularPath, 'tslint.json');
-        var tsConfigPath = path.join(currentProject.paths.angularPath, 'tsconfig.app.json');
-        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}`);
+        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`);
         }
+
       }
     })
 

package/scripts/utils/build/package/angular.js

@@ -51,8 +51,8 @@ module.exports.build = (pkg, isMaster) => {
         if (tools.isFileExists(tsLintPath)) {
           // TODO: remove TSLint since it's deprecated and should not be used by projects in the future
           tools.logWarning('TSLint is deprecated and will be removed in the future. Consider migrating to ESLint')
-          const script = `running tslint -c ${tsLintPath} -p ${pkg.paths.tsConfig} -t verbose`
-          tools.logInfo(script);
+          const script = `tslint -c ${tsLintPath} -p ${pkg.paths.tsConfig} -t verbose`
+          tools.logInfo(`running ${script}`);
           return tools.runScript(script);
         } else if(tools.isFileExists(esLintPath)) {
           // the project path information are located inside the .eslintrc.json