Skip to content

Commit cbac8ed

Browse files
filipesilvahansl
filipesilva
authored and
hansl
committed
fix(@angular-devkit/build-webpack): fixes from adding Angular CLI tests
1 parent 9021188 commit cbac8ed

File tree

78 files changed

+4528
-675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+4528
-675
lines changed

‎package-lock.json‎

Lines changed: 140 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,23 @@
5050
},
5151
"homepage": "https://github.com/angular/devkit",
5252
"dependencies": {
53+
"@angular-devkit/build-optimizer": "^0.4.2",
5354
"@angular/common": "^5.2.1",
5455
"@angular/compiler": "^5.2.1",
5556
"@angular/compiler-cli": "^5.2.1",
5657
"@angular/core": "^5.2.1",
58+
"@angular/http": "^5.2.6",
59+
"@angular/material": "^5.2.3",
5760
"@angular/platform-browser": "^5.2.1",
5861
"@angular/platform-browser-dynamic": "^5.2.1",
62+
"@angular/router": "^5.2.6",
5963
"@angular/service-worker": "^5.2.1",
6064
"@ngtools/json-schema": "^1.0.9",
61-
"@ngtools/webpack": "^1.10.0-rc.0",
65+
"@ngtools/webpack": "angular/ngtools-webpack-builds#5474750",
6266
"@types/common-tags": "^1.4.0",
6367
"@types/copy-webpack-plugin": "^4.0.1",
6468
"@types/denodeify": "^1.2.31",
69+
"@types/express": "^4.11.1",
6570
"@types/glob": "^5.0.29",
6671
"@types/istanbul": "^0.4.29",
6772
"@types/jasmine": "^2.5.47",
@@ -75,6 +80,7 @@
7580
"@types/webpack-sources": "^0.1.3",
7681
"ajv": "^5.5.1",
7782
"autoprefixer": "^7.2.3",
83+
"bootstrap": "^4.0.0",
7884
"chalk": "~2.2.2",
7985
"chokidar": "^1.7.0",
8086
"circular-dependency-plugin": "^4.3.0",
@@ -86,12 +92,15 @@
8692
"css-loader": "^0.28.7",
8793
"denodeify": "^1.2.1",
8894
"exports-loader": "^0.6.4",
95+
"express": "^4.16.2",
8996
"extract-text-webpack-plugin": "^3.0.2",
9097
"file-loader": "^1.1.5",
98+
"font-awesome": "^4.7.0",
9199
"glob": "^7.0.3",
92100
"html-webpack-plugin": "^2.30.1",
93101
"husky": "^0.14.3",
94102
"istanbul": "^0.4.5",
103+
"istanbul-instrumenter-loader": "^3.0.0",
95104
"jasmine": "^2.6.0",
96105
"jasmine-spec-reporter": "^3.2.0",
97106
"karma": "~2.0.0",
@@ -126,6 +135,7 @@
126135
"source-map": "^0.5.6",
127136
"source-map-loader": "^0.2.3",
128137
"source-map-support": "^0.5.0",
138+
"stats-webpack-plugin": "^0.6.2",
129139
"style-loader": "^0.19.1",
130140
"stylus": "^0.54.5",
131141
"stylus-loader": "^3.0.1",

‎packages/angular_devkit/build_webpack/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"silent-error": "^1.1.0",
4747
"source-map-loader": "^0.2.3",
4848
"source-map-support": "^0.5.0",
49+
"stats-webpack-plugin": "^0.6.2",
4950
"style-loader": "^0.19.1",
5051
"stylus": "^0.54.5",
5152
"stylus-loader": "^3.0.1",

‎packages/angular_devkit/build_webpack/src/angular-cli-files/models/build-options.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// TODO: cleanup this file, it's copied as is from Angular CLI.
33

44
export interface BuildOptions {
5-
target?: string;
5+
optimizationLevel: number;
66
environment?: string;
77
outputPath: string;
88
aot?: boolean;
9-
sourcemaps?: boolean;
10-
evalSourcemaps?: boolean;
9+
sourceMap?: boolean;
10+
evalSourceMap?: boolean;
1111
vendorChunk?: boolean;
1212
commonChunk?: boolean;
1313
baseHref?: string;
@@ -18,8 +18,8 @@ export interface BuildOptions {
1818
i18nFormat?: string;
1919
i18nOutFile?: string;
2020
i18nOutFormat?: string;
21-
locale?: string;
22-
missingTranslation?: string;
21+
i18nLocale?: string;
22+
i18nMissingTranslation?: string;
2323
extractCss?: boolean;
2424
bundleDependencies?: 'none' | 'all';
2525
watch?: boolean;
@@ -36,6 +36,8 @@ export interface BuildOptions {
3636
forceTsCommonjs?: boolean;
3737
serviceWorker?: boolean;
3838
skipAppShell?: boolean;
39+
statsJson: boolean;
40+
forkTypeChecker: boolean;
3941
}
4042

4143
export interface WebpackConfigOptions<T extends BuildOptions = BuildOptions> {
@@ -48,4 +50,5 @@ export interface WebpackConfigOptions<T extends BuildOptions = BuildOptions> {
4850

4951
export interface WebpackTestOptions extends BuildOptions {
5052
codeCoverage?: boolean;
53+
codeCoverageExclude: string[];
5154
}

0 commit comments

Comments
 (0)