@eui/tools 5.3.32 → 5.3.35

package/.version.properties

@@ -1 +1 @@
-5.3.32
+5.3.35

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+## 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
+
+* **other:**
+  * support tsconfig.json usage in lib packages - EUI-6227 [EUI-6227](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6227)  ([72c220f8](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/72c220f872f652b4f94359a74d89845d29b475a5))
+
+* * *
+* * *
 ## 5.3.32 (2022-07-13)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/config/angular.js

@@ -1085,7 +1085,7 @@ const angularPackageDef = {
     "build": {
       "builder": "@angular-devkit/build-ng-packagr:build",
       "options": {
-        "tsConfig": "@path@/@module.name@/tsconfig.lib.json",
+        "tsConfig": "@path@/@module.name@/@tsconfig@",
         "project": "@path@/@module.name@/ng-package.json"
       },
       "configurations": {
@@ -1114,12 +1114,12 @@ const angularPackageSubEntryDef = {
     "build": {
       "builder": "@angular-devkit/build-angular:ng-packagr",
       "options": {
-        "tsConfig": "packages/eui/packages/components/tsconfig.lib.json",
+        "tsConfig": "packages/eui/packages/components/@tsconfig@",
         "project": "packages/eui/packages/components/@subEntry.path@/@subEntry.package.name@"
       },
       "configurations": {
         "production": {
-          "tsConfig": "packages/eui/packages/components/tsconfig.lib.json"
+          "tsConfig": "packages/eui/packages/components/@tsconfig@"
         }
       }
     },
@@ -1154,7 +1154,7 @@ const angularPackageDefV13 = {
     "build": {
       "builder": "@angular-devkit/build-angular:ng-packagr",
       "options": {
-        "tsConfig": "@path@/@module.name@/tsconfig.lib.json",
+        "tsConfig": "@path@/@module.name@/@tsconfig@",
         "project": "@path@/@module.name@/ng-package.json"
       },
       "configurations": {
@@ -1194,7 +1194,7 @@ const angularPackageDefV14 = {
     "build": {
       "builder": "@angular-devkit/build-angular:ng-packagr",
       "options": {
-        "tsConfig": "@path@/@module.name@/tsconfig.lib.json",
+        "tsConfig": "@path@/@module.name@/@tsconfig@",
         "project": "@path@/@module.name@/ng-package.json"
       },
       "configurations": {
@@ -1385,14 +1385,15 @@ module.exports.registerAngularPackage = (pkg, isReset) => {
   const replacePath = tools.replaceAll(replaceModule, '@path@', pathBase);
   const replaceSrcRoot = tools.replaceAll(replacePath, '@srcRoot@', srcRoot);
   const replaceSrcRootTesting = tools.replaceAll(replaceSrcRoot, '@srcRootTesting@', srcRootTesting);
+  const replaceTSConfig = tools.replaceAll(replaceSrcRootTesting, '@tsconfig@', pkg.tsConfigFileName);
 
-  jsonFile['projects'][pkg.name] = JSON.parse(replaceSrcRootTesting);
+  jsonFile['projects'][pkg.name] = JSON.parse(replaceTSConfig);
 
   tools.writeJsonFileSync(file, jsonFile);
 }
 
 
-module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath) => {
+module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath, pkg) => {
   const file = path.join(process.cwd(), 'angular.json');
   const jsonFile = require(file);
 
@@ -1400,6 +1401,7 @@ module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath) =>
 
   let replacePath = tools.replaceAll(projectDef, '@subEntry.path@', subEntryName)
   replacePath = tools.replaceAll(replacePath, '@subEntry.package.name@', 'ng-package.json');
+  replacePath = tools.replaceAll(replacePath, '@tsconfig@', pkg.tsConfigFileName);
 
   jsonFile['projects'][subEntryName] = JSON.parse(replacePath);
 

package/scripts/csdr/config/packages.js

@@ -107,6 +107,7 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
 
   // additional pkg infos
   pkg.paths = this.getPackagePaths(pkg);
+  pkg.tsConfigFileName = `${path.parse(pkg.paths.tsConfig).name}.json` ;
 
   // devops file location
   if (pkg.child) {
@@ -182,6 +183,7 @@ module.exports.getPackagePaths = (pkg) => {
     pkgJson: resolvePath(packagesPath + '/' + folder + '/package.json'),
     pkgSrc: resolvePath(packagesPath + '/' + folder + '/src'),
     pkgLibFolder: resolvePath(packagesPath + '/' + folder + '/src/lib'),
+    tsConfig: this.getTSConfigPath(resolvePath, packagesPath + '/' + folder),
   };
 
   return paths;
@@ -307,3 +309,13 @@ module.exports.getLocalPackagesEuiVersion = () => {
 
   return versionsFound;
 }
+
+module.exports.getTSConfigPath = (resolvePath, packagePath) => {
+  const path = resolvePath(`${packagePath}/tsconfig.json`);
+  const oldPath = resolvePath(`${packagePath}/tsconfig.lib.json`);
+  return fs.existsSync(path) ? path : oldPath;
+}
+
+module.exports.getTSConfigFileName = (tsConfigPath) => {
+  return tsConfigPath.split('/')[tsConfigPath.split('/').length - 1];
+}

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,9 +51,9 @@ 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 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 script = `running tslint -c ${tsLintPath} -p ${pkg.paths.tsConfig} -t verbose`
+          tools.logInfo(script);
+          return tools.runScript(script);
         } else if(tools.isFileExists(esLintPath)) {
           // the project path information are located inside the .eslintrc.json
           tools.logInfo(`running ng lint ${pkg.name}`);
@@ -101,7 +101,7 @@ module.exports.build = (pkg, isMaster) => {
             return tools.rimraf(docDistPath);
           })
           .then(() => {
-            return tools.runScript(`compodoc -p ${pkg.paths.pkgRootDirectory}/tsconfig.lib.json -d ${docDistPath} --theme material --disableGraph --disableCoverage --disableSourceCode --disableDomTree --disableProtected --disablePrivate --disableLifeCycleHooks --disableTemplateTab --disableStyleTab --hideGenerator --toggleMenuItems all`);
+            return tools.runScript(`compodoc -p ${pkg.paths.pkgRootDirectory}/${pkg.tsConfigFileName} -d ${docDistPath} --theme material --disableGraph --disableCoverage --disableSourceCode --disableDomTree --disableProtected --disablePrivate --disableLifeCycleHooks --disableTemplateTab --disableStyleTab --hideGenerator --toggleMenuItems all`);
           })
           .then(() => {
             tools.logSuccess();

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

@@ -217,7 +217,7 @@ module.exports.buildSubEntry = (pkg, subEntry) => {
           subEntryPath = subEntryPath.replace('/ng-package.json', '');
           tools.logInfo(`${subEntryPath} found... injecting angular.json for sub entry`);
 
-          return configUtils.angular.registerAngularPackageSubEntry(subEntry, subEntryPath);
+          return configUtils.angular.registerAngularPackageSubEntry(subEntry, subEntryPath, pkg);
         };
       }
     })