Skip to content

Commit

Permalink
fix(engine): watch mode
Browse files Browse the repository at this point in the history
fix #644
  • Loading branch information
vogloblinsky committed Sep 6, 2018
1 parent 6220375 commit cc9c887
Showing 1 changed file with 36 additions and 20 deletions.
56 changes: 36 additions & 20 deletions src/app/application.ts
Expand Up @@ -398,7 +398,18 @@ export class Application {
*/
private getMicroDependenciesData(): void {
logger.info('Get diff dependencies data');
let crawler = new Dependencies(

let dependenciesClass: AngularDependencies | AngularJSDependencies = AngularDependencies;
this.configuration.mainData.angularProject = true;

if (this.detectAngularJSProjects()) {
logger.info('AngularJS project detected');
this.configuration.mainData.angularProject = false;
this.configuration.mainData.angularJSProject = true;
dependenciesClass = AngularJSDependencies;
}

let crawler = new dependenciesClass(
this.updatedFiles,
{
tsconfigDirectory: path.dirname(this.configuration.mainData.tsconfig)
Expand Down Expand Up @@ -440,23 +451,11 @@ export class Application {
});
}

private getDependenciesData(): void {
logger.info('Get dependencies data');

/**
* AngularJS detection strategy :
* - if in package.json
* - if 75% of scanned files are *.js files
*/
let dependenciesClass: AngularDependencies | AngularJSDependencies = AngularDependencies;
this.configuration.mainData.angularProject = true;

private detectAngularJSProjects() {
let result = false;
if (typeof this.packageJsonData.dependencies !== 'undefined') {
if (typeof this.packageJsonData.dependencies.angular !== 'undefined') {
logger.info('AngularJS project detected');
this.configuration.mainData.angularProject = false;
this.configuration.mainData.angularJSProject = true;
dependenciesClass = AngularJSDependencies;
result = true;
} else {
let countJSFiles = 0;
this.files.forEach((file) => {
Expand All @@ -466,13 +465,30 @@ export class Application {
});
let percentOfJSFiles = (countJSFiles * 100) / this.files.length;
if (percentOfJSFiles >= 75) {
logger.info('AngularJS project detected');
this.configuration.mainData.angularProject = false;
this.configuration.mainData.angularJSProject = true;
dependenciesClass = AngularJSDependencies;
result = true;
}
}
}
return result;
}

private getDependenciesData(): void {
logger.info('Get dependencies data');

/**
* AngularJS detection strategy :
* - if in package.json
* - if 75% of scanned files are *.js files
*/
let dependenciesClass: AngularDependencies | AngularJSDependencies = AngularDependencies;
this.configuration.mainData.angularProject = true;

if (this.detectAngularJSProjects()) {
logger.info('AngularJS project detected');
this.configuration.mainData.angularProject = false;
this.configuration.mainData.angularJSProject = true;
dependenciesClass = AngularJSDependencies;
}

let crawler = new dependenciesClass(
this.files,
Expand Down

0 comments on commit cc9c887

Please sign in to comment.