Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e9621c8

Browse filesBrowse files
Update aspnet-webpack-react type declarations
1 parent 59ca023 commit e9621c8
Copy full SHA for e9621c8

File tree

Expand file treeCollapse file tree

1 file changed

+5
-5
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+5
-5
lines changed
Open diff view settings
Collapse file

‎src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts‎

Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as webpack from 'webpack';
33
const supportedTypeScriptLoaders = ['ts-loader', 'awesome-typescript-loader'];
44

55
export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Configuration) {
6-
const moduleConfig = webpackConfig.module as webpack.NewModule;
6+
const moduleConfig = webpackConfig.module as webpack.Module;
77
const moduleRules = moduleConfig.rules;
88
if (!moduleRules) {
99
return; // Unknown rules list format. Might be Webpack 1.x, which is not supported.
@@ -13,13 +13,13 @@ export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Config
1313
// to its array of loaders
1414
for (let ruleIndex = 0; ruleIndex < moduleRules.length; ruleIndex++) {
1515
// We only support NewUseRule (i.e., { use: ... }) because OldUseRule doesn't accept array values
16-
const rule = moduleRules[ruleIndex] as webpack.NewUseRule;
16+
const rule = moduleRules[ruleIndex] as webpack.RuleSetRule;
1717
if (!rule.use) {
1818
continue;
1919
}
2020

2121
// We're looking for the first 'use' value that's a TypeScript loader
22-
const loadersArray = rule.use instanceof Array ? rule.use : [rule.use];
22+
const loadersArray: webpack.RuleSetUseItem[] = rule.use instanceof Array ? rule.use : [rule.use as webpack.RuleSetUseItem];
2323
const isTypescriptLoader = supportedTypeScriptLoaders.some(typeScriptLoaderName => containsLoader(loadersArray, typeScriptLoaderName));
2424
if (!isTypescriptLoader) {
2525
continue;
@@ -43,11 +43,11 @@ export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Config
4343
});
4444
}
4545

46-
function containsLoader(loadersArray: webpack.Loader[], loaderName: string) {
46+
function containsLoader(loadersArray: webpack.RuleSetUseItem[], loaderName: string) {
4747
return loadersArray.some(loader => {
4848
// Allow 'use' values to be either { loader: 'name' } or 'name'
4949
// No need to support legacy webpack.OldLoader
50-
const actualLoaderName = (loader as webpack.NewLoader).loader || (loader as string);
50+
const actualLoaderName = (loader as webpack.RuleSetLoader).loader || (loader as string);
5151
return actualLoaderName && new RegExp(`\\b${ loaderName }\\b`).test(actualLoaderName);
5252
});
5353
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.