Skip to content

Commit 3e5f01a

Browse files
author
Angular Builds
committed
c18ba5fb6 fix(@ngtools/webpack): gracefully show error when compiling broken component styles
1 parent a740822 commit 3e5f01a

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "@angular-devkit/build-angular",
3-
"version": "0.802.0+2.d212620",
3+
"version": "0.802.0+7.c18ba5f",
44
"description": "Angular Webpack Build Facade",
55
"experimental": true,
66
"main": "src/index.js",
77
"typings": "src/index.d.ts",
88
"builders": "builders.json",
99
"dependencies": {
10-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#d212620bf",
11-
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#d212620bf",
12-
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#d212620bf",
13-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#d212620bf",
14-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#d212620bf",
10+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#c18ba5fb6",
11+
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#c18ba5fb6",
12+
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#c18ba5fb6",
13+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#c18ba5fb6",
14+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#c18ba5fb6",
1515
"ajv": "6.10.2",
1616
"autoprefixer": "9.6.1",
1717
"browserslist": "4.6.6",

src/angular-cli-files/models/webpack-configs/common.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,20 @@ function getCommonConfig(wco) {
224224
ngDevMode: false,
225225
ngI18nClosureMode: false,
226226
};
227-
try {
228-
// Try to load known global definitions from @angular/compiler-cli.
229-
// tslint:disable-next-line:no-implicit-dependencies
230-
const GLOBAL_DEFS_FOR_TERSER = require('@angular/compiler-cli').GLOBAL_DEFS_FOR_TERSER;
231-
if (GLOBAL_DEFS_FOR_TERSER) {
232-
angularGlobalDefinitions = GLOBAL_DEFS_FOR_TERSER;
233-
}
227+
// Try to load known global definitions from @angular/compiler-cli.
228+
const GLOBAL_DEFS_FOR_TERSER = require('@angular/compiler-cli').GLOBAL_DEFS_FOR_TERSER;
229+
if (GLOBAL_DEFS_FOR_TERSER) {
230+
angularGlobalDefinitions = GLOBAL_DEFS_FOR_TERSER;
234231
}
235-
catch (_b) {
236-
// Do nothing, the default above will be used instead.
232+
if (buildOptions.aot) {
233+
// Also try to load AOT-only global definitions.
234+
const GLOBAL_DEFS_FOR_TERSER_WITH_AOT = require('@angular/compiler-cli').GLOBAL_DEFS_FOR_TERSER_WITH_AOT;
235+
if (GLOBAL_DEFS_FOR_TERSER_WITH_AOT) {
236+
angularGlobalDefinitions = {
237+
...angularGlobalDefinitions,
238+
...GLOBAL_DEFS_FOR_TERSER_WITH_AOT,
239+
};
240+
}
237241
}
238242
const terserOptions = {
239243
ecma: wco.supportES2015 ? 6 : 5,

uniqueId

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Fri Aug 02 2019 21:11:42 GMT+0000 (Coordinated Universal Time)
1+
Tue Aug 06 2019 01:26:55 GMT+0000 (Coordinated Universal Time)

0 commit comments

Comments
 (0)