Implement workaround for #1066

Fixes small typo.

NuGet.config

@@ -2,7 +2,9 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
+    <add key="AspNetCorePreview2Final" value="https://dotnet.myget.org/F/dotnet-2-0-0-preview2-final/api/v3/index.json" />
+    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-release/api/v3/index.json" />
+    <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

README.md

@@ -94,7 +94,7 @@ If you're interested in contributing to the various packages, samples, and proje
  * Run `dotnet restore` at the repo root dir
  * Go to whatever sample or template you want to run (for example, `cd templates/AngularSpa`)
  * Restore NPM dependencies (run `npm install`)
- * If the sample/template you're trying to run has a file called `webpack.config.vendor.js` at its root, run `webpack --config webpack.config.vendor.js`. It it has a file called `webpack.config.js`, run `webpack` (no args). You might need to install webpack first, by running `npm install -g webpack`.
+ * If the sample/template you're trying to run has a file called `webpack.config.vendor.js` at its root, run `webpack --config webpack.config.vendor.js`. If it has a file called `webpack.config.js`, run `webpack` (no args). You might need to install webpack first, by running `npm install -g webpack`.
  * Launch it (`dotnet run`)
 
 If you're planning to submit a pull request, and if it's more than a trivial fix (for example, for a typo), it's usually a good idea first to file an issue describing what you're proposing to do and how it will work. Then you can find out if it's likely that such a pull request will be accepted, and how it fits into wider ongoing plans.

appveyor.yml

@@ -3,8 +3,8 @@ init:
 install:
    - ps: Install-Product node 6.9.2 x64
    # .NET Core SDK binaries
-   # Download .NET Core 2.0 Preview 1 SDK and add to PATH
-   - ps: $urlCurrent = "https://download.microsoft.com/download/0/6/5/0656B047-5F2F-4281-A851-F30776F8616D/dotnet-dev-win-x64.2.0.0-preview1-005977.zip"
+   # Download .NET Core 2.0 Preview 2 SDK and add to PATH
+   - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview2-006497/dotnet-sdk-2.0.0-preview2-006497-win-x64.zip"
    - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
    - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
    - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName()

build.ps1

@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP

build.sh

@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi

build/common.props

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
-    <PackageReference Include="NETStandard.Library" Version="$(BundledNETStandardPackageVersion)" />
+    <PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
     <PackageReference Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
   </ItemGroup>
 </Project>

build/dependencies.props

@@ -1,12 +1,12 @@
 <Project>
   <PropertyGroup>
-    <AspNetCoreVersion>2.0.0-preview2-*</AspNetCoreVersion>
+    <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
     <AutoMapperVersion>5.0.2</AutoMapperVersion>
     <InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
     <JsonNetVersion>10.0.1</JsonNetVersion>
-    <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
+    <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
     <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <ThreadingDataflowVersion>4.7.0</ThreadingDataflowVersion>
+    <ThreadingDataflowVersion>4.8.0-*</ThreadingDataflowVersion>
   </PropertyGroup>
 </Project>

src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs

@@ -67,8 +67,10 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
             if (!response.IsSuccessStatusCode)
             {
                 // Unfortunately there's no true way to cancel ReadAsStringAsync calls, hence AbandonIfCancelled
-                var responseErrorString = await response.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken);
-                throw new Exception("Call to Node module failed with error: " + responseErrorString);
+                var responseJson = await response.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken);
+                var responseError = JsonConvert.DeserializeObject<RpcJsonResponse>(responseJson, jsonSerializerSettings);
+
+                throw new NodeInvocationException(responseError.ErrorMessage, responseError.ErrorDetails);
             }
 
             var responseContentType = response.Content.Headers.ContentType;
@@ -136,5 +138,13 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
                 _disposed = true;
             }
         }
+
+#pragma warning disable 649 // These properties are populated via JSON deserialization
+        private class RpcJsonResponse
+        {
+            public string ErrorMessage { get; set; }
+            public string ErrorDetails { get; set; }
+        }
+#pragma warning restore 649
     }
 }

src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts

