github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 09:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update aspnet-webpack-react type declarations

Browse Source
This commit is contained in:
Steve Sanderson
2018-09-26 17:24:02 +01:00
parent 59ca023f46
commit e9621c8add
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts
View File

@@ -3,7 +3,7 @@ import * as webpack from 'webpack';
const supportedTypeScriptLoaders = ['ts-loader', 'awesome-typescript-loader']; const supportedTypeScriptLoaders = ['ts-loader', 'awesome-typescript-loader'];
export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Configuration) { export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Configuration) {
const moduleConfig = webpackConfig.module as webpack.NewModule; const moduleConfig = webpackConfig.module as webpack.Module;
const moduleRules = moduleConfig.rules; const moduleRules = moduleConfig.rules;
if (!moduleRules) { if (!moduleRules) {
return; // Unknown rules list format. Might be Webpack 1.x, which is not supported. 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 // to its array of loaders
for (let ruleIndex = 0; ruleIndex < moduleRules.length; ruleIndex++) { for (let ruleIndex = 0; ruleIndex < moduleRules.length; ruleIndex++) {
// We only support NewUseRule (i.e., { use: ... }) because OldUseRule doesn't accept array values // 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) { if (!rule.use) {
continue; continue;
} }
// We're looking for the first 'use' value that's a TypeScript loader // 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)); const isTypescriptLoader = supportedTypeScriptLoaders.some(typeScriptLoaderName => containsLoader(loadersArray, typeScriptLoaderName));
if (!isTypescriptLoader) { if (!isTypescriptLoader) {
continue; 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 => { return loadersArray.some(loader => {
// Allow 'use' values to be either { loader: 'name' } or 'name' // Allow 'use' values to be either { loader: 'name' } or 'name'
// No need to support legacy webpack.OldLoader // 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); return actualLoaderName && new RegExp(`\\b${ loaderName }\\b`).test(actualLoaderName);
}); });
} }