In aspnet-webpack-react 3.0.0+, remove the workaround for #1066. Templates that use this version of the package need to not have issue #1066

src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json

@@ -1,12 +1,11 @@
 {
   "name": "aspnet-webpack-react",
-  "version": "2.0.1",
+  "version": "3.0.0-beta.1",
   "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": {
     "prepublish": "rimraf *.d.ts && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node scripts/postinstall.js"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Microsoft",
   "license": "Apache-2.0",
@@ -17,12 +16,8 @@
     "type": "git",
     "url": "https://github.com/aspnet/JavaScriptServices.git"
   },
-  "dependencies": {
-    "@types/webpack": "2.2.15",
-    "hjson": "2.4.3"
-  },
   "devDependencies": {
-    "@types/react": "15.0.29",
+    "@types/webpack": "^2.2.0",
     "rimraf": "^2.5.4",
     "typescript": "^2.0.0",
     "webpack": "^2.2.0"

src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/scripts/postinstall.js

@@ -1,55 +0,0 @@
-var fs = require('fs');
-var path = require('path');
-var Hjson = require('hjson');
-
-// This logic is a workaround for #1066.
-// See the comment in index.ts for details.
-
-function findInDirOrAncestor(targetFilename, rootDir) {
-    var candidateFilename = path.join(rootDir, targetFilename);
-    if (fs.existsSync(candidateFilename)) {
-        return candidateFilename;
-    }
-
-    var parentDir = path.join(rootDir, '..');
-    return parentDir !== rootDir ? findInDirOrAncestor(targetFilename, parentDir) : null;
-}
-
-function findTsConfigFile() {
-    var rootDir = path.join(__dirname, '..', '..'); // Start 2 levels up because this package has a tsconfig file of its own
-    var tsConfigFile = 'tsconfig.json';
-    var tsConfigFileName = findInDirOrAncestor(tsConfigFile, rootDir);
-    if (!tsConfigFileName) {
-        console.error('Could not locate ' + tsConfigFile + ' in ' + rootDir + ' or any ancestor directory.');
-    }
-    return tsConfigFileName;
-}
-
-function ensureTsConfigContainsTypesEntry(packageName) {
-    var tsConfigFileName = findTsConfigFile();
-    if (tsConfigFileName) {
-        var parsedTsConfig = Hjson.rt.parse(fs.readFileSync(tsConfigFileName, 'utf8'));
-        parsedTsConfig.compilerOptions = parsedTsConfig.compilerOptions || {};
-        parsedTsConfig.compilerOptions.types = parsedTsConfig.compilerOptions.types || [];
-
-        if (parsedTsConfig.compilerOptions.types.indexOf(packageName) < 0) {
-            parsedTsConfig.compilerOptions.types.push(packageName);
-
-            var hjsonOptions = {
-                bracesSameLine: true,
-                multiline: 'off',
-                quotes: 'all',
-                separator: true,
-                space: 2
-            };
-            fs.writeFileSync(tsConfigFileName, Hjson.rt.stringify(parsedTsConfig, hjsonOptions), 'utf8');
-        }
-    }
-}
-
-try {
-    ensureTsConfigContainsTypesEntry('aspnet-webpack-react');
-} catch(ex) {
-    console.error(ex);
-    process.exit(0); // Don't break installation
-}

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

@@ -4,23 +4,3 @@ export { addReactHotModuleReplacementConfig } from './HotModuleReplacement';
 // compatibility with aspnet-webpack 1.x. In aspnet-webpack 2.0, we can drop the old name (and also deprecate
 // some other no-longer-supported functionality, such as LoadViaWebpack).
 export { addReactHotModuleReplacementConfig as addReactHotModuleReplacementBabelTransform } from './HotModuleReplacement';
-
-// Workaround for #1066
-//
-// The issue is that @types/react-router@4.0.12 is incompatible with @types/react@15.0.29
-// This is a problem because the ReactReduxSpa template that ships in 2.0.0-preview2 is pinned
-// to @types/react@15.0.29 but does *not* declare a direct dependency on @types/react-router,
-// which means we end up grabbing the latest @types/react-router.
-//
-// The temporary solution is for aspnet-webpack-react to add the following extra type information
-// that patches the compatibility issue. The longer-term solution will be for the templates to
-// pin versions of *every* package in the transitive closure, not just their direct dependencies.
-//
-// Note that for this workaround to work, the developer also needs 'aspnet-webpack-react' to be
-// present in the 'types' array in tsconfig.json. We automate the task of adding that in the
-// scripts/postinstall.js file in this package. Later, that action can be removed.
-
-import * as React from 'react';
-declare module 'react' {
-    interface Component<P, S={}> {}
-}

src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json

@@ -5,7 +5,7 @@
     "target": "es5",
     "declaration": true,
     "outDir": ".",
-    "lib": ["dom", "es2015"]
+    "lib": ["es2015"]
   },
   "files": [
     "src/index.ts"