@eui/tools 5.3.27 → 5.3.28

package/.version.properties

@@ -1 +1 @@
-5.3.27
+5.3.28

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.3.28 (2022-07-11)
+
+##### Chores
+
+* **other:**
+  * migrate to tslint - EUI-3809 [EUI-3809](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-3809)  ([c830f8d4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c830f8d4c2a403cd60d743f78924349a4f278edb))
+
+* * *
+* * *
 ## 5.3.27 (2022-06-29)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/config/angular.js

@@ -238,6 +238,16 @@ const angularProjectDefV13 = {
     }
   },
   "architect": {
+      "lint": {
+        "builder": "@angular-eslint/builder:lint",
+        "options": {
+          "lintFilePatterns": [
+            "apps/@project.name@/**/*.ts",
+            "apps/@project.name@/**/*.html"
+          ],
+          "eslintConfig": "apps/@project.name@/.eslintrc.json"
+        }
+      },
       "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
@@ -390,6 +400,16 @@ const angularProjectDefV14 = {
     }
   },
   "architect": {
+      "lint": {
+        "builder": "@angular-eslint/builder:lint",
+        "options": {
+          "lintFilePatterns": [
+            "apps/@project.name@/**/*.ts",
+            "apps/@project.name@/**/*.html"
+          ],
+          "eslintConfig": "apps/@project.name@/.eslintrc.json"
+        }
+      },
       "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
@@ -1102,6 +1122,14 @@ const angularPackageSubEntryDef = {
           "tsConfig": "packages/eui/packages/components/tsconfig.lib.json"
         }
       }
+    },
+    "test": {
+      "builder": "@angular-devkit/build-angular:karma",
+      "options": {
+        "main": "packages/eui/packages/components/@subEntry.path@/test.ts",
+        "tsConfig": "packages/eui/packages/components/@subEntry.path@/tsconfig.spec.json",
+        "karmaConfig": "packages/eui/packages/components/@subEntry.path@/karma.conf.js"
+      }
     }
   }
 };
@@ -1113,6 +1141,16 @@ const angularPackageDefV13 = {
   "projectType": "library",
   "prefix": "lib",
   "architect": {
+    "lint": {
+      "builder": "@angular-eslint/builder:lint",
+      "options": {
+        "lintFilePatterns": [
+          "@path@/@module.name@/**/*.ts",
+          "@path@/@module.name@/**/*.html"
+        ],
+        "eslintConfig": "@path@/@module.name@/.eslintrc.json"
+      }
+    },
     "build": {
       "builder": "@angular-devkit/build-angular:ng-packagr",
       "options": {
@@ -1143,6 +1181,16 @@ const angularPackageDefV14 = {
   "projectType": "library",
   "prefix": "lib",
   "architect": {
+    "lint": {
+      "builder": "@angular-eslint/builder:lint",
+      "options": {
+        "lintFilePatterns": [
+          "@path@/@module.name@/**/*.ts",
+          "@path@/@module.name@/**/*.html"
+        ],
+        "eslintConfig": "@path@/@module.name@/.eslintrc.json"
+      }
+    },
     "build": {
       "builder": "@angular-devkit/build-angular:ng-packagr",
       "options": {

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

@@ -46,9 +46,21 @@ module.exports.build = (pkg, isMaster) => {
       if (!skipLint) {
         tools.logInfo('Linting...');
         const tsLintPath = path.join(pkg.paths.pkgRootDirectory, 'tslint.json');
-        const tsConfigPath = path.join(pkg.paths.pkgRootDirectory, 'tsconfig.lib.json');
-        tools.logInfo(`running tslint -c ${tsLintPath} -p ${tsConfigPath}`);
-        return tools.runScript(`tslint -c ${tsLintPath} -p ${tsConfigPath} -t verbose`);
+        const esLintPath = path.join(pkg.paths.pkgRootDirectory, '.eslintrc.json');
+
+        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 tsConfigPath = path.join(pkg.paths.pkgRootDirectory, 'tsconfig.lib.json');
+          tools.logInfo(`running tslint -c ${tsLintPath} -p ${tsConfigPath}`);
+          return tools.runScript(`tslint -c ${tsLintPath} -p ${tsConfigPath} -t verbose`);
+        } else if(tools.isFileExists(esLintPath)) {
+          // the project path information are located inside the .eslintrc.json
+          tools.logInfo(`running ng lint ${pkg.name}`);
+          return tools.runScript(`ng lint ${pkg.name}`);
+        } else {
+          tools.logError(`No ESLint or TSLint configuration found for the project`);
+        }
       }
     })
     .then(() => {