From 69a0a29057496ae56a948686ab7242dce1b008e3 Mon Sep 17 00:00:00 2001 From: SteveSandersonMS Date: Fri, 25 Nov 2016 10:15:38 +0000 Subject: [PATCH] Handle Webpack 2.1.0 beta 23 renaming 'loaders' to 'rules'. Fixes #460. --- .../npm/aspnet-webpack-react/package.json | 2 +- .../npm/aspnet-webpack-react/src/HotModuleReplacement.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json index 477c05d..13d9b83 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack-react", - "version": "1.0.2", + "version": "1.0.3", "description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { 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 index 4756e4c..3b77a36 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts @@ -1,7 +1,11 @@ import * as webpack from 'webpack'; export function addReactHotModuleReplacementBabelTransform(webpackConfig: webpack.Configuration) { - webpackConfig.module.loaders.forEach(loaderConfig => { + const moduleRules: webpack.Loader[] = + (webpackConfig.module as any).rules // Webpack < 2.1.0 beta 23 + || webpackConfig.module.loaders; // Webpack >= 2.1.0 beta 23 + + moduleRules.forEach(loaderConfig => { if (loaderConfig.loader && loaderConfig.loader.match(/\bbabel-loader\b/)) { // Ensure the babel-loader options includes a 'query' const query = loaderConfig.query = loaderConfig.query || {};