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

Make the fix for #365 not be a breaking change (at least, for the considerable majority of aspnet-webpack users)

Browse Source
This commit is contained in:
SteveSandersonMS
2016-10-10 12:36:52 +01:00
parent 3568476cca
commit d5055dbaf3
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
View File

@@ -50,17 +50,24 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati
} }
// Now also inject eventsource polyfill so this can work on IE/Edge (unless it's already there) // Now also inject eventsource polyfill so this can work on IE/Edge (unless it's already there)
// To avoid this being a breaking change for everyone who uses aspnet-webpack, we only do this if you've
// referenced event-source-polyfill in your package.json. Note that having event-source-polyfill available
// on the server in node_modules doesn't imply that you've also included it in your client-side bundle,
// but the converse is true (if it's not in node_modules, then you obviously aren't trying to use it at
// all, so it would definitely not work to take a dependency on it).
const eventSourcePolyfillEntryPoint = 'event-source-polyfill'; const eventSourcePolyfillEntryPoint = 'event-source-polyfill';
const entryPointsArray: string[] = entryPoints[entryPointName]; // We know by now that it's an array, because if it wasn't, we already wrapped it in one if (npmModuleIsPresent(eventSourcePolyfillEntryPoint)) {
if (entryPointsArray.indexOf(eventSourcePolyfillEntryPoint) < 0) { const entryPointsArray: string[] = entryPoints[entryPointName]; // We know by now that it's an array, because if it wasn't, we already wrapped it in one
const webpackHmrIndex = firstIndexOfStringStartingWith(entryPointsArray, webpackHotMiddlewareEntryPoint); if (entryPointsArray.indexOf(eventSourcePolyfillEntryPoint) < 0) {
if (webpackHmrIndex < 0) { const webpackHmrIndex = firstIndexOfStringStartingWith(entryPointsArray, webpackHotMiddlewareEntryPoint);
// This should not be possible, since we just added it if it was missing if (webpackHmrIndex < 0) {
throw new Error('Cannot find ' + webpackHotMiddlewareEntryPoint + ' in entry points array: ' + entryPointsArray); // This should not be possible, since we just added it if it was missing
} throw new Error('Cannot find ' + webpackHotMiddlewareEntryPoint + ' in entry points array: ' + entryPointsArray);
}
// Insert the polyfill just before the HMR entrypoint // Insert the polyfill just before the HMR entrypoint
entryPointsArray.splice(webpackHmrIndex, 0, eventSourcePolyfillEntryPoint); entryPointsArray.splice(webpackHmrIndex, 0, eventSourcePolyfillEntryPoint);
}
} }
}); });
@@ -189,3 +196,12 @@ function firstIndexOfStringStartingWith(array: string[], prefixToFind: string) {
return -1; // Not found return -1; // Not found
} }
function npmModuleIsPresent(moduleName: string) {
try {
require.resolve(moduleName);
return true;
} catch (ex) {
return false;
}
}