@@ -38,78 +38,42 @@ import {
3838 NormalizedOptimization ,
3939 NormalizedSourceMaps ,
4040 defaultProgress ,
41- normalizeAssetPatterns ,
42- normalizeFileReplacements ,
43- normalizeOptimization ,
44- normalizeSourceMaps ,
41+ normalizeBuilderSchema ,
4542} from '../utils' ;
4643import {
4744 AssetPatternObject ,
4845 BrowserBuilderSchema ,
4946 CurrentFileReplacement ,
47+ NormalizedBrowserBuilderSchema ,
5048} from './schema' ;
5149const SpeedMeasurePlugin = require ( 'speed-measure-webpack-plugin' ) ;
5250const webpackMerge = require ( 'webpack-merge' ) ;
5351
54-
55- // TODO: figure out a better way to normalize assets, extra entry points, file replacements,
56- // and whatever else needs to be normalized, while keeping type safety.
57- // Right now this normalization has to be done in all other builders that make use of the
58- // BrowserBuildSchema and BrowserBuilder.buildWebpackConfig.
59- // It would really help if it happens during architect.validateBuilderOptions, or similar.
60- export interface NormalizedBrowserBuilderSchema extends
61- Pick <
62- BrowserBuilderSchema ,
63- Exclude < keyof BrowserBuilderSchema , 'sourceMap' | 'vendorSourceMap' | 'optimization' >
64- > ,
65- NormalizedSourceMaps {
66- assets : AssetPatternObject [ ] ;
67- fileReplacements : CurrentFileReplacement [ ] ;
68- optimization : NormalizedOptimization ;
69- }
70-
7152export class BrowserBuilder implements Builder < BrowserBuilderSchema > {
7253
7354 constructor ( public context : BuilderContext ) { }
7455
7556 run ( builderConfig : BuilderConfiguration < BrowserBuilderSchema > ) : Observable < BuildEvent > {
76- let options = builderConfig . options ;
57+ let options : NormalizedBrowserBuilderSchema ;
7758 const root = this . context . workspace . root ;
7859 const projectRoot = resolve ( root , builderConfig . root ) ;
7960 const host = new virtualFs . AliasHost ( this . context . host as virtualFs . Host < fs . Stats > ) ;
8061 const webpackBuilder = new WebpackBuilder ( { ...this . context , host } ) ;
8162
8263 return of ( null ) . pipe (
64+ concatMap ( ( ) => normalizeBuilderSchema (
65+ host ,
66+ root ,
67+ builderConfig ,
68+ ) ) ,
69+ tap ( normalizedOptions => options = normalizedOptions ) ,
8370 concatMap ( ( ) => options . deleteOutputPath
8471 ? this . _deleteOutputDir ( root , normalize ( options . outputPath ) , this . context . host )
8572 : of ( null ) ) ,
86- concatMap ( ( ) => normalizeFileReplacements ( options . fileReplacements , host , root ) ) ,
87- tap ( fileReplacements => options . fileReplacements = fileReplacements ) ,
88- concatMap ( ( ) => normalizeAssetPatterns (
89- options . assets , host , root , projectRoot , builderConfig . sourceRoot ) ) ,
90- // Replace the assets in options with the normalized version.
91- tap ( ( assetPatternObjects => options . assets = assetPatternObjects ) ) ,
92- tap ( ( ) => {
93- const normalizedOptions = normalizeSourceMaps ( options . sourceMap ) ;
94- // todo: remove when removing the deprecations
95- normalizedOptions . vendorSourceMap
96- = normalizedOptions . vendorSourceMap || ! ! options . vendorSourceMap ;
97-
98- options = {
99- ...options ,
100- ...normalizedOptions ,
101- // tslint:disable-next-line:no-any
102- optimization : normalizeOptimization ( options . optimization ) as any ,
103- } ;
104- } ) ,
10573 concatMap ( ( ) => {
10674 let webpackConfig ;
10775 try {
108- webpackConfig = this . buildWebpackConfig ( root , projectRoot , host ,
109- // todo replace with unknown
110- // we need to find a clear way to create this options
111- // tslint:disable-next-line:no-any
112- options as any as NormalizedBrowserBuilderSchema ) ;
76+ webpackConfig = this . buildWebpackConfig ( root , projectRoot , host , options ) ;
11377 } catch ( e ) {
11478 return throwError ( e ) ;
11579 }
0 commit comments