Update aspnet-webpack-react type declarations

SteveSandersonMS · SteveSandersonMS · commit e9621c8add7d · 2018-09-26T17:24:02.000+01:00
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts
@@ -3,7 +3,7 @@ import * as webpack from 'webpack';
 const supportedTypeScriptLoaders = ['ts-loader', 'awesome-typescript-loader'];
 
 export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Configuration){
- const moduleConfig = webpackConfig.module as webpack.NewModule;
+ const moduleConfig = webpackConfig.module as webpack.Module;
 const moduleRules = moduleConfig.rules;
 if (!moduleRules){
 return; // Unknown rules list format. Might be Webpack 1.x, which is not supported.
@@ -13,13 +13,13 @@ export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Config
 // to its array of loaders
 for (let ruleIndex = 0; ruleIndex < moduleRules.length; ruleIndex++){
 // We only support NewUseRule (i.e.,{use: ... }) because OldUseRule doesn't accept array values
- const rule = moduleRules[ruleIndex] as webpack.NewUseRule;
+ const rule = moduleRules[ruleIndex] as webpack.RuleSetRule;
 if (!rule.use){
 continue;
 }
 
 // We're looking for the first 'use' value that's a TypeScript loader
- const loadersArray = rule.use instanceof Array ? rule.use : [rule.use];
+ const loadersArray: webpack.RuleSetUseItem[] = rule.use instanceof Array ? rule.use : [rule.use as webpack.RuleSetUseItem];
 const isTypescriptLoader = supportedTypeScriptLoaders.some(typeScriptLoaderName => containsLoader(loadersArray, typeScriptLoaderName));
 if (!isTypescriptLoader){
 continue;
@@ -43,11 +43,11 @@ export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Config
 });
 }
 
-function containsLoader(loadersArray: webpack.Loader[], loaderName: string){
+function containsLoader(loadersArray: webpack.RuleSetUseItem[], loaderName: string){
 return loadersArray.some(loader =>{
 // Allow 'use' values to be either{loader: 'name' } or 'name'
 // No need to support legacy webpack.OldLoader
- const actualLoaderName = (loader as webpack.NewLoader).loader || (loader as string);
+ const actualLoaderName = (loader as webpack.RuleSetLoader).loader || (loader as string);
 return actualLoaderName && new RegExp(`\\b${loaderName }\\b`).test(actualLoaderName);
 });
 }

-Original file line number
+Diff line change
 constsupportedTypeScriptLoaders=['ts-loader','awesome-typescript-loader'];
 exportfunctionaddReactHotModuleReplacementConfig(webpackConfig: webpack.Configuration){
 -constmoduleConfig=webpackConfig.moduleaswebpack.NewModule;
 +constmoduleConfig=webpackConfig.moduleaswebpack.Module;
 constmoduleRules=moduleConfig.rules;
 if(!moduleRules){
 return;// Unknown rules list format. Might be Webpack 1.x, which is not supported.
 // to its array of loaders
 for(letruleIndex=0;ruleIndex<moduleRules.length;ruleIndex++){
 // We only support NewUseRule (i.e.,{use: ... }) because OldUseRule doesn't accept array values
 -construle=moduleRules[ruleIndex]aswebpack.NewUseRule;
 +construle=moduleRules[ruleIndex]aswebpack.RuleSetRule;
 if(!rule.use){
 continue;
+}
 // We're looking for the first 'use' value that's a TypeScript loader
 -constloadersArray=rule.useinstanceofArray ? rule.use : [rule.use];
 +constloadersArray: webpack.RuleSetUseItem[]=rule.useinstanceofArray ? rule.use : [rule.useaswebpack.RuleSetUseItem];
 constisTypescriptLoader=supportedTypeScriptLoaders.some(typeScriptLoaderName=>containsLoader(loadersArray,typeScriptLoaderName));
 if(!isTypescriptLoader){
 continue;
 });
+}
 -functioncontainsLoader(loadersArray: webpack.Loader[],loaderName: string){
 +functioncontainsLoader(loadersArray: webpack.RuleSetUseItem[],loaderName: string){
 returnloadersArray.some(loader=>{
 // Allow 'use' values to be either{loader: 'name'} or 'name'
 // No need to support legacy webpack.OldLoader
 -constactualLoaderName=(loaderaswebpack.NewLoader).loader||(loaderasstring);
 +constactualLoaderName=(loaderaswebpack.RuleSetLoader).loader||(loaderasstring);
 returnactualLoaderName&&newRegExp(`\\b${loaderName}\\b`).test(actualLoaderName);
 });
+}