Skip to content

Commit 7d3c2b3

Browse files
committed
refactor(@angular/cli): cleanup leftover tsconfig reading logic
Followup to angular#7937
1 parent 46530b9 commit 7d3c2b3

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

packages/@angular/cli/models/webpack-configs/common.ts

-2
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
157157
extraPlugins.push(new NamedLazyChunksWebpackPlugin());
158158
}
159159

160-
// Read the tsconfig to determine if we should prefer ES2015 modules.
161-
162160
return {
163161
resolve: {
164162
extensions: ['.ts', '.js'],

packages/@angular/cli/models/webpack-configs/production.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { PurifyPlugin } from '@angular-devkit/build-optimizer';
99
import { StaticAssetPlugin } from '../../plugins/static-asset';
1010
import { GlobCopyWebpackPlugin } from '../../plugins/glob-copy-webpack-plugin';
1111
import { WebpackConfigOptions } from '../webpack-config';
12-
import { readTsconfig } from '../../utilities/read-tsconfig';
1312

1413
const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
1514

@@ -121,11 +120,8 @@ export function getProdConfig(wco: WebpackConfigOptions) {
121120
uglifyCompressOptions.passes = 3;
122121
}
123122

124-
// Read the tsconfig to determine if we should apply ES6 uglify.
125-
const tsconfigPath = path.resolve(projectRoot, appConfig.root, appConfig.tsconfig);
126-
const tsConfig = readTsconfig(tsconfigPath);
127-
const supportES2015 = tsConfig.options.target !== ts.ScriptTarget.ES3
128-
&& tsConfig.options.target !== ts.ScriptTarget.ES5;
123+
const supportES2015 = wco.tsConfig.options.target !== ts.ScriptTarget.ES3
124+
&& wco.tsConfig.options.target !== ts.ScriptTarget.ES5;
129125

130126
if (supportES2015) {
131127
extraPlugins.push(new UglifyJSPlugin({

0 commit comments

Comments
 (0)