@eui/tools 5.3.31 → 5.3.34

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);
         };
       }
     })