Skip to content

Commit b578c2a

Browse files
committed
Revert "fix(@angular-devkit/build-angular): use process TTY as progress default"
This reverts commit 6b0e14f. It was actually a feature and didn't belong in a patch release 6.1.3
1 parent 33e3f3e commit b578c2a

File tree

9 files changed

+10
-29
lines changed

9 files changed

+10
-29
lines changed

packages/angular_devkit/build_angular/src/browser/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import {
3434
statsToString,
3535
statsWarningsToString,
3636
} from '../angular-cli-files/utilities/stats';
37-
import { defaultProgress, normalizeAssetPatterns, normalizeFileReplacements } from '../utils';
37+
import { normalizeAssetPatterns, normalizeFileReplacements } from '../utils';
3838
import { AssetPatternObject, BrowserBuilderSchema, CurrentFileReplacement } from './schema';
3939
const webpackMerge = require('webpack-merge');
4040

@@ -138,8 +138,6 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
138138
supportES2015,
139139
};
140140

141-
wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
142-
143141
const webpackConfigs: {}[] = [
144142
getCommonConfig(wco),
145143
getBrowserConfig(wco),

packages/angular_devkit/build_angular/src/browser/schema.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export interface BrowserBuilderSchema {
104104
/**
105105
* Log progress to the console while building.
106106
*/
107-
progress?: boolean;
107+
progress: boolean;
108108

109109
/**
110110
* Localization file to use for i18n.

packages/angular_devkit/build_angular/src/browser/schema.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115
},
116116
"progress": {
117117
"type": "boolean",
118-
"description": "Log progress to the console while building."
118+
"description": "Log progress to the console while building.",
119+
"default": true
119120
},
120121
"i18nFile": {
121122
"type": "string",

packages/angular_devkit/build_angular/src/karma/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
2828
import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
2929
import { AssetPatternObject, CurrentFileReplacement } from '../browser/schema';
30-
import { defaultProgress, normalizeAssetPatterns, normalizeFileReplacements } from '../utils';
30+
import { normalizeAssetPatterns, normalizeFileReplacements } from '../utils';
3131
import { KarmaBuilderSchema } from './schema';
3232
const webpackMerge = require('webpack-merge');
3333

@@ -137,8 +137,6 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
137137
supportES2015,
138138
};
139139

140-
wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
141-
142140
const webpackConfigs: {}[] = [
143141
getCommonConfig(wco),
144142
getStylesConfig(wco),

packages/angular_devkit/build_angular/src/karma/schema.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@
7777
},
7878
"progress": {
7979
"type": "boolean",
80-
"description": "Log progress to the console while building."
80+
"description": "Log progress to the console while building.",
81+
"default": true
8182
},
8283
"watch": {
8384
"type": "boolean",

packages/angular_devkit/build_angular/src/server/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
3131
import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
3232
import { getBrowserLoggingCb } from '../browser';
33-
import { defaultProgress, normalizeFileReplacements } from '../utils';
33+
import { normalizeFileReplacements } from '../utils';
3434
import { BuildWebpackServerSchema } from './schema';
3535
const webpackMerge = require('webpack-merge');
3636

@@ -98,8 +98,6 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
9898
supportES2015,
9999
};
100100

101-
wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
102-
103101
const webpackConfigs: {}[] = [
104102
getCommonConfig(wco),
105103
getServerConfig(wco),

packages/angular_devkit/build_angular/src/server/schema.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
},
8181
"progress": {
8282
"type": "boolean",
83-
"description": "Log progress to the console while building."
83+
"description": "Log progress to the console while building.",
84+
"default": true
8485
},
8586
"i18nFile": {
8687
"type": "string",

packages/angular_devkit/build_angular/src/utils/default-progress.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

packages/angular_devkit/build_angular/src/utils/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
export * from './default-progress';
109
export * from './run-module-as-observable-fork';
1110
export * from './normalize-file-replacements';
1211
export * from './normalize-asset-patterns';

0 commit comments

Comments
 (0)