Skip to content

Commit e871f87

Browse files
committed
refactor(@angular-devkit/build-angular): remove use of Webpack RuleSetLoader type
The `RuleSetLoader` type is not exported from the Webpack 5 types.
1 parent 6306872 commit e871f87

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

packages/angular_devkit/build_angular/src/webpack/configs/common.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
Compiler,
1818
Configuration,
1919
ContextReplacementPlugin,
20-
RuleSetLoader,
2120
RuleSetRule,
2221
compilation,
2322
debug,
@@ -326,7 +325,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
326325
});
327326
}
328327

329-
let buildOptimizerUseRule: RuleSetLoader[] = [];
328+
let buildOptimizerUseRule: RuleSetRule[] = [];
330329
if (buildOptions.buildOptimizer) {
331330
extraPlugins.push(new BuildOptimizerWebpackPlugin());
332331
buildOptimizerUseRule = [

packages/angular_devkit/build_angular/src/webpack/configs/styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
9191
}
9292

9393
// set base rules to derive final rules from
94-
const baseRules: { test: RegExp, use: webpack.RuleSetLoader[] }[] = [
94+
const baseRules: { test: RegExp, use: webpack.RuleSetUseItem[] }[] = [
9595
{ test: /\.css$/, use: [] },
9696
{
9797
test: /\.scss$|\.sass$/,

packages/angular_devkit/build_angular/src/webpack/configs/typescript.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
ivy,
1919
} from '@ngtools/webpack';
2020
import * as path from 'path';
21-
import { RuleSetLoader } from 'webpack';
2221
import { WebpackConfigOptions, BuildOptions } from '../../utils/build-options';
2322
import { legacyIvyPluginEnabled } from '../../utils/environment-options';
2423

@@ -191,21 +190,20 @@ export function getAotConfig(wco: WebpackConfigOptions, i18nExtract = false) {
191190
const optimize = buildOptions.optimization.scripts;
192191
const useIvyOnlyPlugin = canUseIvyPlugin(wco) && !i18nExtract;
193192

194-
let buildOptimizerRules: RuleSetLoader[] = [];
195-
if (buildOptions.buildOptimizer) {
196-
buildOptimizerRules = [{
197-
loader: buildOptimizerLoaderPath,
198-
options: { sourceMap: buildOptions.sourceMap.scripts }
199-
}];
200-
}
201-
202193
return {
203194
module: {
204195
rules: [
205196
{
206197
test: useIvyOnlyPlugin ? /\.tsx?$/ : /(?:\.ngfactory\.js|\.ngstyle\.js|\.tsx?)$/,
207198
use: [
208-
...buildOptimizerRules,
199+
...(buildOptions.buildOptimizer
200+
? [
201+
{
202+
loader: buildOptimizerLoaderPath,
203+
options: { sourceMap: buildOptions.sourceMap.scripts },
204+
},
205+
]
206+
: []),
209207
useIvyOnlyPlugin ? ivy.AngularWebpackLoaderPath : NgToolsLoader,
210208
],
211209
},

0 commit comments

Comments
 (0)