@@ -86,5 +86,8 @@ function readRequestBodyAsJson(request, callback) {
 
 function respondWithError(res: http.ServerResponse, errorValue: any) {
     res.statusCode = 500;
-    res.end(errorValue.stack || errorValue.toString());
+    res.end(JSON.stringify({
+        errorMessage: errorValue.message || errorValue,
+        errorDetails: errorValue.stack || null
+    }));
 }

src/Microsoft.AspNetCore.SpaServices/README.md

@@ -20,7 +20,7 @@ Behind the scenes, it uses the [`Microsoft.AspNetCore.NodeServices`](https://git
 
 ### Installation into existing projects
 
- * Add `Microsoft.AspNetCore.SpaServices` to the dependencies list in your `project.json` file
+ * Install the `Microsoft.AspNetCore.SpaServices` NuGet package
  * Run `dotnet restore` (or if you use Visual Studio, just wait a moment - it will restore dependencies automatically)
  * Install supporting NPM packages for the features you'll be using:
    * For **server-side prerendering**, install `aspnet-prerendering`

src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aspnet-prerendering",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
   "main": "index.js",
   "scripts": {

src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts

@@ -1,8 +1,8 @@
-/// <reference path="./PrerenderingInterfaces.d.ts" />
 import * as url from 'url';
 import * as path from 'path';
 import * as domain from 'domain';
 import { run as domainTaskRun, baseUrl as domainTaskBaseUrl } from 'domain-task/main';
+import { BootFunc, BootFuncParams, BootModuleInfo, RenderToStringCallback, RenderToStringFunc } from './PrerenderingInterfaces';
 
 const defaultTimeoutMilliseconds = 30 * 1000;
 

src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts

@@ -1,26 +1,28 @@
-interface RenderToStringFunc {
+export interface RenderToStringFunc {
     (callback: RenderToStringCallback, applicationBasePath: string, bootModule: BootModuleInfo, absoluteRequestUrl: string, requestPathAndQuery: string, customDataParameter: any, overrideTimeoutMilliseconds: number, requestPathBase: string): void;
 }
 
-interface RenderToStringCallback {
-    (error: any, result?: RenderToStringResult): void;
+export interface RenderToStringCallback {
+    (error: any, result?: RenderResult): void;
 }
 
-interface RenderToStringResult {
+export interface RenderToStringResult {
     html: string;
     statusCode?: number;
     globals?: { [key: string]: any };
 }
 
-interface RedirectResult {
+export interface RedirectResult {
     redirectUrl: string;
 }
 
-interface BootFunc {
-    (params: BootFuncParams): Promise<RenderToStringResult>;
+export type RenderResult = RenderToStringResult | RedirectResult;
+
+export interface BootFunc {
+    (params: BootFuncParams): Promise<RenderResult>;
 }
 
-interface BootFuncParams {
+export interface BootFuncParams {
     location: any;              // e.g., Location object containing information '/some/path'
     origin: string;             // e.g., 'https://example.com:1234'
     url: string;                // e.g., '/some/path'
@@ -30,7 +32,7 @@ interface BootFuncParams {
     data: any;                  // any custom object passed through from .NET
 }
 
-interface BootModuleInfo {
+export interface BootModuleInfo {
     moduleName: string;
     exportName?: string;
     webpackConfig?: string;

src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts

@@ -1,5 +1,2 @@
-/// <reference path="./PrerenderingInterfaces.d.ts" />
-
 export * from './Prerendering';
-
-export type RenderResult = RenderToStringResult | RedirectResult;
+export * from './PrerenderingInterfaces';

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

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

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

@@ -0,0 +1,55 @@
+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,3 +4,23 @@ 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": ["es2015"]
+    "lib": ["dom", "es2015"]
   },
   "files": [
     "src/index.ts"

templates/AngularSpa/AngularSpa.csproj

@@ -13,7 +13,6 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
-    <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />

templates/AngularSpa/package.json

@@ -1,5 +1,6 @@
 {
   "name": "WebApplicationBasic",
+  "private": true,
   "version": "0.0.0",
   "scripts": {
     "test": "karma start ClientApp/test/karma.conf.js"

templates/AureliaSpa/AureliaSpa.csproj

@@ -13,7 +13,6 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
-    <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />

templates/AureliaSpa/package.json

@@ -1,5 +1,6 @@
 {
   "name": "WebApplicationBasic",
+  "private": true,
   "version": "0.0.0",
   "dependencies": {
     "aurelia-bootstrapper": "^2.0.1",

templates/KnockoutSpa/KnockoutSpa.csproj

@@ -13,7 +13,6 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
-    <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />

templates/KnockoutSpa/package.json

@@ -1,5 +1,6 @@
 {
   "name": "WebApplicationBasic",
+  "private": true,
   "version": "0.0.0",
   "devDependencies": {
     "@types/core-js": "^0.9.34",

templates/ReactReduxSpa/ReactReduxSpa.csproj

@@ -13,7 +13,6 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
-    <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />

templates/ReactReduxSpa/package.json

@@ -1,9 +1,10 @@
 {
   "name": "WebApplicationBasic",
+  "private": true,
   "version": "0.0.0",
   "dependencies": {
     "@types/history": "4.5.1",
-    "@types/react": "15.0.24",
+    "@types/react": "15.0.29",
     "@types/react-dom": "15.5.0",
     "@types/react-redux": "4.4.40",
     "@types/react-router-dom": "4.0.4",

templates/ReactSpa/ReactSpa.csproj

@@ -13,7 +13,6 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
-    <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />

templates/ReactSpa/package.json

@@ -1,9 +1,10 @@
 {
   "name": "WebApplicationBasic",
+  "private": true,
   "version": "0.0.0",
   "devDependencies": {
     "@types/history": "4.5.1",
-    "@types/react": "15.0.24",
+    "@types/react": "15.0.29",
     "@types/react-dom": "15.5.0",
     "@types/react-router": "4.0.9",
     "@types/webpack-env": "1.13.0",

templates/VueSpa/VueSpa.csproj

@@ -13,7 +13,6 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
-    <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />

templates/VueSpa/package.json

@@ -1,5 +1,6 @@
 {
   "name": "WebApplicationBasic",
+  "private": true,
   "version": "0.0.0",
   "devDependencies": {
     "@types/requirejs": "^2.1.28",

templates/VueSpa/webpack.config.js

@@ -7,7 +7,6 @@ const bundleOutputDir = './wwwroot/dist';
 module.exports = (env) => {
     const isDevBuild = !(env && env.prod);
 
-    const bundleOutputDir = './wwwroot/dist';
     return [{
         stats: { modules: false },
         context: __dirname,

version.props

@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
-    <VersionSuffix>preview2</VersionSuffix>
+    <VersionSuffix>preview3</VersionSuffix>
   </PropertyGroup>
 </Project>