diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts index de8c417d69b5..8b81938e3fbf 100644 --- a/packages/angular_devkit/build_angular/src/browser/index.ts +++ b/packages/angular_devkit/build_angular/src/browser/index.ts @@ -34,7 +34,7 @@ import { statsToString, statsWarningsToString, } from '../angular-cli-files/utilities/stats'; -import { normalizeAssetPatterns, normalizeFileReplacements } from '../utils'; +import { defaultProgress, normalizeAssetPatterns, normalizeFileReplacements } from '../utils'; import { AssetPatternObject, BrowserBuilderSchema, CurrentFileReplacement } from './schema'; const webpackMerge = require('webpack-merge'); @@ -138,6 +138,8 @@ export class BrowserBuilder implements Builder { supportES2015, }; + wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress); + const webpackConfigs: {}[] = [ getCommonConfig(wco), getBrowserConfig(wco), diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts index 65ea0742abdc..eb887a851f24 100644 --- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts +++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts @@ -104,7 +104,7 @@ export interface BrowserBuilderSchema { /** * Log progress to the console while building. */ - progress: boolean; + progress?: boolean; /** * Localization file to use for i18n. diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json index 004a423e8d79..d013f123e68f 100644 --- a/packages/angular_devkit/build_angular/src/browser/schema.json +++ b/packages/angular_devkit/build_angular/src/browser/schema.json @@ -115,8 +115,7 @@ }, "progress": { "type": "boolean", - "description": "Log progress to the console while building.", - "default": true + "description": "Log progress to the console while building." }, "i18nFile": { "type": "string", diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts index b4dff24766d7..f12b29015c5a 100644 --- a/packages/angular_devkit/build_angular/src/karma/index.ts +++ b/packages/angular_devkit/build_angular/src/karma/index.ts @@ -27,7 +27,7 @@ import { import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig'; import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module'; import { AssetPatternObject, CurrentFileReplacement } from '../browser/schema'; -import { normalizeAssetPatterns, normalizeFileReplacements } from '../utils'; +import { defaultProgress, normalizeAssetPatterns, normalizeFileReplacements } from '../utils'; import { KarmaBuilderSchema } from './schema'; const webpackMerge = require('webpack-merge'); @@ -137,6 +137,8 @@ export class KarmaBuilder implements Builder { supportES2015, }; + wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress); + const webpackConfigs: {}[] = [ getCommonConfig(wco), getStylesConfig(wco), diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json index 31fc76f52ca8..ce3414672ef6 100644 --- a/packages/angular_devkit/build_angular/src/karma/schema.json +++ b/packages/angular_devkit/build_angular/src/karma/schema.json @@ -77,8 +77,7 @@ }, "progress": { "type": "boolean", - "description": "Log progress to the console while building.", - "default": true + "description": "Log progress to the console while building." }, "watch": { "type": "boolean", diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts index 7b10319156a4..590030022bdb 100644 --- a/packages/angular_devkit/build_angular/src/server/index.ts +++ b/packages/angular_devkit/build_angular/src/server/index.ts @@ -30,7 +30,7 @@ import { import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig'; import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module'; import { getBrowserLoggingCb } from '../browser'; -import { normalizeFileReplacements } from '../utils'; +import { defaultProgress, normalizeFileReplacements } from '../utils'; import { BuildWebpackServerSchema } from './schema'; const webpackMerge = require('webpack-merge'); @@ -98,6 +98,8 @@ export class ServerBuilder implements Builder { supportES2015, }; + wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress); + const webpackConfigs: {}[] = [ getCommonConfig(wco), getServerConfig(wco), diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json index 5b64055de443..d18952ac4c21 100644 --- a/packages/angular_devkit/build_angular/src/server/schema.json +++ b/packages/angular_devkit/build_angular/src/server/schema.json @@ -80,8 +80,7 @@ }, "progress": { "type": "boolean", - "description": "Log progress to the console while building.", - "default": true + "description": "Log progress to the console while building." }, "i18nFile": { "type": "string", diff --git a/packages/angular_devkit/build_angular/src/utils/default-progress.ts b/packages/angular_devkit/build_angular/src/utils/default-progress.ts new file mode 100644 index 000000000000..258412b460f1 --- /dev/null +++ b/packages/angular_devkit/build_angular/src/utils/default-progress.ts @@ -0,0 +1,15 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +export function defaultProgress(progress: boolean | undefined): boolean { + if (progress === undefined) { + return process.stdout.isTTY === true; + } + + return progress; +} diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts index 488c3f4c9e8d..be8b36d7091a 100644 --- a/packages/angular_devkit/build_angular/src/utils/index.ts +++ b/packages/angular_devkit/build_angular/src/utils/index.ts @@ -6,6 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ +export * from './default-progress'; export * from './run-module-as-observable-fork'; export * from './normalize-file-replacements'; export * from './normalize-asset-patterns';