Skip to content

Commit a9594e7

Browse files
author
Angular Builds
committed
3d809ef fix(@angular-devkit/build-angular): validate fileReplacements, allow string styles/scripts
1 parent 9d83456 commit a9594e7

34 files changed

+725
-367
lines changed

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"typings": "src/index.d.ts",
77
"builders": "builders.json",
88
"dependencies": {
9-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#799b2fa",
10-
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#799b2fa",
11-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#799b2fa",
12-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#799b2fa",
9+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#3d809ef",
10+
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#3d809ef",
11+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#3d809ef",
12+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#3d809ef",
1313
"ajv": "^6.0.0",
1414
"autoprefixer": "^8.1.0",
1515
"cache-loader": "^1.2.2",

src/angular-cli-files/models/build-options.d.ts

+6-19
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88
import * as ts from 'typescript';
9-
import { Budget } from '../utilities/bundle-calculator';
9+
import { AssetPattern, Budget, ExtraEntryPoint } from '../../browser/schema';
1010
export interface BuildOptions {
1111
optimization: boolean;
1212
environment?: string;
@@ -22,8 +22,6 @@ export interface BuildOptions {
2222
progress?: boolean;
2323
i18nFile?: string;
2424
i18nFormat?: string;
25-
i18nOutFile?: string;
26-
i18nOutFormat?: string;
2725
i18nLocale?: string;
2826
i18nMissingTranslation?: string;
2927
extractCss?: boolean;
@@ -50,32 +48,21 @@ export interface BuildOptions {
5048
assets: AssetPattern[];
5149
scripts: ExtraEntryPoint[];
5250
styles: ExtraEntryPoint[];
53-
stylePreprocessorOptions: {
51+
stylePreprocessorOptions?: {
5452
includePaths: string[];
5553
};
5654
lazyModules: string[];
5755
platform?: 'browser' | 'server';
5856
}
59-
export interface AssetPattern {
60-
glob: string;
61-
input: string;
62-
output: string;
63-
allowOutsideOutDir?: boolean;
64-
}
65-
export interface ExtraEntryPoint {
66-
input: string;
67-
output?: string;
68-
lazy: boolean;
57+
export interface WebpackTestOptions extends BuildOptions {
58+
codeCoverage?: boolean;
59+
codeCoverageExclude?: string[];
6960
}
70-
export interface WebpackConfigOptions<T extends BuildOptions = BuildOptions> {
61+
export interface WebpackConfigOptions<T = BuildOptions> {
7162
root: string;
7263
projectRoot: string;
7364
buildOptions: T;
7465
tsConfig: ts.ParsedCommandLine;
7566
tsConfigPath: string;
7667
supportES2015: boolean;
7768
}
78-
export interface WebpackTestOptions extends BuildOptions {
79-
codeCoverage?: boolean;
80-
codeCoverageExclude?: string[];
81-
}

src/angular-cli-files/models/build-options.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)