Example of adding font-awesome

2025-12-23 10:08:57 +00:00 · 2016-09-28 11:02:04 +01:00
319 changed files with 40824 additions and 4216 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -37,5 +37,4 @@ npm-debug.log
 /templates/*/node_modules/
 /templates/*/wwwroot/dist/
 /templates/*/ClientApp/dist/
-/templates/*/yarn.lock
 .vscode/
--- a/JavaScriptServices.sln
+++ b/JavaScriptServices.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E6E88944-4800-40BA-8AF5-069EA3ADFEB8}"
 EndProject
@@ -46,10 +46,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "samples\react
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Angular", "Angular", "{4867A616-83D6-48DC-964D-6AE743596631}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Aurelia", "templates\AureliaSpa\Aurelia.xproj", "{33D8DAD9-74F9-471D-8BAD-55F828FAA736}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "KnockoutSpa", "templates\KnockoutSpa\KnockoutSpa.xproj", "{85231B41-6998-49AE-ABD2-5124C83DBEF2}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -112,14 +108,6 @@ Global
 		{C870A92C-9E3F-4BF2-82B8-5758545A8B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C870A92C-9E3F-4BF2-82B8-5758545A8B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C870A92C-9E3F-4BF2-82B8-5758545A8B7C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{33D8DAD9-74F9-471D-8BAD-55F828FAA736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33D8DAD9-74F9-471D-8BAD-55F828FAA736}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33D8DAD9-74F9-471D-8BAD-55F828FAA736}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33D8DAD9-74F9-471D-8BAD-55F828FAA736}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85231B41-6998-49AE-ABD2-5124C83DBEF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85231B41-6998-49AE-ABD2-5124C83DBEF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85231B41-6998-49AE-ABD2-5124C83DBEF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85231B41-6998-49AE-ABD2-5124C83DBEF2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -138,7 +126,5 @@ Global
 		{E0EBA813-4478-4C02-B11D-FB3793113FE4} = {E6E88944-4800-40BA-8AF5-069EA3ADFEB8}
 		{C870A92C-9E3F-4BF2-82B8-5758545A8B7C} = {E0EBA813-4478-4C02-B11D-FB3793113FE4}
 		{4867A616-83D6-48DC-964D-6AE743596631} = {E6E88944-4800-40BA-8AF5-069EA3ADFEB8}
-		{33D8DAD9-74F9-471D-8BAD-55F828FAA736} = {727E6D58-6830-4792-96C6-E138A33959FB}
-		{85231B41-6998-49AE-ABD2-5124C83DBEF2} = {727E6D58-6830-4792-96C6-E138A33959FB}
 	EndGlobalSection
 EndGlobal
--- a/makefile.shade
+++ b/makefile.shade
@@ -2,7 +2,6 @@
 var VERSION='0.1'
 var FULL_VERSION='0.1'
 var AUTHORS='Microsoft Open Technologies, Inc.'
-var SAMPLES_PROJECT_GLOB='templates/*/project.json'

 use-standard-lifecycle
 k-standard-goals
--- a/pack-local.sh
+++ b/pack-local.sh
@@ -2,7 +2,6 @@ versionSuffix=$1
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 projects=(
    ./src/Microsoft.AspNetCore.NodeServices
-    ./src/Microsoft.AspNetCore.NodeServices.Sockets
    ./src/Microsoft.AspNetCore.SpaServices
    ./src/Microsoft.AspNetCore.AngularServices
    ./src/Microsoft.AspNetCore.ReactServices
--- a/samples/angular/MusicStore/package.json
+++ b/samples/angular/MusicStore/package.json
@@ -5,8 +5,6 @@
    "angular2": "2.0.0-beta.15",
    "angular2-aspnet": "^0.0.6",
    "angular2-universal": "0.98.1",
-    "angular2-express-engine": "0.11.1",
-    "angular2-hapi-engine": "0.11.1",
    "aspnet-prerendering": "^1.0.1",
    "bootstrap": "^3.3.5",
    "css": "^2.2.1",
--- a/samples/angular/MusicStore/project.json
+++ b/samples/angular/MusicStore/project.json
@@ -15,28 +15,28 @@

  "dependencies": {
    "Microsoft.NETCore.App": {
-      "version": "1.1.0",
+      "version": "1.0.1",
      "type": "platform"
    },
-    "Microsoft.AspNetCore.AngularServices": "1.1.0-*",
-    "Microsoft.AspNetCore.Diagnostics": "1.1.0",
-    "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0",
-    "Microsoft.AspNetCore.Mvc": "1.1.0",
+    "Microsoft.AspNetCore.AngularServices": "1.0.0-*",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.1",
    "Microsoft.AspNetCore.Razor.Tools": {
      "version": "1.0.0-preview2-final",
      "type": "build"
    },
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
-    "Microsoft.AspNetCore.StaticFiles": "1.1.0",
-    "Microsoft.EntityFrameworkCore.SQLite": "1.1.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
-    "Microsoft.Extensions.Configuration.Json": "1.1.0",
-    "Microsoft.Extensions.Configuration.CommandLine": "1.1.0",
-    "Microsoft.Extensions.Logging": "1.1.0",
-    "Microsoft.Extensions.Logging.Console": "1.1.0",
-    "Microsoft.Extensions.Logging.Debug": "1.1.0",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.EntityFrameworkCore.SQLite": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Configuration.CommandLine": "1.0.0",
+    "Microsoft.Extensions.Logging": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
    "AutoMapper": "5.0.2"
  },

@@ -47,7 +47,7 @@
  },

  "frameworks": {
-    "netcoreapp1.1": {
+    "netcoreapp1.0": {
      "imports": [
        "dotnet5.6",
        "portable-net45+win8"
--- a/samples/misc/LatencyTest/Program.cs
+++ b/samples/misc/LatencyTest/Program.cs
@@ -3,7 +3,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.NodeServices;
-using Microsoft.AspNetCore.NodeServices.Sockets;
 using Microsoft.Extensions.DependencyInjection;

 namespace ConsoleApplication
@@ -17,10 +16,7 @@ namespace ConsoleApplication
            // Set up the DI system
            var services = new ServiceCollection();
            services.AddNodeServices(options => {
-                // To compare with Socket hosting, uncomment the following line
-                // Since .NET Core 1.1, the HTTP hosting model has become basically as fast as the Socket hosting model
-                //options.UseSocketHosting();
-
+                options.HostingModel = NodeServicesOptions.DefaultNodeHostingModel;
                options.ProjectPath = Directory.GetCurrentDirectory();
                options.WatchFileExtensions = new string[] {}; // Don't watch anything
            });
--- a/samples/misc/LatencyTest/project.json
+++ b/samples/misc/LatencyTest/project.json
@@ -5,12 +5,11 @@
  },
  "dependencies": {
    "Microsoft.NETCore.App": {
-      "version": "1.1.0",
+      "version": "1.0.0",
      "type": "platform"
    },
-    "Microsoft.AspNetCore.NodeServices": "1.1.0-*",
-    "Microsoft.AspNetCore.NodeServices.Sockets": "1.1.0-*",
-    "Microsoft.Extensions.DependencyInjection": "1.1.0"
+    "Microsoft.AspNetCore.NodeServices": "1.0.0-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/samples/misc/NodeServicesExamples/project.json
+++ b/samples/misc/NodeServicesExamples/project.json
@@ -12,22 +12,29 @@
  },
  "dependencies": {
    "Microsoft.NETCore.App": {
-      "version": "1.1.0",
+      "version": "1.0.0",
      "type": "platform"
    },
-    "Microsoft.AspNetCore.Diagnostics": "1.1.0",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
-    "Microsoft.AspNetCore.Mvc": "1.1.0",
-    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
-    "Microsoft.AspNetCore.StaticFiles": "1.1.0",
-    "Microsoft.Extensions.Configuration.Json": "1.1.0",
-    "Microsoft.Extensions.Logging.Console": "1.1.0",
-    "Microsoft.Extensions.Logging.Debug": "1.1.0",
-    "Microsoft.AspNetCore.NodeServices": "1.1.0-*"
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.NETCore.Platforms": "1.0.1",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.AspNetCore.NodeServices": "1.0.0-*"
  },
  "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.0": {
+      "imports": [
+        "dotnet5.6",
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  },
  "publishExclude": [
    "node_modules",
--- a/samples/misc/Webpack/.gitignore
+++ b/samples/misc/Webpack/.gitignore
@@ -1,9 +1,6 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

-yarn.lock
-wwwroot/dist
-
 # User-specific files
 *.suo
 *.user
--- a/samples/misc/Webpack/ActionResults/PrerenderResult.cs
+++ b/samples/misc/Webpack/ActionResults/PrerenderResult.cs
@@ -37,8 +37,7 @@ namespace Webpack.ActionResults
                _moduleExport,
                request.GetEncodedUrl(),
                request.Path + request.QueryString.Value,
-                _dataToSupply,
-                /* timeoutMilliseconds */ 30000
+                _dataToSupply
            );

            response.ContentType = "text/html";
--- a/samples/misc/Webpack/package.json
+++ b/samples/misc/Webpack/package.json
@@ -11,10 +11,9 @@
    "webpack-hot-middleware": "^2.7.1"
  },
  "dependencies": {
-    "aspnet-prerendering": "^1.0.4",
    "aspnet-webpack": "^1.0.3",
+    "aspnet-prerendering": "^1.0.4",
    "ts-loader": "^0.8.1",
-    "typescript": "^2.0.0",
-    "webpack": "^1.13.3"
+    "typescript": "^1.7.5"
  }
 }
--- a/samples/misc/Webpack/project.json
+++ b/samples/misc/Webpack/project.json
@@ -12,22 +12,29 @@
  },
  "dependencies": {
    "Microsoft.NETCore.App": {
-      "version": "1.1.0",
+      "version": "1.0.0",
      "type": "platform"
    },
-    "Microsoft.AspNetCore.Diagnostics": "1.1.0",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
-    "Microsoft.AspNetCore.Mvc": "1.1.0",
-    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
-    "Microsoft.AspNetCore.StaticFiles": "1.1.0",
-    "Microsoft.Extensions.Configuration.Json": "1.1.0",
-    "Microsoft.Extensions.Logging.Console": "1.1.0",
-    "Microsoft.Extensions.Logging.Debug": "1.1.0",
-    "Microsoft.AspNetCore.SpaServices": "1.1.0-*"
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.NETCore.Platforms": "1.0.1",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
  },
  "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.0": {
+      "imports": [
+        "dotnet5.6",
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  },
  "publishOptions": {
    "exclude": [
--- a/samples/misc/Webpack/tsconfig.json
+++ b/samples/misc/Webpack/tsconfig.json
@@ -2,10 +2,9 @@
  "compilerOptions": {
    "moduleResolution": "node",
    "module": "commonjs",
-    "target": "es5",
+    "target": "es6",
    "jsx": "preserve",
-    "sourceMap": true,
-    "lib": ["es6", "dom"]
+    "sourceMap": true
  },
  "exclude": [
      "node_modules"
--- a/samples/misc/Webpack/webpack.config.dev.js
+++ b/samples/misc/Webpack/webpack.config.dev.js
@@ -2,7 +2,7 @@ module.exports = {
    devtool: 'inline-source-map',
    module: {
        loaders: [
-            { test: /\.less$/, loader: 'style-loader!css-loader!less-loader' }
+            { test: /\.less$/, loader: 'style!css!less' }
        ]
    }
 };
--- a/samples/misc/Webpack/webpack.config.prod.js
+++ b/samples/misc/Webpack/webpack.config.prod.js
@@ -5,11 +5,11 @@ var extractLESS = new ExtractTextPlugin('my-styles.css');
 module.exports = {
    module: {
        loaders: [
-            { test: /\.less$/, loader: extractLESS.extract(['css-loader', 'less-loader']) },
+            { test: /\.less$/, loader: extractLESS.extract(['css', 'less']) },
        ]
    },
    plugins: [
        extractLESS,
-        new webpack.optimize.UglifyJsPlugin({ minimize: true, compressor: { warnings: false } })
+        new webpack.optimize.UglifyJsPlugin({ minimize: true })
    ]
 };
--- a/samples/react/MusicStore/.gitignore
+++ b/samples/react/MusicStore/.gitignore
@@ -1,4 +1,3 @@
 music-db.sqlite
 /wwwroot/dist/
 /node_modules/
-yarn.lock
--- a/samples/react/MusicStore/ReactApp/boot-server.tsx
+++ b/samples/react/MusicStore/ReactApp/boot-server.tsx
@@ -5,29 +5,19 @@ import { match, RouterContext } from 'react-router';
 import createMemoryHistory from 'history/lib/createMemoryHistory';
 import { routes } from './routes';
 import configureStore from './configureStore';
-type BootResult = { html?: string, globals?: { [key: string]: any }, redirectUrl?: string};
+React;

 export default function (params: any): Promise<{ html: string }> {
-    return new Promise<BootResult>((resolve, reject) => {
+    return new Promise<{ html: string, globals: { [key: string]: any } }>((resolve, reject) => {
        // Match the incoming request against the list of client-side routes
        match({ routes, location: params.location }, (error, redirectLocation, renderProps: any) => {
            if (error) {
                throw error;
            }

-            // If there's a redirection, just send this information back to the host application
-            if (redirectLocation) {
-                resolve({ redirectUrl: redirectLocation.pathname });
-                return;
-            }
-
-            // If it didn't match any route, renderProps will be undefined
-            if (!renderProps) {
-                throw new Error(`The location '${ params.url }' doesn't match any route configured in react-router.`);
-            }
-
            // Build an instance of the application
-            const store = configureStore();
+            const history = createMemoryHistory(params.url);
+            const store = configureStore(history);
            const app = (
                <Provider store={ store }>
                    <RouterContext {...renderProps} />
--- a/samples/react/MusicStore/ReactApp/boot.tsx
+++ b/samples/react/MusicStore/ReactApp/boot.tsx
@@ -1,25 +1,21 @@
-import './styles/styles.css';
-import 'bootstrap/dist/css/bootstrap.css';
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { browserHistory, Router } from 'react-router';
 import { Provider } from 'react-redux';
-import { syncHistoryWithStore } from 'react-router-redux';
-import { routes } from './routes';
+React; // Need this reference otherwise TypeScript doesn't think we're using it and ignores the import
+
+import './styles/styles.css';
+import 'bootstrap/dist/css/bootstrap.css';
 import configureStore from './configureStore';
+import { routes } from './routes';
 import { ApplicationState }  from './store';

-// Get the application-wide store instance, prepopulating with state from the server where available.
 const initialState = (window as any).initialReduxState as ApplicationState;
-const store = configureStore(initialState);
-const history = syncHistoryWithStore(browserHistory, store);
+const store = configureStore(browserHistory, initialState);

-// This code starts up the React app when it runs in a browser. It sets up the routing configuration
-// and injects the app into a DOM element.
 ReactDOM.render(
    <Provider store={ store }>
-        <Router history={ history } children={ routes } />
+        <Router history={ browserHistory } children={ routes } />
    </Provider>,
    document.getElementById('react-app')
 );
--- a/samples/react/MusicStore/ReactApp/configureStore.ts
+++ b/samples/react/MusicStore/ReactApp/configureStore.ts
@@ -1,22 +1,28 @@
-import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer } from 'redux';
-import thunk from 'redux-thunk';
-import { routerReducer } from 'react-router-redux';
+import { createStore, applyMiddleware, compose, combineReducers } from 'redux';
+import * as thunkModule from 'redux-thunk';
+import { syncHistory, routeReducer } from 'react-router-redux';
 import * as Store from './store';
 import { typedToPlain } from 'redux-typed';

-export default function configureStore(initialState?: Store.ApplicationState) {
-    // Build middleware. These are functions that can process the actions before they reach the store.
-    const windowIfDefined = typeof window === 'undefined' ? null : window as any;
-    // If devTools is installed, connect to it
-    const devToolsExtension = windowIfDefined && windowIfDefined.devToolsExtension as () => GenericStoreEnhancer;
-    const createStoreWithMiddleware = compose(
-        applyMiddleware(thunk, typedToPlain),
-        devToolsExtension ? devToolsExtension() : f => f
-    )(createStore);
+export default function configureStore(history: HistoryModule.History, initialState?: Store.ApplicationState) {
+    // Build middleware
+    const thunk = (thunkModule as any).default; // Workaround for TypeScript not importing thunk module as expected
+    const reduxRouterMiddleware = syncHistory(history);
+    const middlewares = [thunk, reduxRouterMiddleware, typedToPlain];
+    const devToolsExtension = null;//(window as any).devToolsExtension; // If devTools is installed, connect to it

-    // Combine all reducers and instantiate the app-wide store instance
+    const finalCreateStore = compose(
+        applyMiddleware(...middlewares),
+        devToolsExtension ? devToolsExtension() : f => f
+    )(createStore)
+
+    // Combine all reducers
    const allReducers = buildRootReducer(Store.reducers);
-    const store = createStoreWithMiddleware(allReducers, initialState) as Redux.Store<Store.ApplicationState>;
+
+    const store = finalCreateStore(allReducers, initialState) as Redux.Store;
+
+    // Required for replaying actions from devtools to work
+    reduxRouterMiddleware.listenForReplays(store);

    // Enable Webpack hot module replacement for reducers
    if (module.hot) {
@@ -30,5 +36,5 @@ export default function configureStore(initialState?: Store.ApplicationState) {
 }

 function buildRootReducer(allReducers) {
-    return combineReducers<Store.ApplicationState>(Object.assign({}, allReducers, { routing: routerReducer }));
+    return combineReducers(Object.assign({}, allReducers, { routing: routeReducer })) as Redux.Reducer;
 }
--- a/samples/react/MusicStore/package.json
+++ b/samples/react/MusicStore/package.json
@@ -1,51 +1,45 @@
 {
-  "name": "music-store",
+  "name": "MusicStore",
  "version": "0.0.0",
-  "dependencies": {
-    "@types/react": "^0.14.29",
-    "@types/react-bootstrap": "^0.0.35",
-    "@types/react-dom": "^0.14.14",
-    "@types/react-redux": "^4.4.29",
-    "@types/react-router": "^2.0.30",
-    "@types/react-router-bootstrap": "^0.0.27",
-    "@types/react-router-redux": "^4.0.30",
-    "@types/redux-thunk": "^2.1.28",
-    "@types/source-map": "^0.1.28",
-    "@types/uglify-js": "^2.0.27",
-    "@types/webpack": "^1.12.35",
-    "@types/webpack-env": "^1.12.1",
-    "@types/whatwg-fetch": "0.0.28",
-    "aspnet-prerendering": "^1.0.7",
-    "aspnet-webpack": "^1.0.17",
-    "aspnet-webpack-react": "^1.0.2",
-    "babel-core": "^6.5.2",
-    "babel-loader": "^6.2.3",
-    "babel-preset-es2015": "^6.5.0",
-    "babel-preset-react": "^6.5.0",
-    "bootstrap": "^3.3.6",
+  "devDependencies": {
+    "babel-loader": "^6.2.1",
+    "babel-plugin-react-transform": "^2.0.0",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
    "css-loader": "^0.23.1",
-    "domain-task": "^2.0.1",
-    "event-source-polyfill": "^0.0.7",
+    "express": "^4.13.4",
    "extract-text-webpack-plugin": "^1.0.1",
    "file-loader": "^0.8.5",
-    "jquery": "^2.2.1",
-    "react": "^15.3.2",
-    "react-bootstrap": "^0.30.6",
-    "react-dom": "^15.3.2",
-    "react-redux": "^4.4.5",
-    "react-router": "^2.8.1",
-    "react-router-bootstrap": "^0.23.1",
-    "react-router-redux": "^4.0.6",
-    "redux": "^3.6.0",
-    "redux-thunk": "^2.1.0",
-    "redux-typed": "^2.0.0",
+    "react-transform-hmr": "^1.0.2",
    "style-loader": "^0.13.0",
-    "ts-loader": "^0.8.1",
-    "typescript": "2.0.3",
+    "ts-loader": "^0.8.0",
+    "typescript": "^1.7.5",
    "url-loader": "^0.5.7",
-    "webpack": "^1.13.2",
-    "webpack-hot-middleware": "^2.12.2",
-    "webpack-merge": "^0.14.1",
-    "webpack-node-externals": "^1.4.3"
+    "webpack": "^1.12.12",
+    "webpack-dev-middleware": "^1.5.1",
+    "webpack-hot-middleware": "^2.6.4"
+  },
+  "dependencies": {
+    "aspnet-prerendering": "^1.0.0",
+    "aspnet-webpack": "^1.0.3",
+    "aspnet-webpack-react": "^1.0.1",
+    "bootstrap": "^3.3.6",
+    "domain-context": "^0.5.1",
+    "domain-task": "^2.0.0",
+    "history": "^2.0.0",
+    "isomorphic-fetch": "^2.2.1",
+    "memory-fs": "^0.3.0",
+    "react": "^0.14.7",
+    "react-bootstrap": "^0.28.2",
+    "react-dom": "^0.14.7",
+    "react-redux": "^4.2.1",
+    "react-router": "^2.0.0-rc5",
+    "react-router-bootstrap": "^0.20.1",
+    "react-router-redux": "^2.1.0",
+    "redux": "^3.2.1",
+    "redux-thunk": "^1.0.3",
+    "redux-typed": "^1.0.0",
+    "require-from-string": "^1.1.0",
+    "webpack-externals-plugin": "^1.0.0"
  }
 }
--- a/samples/react/MusicStore/project.json
+++ b/samples/react/MusicStore/project.json
@@ -1,80 +1,56 @@
 {
-  "dependencies": {
-    "Microsoft.NETCore.App": {
-      "version": "1.1.0",
-      "type": "platform"
-    },
-    "Microsoft.AspNetCore.ReactServices": "1.1.0-*",
-    "Microsoft.AspNetCore.Diagnostics": "1.1.0",
-    "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0",
-    "Microsoft.AspNetCore.Mvc": "1.1.0",
-    "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview2-final",
-      "type": "build"
-    },
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
-    "Microsoft.AspNetCore.StaticFiles": "1.1.0",
-    "Microsoft.EntityFrameworkCore.SQLite": "1.1.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
-    "Microsoft.Extensions.Configuration.Json": "1.1.0",
-    "Microsoft.Extensions.Configuration.CommandLine": "1.1.0",
-    "Microsoft.Extensions.Logging": "1.1.0",
-    "Microsoft.Extensions.Logging.Console": "1.1.0",
-    "Microsoft.Extensions.Logging.Debug": "1.1.0",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
-    "AutoMapper": "5.0.2"
-  },
-
-  "tools": {
-    "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final",
-    "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final"
-  },
-
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": []
-    }
-  },
-
+  "version": "1.0.0-*",
  "buildOptions": {
    "emitEntryPoint": true,
-    "preserveCompilationContext": true,
-    "compile": {
-      "exclude": ["node_modules"]
-    }
+    "preserveCompilationContext": true
  },
-
  "runtimeOptions": {
-    "configProperties": {
-      "System.GC.Server": true
-    }
+    "gcServer": true
  },
-
-  "publishOptions": {
-    "include": [
-      "appsettings.json",
-      "ClientApp/dist",
-      "node_modules",
-      "Views",
-      "web.config",
-      "wwwroot"
-    ],
-    "exclude": [
-      "wwwroot/dist/*.map"
-    ]
-  },
-
-  "scripts": {
-    "prepublish": [
-      "npm install",
-      "node node_modules/webpack/bin/webpack.js"
-    ],
-    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
-  },
-
  "tooling": {
    "defaultNamespace": "MusicStore"
+  },
+
+"dependencies": {
+    "Microsoft.NETCore.App": {
+      "version": "1.0.0",
+      "type": "platform"
+    },
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.NETCore.Platforms": "1.0.1",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.EntityFrameworkCore.SQLite": "1.0.0",
+    "Microsoft.AspNetCore.ReactServices": "1.0.0-*",
+  "AutoMapper": "5.0.2"
+  },
+  "frameworks": {
+    "netcoreapp1.0": {
+      "imports": [
+        "dotnet5.6",
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
+  },
+  "publishOptions": {
+    "exclude": [
+      "node_modules",
+      "bower_components",
+      "**.xproj",
+      "**.user",
+      "**.vspscc"
+    ]
+  },
+  "scripts": {
+    "prepublish": [ "npm install" ],
+    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
  }
 }
--- a/samples/react/MusicStore/tsconfig.json
+++ b/samples/react/MusicStore/tsconfig.json
@@ -4,8 +4,7 @@
    "target": "es6",
    "jsx": "preserve",
    "sourceMap": true,
-    "experimentalDecorators": true,
-    "types": [ "webpack-env", "whatwg-fetch" ]
+    "experimentalDecorators": true
  },
  "exclude": [
      "node_modules"
--- a/samples/react/MusicStore/tsd.json
+++ b/samples/react/MusicStore/tsd.json
@@ -0,0 +1,45 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "typings",
+  "bundle": "typings/tsd.d.ts",
+  "installed": {
+    "react/react.d.ts": {
+      "commit": "e69fe60f2d6377ea4fae539493997b098f52cad1"
+    },
+    "react/react-dom.d.ts": {
+      "commit": "86dbea8fc37d9473fee465da4f0a21bea4f8cbd9"
+    },
+    "redux/redux.d.ts": {
+      "commit": "e69fe60f2d6377ea4fae539493997b098f52cad1"
+    },
+    "webpack/webpack-env.d.ts": {
+      "commit": "717a5fdb079f8dd7c19f1b22f7f656dd990f0ccf"
+    },
+    "react-redux/react-redux.d.ts": {
+      "commit": "717a5fdb079f8dd7c19f1b22f7f656dd990f0ccf"
+    },
+    "react-bootstrap/react-bootstrap.d.ts": {
+      "commit": "e69fe60f2d6377ea4fae539493997b098f52cad1"
+    },
+    "react-router/react-router.d.ts": {
+      "commit": "e69fe60f2d6377ea4fae539493997b098f52cad1"
+    },
+    "react-router/history.d.ts": {
+      "commit": "e69fe60f2d6377ea4fae539493997b098f52cad1"
+    },
+    "react-router-bootstrap/react-router-bootstrap.d.ts": {
+      "commit": "e69fe60f2d6377ea4fae539493997b098f52cad1"
+    },
+    "react-router-redux/react-router-redux.d.ts": {
+      "commit": "e69fe60f2d6377ea4fae539493997b098f52cad1"
+    },
+    "redux-thunk/redux-thunk.d.ts": {
+      "commit": "e69fe60f2d6377ea4fae539493997b098f52cad1"
+    },
+    "whatwg-fetch/whatwg-fetch.d.ts": {
+      "commit": "f4b1797c1201b6c575668f5d7ea12d9b1ab21846"
+    }
+  }
+}
--- a/samples/react/MusicStore/typings/react-bootstrap/react-bootstrap.d.ts
+++ b/samples/react/MusicStore/typings/react-bootstrap/react-bootstrap.d.ts
@@ -0,0 +1,976 @@
+// Type definitions for react-bootstrap 
+// Project: https://github.com/react-bootstrap/react-bootstrap
+// Definitions by: Walker Burgin <https://github.com/walkerburgin>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../react/react.d.ts"/>
+    
+declare module "react-bootstrap" {
+    // Import React 
+    import React = require("react");
+
+
+    // <Button />
+    // ----------------------------------------
+    interface ButtonProps extends React.Props<ButtonClass>{
+
+        // Optional
+        active?: boolean;
+        disabled?: boolean;
+        block?: boolean;
+        bsStyle?: string;
+        bsSize?: string;
+        className?: string;
+        navItem?: boolean;
+        navDropdown?: boolean;
+        componentClass?: string;
+        href?: string;
+        onClick?: Function; // Add more specific type 
+        target?: string;
+        type?: string;
+    }
+    interface Button extends  React.ReactElement<ButtonProps> { }
+    interface ButtonClass extends  React.ComponentClass<ButtonProps> { }
+    var Button: ButtonClass;
+
+
+    // <ButtonToolbar />
+    // ----------------------------------------
+    interface ButtonToolbarProps extends React.Props<ButtonToolbarClass> {
+
+        // Optional
+        block?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        justified?: boolean;
+        vertical?: boolean;
+    }
+    interface ButtonToolbar extends React.ReactElement<ButtonToolbarProps> { }
+    interface ButtonToolbarClass extends  React.ComponentClass<ButtonToolbarProps> { }
+    var ButtonToolbar: ButtonToolbarClass;
+
+    // <ButtonGroup />
+    // ----------------------------------------
+    interface ButtonGroupProps extends React.Props<ButtonGroupClass> {
+        // Optional
+        block?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        justified?: boolean;
+        vertical?: boolean;
+    }
+    interface ButtonGroup extends React.ReactElement<ButtonGroupProps> { }
+    interface ButtonGroupClass extends  React.ComponentClass<ButtonGroupProps> { }
+    var ButtonGroup: ButtonGroupClass;
+    
+
+    // <DropdownButton />
+    // ----------------------------------------
+    interface DropdownButtonProps extends React.Props<DropdownButtonClass> {
+        bsStyle?: string;
+        bsSize?: string;
+        buttonClassName?: string; 
+        className?: string;
+        dropup?: boolean;
+        href?: string;
+        id?: string | number; 
+        navItem?: boolean;
+        noCaret?: boolean;
+        onClick?: Function;  // TODO: Add more specifc type 
+        onSelect?: Function; // TODO: Add more specific type 
+        pullRight?: boolean;
+        title?: any; // TODO: Add more specific type
+    }
+    interface DropdownButton extends React.ReactElement<DropdownButtonProps> { }
+    interface DropdownButtonClass extends React.ComponentClass<DropdownButtonProps> { }
+    var DropdownButton: DropdownButtonClass;
+
+
+    // <SplitButton />
+    // ----------------------------------------
+    interface SplitButtonProps extends React.Props<SplitButtonClass>{ 
+        bsStyle?: string;
+        bsSize?: string;
+        className?: string;
+        disabled?: boolean;
+        dropdownTitle?: any; // TODO: Add more specific type
+        dropup?: boolean;
+        href?: string;
+        id?: string; 
+        onClick?: Function;  // TODO: Add more specific type 
+        onSelect?: Function; // TODO: Add more specific type 
+        pullRight?: boolean;
+        target?: string;
+        title?: any; // TODO: Add more specific type
+    }
+    interface SplitButton extends React.ReactElement<SplitButtonProps> { }
+    interface SplitButtonClass extends React.ComponentClass<SplitButtonProps> { }
+    var SplitButton: SplitButtonClass;
+
+
+    // <MenuItem />
+    // ----------------------------------------
+    interface MenuItemProps extends React.Props<MenuItemClass> {
+        active?: boolean;
+        className?: string;
+        disabled?: boolean;
+        divider?: boolean;
+        eventKey?: any;
+        header?: boolean;
+        href?: string;
+        onClick?: Function;
+        onKeyDown?: Function;
+        onSelect?: Function;
+        target?: string;
+        title?: string;
+    }
+    interface MenuItem extends React.ReactElement<MenuItemProps> { }
+    interface MenuItemClass extends React.ComponentClass<MenuItemProps> { }
+    var MenuItem: MenuItemClass;
+
+
+    // <Panel />
+    // ----------------------------------------
+    interface PanelProps extends React.Props<PanelClass> {
+        className?: string;
+        bsSize?: string;
+        bsStyle?: string;
+        collapsible?: boolean;
+        defaultExpanded?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        footer?: any; // TODO: Add more specific type
+        header?: any; // TODO: Add more specific type
+        id?: string;
+        onSelect?: Function; // TODO: Add more specific type 
+        onClick?: Function; // TODO: Add more specific type 
+    }
+    interface Panel extends React.ReactElement<PanelProps> { }
+    interface PanelClass extends React.ComponentClass<PanelProps> { }
+    var Panel: PanelClass;
+
+
+    // <Accordion />
+    // ----------------------------------------
+    interface AccordionProps extends React.Props<AccordionClass> {
+        bsSize?: string;
+        bsStyle?: string;
+        collapsible?: boolean;
+        defaultExpanded?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        footer?: any; // TODO: Add more specific type
+        header?: any; // TODO: Add more specific type
+        id?: string;
+        onSelect?: Function; // TODO: Add more specific type 
+    }
+    interface Accordion extends React.ReactElement<AccordionProps> { }
+    interface AccordionClass extends  React.ComponentClass<AccordionProps> { }
+    var Accordion: AccordionClass;
+
+
+    // <PanelGroup />
+    // ----------------------------------------
+    interface PanelGroupProps extends React.Props<PanelGroupClass> { 
+        accordion?: boolean;
+        activeKey?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        defaultActiveKey?: any;
+        onSelect?: Function;
+    }
+    interface PanelGroup extends React.ReactElement<PanelGroupProps> { }
+    interface PanelGroupClass extends  React.ComponentClass<PanelGroupProps> { }
+    var PanelGroup: PanelGroupClass;
+
+
+    // <Modal.Dialog />
+    // ----------------------------------------
+    interface ModalDialogProps extends React.Props<ModalDialogClass> {
+        // TODO: Add more specific type 
+    }
+    interface ModalDialog extends React.ReactElement<ModalDialogProps> { }
+    interface ModalDialogClass extends React.ComponentClass<ModalHeaderProps> { }
+
+
+    // <Modal.Header />
+    // ----------------------------------------
+  interface ModalHeaderProps extends React.Props<ModalHeaderClass> {
+        className?: string;
+        closeButton?: boolean;
+        modalClassName?: string;
+        onHide?: Function;
+        // undefined?: string;
+    }
+    interface ModalHeader extends React.ReactElement<ModalHeaderProps> { }
+    interface ModalHeaderClass extends React.ComponentClass<ModalHeaderProps> { }
+
+
+    // <Modal.Title/>
+    // ----------------------------------------
+    interface ModalTitleProps extends React.Props<ModalTitleClass> {
+        className?: string;
+        modalClassName?: string;
+    }
+    interface ModalTitle extends React.ReactElement<ModalTitleProps> { }
+    interface ModalTitleClass extends React.ComponentClass<ModalTitleProps> { }
+
+
+    // <Modal.Body />
+    // ----------------------------------------
+    interface ModalBodyProps extends React.Props<ModalBodyClass> {
+        className?: string;
+        modalClassName?: string;
+    }
+    interface ModalBody extends React.ReactElement<ModalBodyProps> { }
+    interface ModalBodyClass extends React.ComponentClass<ModalBodyProps> { }
+
+
+    // <Modal.Footer />
+    // ----------------------------------------
+    interface ModalFooterProps extends React.Props<ModalFooterClass> {
+        className?: string;
+        modalClassName?: string;
+    }
+    interface ModalFooter extends React.ReactElement<ModalFooterProps> { }
+    interface ModalFooterClass extends React.ComponentClass<ModalFooterProps> { }
+
+
+    // <Modal />
+    // ----------------------------------------
+    interface ModalProps extends React.Props<ModalClass> {
+        // Required
+        onHide: Function;
+
+        // Optional
+        animation?: boolean;
+        autoFocus?: boolean;
+        backdrop?: boolean|string;
+        bsSize?: string;
+        container?: any; // TODO: Add more specific type
+        dialogClassName?: string;
+        dialogComponent?: any; // TODO: Add more specific type
+        enforceFocus?: boolean;
+        keyboard?: boolean;
+        show?: boolean;
+    }
+    interface Modal extends React.ReactElement<ModalProps> { }
+    interface ModalClass extends React.ComponentClass<ModalProps> {
+        Header: ModalHeaderClass;
+        Title: ModalTitleClass;
+        Body: ModalBodyClass;
+        Footer: ModalFooterClass;
+        Dialog: ModalDialogClass;
+    }
+    var Modal: ModalClass;
+
+
+    // <OverlayTrigger />
+    // ----------------------------------------
+    interface OverlayTriggerProps extends React.Props<OverlayTriggerClass> {
+        // Required
+        overlay: any; // TODO: Add more specific type
+
+        // Optional
+        animation?: any; // TODO: Add more specific type
+        container?: any; // TODO: Add more specific type
+        containerPadding?: number;
+        defaultOverlayShown?: boolean;
+        delay?: number;
+        delayHide?: number;
+        delayShow?: number;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        placement?: string;
+        rootClose?: boolean;
+        trigger?: string;
+    }
+    interface OverlayTrigger extends React.ReactElement<OverlayTriggerProps> { }
+    interface OverlayTriggerClass extends  React.ComponentClass<OverlayTriggerProps> { }
+    var OverlayTrigger: OverlayTriggerClass;
+
+
+    // <Tooltip />
+    // ----------------------------------------
+    interface TooltipProps extends React.Props<TooltipClass> {
+        // Optional
+        arrowOffsetLeft?: number | string;
+        arrowOffsetTop?: number | string;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        id?: string; 
+        placement?: string;
+        positionLeft?: number;
+        positionTop?: number;
+        title?: any; // TODO: Add more specific type
+    }
+    interface Tooltip extends React.ReactElement<TooltipProps> { }
+    interface TooltipClass extends React.ComponentClass<TooltipProps> { }
+    var Tooltip: TooltipClass;
+
+
+    // <Popover/>
+    // ----------------------------------------
+    interface PopoverProps  extends React.Props<PopoverClass> {
+        // Optional
+        arrowOffsetLeft?: number | string;
+        arrowOffsetTop?: number | string;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        id?: string; 
+        placement?: string;
+        positionLeft?: number;
+        positionTop?: number;
+        title?: any; // TODO: Add more specific type
+    }
+    interface Popover extends React.ReactElement<PopoverProps> { }
+    interface PopoverClass extends React.ComponentClass<PopoverProps> { }
+    var Popover: PopoverClass;
+
+
+    // <Overlay />
+    // ----------------------------------------
+    interface OverlayProps extends React.Props<OverlayClass> {
+        // Optional
+        animation?: any; // TODO: Add more specific type
+        container?: any; // TODO: Add more specific type
+        containerPadding?: number; // TODO: Add more specific type
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        onHide?: Function;
+        placement?: string;
+        rootClose?: boolean;
+        show?: boolean;
+        target?: Function;
+    }
+    interface Overlay extends React.ReactElement<OverlayProps> { }
+    interface OverlayClass extends  React.ComponentClass<OverlayProps> { }
+    var Overlay: OverlayClass;
+
+
+    // <ProgressBar />
+    // ----------------------------------------
+    interface ProgressBarProps extends React.Props<ProgressBarClass> {
+        // Optional
+        active?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        interpolatedClass?: any; // TODO: Add more specific type
+        label?: any; // TODO: Add more specific type
+        max?: number;
+        min?: number;
+        now?: number;
+        srOnly?: boolean;
+        striped?: boolean;
+    }
+    interface ProgressBar extends React.ReactElement<ProgressBarProps> { }
+    interface ProgressBarClass extends  React.ComponentClass<ProgressBarProps> { }
+    var ProgressBar: ProgressBarClass;
+
+
+    // <Nav />
+    // ----------------------------------------
+    // TODO: This one turned into a union of two different types 
+    interface NavProps extends React.Props<NavClass> {
+        // Optional
+        activeHref?: string;
+        activeKey?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        collapsible?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        id?: string;
+        justified?: boolean;
+        navbar?: boolean;
+        onSelect?: Function;
+        pullRight?: boolean;
+        right?: boolean;
+        stacked?: boolean;
+        ulClassName?: string;
+        ulId?: string;
+    }
+    interface Nav extends React.ReactElement<NavProps> { }
+    interface NavClass extends  React.ComponentClass<NavProps> { }
+    var Nav: NavClass;
+
+
+    // <NavItem />
+    // ----------------------------------------
+    interface NavItemProps extends React.Props<NavItemClass> {
+        active?: boolean;
+        brand?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        componentClass?: any; // TODO: Add more specific type
+        defaultNavExpanded?: boolean;
+        disabled?: boolean;
+        eventKey?: any;
+        fixedBottom?: boolean;
+        fixedTop?: boolean;
+        fluid?: boolean;
+        href?: string;
+        inverse?: boolean;
+        linkId?: string;
+        navExpanded?: boolean;
+        onClick?: Function;
+        onSelect?: Function;
+        onToggle?: Function;
+        role?: string;
+        staticTop?: boolean;
+        target?: string;
+        title?: string;
+        toggleButton?: any; // TODO: Add more specific type
+        toggleNavKey?: string | number;
+    }
+    interface NavItem extends React.ReactElement<NavItemProps> { }
+    interface NavItemClass extends React.ComponentClass<NavItemProps> { }
+    var NavItem: NavItemClass;
+
+    // <Navbar.Brand />
+    // ----------------------------------------
+    interface NavbarBrandProps extends React.Props<NavbarBrandClass> {
+    }
+    interface NavbarBrand extends React.ReactElement<NavbarBrandProps> { }
+    interface NavbarBrandClass extends  React.ComponentClass<NavbarBrandProps> { }
+
+    // <Navbar.Collapse />
+    // ----------------------------------------
+    interface NavbarCollapseProps extends React.Props<NavbarCollapseClass> {
+    }
+    interface NavbarCollapse extends React.ReactElement<NavbarCollapseProps> { }
+    interface NavbarCollapseClass extends  React.ComponentClass<NavbarCollapseProps> { }
+
+    // <Navbar.Header />
+    // ----------------------------------------
+    interface NavbarHeaderProps extends React.Props<NavbarHeaderClass> {
+    }
+    interface NavbarHeader extends React.ReactElement<NavbarHeaderProps> { }
+    interface NavbarHeaderClass extends  React.ComponentClass<NavbarHeaderProps> { }
+
+    // <Navbar.Toggle />
+    // ----------------------------------------
+    interface NavbarToggleProps extends React.Props<NavbarToggleClass> {
+    }
+    interface NavbarToggle extends React.ReactElement<NavbarToggleProps> { }
+    interface NavbarToggleClass extends  React.ComponentClass<NavbarToggleProps> { }
+
+    // <Navbar />
+    // ----------------------------------------
+    interface NavbarProps extends React.Props<NavbarClass> {
+        brand?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        componentClass?: any; // TODO: Add more specific type
+        defaultNavExpanded?: boolean;
+        fixedBottom?: boolean;
+        fixedTop?: boolean;
+        fluid?: boolean;
+        inverse?: boolean;
+        navExpanded?: boolean;
+        onToggle?: Function;
+        role?: string;
+        staticTop?: boolean;
+        toggleButton?: any; // TODO: Add more specific type
+        toggleNavKey?: string | number;
+    }
+    interface Navbar extends React.ReactElement<NavbarProps> { }
+    interface NavbarClass extends React.ComponentClass<NavbarProps> {
+        Brand: NavbarBrandClass;
+        Collapse: NavbarCollapseClass;
+        Header: NavbarHeaderClass;
+        Toggle: NavbarToggleClass;
+    }
+    var Navbar: NavbarClass;
+    
+    // <NavBrand />
+    // ----------------------------------------
+    interface NavBrandProps {
+
+    }
+    interface NavBrand extends React.ReactElement<NavbarProps> { }
+    interface NavBrandClass extends  React.ComponentClass<NavbarProps> { }
+    var NavBrand: NavBrandClass;
+
+
+    // <NavDropdown />
+    // ----------------------------------------
+    interface NavDropdownProps extends React.Props<NavDropdownClass> {
+        className?: string;
+        eventKey?: any;
+        title?: string;
+        id?: string;
+    }
+    interface NavDropdown extends React.ReactElement<NavDropdownProps> { }
+    interface NavDropdownClass extends  React.ComponentClass<NavDropdownProps> { }
+    var NavDropdown: NavDropdownClass;
+
+
+    // <Tabs />
+    // ----------------------------------------
+    interface TabsProps extends React.Props<TabsClass> {
+        activeKey?: any; 
+        animation?: boolean;
+        bsStyle?: string;
+        defaultActiveKey?: any;
+        id?: string | number;
+        onSelect?: Function;
+        paneWidth?: any; // TODO: Add more specific type 
+        position?: string;
+        tabWidth?: any; // TODO: Add more specific type
+    }
+    interface Tabs extends React.ReactElement<TabsProps> { }
+    interface TabsClass extends React.ComponentClass<TabsProps> { }
+    var Tabs: TabsClass;
+
+
+    // <Tab />
+    // ----------------------------------------
+    interface TabProps extends React.Props<TabClass> {
+        animation?: boolean;
+        className?: string;
+        disabled?: boolean;
+        eventKey?: any; // TODO: Add more specific type
+        title?: any; // TODO: Add more specific type
+    }
+    interface Tab extends React.ReactElement<TabProps> { }
+    interface TabClass extends React.ComponentClass<TabProps> { }
+    var Tab: TabClass;
+
+
+    // <Pager />
+    // ----------------------------------------
+    interface PagerProps extends React.Props<PagerClass> {
+        className?: string;
+        onSelect?: Function;
+    }
+    interface Pager extends React.ReactElement<PagerProps> { }
+    interface PagerClass extends  React.ComponentClass<PagerProps> { }
+    var Pager: PagerClass;
+
+
+    // <PageItem />
+    // ----------------------------------------
+    interface PageItemProps extends React.Props<PageItemClass> {
+        className?: string;
+        disabled?: boolean;
+        eventKey?: any; 
+        href?: string;
+        next?: boolean;
+        onSelect?: Function;
+        previous?: boolean;
+        target?: string;
+        title?: string;
+    }
+    interface PageItem extends React.ReactElement<PageItemProps> { }
+    interface PageItemClass extends React.ComponentClass<PageItemProps> { }
+    var PageItem: PageItemClass;
+
+
+    // <Pagination />
+    // ----------------------------------------
+    interface PaginationProps extends React.Props<PaginationClass> {
+        activePage?: number;
+        bsSize?: string;
+        bsStyle?: string;
+        buttonComponentClass?: any; // TODO: Add more specific type
+        className?: string;
+        ellipsis?: boolean;
+        first?: boolean;
+        items?: number;
+        last?: boolean;
+        maxButtons?: number;
+        next?: boolean;
+        onSelect?: Function;
+        prev?: boolean;
+    }
+    interface Pagination extends React.ReactElement<PaginationProps> { }
+    interface PaginationClass extends React.ComponentClass<PaginationProps> { }
+    var Pagination: PaginationClass;
+
+
+    // <Alert />
+    // ----------------------------------------
+    interface AlertProps extends React.Props<AlertClass> {
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        closeLabel?: string;
+        dismissAfter?: number;
+        onDismiss?: Function;
+    }
+    interface Alert extends React.ReactElement<AlertProps> { }
+    interface AlertClass extends React.ComponentClass<AlertProps> { }
+    var Alert: AlertClass;
+
+
+    // <Carousel />
+    // ----------------------------------------
+    interface CarouselProps extends React.Props<CarouselClass> {
+        activeIndex?: number;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        controls?: boolean;
+        defaultActiveIndex?: number;
+        direction?: string;
+        indicators?: boolean;
+        interval?: number;
+        nextIcon?: any; // TODO: Add more specific type
+        onSelect?: Function;
+        onSlideEnd?: Function;
+        pauseOnHover?: boolean;
+        prevIcon?: any; // TODO: Add more specific type
+        slide?: boolean;
+        wrap?: boolean;   
+    }
+    interface Carousel extends React.ReactElement<CarouselProps> { }
+    interface CarouselClass extends React.ComponentClass<CarouselProps> { }
+    var Carousel: CarouselClass;
+
+
+    // <CarouselItem />
+    // ----------------------------------------
+    interface CarouselItemProps extends React.Props<CarouselItemClass> {
+        active?: boolean;
+        animtateIn?: boolean;
+        animateOut?: boolean;
+        caption?: any; // TODO: Add more specific type
+        className?: string;
+        direction?: string;
+        index?: number;
+        onAnimateOutEnd?: Function;
+    }
+    interface CarouselItem extends React.ReactElement<CarouselItemProps> { }
+    interface CarouselItemClass extends React.ComponentClass<CarouselItemProps> { }
+    var CarouselItem: CarouselItemClass;
+
+
+    // <Grid />
+    // ----------------------------------------
+    interface GridProps extends React.Props<GridClass> {
+        className?: string;
+        componentClass?: any; // TODO: Add more specific type
+        fluid?: boolean; 
+    }
+    interface Grid extends React.ReactElement<GridProps> { }
+    interface GridClass extends React.ComponentClass<GridProps> { }
+    var Grid: GridClass;
+
+
+    // <Row />
+    // ----------------------------------------
+    interface RowProps extends React.Props<RowClass> {
+        className?: string;
+        componentClass?: any; // TODO: Add more specific type
+    }
+    interface Row extends React.ReactElement<RowProps> { }
+    interface RowClass extends React.ComponentClass<RowProps> { }
+    var Row: RowClass;
+
+
+    // <Col />
+    // ----------------------------------------
+    interface ColProps extends React.Props<ColClass> {
+        className?: string;
+        componentClass?: any; // TODO: Add more specific type
+        lg?: number;
+        lgOffset?: number;
+        lgPull?: number;
+        lgPush?: number;
+        md?: number;
+        mdOffset?: number;
+        mdPull?: number;
+        mdPush?: number;
+        sm?: number;
+        smOffset?: number;
+        smPull?: number;
+        smPush?: number;
+        xs?: number;
+        xsOffset?: number;
+        xsPull?: number;
+        xsPush?: number;
+    }
+    interface Col extends React.ReactElement<ColProps> { } 
+    interface ColClass extends React.ComponentClass<ColProps> { }
+    var Col: ColClass;
+
+
+    // <Thumbnail />
+    // ----------------------------------------
+    interface ThumbnailProps extends React.Props<ThumbnailClass> {
+        alt?: string;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        href?: string;
+        src?: string;
+    }
+    interface Thumbnail extends React.ReactElement<ThumbnailProps> { }
+    interface ThumbnailClass extends React.ComponentClass<ThumbnailProps> { }
+    var Thumbnail: ThumbnailClass;    
+
+
+    // <ListGroup />
+    // ----------------------------------------
+    interface ListGroupProps extends React.Props<ListGroupClass> {
+        className?: string;
+        id?: string | number;
+        fill?: boolean; // TODO: Add more specific type
+    }
+    interface ListGroup extends React.ReactElement<ListGroupProps> { }
+    interface ListGroupClass extends React.ComponentClass<ListGroupProps> { }
+    var ListGroup: ListGroupClass;
+
+
+    // <ListGroupItem />
+    // ----------------------------------------
+    interface ListGroupItemProps extends React.Props<ListGroupItemClass> {
+        active?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        disabled?: any;
+        eventKey?: any;
+        header?: any; // TODO: Add more specific type
+        href?: string;
+        key?: any; // TODO: Add more specific type 
+        listItem?: boolean;
+        onClick?: Function; // TODO: Add more specific type 
+        target?: string;
+    }
+    interface ListGroupItem extends React.ReactElement<ListGroupItemProps> { }
+    interface ListGroupItemClass extends React.ComponentClass<ListGroupItemProps> { }
+    var ListGroupItem: ListGroupItemClass;
+
+
+    // <Label />
+    // ----------------------------------------
+    interface LabelProps extends React.Props<LabelClass> {
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+    }
+    interface Label extends React.ReactElement<LabelProps> { }
+    interface LabelClass extends React.ComponentClass<LabelProps> { }
+    var Label: LabelClass;
+
+
+    // <Badge />
+    // ----------------------------------------
+    interface BadgeProps extends React.Props<BadgeClass> {
+        className?: string;
+        pullRight?: boolean;
+    }
+    interface Badge extends React.ReactElement<BadgeProps> { }
+    interface BadgeClass extends React.ComponentClass<BadgeProps> { }
+    var Badge: BadgeClass;
+
+
+    // <Jumbotron />
+    // ----------------------------------------
+    interface JumbotronProps extends React.Props<JumbotronClass> {
+        className?: string;
+        componentClass?: any; // TODO: Add more specific type
+    }
+    interface Jumbotron extends React.ReactElement<JumbotronProps> { }
+    interface JumbotronClass extends React.ComponentClass<JumbotronProps> { }
+    var Jumbotron: JumbotronClass;
+
+
+    // <PageHeader />
+    // ----------------------------------------
+    interface PageHeaderProps extends React.Props<PageHeaderClass> {
+        className?: string;
+    }
+    interface PageHeader extends React.ReactElement<PageHeaderProps> { }
+    interface PageHeaderClass extends React.ComponentClass<PageHeaderProps> { }
+    var PageHeader: PageHeaderClass;
+
+
+    // <Well />
+    // ----------------------------------------
+    interface WellProps extends React.Props<WellClass> {
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+    }
+    interface Well extends React.ReactElement<WellProps> { }
+    interface WellClass extends React.ComponentClass<WellProps> { }
+    var Well: WellClass;
+
+
+    // <Glyphicon />
+    // ----------------------------------------
+    interface GlyphiconProps extends React.Props<GlyphiconClass> {
+        className?: string;
+        // Required 
+        glyph: string;
+    }
+    interface Glyphicon extends React.ReactElement<GlyphiconProps> { }
+    interface GlyphiconClass extends React.ComponentClass<GlyphiconProps> { }
+    var Glyphicon: GlyphiconClass;
+
+
+    // <Table />
+    // ----------------------------------------
+    interface TableProps extends React.Props<TableClass> {
+        bordered?: boolean;
+        className?: string;
+        condensed?: boolean;
+        hover?: boolean;
+        responsive?: boolean;
+        striped?: boolean;
+    }
+    interface Table extends React.ReactElement<TableProps> { }
+    interface TableClass extends React.ComponentClass<TableProps> { }
+    var Table: TableClass;
+
+
+    // <Input />
+    // ----------------------------------------
+    interface InputProps extends React.Props<InputClass> {
+        defaultValue?:string;
+        addonAfter?: any; // TODO: Add more specific type
+        addonBefore?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        buttonAfter?: any; // TODO: Add more specific type
+        buttonBefore?: any; // TODO: Add more specific type
+        className?: string;
+        checked?: boolean;
+        disabled?: boolean;
+        feedbackIcon?: any; // TODO: Add more specific type
+        groupClassName?: string;
+        hasFeedback?: boolean;
+        help?: any; // TODO: Add more specific type
+        id?: string | number;
+        label?: any; // TODO: Add more specific type 
+        labelClassName?: string;
+        multiple?: boolean;
+        placeholder?: string;
+        readOnly?: boolean;
+        type?: string;
+        onChange?: Function; // TODO: Add more specific type 
+        onKeyDown?: Function; // TODO: Add more specific type 
+        onKeyUp?: Function; // TODO: Add more specific type 
+        onKeyPress?: Function; // TODO: Add more specific type 
+        value?: any; // TODO: Add more specific type
+        wrapperClassName?: string; 
+    }
+    interface Input extends React.ReactElement<InputProps> { }
+    interface InputClass extends React.ComponentClass<InputProps> { }
+    var Input: InputClass;
+
+
+    // <ButtonInput />
+    // ----------------------------------------
+    interface ButtonInputProps extends React.Props<ButtonInputClass> {
+        addonAfter?: any; // TODO: Add more specific type
+        addonBefore?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        buttonAfter?: any; // TODO: Add more specific type
+        buttonBefore?: any; // TODO: Add more specific type
+        className?: string;
+        disabled?: boolean;
+        feedbackIcon?: any; // TODO: Add more specific type
+        groupClassName?: string;
+        hasFeedback?: boolean;
+        help?: any; // TODO: Add more specific type
+        id?: string | number;
+        label?: any; // TODO: Add more specific type 
+        labelClassName?: string;
+        multiple?: boolean;
+        onClick?: Function; // TODO: Add more specific type 
+        type?: string;
+        value?: any; // TODO: Add more specific type
+        wrapperClassName?: string; 
+    }
+    interface ButtonInput extends React.ReactElement<ButtonInputProps> { }
+    interface ButtonInputClass extends React.ComponentClass<ButtonInputProps> { }
+    var ButtonInput: ButtonInputClass;
+
+
+    // TODO: FormControls.Static
+  
+  
+    // <Portal />
+    // ----------------------------------------
+    interface PortalProps extends React.Props<PortalClass> {
+        dimension?: string | Function;
+        getDimensionValue?: Function;
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        role?: string;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    interface Portal extends React.ReactElement<PortalProps> { }
+    interface PortalClass extends React.ComponentClass<PortalProps> { }
+    var Portal: PortalClass;
+
+   
+    // <Position />
+    // ----------------------------------------
+    interface PositionProps extends React.Props<PositionClass> {
+        dimension?: string | Function;
+        getDimensionValue?: Function;
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        role?: string;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    interface Position extends React.ReactElement<PositionProps> { }
+    interface PositionClass extends  React.ComponentClass<PositionProps> { }
+    var Position: PositionClass;
+
+
+    // <Fade />
+    // ----------------------------------------
+    interface FadeProps extends React.Props<FadeClass> {
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    interface Fade extends React.ReactElement<FadeProps> { }
+    interface FadeClass extends React.ComponentClass<FadeProps> { }
+    var Fade: FadeClass;
+}
--- a/samples/react/MusicStore/typings/react-redux/react-redux.d.ts
+++ b/samples/react/MusicStore/typings/react-redux/react-redux.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for react-redux 2.1.2
+// Project: https://github.com/rackt/react-redux
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+/// <reference path="../redux/redux.d.ts" />
+
+declare module "react-redux" {
+  import { Component } from 'react';
+  import { Store, Dispatch, ActionCreator } from 'redux';
+
+  export class ElementClass extends Component<any, any> { }
+  export interface ClassDecorator {
+    <T extends (typeof ElementClass)>(component: T): T
+  }
+
+  /**
+   * Connects a React component to a Redux store.
+   * @param mapStateToProps
+   * @param mapDispatchToProps
+   * @param mergeProps
+   * @param options
+     */
+  export function connect(mapStateToProps?: MapStateToProps,
+                          mapDispatchToProps?: MapDispatchToPropsFunction|MapDispatchToPropsObject,
+                          mergeProps?: MergeProps,
+                          options?: Options): ClassDecorator;
+
+  interface MapStateToProps {
+    (state: any, ownProps?: any): any;
+  }
+
+  interface MapDispatchToPropsFunction {
+    (dispatch: Dispatch, ownProps?: any): any;
+  }
+
+  interface MapDispatchToPropsObject {
+    [name: string]: ActionCreator;
+  }
+
+  interface MergeProps {
+    (stateProps: any, dispatchProps: any, ownProps: any): any;
+  }
+
+  interface Options {
+    /**
+     * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
+     * preventing unnecessary updates, assuming that the component is a “pure” component
+     * and does not rely on any input or state other than its props and the selected Redux store’s state.
+     * Defaults to true.
+     * @default true
+     */
+    pure: boolean;
+  }
+
+  export interface Property {
+    /**
+     * The single Redux store in your application.
+     */
+    store?: Store;
+    children?: Function;
+  }
+
+  /**
+   * Makes the Redux store available to the connect() calls in the component hierarchy below.
+   */
+  export class Provider extends Component<Property, {}> { }
+}
--- a/samples/react/MusicStore/typings/react-router-bootstrap/react-router-bootstrap.d.ts
+++ b/samples/react/MusicStore/typings/react-router-bootstrap/react-router-bootstrap.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for react-router-bootstrap
+// Project: https://github.com/react-bootstrap/react-router-bootstrap
+// Definitions by: Vincent Lesierse <https://github.com/vlesierse>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../react/react.d.ts"/>
+///<reference path="../react-router/react-router.d.ts"/>
+
+declare namespace ReactRouterBootstrap {
+    // Import React
+    import React = __React;
+
+    interface LinkContainerProps extends ReactRouter.LinkProps {
+        disabled?: boolean
+    }
+    interface LinkContainer extends React.ComponentClass<LinkContainerProps> {}
+    interface LinkContainerElement extends React.ReactElement<LinkContainerProps> {}
+    const LinkContainer: LinkContainer
+
+    const IndexLinkContainer: LinkContainer
+}
+
+declare module "react-router-bootstrap/lib/LinkContainer" {
+
+    export default ReactRouterBootstrap.LinkContainer
+
+}
+
+declare module "react-router-bootstrap/lib/IndexLinkContainer" {
+
+    export default ReactRouterBootstrap.IndexLinkContainer
+
+}
+
+declare module "react-router-bootstrap" {
+
+    import LinkContainer from "react-router-bootstrap/lib/LinkContainer"
+    
+    import IndexLinkContainer from "react-router-bootstrap/lib/IndexLinkContainer"
+
+    export {
+        LinkContainer,
+        IndexLinkContainer
+    }
+
+}
--- a/samples/react/MusicStore/typings/react-router-redux/react-router-redux.d.ts
+++ b/samples/react/MusicStore/typings/react-router-redux/react-router-redux.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for react-router-redux v2.1.0
+// Project: https://github.com/rackt/react-router-redux
+// Definitions by: Isman Usoh <http://github.com/isman-usoh>, Noah Shipley <https://github.com/noah79>, Dimitri Rosenberg <https://github.com/rosendi>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../redux/redux.d.ts" />
+/// <reference path="../react-router/react-router.d.ts"/>
+
+declare namespace ReactRouterRedux {
+    import R = Redux;
+    import H = HistoryModule;
+
+    const TRANSITION: string;
+    const UPDATE_LOCATION: string;
+
+    const push: PushAction;
+    const replace: ReplaceAction;
+    const go: GoAction;
+    const goBack: GoForwardAction;
+    const goForward: GoBackAction;
+    const routeActions: RouteActions;
+
+    type LocationDescriptor = H.Location | H.Path;
+    type PushAction = (nextLocation: LocationDescriptor) => void;
+    type ReplaceAction = (nextLocation: LocationDescriptor) => void;
+    type GoAction = (n: number) => void;
+    type GoForwardAction = () => void;
+    type GoBackAction = () => void;
+
+    interface RouteActions {
+        push: PushAction;
+        replace: ReplaceAction;
+        go: GoAction;
+        goForward: GoForwardAction;
+        goBack: GoBackAction;
+    }
+    interface HistoryMiddleware extends R.Middleware {
+        listenForReplays(store: R.Store, selectLocationState?: Function): void;
+        unsubscribe(): void;
+    }
+
+    function routeReducer(state?: any, options?: any): R.Reducer;
+    function syncHistory(history: H.History): HistoryMiddleware;
+}
+
+declare module "react-router-redux" {
+    export = ReactRouterRedux;
+}
--- a/samples/react/MusicStore/typings/react-router/history.d.ts
+++ b/samples/react/MusicStore/typings/react-router/history.d.ts
@@ -0,0 +1,192 @@
+// Type definitions for history v1.13.1
+// Project: https://github.com/rackt/history
+// Definitions by: Sergey Buturlakin <http://github.com/sergey-buturlakin>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+declare namespace HistoryModule {
+
+    // types based on https://github.com/rackt/history/blob/master/docs/Terms.md
+
+    type Action = string
+
+    type BeforeUnloadHook = () => string | boolean
+
+    type CreateHistory<T> = (options?: HistoryOptions) => T
+
+    type CreateHistoryEnhancer<T, E> = (createHistory: CreateHistory<T>) => CreateHistory<T & E>
+
+    interface History {
+        listenBefore(hook: TransitionHook): Function
+        listen(listener: LocationListener): Function
+        transitionTo(location: Location): void
+        pushState(state: LocationState, path: Path): void
+        replaceState(state: LocationState, path: Path): void
+        push(path: Path): void
+        replace(path: Path): void
+        go(n: number): void
+        goBack(): void
+        goForward(): void
+        createKey(): LocationKey
+        createPath(path: Path): Path
+        createHref(path: Path): Href
+        createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location
+
+        /** @deprecated use location.key to save state instead */
+        setState(state: LocationState): void
+        /** @deprecated use listenBefore instead */
+        registerTransitionHook(hook: TransitionHook): void
+        /** @deprecated use the callback returned from listenBefore instead */
+        unregisterTransitionHook(hook: TransitionHook): void
+    }
+
+    type HistoryOptions = Object
+
+    type Href = string
+
+    type Location = {
+        pathname: Pathname
+        search: QueryString
+        query: Query
+        state: LocationState
+        action: Action
+        key: LocationKey
+    }
+
+    type LocationKey = string
+
+    type LocationListener = (location: Location) => void
+
+    type LocationState = Object
+
+    type Path = string // Pathname + QueryString
+
+    type Pathname = string
+
+    type Query = Object
+
+    type QueryString = string
+
+    type TransitionHook = (location: Location, callback: Function) => any
+
+
+    interface HistoryBeforeUnload {
+        listenBeforeUnload(hook: BeforeUnloadHook): Function
+    }
+
+    interface HistoryQueries {
+        pushState(state: LocationState, pathname: Pathname | Path, query?: Query): void
+        replaceState(state: LocationState, pathname: Pathname | Path, query?: Query): void
+        createPath(path: Path, query?: Query): Path
+        createHref(path: Path, query?: Query): Href
+    }
+
+
+    // Global usage, without modules, needs the small trick, because lib.d.ts
+    // already has `history` and `History` global definitions:
+    // var createHistory = ((window as any).History as HistoryModule.Module).createHistory;
+    interface Module {
+        createHistory: CreateHistory<History>
+        createHashHistory: CreateHistory<History>
+        createMemoryHistory: CreateHistory<History>
+        createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location
+        useBasename<T>(createHistory: CreateHistory<T>): CreateHistory<T>
+        useBeforeUnload<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryBeforeUnload>
+        useQueries<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryQueries>
+        actions: {
+            PUSH: string
+            REPLACE: string
+            POP: string
+        }
+    }
+
+}
+
+
+declare module "history/lib/createBrowserHistory" {
+
+    export default function createBrowserHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
+
+}
+
+
+declare module "history/lib/createHashHistory" {
+
+    export default function createHashHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
+
+}
+
+
+declare module "history/lib/createMemoryHistory" {
+
+    export default function createMemoryHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
+
+}
+
+
+declare module "history/lib/createLocation" {
+
+    export default function createLocation(path?: HistoryModule.Path, state?: HistoryModule.LocationState, action?: HistoryModule.Action, key?: HistoryModule.LocationKey): HistoryModule.Location
+
+}
+
+
+declare module "history/lib/useBasename" {
+
+    export default function useBasename<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T>
+
+}
+
+
+declare module "history/lib/useBeforeUnload" {
+
+    export default function useBeforeUnload<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryModule.HistoryBeforeUnload>
+
+}
+
+
+declare module "history/lib/useQueries" {
+
+    export default function useQueries<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryModule.HistoryQueries>
+
+}
+
+
+declare module "history/lib/actions" {
+
+    export const PUSH: string
+
+    export const REPLACE: string
+
+    export const POP: string
+
+    export default {
+        PUSH,
+        REPLACE,
+        POP
+    }
+
+}
+
+
+declare module "history" {
+
+    export { default as createHistory } from "history/lib/createBrowserHistory"
+
+    export { default as createHashHistory } from "history/lib/createHashHistory"
+
+    export { default as createMemoryHistory } from "history/lib/createMemoryHistory"
+
+    export { default as createLocation } from "history/lib/createLocation"
+
+    export { default as useBasename } from "history/lib/useBasename"
+
+    export { default as useBeforeUnload } from "history/lib/useBeforeUnload"
+
+    export { default as useQueries } from "history/lib/useQueries"
+
+    import * as Actions from "history/lib/actions"
+
+    export { Actions }
+
+}
--- a/samples/react/MusicStore/typings/react-router/react-router.d.ts
+++ b/samples/react/MusicStore/typings/react-router/react-router.d.ts
@@ -0,0 +1,474 @@
+// Type definitions for react-router v2.0.0-rc5
+// Project: https://github.com/rackt/react-router
+// Definitions by: Sergey Buturlakin <http://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+/// <reference path="../react/react.d.ts" />
+/// <reference path="./history.d.ts"/>
+
+
+declare namespace ReactRouter {
+
+    import React = __React
+
+    import H = HistoryModule
+
+    // types based on https://github.com/rackt/react-router/blob/master/docs/Glossary.md
+
+    type Component = React.ReactType
+
+    type EnterHook = (nextState: RouterState, replaceState: RedirectFunction, callback?: Function) => any
+
+    type LeaveHook = () => any
+
+    type Params = Object
+
+    type ParseQueryString = (queryString: H.QueryString) => H.Query
+
+    type RedirectFunction = (state: H.LocationState, pathname: H.Pathname | H.Path, query?: H.Query) => void
+
+    type RouteComponent = Component
+
+    // use the following interface in an app code to get access to route param values, history, location...
+    // interface MyComponentProps extends ReactRouter.RouteComponentProps<{}, { id: number }> {}
+    // somewhere in MyComponent
+    // ...
+    //   let id = this.props.routeParams.id
+    // ...
+    //   this.props.history. ...
+    // ...
+    interface RouteComponentProps<P, R> {
+        history?: History
+        location?: H.Location
+        params?: P
+        route?: PlainRoute
+        routeParams?: R
+        routes?: PlainRoute[]
+        children?: React.ReactElement<any>
+    }
+
+    type RouteComponents = { [key: string]: RouteComponent }
+
+    type RouteConfig = React.ReactNode | PlainRoute | PlainRoute[]
+
+    type RouteHook = (nextLocation?: H.Location) => any
+
+    type RoutePattern = string
+
+    type StringifyQuery = (queryObject: H.Query) => H.QueryString
+
+    type RouterListener = (error: Error, nextState: RouterState) => void
+
+    interface RouterState {
+        location: H.Location
+        routes: PlainRoute[]
+        params: Params
+        components: RouteComponent[]
+    }
+
+
+    interface HistoryBase extends H.History {
+        routes: PlainRoute[]
+        parseQueryString?: ParseQueryString
+        stringifyQuery?: StringifyQuery
+    }
+
+    type History = HistoryBase & H.HistoryQueries & HistoryRoutes
+    const browserHistory: History;
+    const hashHistory: History;
+
+    /* components */
+
+    interface RouterProps extends React.Props<Router> {
+        history?: H.History
+        routes?: RouteConfig // alias for children
+        createElement?: (component: RouteComponent, props: Object) => any
+        onError?: (error: any) => any
+        onUpdate?: () => any
+        parseQueryString?: ParseQueryString
+        stringifyQuery?: StringifyQuery
+    }
+    interface Router extends React.ComponentClass<RouterProps> {}
+    interface RouterElement extends React.ReactElement<RouterProps> {}
+    const Router: Router
+
+
+    interface LinkProps extends React.HTMLAttributes, React.Props<Link> {
+        activeStyle?: React.CSSProperties
+        activeClassName?: string
+        onlyActiveOnIndex?: boolean
+        to: RoutePattern
+        query?: H.Query
+        state?: H.LocationState
+    }
+    interface Link extends React.ComponentClass<LinkProps> {}
+    interface LinkElement extends React.ReactElement<LinkProps> {}
+    const Link: Link
+
+
+    const IndexLink: Link
+
+
+    interface RouterContextProps extends React.Props<RouterContext> {
+        history?: H.History
+        router: Router
+        createElement: (component: RouteComponent, props: Object) => any
+        location: H.Location
+        routes: RouteConfig
+        params: Params
+        components?: RouteComponent[]
+    }
+    interface RouterContext extends React.ComponentClass<RouterContextProps> {}
+    interface RouterContextElement extends React.ReactElement<RouterContextProps> {
+        history?: H.History
+        location: H.Location
+        router?: Router
+    }
+    const RouterContext: RouterContext
+
+
+    /* components (configuration) */
+
+    interface RouteProps extends React.Props<Route> {
+        path?: RoutePattern
+        component?: RouteComponent
+        components?: RouteComponents
+        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
+        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
+        onEnter?: EnterHook
+        onLeave?: LeaveHook
+        getIndexRoute?: (location: H.Location, cb: (error: any, indexRoute: RouteConfig) => void) => void
+        getChildRoutes?: (location: H.Location, cb: (error: any, childRoutes: RouteConfig) => void) => void
+    }
+    interface Route extends React.ComponentClass<RouteProps> {}
+    interface RouteElement extends React.ReactElement<RouteProps> {}
+    const Route: Route
+
+
+    interface PlainRoute {
+        path?: RoutePattern
+        component?: RouteComponent
+        components?: RouteComponents
+        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
+        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
+        onEnter?: EnterHook
+        onLeave?: LeaveHook
+        indexRoute?: PlainRoute
+        getIndexRoute?: (location: H.Location, cb: (error: any, indexRoute: RouteConfig) => void) => void
+        childRoutes?: PlainRoute[]
+        getChildRoutes?: (location: H.Location, cb: (error: any, childRoutes: RouteConfig) => void) => void
+    }
+
+
+    interface RedirectProps extends React.Props<Redirect> {
+        path?: RoutePattern
+        from?: RoutePattern // alias for path
+        to: RoutePattern
+        query?: H.Query
+        state?: H.LocationState
+    }
+    interface Redirect extends React.ComponentClass<RedirectProps> {}
+    interface RedirectElement extends React.ReactElement<RedirectProps> {}
+    const Redirect: Redirect
+
+
+    interface IndexRouteProps extends React.Props<IndexRoute> {
+        component?: RouteComponent
+        components?: RouteComponents
+        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
+        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
+        onEnter?: EnterHook
+        onLeave?: LeaveHook
+    }
+    interface IndexRoute extends React.ComponentClass<IndexRouteProps> {}
+    interface IndexRouteElement extends React.ReactElement<IndexRouteProps> {}
+    const IndexRoute: IndexRoute
+
+
+    interface IndexRedirectProps extends React.Props<IndexRedirect> {
+        to: RoutePattern
+        query?: H.Query
+        state?: H.LocationState
+    }
+    interface IndexRedirect extends React.ComponentClass<IndexRedirectProps> {}
+    interface IndexRedirectElement extends React.ReactElement<IndexRedirectProps> {}
+    const IndexRedirect: IndexRedirect
+
+
+    /* mixins */
+
+    interface HistoryMixin {
+        history: History
+    }
+    const History: React.Mixin<any, any>
+
+
+    interface LifecycleMixin {
+        routerWillLeave(nextLocation: H.Location): string | boolean
+    }
+    const Lifecycle: React.Mixin<any, any>
+
+
+    const RouteContext: React.Mixin<any, any>
+
+
+    /* utils */
+
+    interface HistoryRoutes {
+        listen(listener: RouterListener): Function
+        listenBeforeLeavingRoute(route: PlainRoute, hook: RouteHook): void
+        match(location: H.Location, callback: (error: any, nextState: RouterState, nextLocation: H.Location) => void): void
+        isActive(pathname: H.Pathname, query?: H.Query, indexOnly?: boolean): boolean
+    }
+
+    function useRoutes<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryRoutes>
+
+
+    function createRoutes(routes: RouteConfig): PlainRoute[]
+
+
+    interface MatchArgs {
+        routes?: RouteConfig
+        history?: H.History
+        location?: H.Location
+        parseQueryString?: ParseQueryString
+        stringifyQuery?: StringifyQuery
+    }
+    interface MatchState extends RouterState {
+        history: History
+    }
+    function match(args: MatchArgs, cb: (error: any, nextLocation: H.Location, nextState: MatchState) => void): void
+
+}
+
+
+declare module "react-router/lib/Router" {
+
+    export default ReactRouter.Router
+
+}
+
+
+declare module "react-router/lib/Link" {
+
+    export default ReactRouter.Link
+
+}
+
+
+declare module "react-router/lib/IndexLink" {
+
+    export default ReactRouter.IndexLink
+
+}
+
+
+declare module "react-router/lib/IndexRedirect" {
+
+    export default ReactRouter.IndexRedirect
+
+}
+
+
+declare module "react-router/lib/IndexRoute" {
+
+    export default ReactRouter.IndexRoute
+
+}
+
+
+declare module "react-router/lib/Redirect" {
+
+    export default ReactRouter.Redirect
+
+}
+
+
+declare module "react-router/lib/Route" {
+
+    export default ReactRouter.Route
+
+}
+
+
+declare module "react-router/lib/History" {
+
+    export default ReactRouter.History
+
+}
+
+
+declare module "react-router/lib/Lifecycle" {
+
+    export default ReactRouter.Lifecycle
+
+}
+
+
+declare module "react-router/lib/RouteContext" {
+
+    export default ReactRouter.RouteContext
+
+}
+
+
+declare module "react-router/lib/useRoutes" {
+
+    export default ReactRouter.useRoutes
+
+}
+
+declare module "react-router/lib/PatternUtils" {
+
+	export function formatPattern(pattern: string, params: {}): string;
+
+}
+
+declare module "react-router/lib/RouteUtils" {
+
+    type E = __React.ReactElement<any>
+
+    export function isReactChildren(object: E | E[]): boolean
+
+    export function createRouteFromReactElement(element: E): ReactRouter.PlainRoute
+
+    export function createRoutesFromReactChildren(children: E | E[], parentRoute: ReactRouter.PlainRoute): ReactRouter.PlainRoute[]
+
+    export import createRoutes = ReactRouter.createRoutes
+
+}
+
+
+declare module "react-router/lib/RouterContext" {
+
+    export default ReactRouter.RouterContext
+
+}
+
+
+declare module "react-router/lib/PropTypes" {
+
+    import React = __React
+
+    export function falsy(props: any, propName: string, componentName: string): Error;
+
+    export const history: React.Requireable<any>
+
+    export const location: React.Requireable<any>
+
+    export const component: React.Requireable<any>
+
+    export const components: React.Requireable<any>
+
+    export const route: React.Requireable<any>
+
+    export const routes: React.Requireable<any>
+
+    export default {
+        falsy,
+        history,
+        location,
+        component,
+        components,
+        route
+    }
+
+}
+
+declare module "react-router/lib/browserHistory" {
+  export default ReactRouter.browserHistory;
+}
+
+declare module "react-router/lib/hashHistory" {
+  export default ReactRouter.hashHistory;
+}
+
+declare module "react-router/lib/match" {
+
+    export default ReactRouter.match
+
+}
+
+
+declare module "react-router" {
+
+    import Router from "react-router/lib/Router"
+
+    import Link from "react-router/lib/Link"
+
+    import IndexLink from "react-router/lib/IndexLink"
+
+    import IndexRedirect from "react-router/lib/IndexRedirect"
+
+    import IndexRoute from "react-router/lib/IndexRoute"
+
+    import Redirect from "react-router/lib/Redirect"
+
+    import Route from "react-router/lib/Route"
+
+    import History from "react-router/lib/History"
+
+    import Lifecycle from "react-router/lib/Lifecycle"
+
+    import RouteContext from "react-router/lib/RouteContext"
+
+    import browserHistory from "react-router/lib/browserHistory"
+
+    import hashHistory from "react-router/lib/hashHistory"
+
+    import useRoutes from "react-router/lib/useRoutes"
+
+    import { createRoutes } from "react-router/lib/RouteUtils"
+
+    import { formatPattern } from "react-router/lib/PatternUtils"
+
+    import RouterContext from "react-router/lib/RouterContext"
+
+    import PropTypes from "react-router/lib/PropTypes"
+
+    import match from "react-router/lib/match"
+
+    // PlainRoute is defined in the API documented at:
+    // https://github.com/rackt/react-router/blob/master/docs/API.md
+    // but not included in any of the .../lib modules above.
+    export type PlainRoute = ReactRouter.PlainRoute
+
+    // The following definitions are also very useful to export
+    // because by using these types lots of potential type errors
+    // can be exposed:
+    export type EnterHook = ReactRouter.EnterHook
+    export type LeaveHook = ReactRouter.LeaveHook
+    export type ParseQueryString = ReactRouter.ParseQueryString
+    export type RedirectFunction = ReactRouter.RedirectFunction
+    export type RouteComponentProps<P,R> = ReactRouter.RouteComponentProps<P,R>;
+    export type RouteHook = ReactRouter.RouteHook
+    export type StringifyQuery = ReactRouter.StringifyQuery
+    export type RouterListener = ReactRouter.RouterListener
+    export type RouterState = ReactRouter.RouterState
+    export type HistoryBase = ReactRouter.HistoryBase
+
+    export {
+        Router,
+        Link,
+        IndexLink,
+        IndexRedirect,
+        IndexRoute,
+        Redirect,
+        Route,
+        History,
+        browserHistory,
+        hashHistory,
+        Lifecycle,
+        RouteContext,
+        useRoutes,
+        createRoutes,
+        formatPattern,
+        RouterContext,
+        PropTypes,
+        match
+    }
+
+    export default Router
+
+}
--- a/samples/react/MusicStore/typings/react/react-dom.d.ts
+++ b/samples/react/MusicStore/typings/react/react-dom.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for React v0.14 (react-dom)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="react.d.ts" />
+
+declare namespace __React {
+    namespace __DOM {
+        function findDOMNode<E extends Element>(instance: ReactInstance): E;
+        function findDOMNode(instance: ReactInstance): Element;
+
+        function render<P>(
+            element: DOMElement<P>,
+            container: Element,
+            callback?: (element: Element) => any): Element;
+        function render<P, S>(
+            element: ClassicElement<P>,
+            container: Element,
+            callback?: (component: ClassicComponent<P, S>) => any): ClassicComponent<P, S>;
+        function render<P, S>(
+            element: ReactElement<P>,
+            container: Element,
+            callback?: (component: Component<P, S>) => any): Component<P, S>;
+
+        function unmountComponentAtNode(container: Element): boolean;
+
+        var version: string;
+
+        function unstable_batchedUpdates<A, B>(callback: (a: A, b: B) => any, a: A, b: B): void;
+        function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+        function unstable_batchedUpdates(callback: () => any): void;
+
+        function unstable_renderSubtreeIntoContainer<P>(
+            parentComponent: Component<any, any>,
+            nextElement: DOMElement<P>,
+            container: Element,
+            callback?: (element: Element) => any): Element;
+        function unstable_renderSubtreeIntoContainer<P, S>(
+            parentComponent: Component<any, any>,
+            nextElement: ClassicElement<P>,
+            container: Element,
+            callback?: (component: ClassicComponent<P, S>) => any): ClassicComponent<P, S>;
+        function unstable_renderSubtreeIntoContainer<P, S>(
+            parentComponent: Component<any, any>,
+            nextElement: ReactElement<P>,
+            container: Element,
+            callback?: (component: Component<P, S>) => any): Component<P, S>;
+    }
+
+    namespace __DOMServer {
+        function renderToString(element: ReactElement<any>): string;
+        function renderToStaticMarkup(element: ReactElement<any>): string;
+        var version: string;
+    }
+}
+
+declare module "react-dom" {
+    import DOM = __React.__DOM;
+    export = DOM;
+}
+
+declare module "react-dom/server" {
+    import DOMServer = __React.__DOMServer;
+    export = DOMServer;
+}
--- a/samples/react/MusicStore/typings/react/react.d.ts
+++ b/samples/react/MusicStore/typings/react/react.d.ts
--- a/samples/react/MusicStore/typings/redux-thunk/redux-thunk.d.ts
+++ b/samples/react/MusicStore/typings/redux-thunk/redux-thunk.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for redux-thunk
+// Project: https://github.com/gaearon/redux-thunk
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../redux/redux.d.ts" />
+
+declare module ReduxThunk {
+    export interface Thunk extends Redux.Middleware {}
+    export interface ThunkInterface {
+      <T>(dispatch: Redux.Dispatch, getState?: () => T): any;
+    }
+}
+
+declare module "redux-thunk" {
+    var thunk: ReduxThunk.Thunk;
+    export = thunk;
+}
--- a/samples/react/MusicStore/typings/redux/redux.d.ts
+++ b/samples/react/MusicStore/typings/redux/redux.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for Redux v1.0.0
+// Project: https://github.com/rackt/redux
+// Definitions by: William Buchwalter <https://github.com/wbuchwalter/>, Vincent Prouillet <https://github.com/Keats/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module Redux {
+
+    interface ActionCreator extends Function {
+        (...args: any[]): any;
+    }
+
+    interface Reducer extends Function {
+        (state: any, action: any): any;
+    }
+
+    interface Dispatch extends Function {
+        (action: any): any;
+    }
+
+    interface StoreMethods {
+        dispatch: Dispatch;
+        getState(): any;
+    }
+
+
+    interface MiddlewareArg {
+        dispatch: Dispatch;
+        getState: Function;
+    }
+
+    interface Middleware extends Function {
+        (obj: MiddlewareArg): Function;
+    }
+
+    class Store {
+        getReducer(): Reducer;
+        replaceReducer(nextReducer: Reducer): void;
+        dispatch(action: any): any;
+        getState(): any;
+        subscribe(listener: Function): Function;
+    }
+
+    function createStore(reducer: Reducer, initialState?: any): Store;
+    function bindActionCreators<T>(actionCreators: T, dispatch: Dispatch): T;
+    function combineReducers(reducers: any): Reducer;
+    function applyMiddleware(...middlewares: Middleware[]): Function;
+    function compose<T extends Function>(...functions: Function[]): T;
+}
+
+declare module "redux" {
+    export = Redux;
+}
--- a/samples/react/MusicStore/typings/tsd.d.ts
+++ b/samples/react/MusicStore/typings/tsd.d.ts
@@ -0,0 +1,12 @@
+/// <reference path="react-redux/react-redux.d.ts" />
+/// <reference path="react/react-dom.d.ts" />
+/// <reference path="react/react.d.ts" />
+/// <reference path="redux/redux.d.ts" />
+/// <reference path="webpack/webpack-env.d.ts" />
+/// <reference path="react-bootstrap/react-bootstrap.d.ts" />
+/// <reference path="react-router/history.d.ts" />
+/// <reference path="react-router/react-router.d.ts" />
+/// <reference path="react-router-bootstrap/react-router-bootstrap.d.ts" />
+/// <reference path="react-router-redux/react-router-redux.d.ts" />
+/// <reference path="redux-thunk/redux-thunk.d.ts" />
+/// <reference path="whatwg-fetch/whatwg-fetch.d.ts" />
--- a/samples/react/MusicStore/typings/webpack/webpack-env.d.ts
+++ b/samples/react/MusicStore/typings/webpack/webpack-env.d.ts
@@ -0,0 +1,232 @@
+// Type definitions for webpack 1.12.2 (module API)
+// Project: https://github.com/webpack/webpack
+// Definitions by: use-strict <https://github.com/use-strict>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/**
+ * Webpack module API - variables and global functions available inside modules
+ */
+
+declare namespace __WebpackModuleApi {
+    interface RequireContext {
+        keys(): string[];
+        <T>(id: string): T;
+        resolve(id: string): string;
+    }
+
+    interface RequireFunction {
+        /**
+         * Returns the exports from a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.
+         */
+        <T>(path: string): T;
+        /**
+         * Behaves similar to require.ensure, but the callback is called with the exports of each dependency in the paths array. There is no option to provide a chunk name.
+         */
+        (paths: string[], callback: (...modules: any[]) => void): void;
+        /**
+         * Download additional dependencies on demand. The paths array lists modules that should be available. When they are, callback is called. If the callback is a function expression, dependencies in that source part are extracted and also loaded on demand. A single request is fired to the server, except if all modules are already available.
+         *
+         * This creates a chunk. The chunk can be named. If a chunk with this name already exists, the dependencies are merged into that chunk and that chunk is used.
+         */
+        ensure: (paths: string[], callback: (require: <T>(path: string) => T) => void, chunkName?: string) => void;
+        context: (path: string, deep?: boolean, filter?: RegExp) => RequireContext;
+        /**
+         * Returns the module id of a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.
+         *
+         * The module id is a number in webpack (in contrast to node.js where it is a string, the filename).
+         */
+        resolve(path: string): number;
+        /**
+         * Like require.resolve, but doesn’t include the module into the bundle. It’s a weak dependency.
+         */
+        resolveWeak(path: string): number;
+        /**
+         * Ensures that the dependency is available, but don’t execute it. This can be use for optimizing the position of a module in the chunks.
+         */
+        include(path: string): void;
+        /**
+         * Multiple requires to the same module result in only one module execution and only one export. Therefore a cache in the runtime exists. Removing values from this cache cause new module execution and a new export. This is only needed in rare cases (for compatibility!).
+         */
+        cache: {
+            [id: string]: any;
+        }
+    }
+
+    interface Module {
+        exports: any;
+        require(id: string): any;
+        id: string;
+        filename: string;
+        loaded: boolean;
+        parent: any;
+        children: any[];
+        hot: Hot;
+    }
+    type ModuleId = string|number;
+
+    interface Hot {
+        /**
+         * Accept code updates for the specified dependencies. The callback is called when dependencies were replaced.
+         * @param dependencies
+         * @param callback
+         */
+        accept(dependencies: string[], callback: (updatedDependencies: ModuleId[]) => void): void;
+        /**
+         * Accept code updates for the specified dependencies. The callback is called when dependencies were replaced.
+         * @param dependency
+         * @param callback
+         */
+        accept(dependency: string, callback: () => void): void;
+        /**
+         * Accept code updates for this module without notification of parents.
+         * This should only be used if the module doesn’t export anything.
+         * The errHandler can be used to handle errors that occur while loading the updated module.
+         * @param errHandler
+         */
+        accept(errHandler?: (err: Error) => void): void;
+        /**
+         * Do not accept updates for the specified dependencies. If any dependencies is updated, the code update fails with code "decline".
+         */
+        decline(dependencies: string[]): void;
+        /**
+         * Do not accept updates for the specified dependencies. If any dependencies is updated, the code update fails with code "decline".
+         */
+        decline(dependency: string): void;
+        /**
+         * Flag the current module as not update-able. If updated the update code would fail with code "decline".
+         */
+        decline(): void;
+        /**
+         * Add a one time handler, which is executed when the current module code is replaced.
+         * Here you should destroy/remove any persistent resource you have claimed/created.
+         * If you want to transfer state to the new module, add it to data object.
+         * The data will be available at module.hot.data on the new module.
+         * @param callback
+         */
+        dispose<T>(callback: (data: T) => void): void;
+        /**
+         * Add a one time handler, which is executed when the current module code is replaced.
+         * Here you should destroy/remove any persistent resource you have claimed/created.
+         * If you want to transfer state to the new module, add it to data object.
+         * The data will be available at module.hot.data on the new module.
+         * @param callback
+         */
+        addDisposeHandler<T>(callback: (data: T) => void): void;
+        /**
+         * Remove a handler.
+         * This can useful to add a temporary dispose handler. You could i. e. replace code while in the middle of a multi-step async function.
+         * @param callback
+         */
+        removeDisposeHandler<T>(callback: (data: T) => void): void;
+        /**
+         * Throws an exceptions if status() is not idle.
+         * Check all currently loaded modules for updates and apply updates if found.
+         * If no update was found, the callback is called with null.
+         * If autoApply is truthy the callback will be called with all modules that were disposed.
+         * apply() is automatically called with autoApply as options parameter.
+         * If autoApply is not set the callback will be called with all modules that will be disposed on apply().
+         * @param autoApply
+         * @param callback
+         */
+        check(autoApply: boolean, callback: (err: Error, outdatedModules: ModuleId[]) => void): void;
+        /**
+         * Throws an exceptions if status() is not idle.
+         * Check all currently loaded modules for updates and apply updates if found.
+         * If no update was found, the callback is called with null.
+         * The callback will be called with all modules that will be disposed on apply().
+         * @param callback
+         */
+        check(callback: (err: Error, outdatedModules: ModuleId[]) => void): void;
+        /**
+         * If status() != "ready" it throws an error.
+         * Continue the update process.
+         * @param options
+         * @param callback
+         */
+        apply(options: AcceptOptions, callback: (err: Error, outdatedModules: ModuleId[]) => void): void;
+        /**
+         * If status() != "ready" it throws an error.
+         * Continue the update process.
+         * @param callback
+         */
+        apply(callback: (err: Error, outdatedModules: ModuleId[]) => void): void;
+        /**
+         * Return one of idle, check, watch, watch-delay, prepare, ready, dispose, apply, abort or fail.
+         */
+        status(): string;
+        /** Register a callback on status change. */
+        status(callback: (status: string) => void): void;
+        /** Register a callback on status change. */
+        addStatusHandler(callback: (status: string) => void): void;
+        /**
+         * Remove a registered status change handler.
+         * @param callback
+         */
+        removeStatusHandler(callback: (status: string) => void): void;
+
+        active: boolean;
+        data: {};
+    }
+
+    interface AcceptOptions {
+        /**
+         * If true the update process continues even if some modules are not accepted (and would bubble to the entry point).
+         */
+        ignoreUnaccepted?: boolean;
+        /**
+         * Indicates that apply() is automatically called by check function
+         */
+        autoApply?: boolean;
+  }
+}
+
+declare var require: __WebpackModuleApi.RequireFunction;
+
+/**
+ * The resource query of the current module.
+ *
+ * e.g. __resourceQuery === "?test" // Inside "file.js?test"
+ */
+declare var __resourceQuery: string;
+
+/**
+ * Equals the config options output.publicPath.
+ */
+declare var __webpack_public_path__: string;
+
+/**
+ * The raw require function. This expression isn’t parsed by the Parser for dependencies.
+ */
+declare var __webpack_require__: any;
+
+/**
+ * The internal chunk loading function
+ *
+ * @param chunkId The id for the chunk to load.
+ * @param callback A callback function called once the chunk is loaded.
+ */
+declare var __webpack_chunk_load__: (chunkId: any, callback: (require: (id: string) => any) => void) => void;
+
+/**
+ * Access to the internal object of all modules.
+ */
+declare var __webpack_modules__: any[];
+
+/**
+ * Access to the hash of the compilation.
+ *
+ * Only available with the HotModuleReplacementPlugin or the ExtendedAPIPlugin
+ */
+declare var __webpack_hash__: any;
+
+/**
+ * Generates a require function that is not parsed by webpack. Can be used to do cool stuff with a global require function if available.
+ */
+declare var __non_webpack_require__: any;
+
+/**
+ * Equals the config option debug
+ */
+declare var DEBUG: boolean;
+
+declare var module: __WebpackModuleApi.Module;
--- a/samples/react/MusicStore/typings/whatwg-fetch/whatwg-fetch.d.ts
+++ b/samples/react/MusicStore/typings/whatwg-fetch/whatwg-fetch.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for fetch API
+// Project: https://github.com/github/fetch
+// Definitions by: Ryan Graham <https://github.com/ryan-codingintrigue>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare class Request extends Body {
+	constructor(input: string|Request, init?:RequestInit);
+	method: string;
+	url: string;
+	headers: Headers;
+	context: string|RequestContext;
+	referrer: string;
+	mode: string|RequestMode;
+	credentials: string|RequestCredentials;
+	cache: string|RequestCache;
+}
+
+interface RequestInit {
+	method?: string;
+	headers?: HeaderInit|{ [index: string]: string };
+	body?: BodyInit;
+	mode?: string|RequestMode;
+	credentials?: string|RequestCredentials;
+	cache?: string|RequestCache;
+}
+
+declare enum RequestContext {
+	"audio", "beacon", "cspreport", "download", "embed", "eventsource", "favicon", "fetch",
+	"font", "form", "frame", "hyperlink", "iframe", "image", "imageset", "import",
+	"internal", "location", "manifest", "object", "ping", "plugin", "prefetch", "script",
+	"serviceworker", "sharedworker", "subresource", "style", "track", "video", "worker",
+	"xmlhttprequest", "xslt"
+}
+declare enum RequestMode { "same-origin", "no-cors", "cors" }
+declare enum RequestCredentials { "omit", "same-origin", "include" }
+declare enum RequestCache { "default", "no-store", "reload", "no-cache", "force-cache", "only-if-cached" }
+
+declare class Headers {
+	append(name: string, value: string): void;
+	delete(name: string):void;
+	get(name: string): string;
+	getAll(name: string): Array<string>;
+	has(name: string): boolean;
+	set(name: string, value: string): void;
+}
+
+declare class Body {
+	bodyUsed: boolean;
+	arrayBuffer(): Promise<ArrayBuffer>;
+	blob(): Promise<Blob>;
+	formData(): Promise<FormData>;
+	json(): Promise<any>;
+	json<T>(): Promise<T>;
+	text(): Promise<string>;
+}
+declare class Response extends Body {
+	constructor(body?: BodyInit, init?: ResponseInit);
+	error(): Response;
+	redirect(url: string, status: number): Response;
+	type: string|ResponseType;
+	url: string;
+	status: number;
+	ok: boolean;
+	statusText: string;
+	headers: Headers;
+	clone(): Response;
+}
+
+declare enum ResponseType { "basic", "cors", "default", "error", "opaque" }
+
+interface ResponseInit {
+	status: number;
+	statusText?: string;
+	headers?: HeaderInit;
+}
+
+declare type HeaderInit = Headers|Array<string>;
+declare type BodyInit = Blob|FormData|string;
+declare type RequestInfo = Request|string;
+
+interface Window {
+	fetch(url: string|Request, init?: RequestInit): Promise<Response>;
+}
+
+declare var fetch: typeof window.fetch;
--- a/samples/react/MusicStore/webpack.config.js
+++ b/samples/react/MusicStore/webpack.config.js
@@ -10,7 +10,7 @@ module.exports = {
    module: {
        loaders: [
            { test: /\.ts(x?)$/, include: /ReactApp/, exclude: /node_modules/, loader: 'babel-loader' },
-            { test: /\.ts(x?)$/, include: /ReactApp/, exclude: /node_modules/, loader: 'ts-loader?silent' },
+            { test: /\.ts(x?)$/, include: /ReactApp/, exclude: /node_modules/, loader: 'ts-loader' },
            { test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader') },
            { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000' }
        ]
--- a/samples/react/ReactGrid/project.json
+++ b/samples/react/ReactGrid/project.json
@@ -9,17 +9,29 @@
  },
  "dependencies": {
    "Microsoft.NETCore.App": {
-      "version": "1.1.0",
+      "version": "1.0.0",
      "type": "platform"
    },
-    "Microsoft.AspNetCore.Diagnostics": "1.1.0",
-    "Microsoft.AspNetCore.ReactServices": "1.1.0-*",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
-    "Microsoft.AspNetCore.StaticFiles": "1.1.0"
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.NETCore.Platforms": "1.0.1",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.AspNetCore.ReactServices": "1.0.0-*"
  },
  "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.0": {
+      "imports": [
+        "dotnet5.6",
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  },
  "publishOptions": {
    "exclude": [
--- a/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs
+++ b/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs
@@ -9,31 +9,14 @@ using Newtonsoft.Json;

 namespace Microsoft.AspNetCore.AngularServices
 {
-    /// <summary>
-    /// Helpers for prepopulating Angular 2's 'http' service with data.
-    /// </summary>
    public static class PrimeCacheHelper
    {
-        /// <summary>
-        /// Performs an HTTP GET request to the specified URL and adds the resulting JSON data
-        /// to the Angular 'http' service cache.
-        /// </summary>
-        /// <param name="html">The <see cref="IHtmlHelper"/>.</param>
-        /// <param name="url">The URL to be requested.</param>
-        /// <returns>A task representing the HTML content to be rendered into the document.</returns>
        [Obsolete("Use PrimeCacheAsync instead")]
        public static Task<IHtmlContent> PrimeCache(this IHtmlHelper html, string url)
        {
            return PrimeCacheAsync(html, url);
        }

-        /// <summary>
-        /// Performs an HTTP GET request to the specified URL and adds the resulting JSON data
-        /// to the Angular 'http' service cache.
-        /// </summary>
-        /// <param name="html">The <see cref="IHtmlHelper"/>.</param>
-        /// <param name="url">The URL to be requested.</param>
-        /// <returns>A task representing the HTML content to be rendered into the document.</returns>
        public static async Task<IHtmlContent> PrimeCacheAsync(this IHtmlHelper html, string url)
        {
            // TODO: Consider deduplicating the PrimeCacheAsync calls (that is, if there are multiple requests to precache
--- a/src/Microsoft.AspNetCore.AngularServices/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.AngularServices/Properties/AssemblyInfo.cs
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: NeutralResourcesLanguage("en-us")]
-[assembly: AssemblyCompany("Microsoft Corporation.")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft ASP.NET Core")]
--- a/src/Microsoft.AspNetCore.AngularServices/npm/package.json
+++ b/src/Microsoft.AspNetCore.AngularServices/npm/package.json
@@ -5,7 +5,7 @@
  "main": "./dist/Exports",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "prepublish": "rimraf *.d.ts dist/*.d.ts && tsc && node build.js"
+    "prepublish": "rimraf *.d.ts dist/*.d.ts && tsd install && tsc && node build.js"
  },
  "typings": "dist/Exports",
  "author": "Microsoft",
@@ -18,15 +18,15 @@
    "url": "https://github.com/aspnet/JavaScriptServices.git"
  },
  "dependencies": {
-    "angular2": "2.0.0-beta.13",
-    "reflect-metadata": "0.1.2",
+    "angular2": "^2.0.0-beta.13",
    "rxjs": "5.0.0-beta.2"
  },
  "devDependencies": {
    "es6-shim": "^0.35.0",
+    "reflect-metadata": "^0.1.2",
    "rimraf": "^2.5.4",
    "systemjs-builder": "^0.14.11",
-    "typescript": "^2.0.0",
+    "typescript": "^1.8.10",
    "zone.js": "^0.6.10"
  }
 }
--- a/src/Microsoft.AspNetCore.AngularServices/npm/tsconfig.json
+++ b/src/Microsoft.AspNetCore.AngularServices/npm/tsconfig.json
@@ -6,8 +6,7 @@
    "declaration": true,
    "experimentalDecorators": true,
    "noLib": false,
-    "outDir": "./dist",
-    "lib": ["es2015", "dom"]
+    "outDir": "./dist"
  },
  "exclude": [
      "node_modules"
--- a/src/Microsoft.AspNetCore.AngularServices/npm/tsd.json
+++ b/src/Microsoft.AspNetCore.AngularServices/npm/tsd.json
@@ -0,0 +1,12 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "typings",
+  "bundle": "typings/tsd.d.ts",
+  "installed": {
+    "es6-shim/es6-shim.d.ts": {
+      "commit": "ec9eb4b28c74665a602c22db3457f0a76fa0fa23"
+    }
+  }
+}
--- a/src/Microsoft.AspNetCore.AngularServices/npm/typings/es6-shim/es6-shim.d.ts
+++ b/src/Microsoft.AspNetCore.AngularServices/npm/typings/es6-shim/es6-shim.d.ts
@@ -0,0 +1,668 @@
+// Type definitions for es6-shim v0.31.2
+// Project: https://github.com/paulmillr/es6-shim
+// Definitions by: Ron Buckton <http://github.com/rbuckton>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare type PropertyKey = string | number | symbol;
+
+interface IteratorResult<T> {
+    done: boolean;
+    value?: T;
+}
+
+interface IterableShim<T> {
+    /**
+      * Shim for an ES6 iterable. Not intended for direct use by user code.
+      */
+    "_es6-shim iterator_"(): Iterator<T>;
+}
+
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+    return?(value?: any): IteratorResult<T>;
+    throw?(e?: any): IteratorResult<T>;
+}
+
+interface IterableIteratorShim<T> extends IterableShim<T>, Iterator<T> {
+    /**
+      * Shim for an ES6 iterable iterator. Not intended for direct use by user code.
+      */
+    "_es6-shim iterator_"(): IterableIteratorShim<T>;
+}
+
+interface StringConstructor {
+    /**
+      * Return the String value whose elements are, in order, the elements in the List elements.
+      * If length is 0, the empty string is returned.
+      */
+    fromCodePoint(...codePoints: number[]): string;
+
+    /**
+      * String.raw is intended for use as a tag function of a Tagged Template String. When called
+      * as such the first argument will be a well formed template call site object and the rest
+      * parameter will contain the substitution values.
+      * @param template A well-formed template string call site representation.
+      * @param substitutions A set of substitution values.
+      */
+    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
+}
+
+interface String {
+    /**
+      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point
+      * value of the UTF-16 encoded code point starting at the string element at position pos in
+      * the String resulting from converting this object to a String.
+      * If there is no element at that position, the result is undefined.
+      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
+      */
+    codePointAt(pos: number): number;
+
+    /**
+      * Returns true if searchString appears as a substring of the result of converting this
+      * object to a String, at one or more positions that are
+      * greater than or equal to position; otherwise, returns false.
+      * @param searchString search string
+      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
+      */
+    includes(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the
+      * same as the corresponding elements of this object (converted to a String) starting at
+      * endPosition – length(this). Otherwise returns false.
+      */
+    endsWith(searchString: string, endPosition?: number): boolean;
+
+    /**
+      * Returns a String value that is made from count copies appended together. If count is 0,
+      * T is the empty String is returned.
+      * @param count number of copies to append
+      */
+    repeat(count: number): string;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the
+      * same as the corresponding elements of this object (converted to a String) starting at
+      * position. Otherwise returns false.
+      */
+    startsWith(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns an <a> HTML anchor element and sets the name attribute to the text value
+      * @param name
+      */
+    anchor(name: string): string;
+
+    /** Returns a <big> HTML element */
+    big(): string;
+
+    /** Returns a <blink> HTML element */
+    blink(): string;
+
+    /** Returns a <b> HTML element */
+    bold(): string;
+
+    /** Returns a <tt> HTML element */
+    fixed(): string
+
+    /** Returns a <font> HTML element and sets the color attribute value */
+    fontcolor(color: string): string
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: number): string;
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: string): string;
+
+    /** Returns an <i> HTML element */
+    italics(): string;
+
+    /** Returns an <a> HTML element and sets the href attribute value */
+    link(url: string): string;
+
+    /** Returns a <small> HTML element */
+    small(): string;
+
+    /** Returns a <strike> HTML element */
+    strike(): string;
+
+    /** Returns a <sub> HTML element */
+    sub(): string;
+
+    /** Returns a <sup> HTML element */
+    sup(): string;
+
+    /**
+      * Shim for an ES6 iterable. Not intended for direct use by user code.
+      */
+    "_es6-shim iterator_"(): IterableIteratorShim<string>;
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(iterable: IterableShim<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      */
+    from<T>(arrayLike: ArrayLike<T>): Array<T>;
+
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      */
+    from<T>(iterable: IterableShim<T>): Array<T>;
+
+    /**
+      * Returns a new array from a set of elements.
+      * @param items A set of elements to include in the new array object.
+      */
+    of<T>(...items: T[]): Array<T>;
+}
+
+interface Array<T> {
+    /**
+      * Returns the value of the first element in the array where predicate is true, and undefined
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
+
+    /**
+      * Returns the index of the first element in the array where predicate is true, and undefined
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
+
+    /**
+      * Returns the this object after filling the section identified by start and end with value
+      * @param value value to fill array section with
+      * @param start index to start filling the array at. If start is negative, it is treated as
+      * length+start where length is the length of the array.
+      * @param end index to stop filling the array at. If end is negative, it is treated as
+      * length+end.
+      */
+    fill(value: T, start?: number, end?: number): T[];
+
+    /**
+      * Returns the this object after copying a section of the array identified by start and end
+      * to the same array starting at position target
+      * @param target If target is negative, it is treated as length+target where length is the
+      * length of the array.
+      * @param start If start is negative, it is treated as length+start. If end is negative, it
+      * is treated as length+end.
+      * @param end If not specified, length of the this object is used as its default value.
+      */
+    copyWithin(target: number, start: number, end?: number): T[];
+
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIteratorShim<[number, T]>;
+
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIteratorShim<number>;
+
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIteratorShim<T>;
+
+    /**
+      * Shim for an ES6 iterable. Not intended for direct use by user code.
+      */
+    "_es6-shim iterator_"(): IterableIteratorShim<T>;
+}
+
+interface NumberConstructor {
+    /**
+      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
+      * that is representable as a Number value, which is approximately:
+      * 2.2204460492503130808472633361816 x 10‍−‍16.
+      */
+    EPSILON: number;
+
+    /**
+      * Returns true if passed value is finite.
+      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a
+      * number. Only finite values of the type number, result in true.
+      * @param number A numeric value.
+      */
+    isFinite(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is an integer, false otherwise.
+      * @param number A numeric value.
+      */
+    isInteger(number: number): boolean;
+
+    /**
+      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
+      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
+      * to a number. Only values of the type number, that are also NaN, result in true.
+      * @param number A numeric value.
+      */
+    isNaN(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is a safe integer.
+      * @param number A numeric value.
+      */
+    isSafeInteger(number: number): boolean;
+
+    /**
+      * The value of the largest integer n such that n and n + 1 are both exactly representable as
+      * a Number value.
+      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
+      */
+    MAX_SAFE_INTEGER: number;
+
+    /**
+      * The value of the smallest integer n such that n and n − 1 are both exactly representable as
+      * a Number value.
+      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
+      */
+    MIN_SAFE_INTEGER: number;
+
+    /**
+      * Converts a string to a floating-point number.
+      * @param string A string that contains a floating-point number.
+      */
+    parseFloat(string: string): number;
+
+    /**
+      * Converts A string to an integer.
+      * @param s A string to convert into a number.
+      * @param radix A value between 2 and 36 that specifies the base of the number in numString.
+      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
+      * All other strings are considered decimal.
+      */
+    parseInt(string: string, radix?: number): number;
+}
+
+interface ObjectConstructor {
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param sources One or more source objects to copy properties from.
+      */
+    assign(target: any, ...sources: any[]): any;
+
+    /**
+      * Returns true if the values are the same value, false otherwise.
+      * @param value1 The first value.
+      * @param value2 The second value.
+      */
+    is(value1: any, value2: any): boolean;
+
+    /**
+      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
+      * @param o The object to change its prototype.
+      * @param proto The value of the new prototype or null.
+      * @remarks Requires `__proto__` support.
+      */
+    setPrototypeOf(o: any, proto: any): any;
+}
+
+interface RegExp {
+    /**
+      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
+      * The characters in this string are sequenced and concatenated in the following order:
+      *
+      *    - "g" for global
+      *    - "i" for ignoreCase
+      *    - "m" for multiline
+      *    - "u" for unicode
+      *    - "y" for sticky
+      *
+      * If no flags are set, the value is the empty string.
+      */
+    flags: string;
+}
+
+interface Math {
+    /**
+      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
+      * @param x A numeric expression.
+      */
+    clz32(x: number): number;
+
+    /**
+      * Returns the result of 32-bit multiplication of two numbers.
+      * @param x First number
+      * @param y Second number
+      */
+    imul(x: number, y: number): number;
+
+    /**
+      * Returns the sign of the x, indicating whether x is positive, negative or zero.
+      * @param x The numeric expression to test
+      */
+    sign(x: number): number;
+
+    /**
+      * Returns the base 10 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log10(x: number): number;
+
+    /**
+      * Returns the base 2 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log2(x: number): number;
+
+    /**
+      * Returns the natural logarithm of 1 + x.
+      * @param x A numeric expression.
+      */
+    log1p(x: number): number;
+
+    /**
+      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of
+      * the natural logarithms).
+      * @param x A numeric expression.
+      */
+    expm1(x: number): number;
+
+    /**
+      * Returns the hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    cosh(x: number): number;
+
+    /**
+      * Returns the hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    sinh(x: number): number;
+
+    /**
+      * Returns the hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    tanh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    acosh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    asinh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    atanh(x: number): number;
+
+    /**
+      * Returns the square root of the sum of squares of its arguments.
+      * @param values Values to compute the square root for.
+      *     If no arguments are passed, the result is +0.
+      *     If there is only one argument, the result is the absolute value.
+      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
+      *     If any argument is NaN, the result is NaN.
+      *     If all arguments are either +0 or −0, the result is +0.
+      */
+    hypot(...values: number[]): number;
+
+    /**
+      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
+      * If x is already an integer, the result is x.
+      * @param x A numeric expression.
+      */
+    trunc(x: number): number;
+
+    /**
+      * Returns the nearest single precision float representation of a number.
+      * @param x A numeric expression.
+      */
+    fround(x: number): number;
+
+    /**
+      * Returns an implementation-dependent approximation to the cube root of number.
+      * @param x A numeric expression.
+      */
+    cbrt(x: number): number;
+}
+
+interface PromiseLike<T> {
+    /**
+    * Attaches callbacks for the resolution and/or rejection of the Promise.
+    * @param onfulfilled The callback to execute when the Promise is resolved.
+    * @param onrejected The callback to execute when the Promise is rejected.
+    * @returns A Promise for the completion of which ever callback is executed.
+    */
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>;
+}
+
+/**
+ * Represents the completion of an asynchronous operation
+ */
+interface Promise<T> {
+    /**
+    * Attaches callbacks for the resolution and/or rejection of the Promise.
+    * @param onfulfilled The callback to execute when the Promise is resolved.
+    * @param onrejected The callback to execute when the Promise is rejected.
+    * @returns A Promise for the completion of which ever callback is executed.
+    */
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
+
+    /**
+     * Attaches a callback for only the rejection of the Promise.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of the callback.
+     */
+    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
+    catch(onrejected?: (reason: any) => void): Promise<T>;
+}
+
+interface PromiseConstructor {
+    /**
+      * A reference to the prototype.
+      */
+    prototype: Promise<any>;
+
+    /**
+     * Creates a new Promise.
+     * @param executor A callback used to initialize the promise. This callback is passed two arguments:
+     * a resolve callback used resolve the promise with a value or the result of another promise,
+     * and a reject callback used to reject the promise with a provided reason or error.
+     */
+    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T>(values: IterableShim<T | PromiseLike<T>>): Promise<T[]>;
+
+    /**
+     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+     * or rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    race<T>(values: IterableShim<T | PromiseLike<T>>): Promise<T>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject(reason: any): Promise<void>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject<T>(reason: any): Promise<T>;
+
+    /**
+      * Creates a new resolved promise for the provided value.
+      * @param value A promise.
+      * @returns A promise whose internal state matches the provided promise.
+      */
+    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
+
+    /**
+     * Creates a new resolved promise .
+     * @returns A resolved promise.
+     */
+    resolve(): Promise<void>;
+}
+
+declare var Promise: PromiseConstructor;
+
+interface Map<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
+    get(key: K): V;
+    has(key: K): boolean;
+    set(key: K, value?: V): Map<K, V>;
+    size: number;
+    entries(): IterableIteratorShim<[K, V]>;
+    keys(): IterableIteratorShim<K>;
+    values(): IterableIteratorShim<V>;
+}
+
+interface MapConstructor {
+    new <K, V>(): Map<K, V>;
+    new <K, V>(iterable: IterableShim<[K, V]>): Map<K, V>;
+    prototype: Map<any, any>;
+}
+
+declare var Map: MapConstructor;
+
+interface Set<T> {
+    add(value: T): Set<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
+    has(value: T): boolean;
+    size: number;
+    entries(): IterableIteratorShim<[T, T]>;
+    keys(): IterableIteratorShim<T>;
+    values(): IterableIteratorShim<T>;
+}
+
+interface SetConstructor {
+    new <T>(): Set<T>;
+    new <T>(iterable: IterableShim<T>): Set<T>;
+    prototype: Set<any>;
+}
+
+declare var Set: SetConstructor;
+
+interface WeakMap<K, V> {
+    delete(key: K): boolean;
+    get(key: K): V;
+    has(key: K): boolean;
+    set(key: K, value?: V): WeakMap<K, V>;
+}
+
+interface WeakMapConstructor {
+    new <K, V>(): WeakMap<K, V>;
+    new <K, V>(iterable: IterableShim<[K, V]>): WeakMap<K, V>;
+    prototype: WeakMap<any, any>;
+}
+
+declare var WeakMap: WeakMapConstructor;
+
+interface WeakSet<T> {
+    add(value: T): WeakSet<T>;
+    delete(value: T): boolean;
+    has(value: T): boolean;
+}
+
+interface WeakSetConstructor {
+    new <T>(): WeakSet<T>;
+    new <T>(iterable: IterableShim<T>): WeakSet<T>;
+    prototype: WeakSet<any>;
+}
+
+declare var WeakSet: WeakSetConstructor;
+
+declare namespace Reflect {
+    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
+    function construct(target: Function, argumentsList: ArrayLike<any>): any;
+    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
+    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+    function enumerate(target: any): IterableIteratorShim<any>;
+    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
+    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+    function getPrototypeOf(target: any): any;
+    function has(target: any, propertyKey: PropertyKey): boolean;
+    function isExtensible(target: any): boolean;
+    function ownKeys(target: any): Array<PropertyKey>;
+    function preventExtensions(target: any): boolean;
+    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
+    function setPrototypeOf(target: any, proto: any): boolean;
+}
+
+declare module "es6-shim" {
+    var String: StringConstructor;
+    var Array: ArrayConstructor;
+    var Number: NumberConstructor;
+    var Math: Math;
+    var Object: ObjectConstructor;
+    var Map: MapConstructor;
+    var Set: SetConstructor;
+    var WeakMap: WeakMapConstructor;
+    var WeakSet: WeakSetConstructor;
+    var Promise: PromiseConstructor;
+    namespace Reflect {
+        function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
+        function construct(target: Function, argumentsList: ArrayLike<any>): any;
+        function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
+        function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+        function enumerate(target: any): Iterator<any>;
+        function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
+        function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+        function getPrototypeOf(target: any): any;
+        function has(target: any, propertyKey: PropertyKey): boolean;
+        function isExtensible(target: any): boolean;
+        function ownKeys(target: any): Array<PropertyKey>;
+        function preventExtensions(target: any): boolean;
+        function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
+        function setPrototypeOf(target: any, proto: any): boolean;
+    }
+}
--- a/src/Microsoft.AspNetCore.AngularServices/npm/typings/tsd.d.ts
+++ b/src/Microsoft.AspNetCore.AngularServices/npm/typings/tsd.d.ts
@@ -0,0 +1,2 @@
+
+/// <reference path="es6-shim/es6-shim.d.ts" />
--- a/src/Microsoft.AspNetCore.AngularServices/project.json
+++ b/src/Microsoft.AspNetCore.AngularServices/project.json
@@ -1,28 +1,26 @@
 {
+  "version": "1.0.0-*",
  "description": "Helpers for building Angular 2 applications on ASP.NET Core.",
-  "version": "1.1.0-*",
-  "packOptions": {
-    "repository": {
-      "type": "git",
-      "url": "git://github.com/aspnet/javascriptservices"
-    },
-    "tags": [
-      "aspnetcore",
-      "aspnetcoremvc",
-      "nodeservices"
-    ]
+  "compilationOptions": {
+    "keyFile": "../../tools/Key.snk"
  },
-  "buildOptions": {
-    "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk",
-    "xmlDoc": true
+  "authors": [ "Microsoft" ],
+  "tooling": {
+    "defaultNamespace": "Microsoft.AspNetCore.AngularServices"
  },
  "dependencies": {
-    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0",
-    "Microsoft.AspNetCore.SpaServices": "1.1.0-*"
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1",
+    "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
  },
  "frameworks": {
-    "net451": {},
-    "netstandard1.6": {}
+    "net451": {
+    },
+    "netstandard1.6": {
+      "imports": [
+        "dotnet5.6",
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  }
 }
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/.gitignore
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/.gitignore
@@ -1,3 +0,0 @@
-/bin/
-/node_modules/
-yarn.lock
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeServicesOptionsExtensions.cs
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeServicesOptionsExtensions.cs
@@ -1,21 +0,0 @@
-using System;
-
-namespace Microsoft.AspNetCore.NodeServices.Sockets
-{
-    /// <summary>
-    /// Extension methods that help with populating a <see cref="NodeServicesOptions"/> object.
-    /// </summary>
-    public static class NodeServicesOptionsExtensions
-    {
-        /// <summary>
-        /// Configures the <see cref="INodeServices"/> service so that it will use out-of-process
-        /// Node.js instances and perform RPC calls over binary sockets (on Windows, this is
-        /// implemented as named pipes; on other platforms it uses domain sockets).
-        /// </summary>
-        public static void UseSocketHosting(this NodeServicesOptions options)
-        {
-            var pipeName = "pni-" + Guid.NewGuid().ToString("D"); // Arbitrary non-clashing string
-            options.NodeInstanceFactory = () => new SocketNodeInstance(options, pipeName);
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/tsconfig.json
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/tsconfig.json
@@ -1,11 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es3",
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "types": ["node"]
-    },
-    "exclude": [
-        "node_modules"
-    ]
-}
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/package.json
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/package.json
@@ -1,18 +0,0 @@
-{
-  "name": "nodeservices.sockets",
-  "version": "1.0.0",
-  "description": "This is not really an NPM package and will not be published. This file exists only to reference compilation tools.",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "./node_modules/.bin/webpack"
-  },
-  "author": "Microsoft",
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "@types/node": "^6.0.42",
-    "ts-loader": "^0.8.2",
-    "typescript": "^2.0.0",
-    "webpack": "^1.13.1"
-  }
-}
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/project.json
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/project.json
@@ -1,39 +0,0 @@
-{
-  "description": "Socket-based RPC for Microsoft.AspNetCore.NodeServices",
-  "version": "1.1.0-*",
-  "packOptions": {
-    "repository": {
-      "type": "git",
-      "url": "git://github.com/aspnet/javascriptservices"
-    },
-    "tags": [
-      "aspnetcore",
-      "aspnetcoremvc",
-      "nodeservices"
-    ]
-  },
-  "buildOptions": {
-    "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk",
-    "embed": [
-      "Content/**/*"
-    ],
-    "xmlDoc": true
-  },
-  "dependencies": {
-    "Microsoft.AspNetCore.NodeServices": "1.1.0-*"
-  },
-  "frameworks": {
-    "net451": {
-      "dependencies": {
-        "Microsoft.Tpl.Dataflow": "4.5.24"
-      }
-    },
-    "netstandard1.6": {
-      "dependencies": {
-        "System.IO.Pipes": "4.3.0",
-        "System.Threading.Tasks.Dataflow": "4.7.0"
-      }
-    }
-  }
-}
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js
@@ -1,20 +0,0 @@
-module.exports = {
-    target: 'node',
-    externals: ['fs', 'net', 'events', 'readline', 'stream'],
-    resolve: {
-        extensions: [ '.ts' ]
-    },
-    module: {
-        loaders: [
-            { test: /\.ts$/, loader: 'ts-loader' },
-        ]
-    },
-    entry: {
-        'entrypoint-socket': ['./TypeScript/SocketNodeInstanceEntryPoint'],
-    },
-    output: {
-        libraryTarget: 'commonjs',
-        path: './Content/Node',
-        filename: '[name].js'
-    }
-};
--- a/src/Microsoft.AspNetCore.NodeServices/.gitignore
+++ b/src/Microsoft.AspNetCore.NodeServices/.gitignore
@@ -1,3 +1,2 @@
 /bin/
 /node_modules/
-yarn.lock
--- a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeHostingModel.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeHostingModel.cs
@@ -0,0 +1,8 @@
+namespace Microsoft.AspNetCore.NodeServices
+{
+    public enum NodeHostingModel
+    {
+        Http,
+        Socket,
+    }
+}
--- a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesFactory.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesFactory.cs
@@ -1,25 +1,43 @@
 using System;
+using Microsoft.AspNetCore.NodeServices.HostingModels;

 namespace Microsoft.AspNetCore.NodeServices
 {
-    /// <summary>
-    /// Supplies INodeServices instances.
-    /// </summary>
    public static class NodeServicesFactory
    {
-        /// <summary>
-        /// Create an <see cref="INodeServices"/> instance according to the supplied options.
-        /// </summary>
-        /// <param name="options">Options for creating the <see cref="INodeServices"/> instance.</param>
-        /// <returns>An <see cref="INodeServices"/> instance.</returns>
        public static INodeServices CreateNodeServices(NodeServicesOptions options)
        {
            if (options == null)
            {
                throw new ArgumentNullException(nameof (options));
            }
+            
+            return new NodeServicesImpl(() => CreateNodeInstance(options));
+        }

-            return new NodeServicesImpl(options.NodeInstanceFactory);
+        private static INodeInstance CreateNodeInstance(NodeServicesOptions options)
+        {
+            if (options.NodeInstanceFactory != null)
+            {
+                // If you've explicitly supplied an INodeInstance factory, we'll use that. This is useful for
+                // custom INodeInstance implementations.
+                return options.NodeInstanceFactory();
+            }
+            else
+            {
+                switch (options.HostingModel)
+                {
+                    case NodeHostingModel.Http:
+                        return new HttpNodeInstance(options.ProjectPath, options.WatchFileExtensions, options.NodeInstanceOutputLogger, 
+                            options.EnvironmentVariables, options.InvocationTimeoutMilliseconds, options.LaunchWithDebugging, options.DebuggingPort, /* port */ 0);
+                    case NodeHostingModel.Socket:
+                        var pipeName = "pni-" + Guid.NewGuid().ToString("D"); // Arbitrary non-clashing string
+                        return new SocketNodeInstance(options.ProjectPath, options.WatchFileExtensions, pipeName, options.NodeInstanceOutputLogger,
+                            options.EnvironmentVariables, options.InvocationTimeoutMilliseconds, options.LaunchWithDebugging, options.DebuggingPort);
+                    default:
+                        throw new ArgumentException("Unknown hosting model: " + options.HostingModel);
+                }
+            }
        }
    }
 }
--- a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs
@@ -8,20 +8,14 @@ using Microsoft.Extensions.Logging.Console;

 namespace Microsoft.AspNetCore.NodeServices
 {
-    /// <summary>
-    /// Describes options used to configure an <see cref="INodeServices"/> instance.
-    /// </summary>
    public class NodeServicesOptions
    {
+        public const NodeHostingModel DefaultNodeHostingModel = NodeHostingModel.Http;
        internal const string TimeoutConfigPropertyName = nameof(InvocationTimeoutMilliseconds);
        private const int DefaultInvocationTimeoutMilliseconds = 60 * 1000;
        private const string LogCategoryName = "Microsoft.AspNetCore.NodeServices";
        private static readonly string[] DefaultWatchFileExtensions = { ".js", ".jsx", ".ts", ".tsx", ".json", ".html" };

-        /// <summary>
-        /// Creates a new instance of <see cref="NodeServicesOptions"/>.
-        /// </summary>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
        public NodeServicesOptions(IServiceProvider serviceProvider)
        {
            if (serviceProvider == null)
@@ -31,6 +25,7 @@ namespace Microsoft.AspNetCore.NodeServices

            EnvironmentVariables = new Dictionary<string, string>();
            InvocationTimeoutMilliseconds = DefaultInvocationTimeoutMilliseconds;
+            HostingModel = DefaultNodeHostingModel;
            WatchFileExtensions = (string[])DefaultWatchFileExtensions.Clone();

            // In an ASP.NET environment, we can use the IHostingEnvironment data to auto-populate a few
@@ -47,51 +42,16 @@ namespace Microsoft.AspNetCore.NodeServices
            NodeInstanceOutputLogger = loggerFactory != null
                ? loggerFactory.CreateLogger(LogCategoryName)
                : new ConsoleLogger(LogCategoryName, null, false);
-
-            // By default, we use this package's built-in out-of-process-via-HTTP hosting/transport
-            this.UseHttpHosting();
        }

-        /// <summary>
-        /// Specifies how to construct Node.js instances. An <see cref="INodeInstance"/> encapsulates all details about
-        /// how Node.js instances are launched and communicated with. A new <see cref="INodeInstance"/> will be created
-        /// automatically if the previous instance has terminated (e.g., because a source file changed).
-        /// </summary>
+        public NodeHostingModel HostingModel { get; set; }
        public Func<INodeInstance> NodeInstanceFactory { get; set; }
-
-        /// <summary>
-        /// If set, overrides the path to the root of your application. This path is used when locating Node.js modules relative to your project.
-        /// </summary>
        public string ProjectPath { get; set; }
-
-        /// <summary>
-        /// If set, the Node.js instance should restart when any matching file on disk within your project changes.
-        /// </summary>
        public string[] WatchFileExtensions { get; set; }
-
-        /// <summary>
-        /// The Node.js instance's stdout/stderr will be redirected to this <see cref="ILogger"/>.
-        /// </summary>
        public ILogger NodeInstanceOutputLogger { get; set; }
-
-        /// <summary>
-        /// If true, the Node.js instance will accept incoming V8 debugger connections (e.g., from node-inspector).
-        /// </summary>
        public bool LaunchWithDebugging { get; set; }
-
-        /// <summary>
-        /// If <see cref="LaunchWithDebugging"/> is true, the Node.js instance will listen for V8 debugger connections on this port.
-        /// </summary>
-        public int DebuggingPort { get; set; }
-
-        /// <summary>
-        /// If set, starts the Node.js instance with the specified environment variables.
-        /// </summary>
        public IDictionary<string, string> EnvironmentVariables { get; set; }
-
-        /// <summary>
-        /// Specifies the maximum duration, in milliseconds, that your .NET code should wait for Node.js RPC calls to return.
-        /// </summary>
+        public int DebuggingPort { get; set; }
        public int InvocationTimeoutMilliseconds { get; set; }
    }
 }
--- a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesServiceCollectionExtensions.cs
@@ -8,18 +8,9 @@ namespace Microsoft.Extensions.DependencyInjection
    /// </summary>
    public static class NodeServicesServiceCollectionExtensions
    {
-        /// <summary>
-        /// Adds NodeServices support to the <paramref name="serviceCollection"/>.
-        /// </summary>
-        /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
        public static void AddNodeServices(this IServiceCollection serviceCollection)
            => AddNodeServices(serviceCollection, _ => {});

-        /// <summary>
-        /// Adds NodeServices support to the <paramref name="serviceCollection"/>.
-        /// </summary>
-        /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="options">Options for configuring the <see cref="INodeServices"/> instances.</param>
        [Obsolete("Use the AddNodeServices(Action<NodeServicesOptions> setupAction) overload instead.")]
        public static void AddNodeServices(this IServiceCollection serviceCollection, NodeServicesOptions options)
        {
@@ -29,11 +20,6 @@ namespace Microsoft.Extensions.DependencyInjection
            });
        }

-        /// <summary>
-        /// Adds NodeServices support to the <paramref name="serviceCollection"/>.
-        /// </summary>
-        /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="setupAction">A callback that will be invoked to populate the <see cref="NodeServicesOptions"/>.</param>
        public static void AddNodeServices(this IServiceCollection serviceCollection, Action<NodeServicesOptions> setupAction)
        {
            if (setupAction == null)
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Content/Node/entrypoint-socket.js
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Content/Node/entrypoint-socket.js
@@ -44,81 +44,11 @@
 /* 0 */
 /***/ function(module, exports, __webpack_require__) {

-	module.exports = __webpack_require__(1);
-
-
-/***/ },
-/* 1 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	// Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive,
-	// but simplifies things for the consumer of this module.
-	__webpack_require__(2);
-	var net = __webpack_require__(3);
-	var path = __webpack_require__(4);
-	var readline = __webpack_require__(5);
-	var ArgsUtil_1 = __webpack_require__(6);
-	var ExitWhenParentExits_1 = __webpack_require__(7);
-	var virtualConnectionServer = __webpack_require__(8);
-	// Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct
-	// reference to Node's runtime 'require' function.
-	var dynamicRequire = eval('require');
-	// Signal to the .NET side when we're ready to accept invocations
-	var server = net.createServer().on('listening', function () {
-	    console.log('[Microsoft.AspNetCore.NodeServices:Listening]');
-	});
-	// Each virtual connection represents a separate invocation
-	virtualConnectionServer.createInterface(server).on('connection', function (connection) {
-	    readline.createInterface(connection, null).on('line', function (line) {
-	        try {
-	            // Get a reference to the function to invoke
-	            var invocation = JSON.parse(line);
-	            var invokedModule = dynamicRequire(path.resolve(process.cwd(), invocation.moduleName));
-	            var invokedFunction = invocation.exportedFunctionName ? invokedModule[invocation.exportedFunctionName] : invokedModule;
-	            // Prepare a callback for accepting non-streamed JSON responses
-	            var hasInvokedCallback_1 = false;
-	            var invocationCallback = function (errorValue, successValue) {
-	                if (hasInvokedCallback_1) {
-	                    throw new Error('Cannot supply more than one result. The callback has already been invoked,'
-	                        + ' or the result stream has already been accessed');
-	                }
-	                hasInvokedCallback_1 = true;
-	                connection.end(JSON.stringify({
-	                    result: successValue,
-	                    errorMessage: errorValue && (errorValue.message || errorValue),
-	                    errorDetails: errorValue && (errorValue.stack || null)
-	                }));
-	            };
-	            // Also support streamed binary responses
-	            Object.defineProperty(invocationCallback, 'stream', {
-	                enumerable: true,
-	                get: function () {
-	                    hasInvokedCallback_1 = true;
-	                    return connection;
-	                }
-	            });
-	            // Actually invoke it, passing through any supplied args
-	            invokedFunction.apply(null, [invocationCallback].concat(invocation.args));
-	        }
-	        catch (ex) {
-	            connection.end(JSON.stringify({
-	                errorMessage: ex.message,
-	                errorDetails: ex.stack
-	            }));
-	        }
-	    });
-	});
-	// Begin listening now. The underlying transport varies according to the runtime platform.
-	// On Windows it's Named Pipes; on Linux/OSX it's Domain Sockets.
-	var useWindowsNamedPipes = /^win/.test(process.platform);
-	var parsedArgs = ArgsUtil_1.parseArgs(process.argv);
-	var listenAddress = (useWindowsNamedPipes ? '\\\\.\\pipe\\' : '/tmp/') + parsedArgs.listenAddress;
-	server.listen(listenAddress);
-	ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid));
+	module.exports = __webpack_require__(7);


 /***/ },
+/* 1 */,
 /* 2 */
 /***/ function(module, exports) {

@@ -160,12 +90,7 @@


 /***/ },
-/* 3 */
-/***/ function(module, exports) {
-
-	module.exports = require("net");
-
-/***/ },
+/* 3 */,
 /* 4 */
 /***/ function(module, exports) {

@@ -173,12 +98,6 @@

 /***/ },
 /* 5 */
-/***/ function(module, exports) {
-
-	module.exports = require("readline");
-
-/***/ },
-/* 6 */
 /***/ function(module, exports) {

 	"use strict";
@@ -204,7 +123,7 @@


 /***/ },
-/* 7 */
+/* 6 */
 /***/ function(module, exports) {

 	/*
@@ -271,12 +190,95 @@


 /***/ },
-/* 8 */
+/* 7 */
 /***/ function(module, exports, __webpack_require__) {

 	"use strict";
-	var events_1 = __webpack_require__(9);
-	var VirtualConnection_1 = __webpack_require__(10);
+	// Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive,
+	// but simplifies things for the consumer of this module.
+	__webpack_require__(2);
+	var net = __webpack_require__(8);
+	var path = __webpack_require__(4);
+	var readline = __webpack_require__(9);
+	var ArgsUtil_1 = __webpack_require__(5);
+	var ExitWhenParentExits_1 = __webpack_require__(6);
+	var virtualConnectionServer = __webpack_require__(10);
+	// Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct
+	// reference to Node's runtime 'require' function.
+	var dynamicRequire = eval('require');
+	// Signal to the .NET side when we're ready to accept invocations
+	var server = net.createServer().on('listening', function () {
+	    console.log('[Microsoft.AspNetCore.NodeServices:Listening]');
+	});
+	// Each virtual connection represents a separate invocation
+	virtualConnectionServer.createInterface(server).on('connection', function (connection) {
+	    readline.createInterface(connection, null).on('line', function (line) {
+	        try {
+	            // Get a reference to the function to invoke
+	            var invocation = JSON.parse(line);
+	            var invokedModule = dynamicRequire(path.resolve(process.cwd(), invocation.moduleName));
+	            var invokedFunction = invocation.exportedFunctionName ? invokedModule[invocation.exportedFunctionName] : invokedModule;
+	            // Prepare a callback for accepting non-streamed JSON responses
+	            var hasInvokedCallback_1 = false;
+	            var invocationCallback = function (errorValue, successValue) {
+	                if (hasInvokedCallback_1) {
+	                    throw new Error('Cannot supply more than one result. The callback has already been invoked,'
+	                        + ' or the result stream has already been accessed');
+	                }
+	                hasInvokedCallback_1 = true;
+	                connection.end(JSON.stringify({
+	                    result: successValue,
+	                    errorMessage: errorValue && (errorValue.message || errorValue),
+	                    errorDetails: errorValue && (errorValue.stack || null)
+	                }));
+	            };
+	            // Also support streamed binary responses
+	            Object.defineProperty(invocationCallback, 'stream', {
+	                enumerable: true,
+	                get: function () {
+	                    hasInvokedCallback_1 = true;
+	                    return connection;
+	                }
+	            });
+	            // Actually invoke it, passing through any supplied args
+	            invokedFunction.apply(null, [invocationCallback].concat(invocation.args));
+	        }
+	        catch (ex) {
+	            connection.end(JSON.stringify({
+	                errorMessage: ex.message,
+	                errorDetails: ex.stack
+	            }));
+	        }
+	    });
+	});
+	// Begin listening now. The underlying transport varies according to the runtime platform.
+	// On Windows it's Named Pipes; on Linux/OSX it's Domain Sockets.
+	var useWindowsNamedPipes = /^win/.test(process.platform);
+	var parsedArgs = ArgsUtil_1.parseArgs(process.argv);
+	var listenAddress = (useWindowsNamedPipes ? '\\\\.\\pipe\\' : '/tmp/') + parsedArgs.listenAddress;
+	server.listen(listenAddress);
+	ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid));
+
+
+/***/ },
+/* 8 */
+/***/ function(module, exports) {
+
+	module.exports = require("net");
+
+/***/ },
+/* 9 */
+/***/ function(module, exports) {
+
+	module.exports = require("readline");
+
+/***/ },
+/* 10 */
+/***/ function(module, exports, __webpack_require__) {
+
+	"use strict";
+	var events_1 = __webpack_require__(11);
+	var VirtualConnection_1 = __webpack_require__(12);
 	// Keep this in sync with the equivalent constant in the .NET code. Both sides split up their transmissions into frames with this max length,
 	// and both will reject longer frames.
 	var MaxFrameBodyLength = 16 * 1024;
@@ -458,13 +460,13 @@


 /***/ },
-/* 9 */
+/* 11 */
 /***/ function(module, exports) {

 	module.exports = require("events");

 /***/ },
-/* 10 */
+/* 12 */
 /***/ function(module, exports, __webpack_require__) {

 	"use strict";
@@ -473,18 +475,17 @@
 	    function __() { this.constructor = d; }
 	    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 	};
-	var stream_1 = __webpack_require__(11);
+	var stream_1 = __webpack_require__(13);
 	/**
 	 * Represents a virtual connection. Multiple virtual connections may be multiplexed over a single physical socket connection.
 	 */
 	var VirtualConnection = (function (_super) {
 	    __extends(VirtualConnection, _super);
 	    function VirtualConnection(_beginWriteCallback) {
-	        var _this = _super.call(this) || this;
-	        _this._beginWriteCallback = _beginWriteCallback;
-	        _this._flowing = false;
-	        _this._receivedDataQueue = [];
-	        return _this;
+	        _super.call(this);
+	        this._beginWriteCallback = _beginWriteCallback;
+	        this._flowing = false;
+	        this._receivedDataQueue = [];
 	    }
 	    VirtualConnection.prototype._read = function () {
 	        this._flowing = true;
@@ -515,7 +516,7 @@


 /***/ },
-/* 11 */
+/* 13 */
 /***/ function(module, exports) {

 	module.exports = require("stream");
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;

@@ -34,19 +36,21 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
        private bool _disposed;
        private int _portNumber;

-        public HttpNodeInstance(NodeServicesOptions options, int port = 0)
+        public HttpNodeInstance(string projectPath, string[] watchFileExtensions, ILogger nodeInstanceOutputLogger,
+            IDictionary<string, string> environmentVars, int invocationTimeoutMilliseconds, bool launchWithDebugging,
+            int debuggingPort, int port = 0)
        : base(
                EmbeddedResourceReader.Read(
                    typeof(HttpNodeInstance),
                    "/Content/Node/entrypoint-http.js"),
-                options.ProjectPath,
-                options.WatchFileExtensions,
+                projectPath,
+                watchFileExtensions,
                MakeCommandLineOptions(port),
-                options.NodeInstanceOutputLogger,
-                options.EnvironmentVariables,
-                options.InvocationTimeoutMilliseconds,
-                options.LaunchWithDebugging,
-                options.DebuggingPort)
+                nodeInstanceOutputLogger,
+                environmentVars,
+                invocationTimeoutMilliseconds,
+                launchWithDebugging,
+                debuggingPort)
        {
            _client = new HttpClient();
        }
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/INodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/INodeInstance.cs
@@ -4,20 +4,8 @@ using System.Threading.Tasks;

 namespace Microsoft.AspNetCore.NodeServices.HostingModels
 {
-    /// <summary>
-    /// Represents an instance of Node.js to which Remote Procedure Calls (RPC) may be sent.
-    /// </summary>
    public interface INodeInstance : IDisposable
    {
-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to cancel the invocation.</param>
-        /// <param name="moduleName">The path to the Node.js module (i.e., JavaScript file) relative to your project root that contains the code to be invoked.</param>
-        /// <param name="exportNameOrNull">If set, specifies the CommonJS export to be invoked. If not set, the module's default CommonJS export itself must be a function to be invoked.</param>
-        /// <param name="args">Any sequence of JSON-serializable arguments to be passed to the Node.js function.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
        Task<T> InvokeExportAsync<T>(CancellationToken cancellationToken, string moduleName, string exportNameOrNull, params object[] args);
    }
 }
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationException.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationException.cs
@@ -2,33 +2,15 @@ using System;

 namespace Microsoft.AspNetCore.NodeServices.HostingModels
 {
-    /// <summary>
-    /// Represents an exception caused by invoking Node.js code.
-    /// </summary>
    public class NodeInvocationException : Exception
    {
-        /// <summary>
-        /// If true, indicates that the invocation failed because the Node.js instance could not be reached. For example,
-        /// it might have already shut down or previously crashed.
-        /// </summary>
        public bool NodeInstanceUnavailable { get; private set; }

-        /// <summary>
-        /// Creates a new instance of <see cref="NodeInvocationException"/>.
-        /// </summary>
-        /// <param name="message">A description of the exception.</param>
-        /// <param name="details">Additional information, such as a Node.js stack trace, representing the exception.</param>
        public NodeInvocationException(string message, string details)
            : base(message + Environment.NewLine + details)
        {
        }

-        /// <summary>
-        /// Creates a new instance of <see cref="NodeInvocationException"/>.
-        /// </summary>
-        /// <param name="message">A description of the exception.</param>
-        /// <param name="details">Additional information, such as a Node.js stack trace, representing the exception.</param>
-        /// <param name="nodeInstanceUnavailable">Specifies a value for the <see cref="NodeInstanceUnavailable"/> flag.</param>
        public NodeInvocationException(string message, string details, bool nodeInstanceUnavailable)
            : this(message, details)
        {
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationInfo.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationInfo.cs
@@ -1,24 +1,9 @@
 namespace Microsoft.AspNetCore.NodeServices.HostingModels
 {
-    /// <summary>
-    /// Describes an RPC call sent from .NET code to Node.js code.
-    /// </summary>
    public class NodeInvocationInfo
    {
-        /// <summary>
-        /// Specifies the path to the Node.js module (i.e., .js file) relative to the project root.
-        /// </summary>
        public string ModuleName { get; set; }
-
-        /// <summary>
-        /// If set, specifies the name of CommonJS function export to be invoked.
-        /// If not set, the Node.js module's default export must itself be a function to be invoked.
-        /// </summary>
        public string ExportedFunctionName { get; set; }
-
-        /// <summary>
-        /// A sequence of JSON-serializable arguments to be passed to the Node.js function being invoked.
-        /// </summary>
        public object[] Args { get; set; }
    }
 }
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeServicesOptionsExtensions.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeServicesOptionsExtensions.cs
@@ -1,17 +0,0 @@
-namespace Microsoft.AspNetCore.NodeServices.HostingModels
-{
-    /// <summary>
-    /// Extension methods that help with populating a <see cref="NodeServicesOptions"/> object.
-    /// </summary>
-    public static class NodeServicesOptionsExtensions
-    {
-        /// <summary>
-        /// Configures the <see cref="INodeServices"/> service so that it will use out-of-process
-        /// Node.js instances and perform RPC calls over HTTP.
-        /// </summary>
-        public static void UseHttpHosting(this NodeServicesOptions options)
-        {
-            options.NodeInstanceFactory = () => new HttpNodeInstance(options);
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
@@ -21,11 +21,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
    /// <seealso cref="Microsoft.AspNetCore.NodeServices.HostingModels.INodeInstance" />
    public abstract class OutOfProcessNodeInstance : INodeInstance
    {
-        /// <summary>
-        /// The <see cref="ILogger"/> to which the Node.js instance's stdout/stderr is being redirected.
-        /// </summary>
        protected readonly ILogger OutputLogger;
-
        private const string ConnectionEstablishedMessage = "[Microsoft.AspNetCore.NodeServices:Listening]";
        private const string DebuggingStartedMessageFormat = @"-----
 *** Node.js debugging is enabled ***
@@ -47,18 +43,6 @@ If you haven't yet installed node-inspector, you can do so as follows:
        private bool _nodeProcessNeedsRestart;
        private readonly string[] _watchFileExtensions;

-        /// <summary>
-        /// Creates a new instance of <see cref="OutOfProcessNodeInstance"/>.
-        /// </summary>
-        /// <param name="entryPointScript">The path to the entry point script that the Node instance should load and execute.</param>
-        /// <param name="projectPath">The root path of the current project. This is used when resolving Node.js module paths relative to the project root.</param>
-        /// <param name="watchFileExtensions">The filename extensions that should be watched within the project root. The Node instance will automatically shut itself down if any matching file changes.</param>
-        /// <param name="commandLineArguments">Additional command-line arguments to be passed to the Node.js instance.</param>
-        /// <param name="nodeOutputLogger">The <see cref="ILogger"/> to which the Node.js instance's stdout/stderr (and other log information) should be written.</param>
-        /// <param name="environmentVars">Environment variables to be set on the Node.js process.</param>
-        /// <param name="invocationTimeoutMilliseconds">The maximum duration, in milliseconds, to wait for RPC calls to complete.</param>
-        /// <param name="launchWithDebugging">If true, passes a flag to the Node.js process telling it to accept V8 debugger connections.</param>
-        /// <param name="debuggingPort">If debugging is enabled, the Node.js process should listen for V8 debugger connections on this port.</param>
        public OutOfProcessNodeInstance(
            string entryPointScript,
            string projectPath,
@@ -87,15 +71,6 @@ If you haven't yet installed node-inspector, you can do so as follows:
            ConnectToInputOutputStreams();
        }

-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to cancel the invocation.</param>
-        /// <param name="moduleName">The path to the Node.js module (i.e., JavaScript file) relative to your project root that contains the code to be invoked.</param>
-        /// <param name="exportNameOrNull">If set, specifies the CommonJS export to be invoked. If not set, the module's default CommonJS export itself must be a function to be invoked.</param>
-        /// <param name="args">Any sequence of JSON-serializable arguments to be passed to the Node.js function.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
        public async Task<T> InvokeExportAsync<T>(
            CancellationToken cancellationToken, string moduleName, string exportNameOrNull, params object[] args)
        {
@@ -179,41 +154,21 @@ If you haven't yet installed node-inspector, you can do so as follows:
            }
        }

-        /// <summary>
-        /// Disposes this instance.
-        /// </summary>
        public void Dispose()
        {
            Dispose(true);
            GC.SuppressFinalize(this);
        }

-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="invocationInfo">Specifies the Node.js function to be invoked and arguments to be passed to it.</param>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to cancel the invocation.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
        protected abstract Task<T> InvokeExportAsync<T>(
            NodeInvocationInfo invocationInfo,
            CancellationToken cancellationToken);

-        /// <summary>
-        /// Configures a <see cref="ProcessStartInfo"/> instance describing how to launch the Node.js process.
-        /// </summary>
-        /// <param name="entryPointFilename">The entrypoint JavaScript file that the Node.js process should execute.</param>
-        /// <param name="projectPath">The root path of the project. This is used when locating Node.js modules relative to the project root.</param>
-        /// <param name="commandLineArguments">Command-line arguments to be passed to the Node.js process.</param>
-        /// <param name="environmentVars">Environment variables to be set on the Node.js process.</param>
-        /// <param name="launchWithDebugging">If true, passes a flag to the Node.js process telling it to accept V8 debugger connections.</param>
-        /// <param name="debuggingPort">If debugging is enabled, the Node.js process should listen for V8 debugger connections on this port.</param>
-        /// <returns></returns>
+        // This method is virtual, as it provides a way to override the NODE_PATH or the path to node.exe
        protected virtual ProcessStartInfo PrepareNodeProcessStartInfo(
            string entryPointFilename, string projectPath, string commandLineArguments,
            IDictionary<string, string> environmentVars, bool launchWithDebugging, int debuggingPort)
        {
-            // This method is virtual, as it provides a way to override the NODE_PATH or the path to node.exe
            string debuggingArgs;
            if (launchWithDebugging)
            {
@@ -262,28 +217,16 @@ If you haven't yet installed node-inspector, you can do so as follows:
            return startInfo;
        }

-        /// <summary>
-        /// Virtual method invoked whenever the Node.js process emits a line to its stdout.
-        /// </summary>
-        /// <param name="outputData">The line emitted to the Node.js process's stdout.</param>
        protected virtual void OnOutputDataReceived(string outputData)
        {
            OutputLogger.LogInformation(outputData);
        }

-        /// <summary>
-        /// Virtual method invoked whenever the Node.js process emits a line to its stderr.
-        /// </summary>
-        /// <param name="errorData">The line emitted to the Node.js process's stderr.</param>
        protected virtual void OnErrorDataReceived(string errorData)
        {
            OutputLogger.LogError(errorData);
        }

-        /// <summary>
-        /// Disposes the instance.
-        /// </summary>
-        /// <param name="disposing">True if the object is disposing or false if it is finalizing.</param>
        protected virtual void Dispose(bool disposing)
        {
            if (!_disposed)
@@ -460,9 +403,6 @@ If you haven't yet installed node-inspector, you can do so as follows:
            EnsureFileSystemWatcherIsDisposed();
        }

-        /// <summary>
-        /// Implements the finalization part of the IDisposable pattern by calling Dispose(false).
-        /// </summary>
        ~OutOfProcessNodeInstance()
        {
            Dispose(false);
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/NamedPipeConnection.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/NamedPipeConnection.cs
@@ -2,7 +2,7 @@ using System.IO;
 using System.IO.Pipes;
 using System.Threading.Tasks;

-namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
+namespace Microsoft.AspNetCore.NodeServices.HostingModels.PhysicalConnections
 {
    internal class NamedPipeConnection : StreamConnection
    {
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/StreamConnection.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/StreamConnection.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using System.Threading.Tasks;

-namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
+namespace Microsoft.AspNetCore.NodeServices.HostingModels.PhysicalConnections
 {
    internal abstract class StreamConnection : IDisposable
    {
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/UnixDomainSocketConnection.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/UnixDomainSocketConnection.cs
@@ -2,7 +2,7 @@ using System.IO;
 using System.Net.Sockets;
 using System.Threading.Tasks;

-namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
+namespace Microsoft.AspNetCore.NodeServices.HostingModels.PhysicalConnections
 {
    internal class UnixDomainSocketConnection : StreamConnection
    {
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/UnixDomainSocketEndPoint.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/UnixDomainSocketEndPoint.cs
@@ -3,7 +3,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;

-namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
+namespace Microsoft.AspNetCore.NodeServices.HostingModels.PhysicalConnections
 {
    // From System.IO.Pipes/src/System/Net/Sockets/UnixDomainSocketEndPoint.cs (an internal class in System.IO.Pipes)
    internal sealed class UnixDomainSocketEndPoint : EndPoint
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/SocketNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/SocketNodeInstance.cs
@@ -1,15 +1,16 @@
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.NodeServices.HostingModels;
-using Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections;
-using Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections;
+using Microsoft.AspNetCore.NodeServices.HostingModels.PhysicalConnections;
+using Microsoft.AspNetCore.NodeServices.HostingModels.VirtualConnections;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;

-namespace Microsoft.AspNetCore.NodeServices.Sockets
+namespace Microsoft.AspNetCore.NodeServices.HostingModels
 {
    /// <summary>
    /// A specialisation of the OutOfProcessNodeInstance base class that uses a lightweight binary streaming protocol
@@ -32,28 +33,27 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets
            TypeNameHandling = TypeNameHandling.None
        };

-        private readonly static int streamBufferSize = 16 * 1024;
-        private readonly static UTF8Encoding utf8EncodingWithoutBom = new UTF8Encoding(false);
-
        private readonly SemaphoreSlim _connectionCreationSemaphore = new SemaphoreSlim(1);
        private bool _connectionHasFailed;
        private StreamConnection _physicalConnection;
        private string _socketAddress;
        private VirtualConnectionClient _virtualConnectionClient;

-        public SocketNodeInstance(NodeServicesOptions options, string socketAddress)
+        public SocketNodeInstance(string projectPath, string[] watchFileExtensions, string socketAddress,
+            ILogger nodeInstanceOutputLogger, IDictionary<string, string> environmentVars,
+            int invocationTimeoutMilliseconds, bool launchWithDebugging, int debuggingPort)
        : base(
                EmbeddedResourceReader.Read(
                    typeof(SocketNodeInstance),
                    "/Content/Node/entrypoint-socket.js"),
-                options.ProjectPath,
-                options.WatchFileExtensions,
+                projectPath,
+                watchFileExtensions,
                MakeNewCommandLineOptions(socketAddress),
-                options.NodeInstanceOutputLogger,
-                options.EnvironmentVariables,
-                options.InvocationTimeoutMilliseconds,
-                options.LaunchWithDebugging,
-                options.DebuggingPort)
+                nodeInstanceOutputLogger,
+                environmentVars,
+                invocationTimeoutMilliseconds,
+                launchWithDebugging,
+                debuggingPort)
        {
            _socketAddress = socketAddress;
        }
@@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets
                // wait for the same connection task. There's no reason why the first caller should have the
                // special ability to cancel the connection process in a way that would affect subsequent
                // callers. So, each caller just independently stops awaiting connection if that call is cancelled.
-                await ThrowOnCancellation(EnsureVirtualConnectionClientCreated(), cancellationToken);
+                await EnsureVirtualConnectionClientCreated().OrThrowOnCancellation(cancellationToken);
            }

            // For each invocation, we open a new virtual connection. This gives an API equivalent to opening a new
@@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets
                virtualConnection = _virtualConnectionClient.OpenVirtualConnection();

                // Send request
-                WriteJsonLine(virtualConnection, invocationInfo);
+                await WriteJsonLineAsync(virtualConnection, invocationInfo, cancellationToken);

                // Determine what kind of response format is expected
                if (typeof(T) == typeof(Stream))
@@ -169,20 +169,11 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets
            base.Dispose(disposing);
        }

-        private static void WriteJsonLine(Stream stream, object serializableObject)
+        private static async Task WriteJsonLineAsync(Stream stream, object serializableObject, CancellationToken cancellationToken)
        {
-            using (var streamWriter = new StreamWriter(stream, utf8EncodingWithoutBom, streamBufferSize, true))
-            using (var jsonWriter = new JsonTextWriter(streamWriter))
-            {
-                jsonWriter.CloseOutput = false;
-
-                var serializer = JsonSerializer.Create(jsonSerializerSettings);
-                serializer.Serialize(jsonWriter, serializableObject);
-                jsonWriter.Flush();
-
-                streamWriter.WriteLine();
-                streamWriter.Flush();
-            }
+            var json = JsonConvert.SerializeObject(serializableObject, jsonSerializerSettings);
+            var bytes = Encoding.UTF8.GetBytes(json + '\n');
+            await stream.WriteAsync(bytes, 0, bytes.Length, cancellationToken);
        }

        private static async Task<T> ReadJsonAsync<T>(Stream stream, CancellationToken cancellationToken)
@@ -193,7 +184,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets

        private static async Task<byte[]> ReadAllBytesAsync(Stream input, CancellationToken cancellationToken)
        {
-            byte[] buffer = new byte[streamBufferSize];
+            byte[] buffer = new byte[16 * 1024];

            using (var ms = new MemoryStream())
            {
@@ -212,17 +203,6 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets
            return $"--listenAddress {listenAddress}";
        }

-        private static Task ThrowOnCancellation(Task task, CancellationToken cancellationToken)
-        {
-            return task.IsCompleted
-                ? task // If the task is already completed, no need to wrap it in a further layer of task
-                : task.ContinueWith(
-                    _ => {}, // If the task completes, allow execution to continue
-                    cancellationToken,
-                    TaskContinuationOptions.ExecuteSynchronously,
-                    TaskScheduler.Default);
-        }
-
 #pragma warning disable 649 // These properties are populated via JSON deserialization
        private class RpcJsonResponse<TResult>
        {
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/VirtualConnections/VirtualConnection.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/VirtualConnections/VirtualConnection.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;

-namespace Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections
+namespace Microsoft.AspNetCore.NodeServices.HostingModels.VirtualConnections
 {
    /// <summary>
    /// A virtual read/write connection, typically to a remote process. Multiple virtual connections can be
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/VirtualConnections/VirtualConnectionClient.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/VirtualConnections/VirtualConnectionClient.cs
@@ -5,12 +5,8 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

-namespace Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections
+namespace Microsoft.AspNetCore.NodeServices.HostingModels.VirtualConnections
 {
-    /// <summary>
-    /// A callback that will be invoked if the <see cref="VirtualConnectionClient"/> encounters a read error.
-    /// </summary>
-    /// <param name="ex"></param>
    public delegate void VirtualConnectionReadErrorHandler(Exception ex);

    /// <summary>
--- a/src/Microsoft.AspNetCore.NodeServices/INodeServices.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/INodeServices.cs
@@ -4,71 +4,18 @@ using System.Threading.Tasks;

 namespace Microsoft.AspNetCore.NodeServices
 {
-    /// <summary>
-    /// Represents the ability to invoke code in a Node.js environment. Although the underlying Node.js instance
-    /// might change over time (e.g., the process might be restarted), the <see cref="INodeServices"/> instance
-    /// will remain constant.
-    /// </summary>
    public interface INodeServices : IDisposable
    {
-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="moduleName">The path to the Node.js module (i.e., JavaScript file) relative to your project root whose default CommonJS export is the function to be invoked.</param>
-        /// <param name="args">Any sequence of JSON-serializable arguments to be passed to the Node.js function.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
        Task<T> InvokeAsync<T>(string moduleName, params object[] args);
-
-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to cancel the invocation.</param>
-        /// <param name="moduleName">The path to the Node.js module (i.e., JavaScript file) relative to your project root whose default CommonJS export is the function to be invoked.</param>
-        /// <param name="args">Any sequence of JSON-serializable arguments to be passed to the Node.js function.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
        Task<T> InvokeAsync<T>(CancellationToken cancellationToken, string moduleName, params object[] args);

-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="moduleName">The path to the Node.js module (i.e., JavaScript file) relative to your project root that contains the code to be invoked.</param>
-        /// <param name="exportedFunctionName">Specifies the CommonJS export to be invoked.</param>
-        /// <param name="args">Any sequence of JSON-serializable arguments to be passed to the Node.js function.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
        Task<T> InvokeExportAsync<T>(string moduleName, string exportedFunctionName, params object[] args);
-
-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to cancel the invocation.</param>
-        /// <param name="moduleName">The path to the Node.js module (i.e., JavaScript file) relative to your project root that contains the code to be invoked.</param>
-        /// <param name="exportedFunctionName">Specifies the CommonJS export to be invoked.</param>
-        /// <param name="args">Any sequence of JSON-serializable arguments to be passed to the Node.js function.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
        Task<T> InvokeExportAsync<T>(CancellationToken cancellationToken, string moduleName, string exportedFunctionName, params object[] args);

-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="moduleName">The path to the Node.js module (i.e., JavaScript file) relative to your project root whose default CommonJS export is the function to be invoked.</param>
-        /// <param name="args">Any sequence of JSON-serializable arguments to be passed to the Node.js function.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
+
        [Obsolete("Use InvokeAsync instead")]
        Task<T> Invoke<T>(string moduleName, params object[] args);

-        /// <summary>
-        /// Asynchronously invokes code in the Node.js instance.
-        /// </summary>
-        /// <typeparam name="T">The JSON-serializable data type that the Node.js code will asynchronously return.</typeparam>
-        /// <param name="moduleName">The path to the Node.js module (i.e., JavaScript file) relative to your project root that contains the code to be invoked.</param>
-        /// <param name="exportedFunctionName">Specifies the CommonJS export to be invoked.</param>
-        /// <param name="args">Any sequence of JSON-serializable arguments to be passed to the Node.js function.</param>
-        /// <returns>A <see cref="Task{TResult}"/> representing the completion of the RPC call.</returns>
        [Obsolete("Use InvokeExportAsync instead")]
        Task<T> InvokeExport<T>(string moduleName, string exportedFunctionName, params object[] args);
    }
--- a/src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs
@@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.NodeServices
            return InvokeExportWithPossibleRetryAsync<T>(moduleName, exportedFunctionName, args, /* allowRetry */ true, cancellationToken);
        }

-        private async Task<T> InvokeExportWithPossibleRetryAsync<T>(string moduleName, string exportedFunctionName, object[] args, bool allowRetry, CancellationToken cancellationToken)
+        public async Task<T> InvokeExportWithPossibleRetryAsync<T>(string moduleName, string exportedFunctionName, object[] args, bool allowRetry, CancellationToken cancellationToken)
        {
            ThrowAnyOutstandingDelayedDisposalException();
            var nodeInstance = GetOrCreateCurrentNodeInstance();
--- a/src/Microsoft.AspNetCore.NodeServices/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Properties/AssemblyInfo.cs
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: NeutralResourcesLanguage("en-us")]
-[assembly: AssemblyCompany("Microsoft Corporation.")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft ASP.NET Core")]
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts
@@ -1,12 +1,12 @@
 // Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive,
 // but simplifies things for the consumer of this module.
-import '../../Microsoft.AspNetCore.NodeServices/TypeScript/Util/OverrideStdOutputs';
+import './Util/OverrideStdOutputs';
 import * as net from 'net';
 import * as path from 'path';
 import * as readline from 'readline';
 import { Duplex } from 'stream';
-import { parseArgs } from '../../Microsoft.AspNetCore.NodeServices/TypeScript/Util/ArgsUtil';
-import { exitWhenParentExits } from '../../Microsoft.AspNetCore.NodeServices/TypeScript/Util/ExitWhenParentExits';
+import { parseArgs } from './Util/ArgsUtil';
+import { exitWhenParentExits } from './Util/ExitWhenParentExits';
 import * as virtualConnectionServer from './VirtualConnections/VirtualConnectionServer';

 // Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts
--- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/tsconfig.json
+++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/tsconfig.json
@@ -1,9 +1,8 @@
 {
    "compilerOptions": {
-        "target": "es3",
+        "target": "es5",
        "module": "commonjs",
-        "moduleResolution": "node",
-        "types": ["node"]
+        "moduleResolution": "node"
    },
    "exclude": [
        "node_modules"
--- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/typings/node/node.d.ts
+++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/typings/node/node.d.ts
--- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/typings/tsd.d.ts
+++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/typings/tsd.d.ts
@@ -0,0 +1 @@
+/// <reference path="node/node.d.ts" />
--- a/src/Microsoft.AspNetCore.NodeServices/Util/EmbeddedResourceReader.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Util/EmbeddedResourceReader.cs
@@ -4,17 +4,8 @@ using System.Reflection;

 namespace Microsoft.AspNetCore.NodeServices
 {
-    /// <summary>
-    /// Contains methods for reading embedded resources.
-    /// </summary>
    public static class EmbeddedResourceReader
    {
-        /// <summary>
-        /// Reads the specified embedded resource from a given assembly.
-        /// </summary>
-        /// <param name="assemblyContainingType">Any <see cref="Type"/> in the assembly whose resource is to be read.</param>
-        /// <param name="path">The path of the resource to be read.</param>
-        /// <returns>The contents of the resource.</returns>
        public static string Read(Type assemblyContainingType, string path)
        {
            var asm = assemblyContainingType.GetTypeInfo().Assembly;
--- a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs
@@ -3,45 +3,19 @@ using System.IO;

 namespace Microsoft.AspNetCore.NodeServices
 {
-    /// <summary>
-    /// Makes it easier to pass script files to Node in a way that's sure to clean up after the process exits.
-    /// </summary>
+    // Makes it easier to pass script files to Node in a way that's sure to clean up after the process exits
    public sealed class StringAsTempFile : IDisposable
    {
        private bool _disposedValue;
-        private bool _hasDeletedTempFile;
-        private object _fileDeletionLock = new object();

-        /// <summary>
-        /// Create a new instance of <see cref="StringAsTempFile"/>.
-        /// </summary>
-        /// <param name="content">The contents of the temporary file to be created.</param>
        public StringAsTempFile(string content)
        {
            FileName = Path.GetTempFileName();
            File.WriteAllText(FileName, content);
-
-            // Because .NET finalizers don't reliably run when the process is terminating, also
-            // add event handlers for other shutdown scenarios.
-#if NET451
-            AppDomain.CurrentDomain.ProcessExit += HandleProcessExit;
-            AppDomain.CurrentDomain.DomainUnload += HandleProcessExit;
-#else
-            // Note that this still doesn't capture SIGKILL (at least on macOS) - there doesn't
-            // appear to be a way of doing that. So in that case, the temporary file will be
-            // left behind.
-            System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += HandleAssemblyUnloading;
-#endif
        }

-        /// <summary>
-        /// Specifies the filename of the temporary file.
-        /// </summary>
        public string FileName { get; }

-        /// <summary>
-        /// Disposes the instance and deletes the associated temporary file.
-        /// </summary>
        public void Dispose()
        {
            DisposeImpl(true);
@@ -54,48 +28,15 @@ namespace Microsoft.AspNetCore.NodeServices
            {
                if (disposing)
                {
-                    // Dispose managed state
-#if NET451
-                    AppDomain.CurrentDomain.ProcessExit -= HandleProcessExit;
-                    AppDomain.CurrentDomain.DomainUnload -= HandleProcessExit;
-#else
-                    System.Runtime.Loader.AssemblyLoadContext.Default.Unloading -= HandleAssemblyUnloading;
-#endif
+                    // Would dispose managed state here, if there was any
                }

-                EnsureTempFileDeleted();
+                File.Delete(FileName);

                _disposedValue = true;
            }
        }

-        private void EnsureTempFileDeleted()
-        {
-            lock (_fileDeletionLock)
-            {
-                if (!_hasDeletedTempFile)
-                {
-                    File.Delete(FileName);
-                    _hasDeletedTempFile = true;
-                }
-            }
-        }
-
-#if NET451
-        private void HandleProcessExit(object sender, EventArgs args)
-        {
-            EnsureTempFileDeleted();
-        }
-#else
-        private void HandleAssemblyUnloading(System.Runtime.Loader.AssemblyLoadContext context)
-        {
-            EnsureTempFileDeleted();
-        }
-#endif
-
-        /// <summary>
-        /// Implements the finalization part of the IDisposable pattern by calling Dispose(false).
-        /// </summary>
        ~StringAsTempFile()
        {
            DisposeImpl(false);
--- a/src/Microsoft.AspNetCore.NodeServices/package.json
+++ b/src/Microsoft.AspNetCore.NodeServices/package.json
@@ -10,9 +10,8 @@
  "author": "Microsoft",
  "license": "Apache-2.0",
  "devDependencies": {
-    "@types/node": "^6.0.42",
    "ts-loader": "^0.8.2",
-    "typescript": "^2.0.0",
+    "typescript": "^1.8.10",
    "webpack": "^1.13.1"
  }
 }
--- a/src/Microsoft.AspNetCore.NodeServices/project.json
+++ b/src/Microsoft.AspNetCore.NodeServices/project.json
@@ -1,45 +1,48 @@
 {
+  "version": "1.0.0-*",
  "description": "Invoke Node.js modules at runtime in ASP.NET Core applications.",
-  "version": "1.1.0-*",
-  "packOptions": {
-    "repository": {
-      "type": "git",
-      "url": "git://github.com/aspnet/javascriptservices"
-    },
-    "tags": [
-      "aspnetcore",
-      "aspnetcoremvc",
-      "nodeservices"
-    ]
-  },
-  "buildOptions": {
-    "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk",
-    "embed": [
-      "Content/**/*"
-    ],
-    "xmlDoc": true
+  "compilationOptions": {
+    "keyFile": "../../tools/Key.snk"
  },
+  "authors": [ "Microsoft" ],
  "dependencies": {
-    "Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0",
-    "Microsoft.Extensions.Logging.Console": "1.1.0",
-    "Newtonsoft.Json": "9.0.1",
-    "NETStandard.Library": "1.6.1-*"
+    "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0",
+    "Newtonsoft.Json": "9.0.1"
  },
  "frameworks": {
-    "net451": {},
-    "netstandard1.6": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Net.Http": "4.0.0"
+      },
      "dependencies": {
-        "System.Diagnostics.Process": "4.3.0",
-        "System.IO.FileSystem.Watcher": "4.3.0",
-        "System.Runtime.Loader": "4.3.0"
+        "Microsoft.Tpl.Dataflow": "4.5.24"
+      }
+    },
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.6",
+        "dnxcore50",
+        "portable-net45+win8"
+      ],
+      "dependencies": {
+        "System.Console": "4.0.0",
+        "System.Diagnostics.Process": "4.1.0",
+        "System.IO.Pipes": "4.0.0",
+        "System.Net.Http": "4.1.0",
+        "System.Net.Sockets": "4.1.0",
+        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
+        "System.Text.RegularExpressions": "4.1.0",
+        "System.Threading.Tasks.Dataflow": "4.5.25"
      }
    }
  },
-  "scripts": {
-    "prepublish": [
-      "npm install",
-      "node node_modules/webpack/bin/webpack.js"
+  "buildOptions": {
+    "embed": [
+      "Content/**/*"
    ]
  }
 }
--- a/src/Microsoft.AspNetCore.NodeServices/tsd.json
+++ b/src/Microsoft.AspNetCore.NodeServices/tsd.json
@@ -0,0 +1,12 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "TypeScript/typings",
+  "bundle": "TypeScript/typings/tsd.d.ts",
+  "installed": {
+    "node/node.d.ts": {
+      "commit": "edb64e4a35896510ce02b93c0bca5ec3878db738"
+    }
+  }
+}
--- a/src/Microsoft.AspNetCore.NodeServices/webpack.config.js
+++ b/src/Microsoft.AspNetCore.NodeServices/webpack.config.js
@@ -10,7 +10,8 @@ module.exports = {
        ]
    },
    entry: {
-        'entrypoint-http': ['./TypeScript/HttpNodeInstanceEntryPoint']
+        'entrypoint-http': ['./TypeScript/HttpNodeInstanceEntryPoint'],
+        'entrypoint-socket': ['./TypeScript/SocketNodeInstanceEntryPoint'],
    },
    output: {
        libraryTarget: 'commonjs',
--- a/src/Microsoft.AspNetCore.ReactServices/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.ReactServices/Properties/AssemblyInfo.cs
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: NeutralResourcesLanguage("en-us")]
-[assembly: AssemblyCompany("Microsoft Corporation.")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft ASP.NET Core")]
--- a/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/.gitignore
+++ b/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/.gitignore
@@ -1,3 +1,4 @@
+/typings/
 /node_modules/
 /*.js
 /*.d.ts
--- a/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json
+++ b/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json
@@ -1,11 +1,11 @@
 {
  "name": "redux-typed",
-  "version": "2.0.0",
+  "version": "1.0.0",
  "description": "Helpers for building React+Redux apps with strong TypeScript type checking everywhere",
  "main": "main.js",
  "typings": "main.d.ts",
  "scripts": {
-    "prepublish": "rimraf *.d.ts && tsc && echo 'Finished building NPM package \"redux-typed\"'",
+    "prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"redux-typed\"'",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "author": "Microsoft",
@@ -18,10 +18,7 @@
    "url": "https://github.com/aspnet/JavaScriptServices.git"
  },
  "devDependencies": {
-    "@types/react": "^0.14.38",
-    "@types/react-redux": "^4.4.32",
-    "@types/redux": "^3.5.30",
    "rimraf": "^2.5.4",
-    "typescript": "^2.0.0"
+    "typescript": "^1.8.10"
  }
 }
--- a/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/tsconfig.json
+++ b/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/tsconfig.json
@@ -4,12 +4,8 @@
    "module": "commonjs",
    "target": "es5",
    "declaration": true,
-    "outDir": ".",
-    "lib": ["es2015", "dom"]
+    "outDir": "."
  },
-  "files": [
-    "src/main.ts"
-  ],
  "exclude": [
    "node_modules"
  ]
--- a/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/tsd.json
+++ b/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/tsd.json
@@ -0,0 +1,18 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "typings",
+  "bundle": "typings/tsd.d.ts",
+  "installed": {
+    "react/react.d.ts": {
+      "commit": "f4b1797c1201b6c575668f5d7ea12d9b1ab21846"
+    },
+    "react-redux/react-redux.d.ts": {
+      "commit": "f4b1797c1201b6c575668f5d7ea12d9b1ab21846"
+    },
+    "redux/redux.d.ts": {
+      "commit": "f4b1797c1201b6c575668f5d7ea12d9b1ab21846"
+    }
+  }
+}
--- a/src/Microsoft.AspNetCore.ReactServices/project.json
+++ b/src/Microsoft.AspNetCore.ReactServices/project.json
@@ -1,28 +1,26 @@
 {
+  "version": "1.0.0-*",
  "description": "Helpers for building React applications on ASP.NET Core.",
-  "version": "1.1.0-*",
-  "packOptions": {
-    "repository": {
-      "type": "git",
-      "url": "git://github.com/aspnet/javascriptservices"
-    },
-    "tags": [
-      "aspnetcore",
-      "aspnetcoremvc",
-      "nodeservices"
-    ]
+  "compilationOptions": {
+    "keyFile": "../../tools/Key.snk"
  },
-  "buildOptions": {
-    "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk",
-    "xmlDoc": true
+  "authors": [ "Microsoft" ],
+  "tooling": {
+    "defaultNamespace": "Microsoft.AspNetCore.ReactServices"
  },
  "dependencies": {
-    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0",
-    "Microsoft.AspNetCore.SpaServices": "1.1.0-*"
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1",
+    "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
  },
  "frameworks": {
-    "net451": {},
-    "netstandard1.6": {}
+    "net451": {
+    },
+    "netstandard1.6": {
+      "imports": [
+        "dotnet5.6",
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  }
 }
--- a/src/Microsoft.AspNetCore.SpaServices/.gitignore
+++ b/src/Microsoft.AspNetCore.SpaServices/.gitignore
@@ -1,2 +1 @@
 /bin/
-/node_modules/
--- a/src/Microsoft.AspNetCore.SpaServices/Content/Node/prerenderer.js
+++ b/src/Microsoft.AspNetCore.SpaServices/Content/Node/prerenderer.js
@@ -1,178 +1,20 @@
-(function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
+// Pass through the invocation to the 'aspnet-prerendering' package, verifying that it can be loaded
+module.exports.renderToString = function (callback) {
+    var aspNetPrerendering;
+    try {
+        aspNetPrerendering = require('aspnet-prerendering');
+    } catch (ex) {
+        // Developers sometimes have trouble with badly-configured Node installations, where it's unable
+        // to find node_modules. Or they accidentally fail to deploy node_modules, or even to run 'npm install'.
+        // Make sure such errors are reported back to the .NET part of the app.
+        callback(
+            'Prerendering failed because of an error while loading \'aspnet-prerendering\'. Error was: '
+            + ex.stack
+            + '\nCurrent directory is: '
+            + process.cwd()
+        );
+        return;
+    }

-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
-/******/ 			return installedModules[moduleId].exports;
-
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			exports: {},
-/******/ 			id: moduleId,
-/******/ 			loaded: false
-/******/ 		};
-
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ 		// Flag the module as loaded
-/******/ 		module.loaded = true;
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ function(module, exports, __webpack_require__) {
-
-	module.exports = __webpack_require__(1);
-
-
-/***/ },
-/* 1 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	var path = __webpack_require__(2);
-	// Separate declaration and export just to add type checking on function signature
-	exports.renderToString = renderToStringImpl;
-	// This function is invoked by .NET code (via NodeServices). Its job is to hand off execution to the application's
-	// prerendering boot function. It can operate in two modes:
-	// [1] Legacy mode
-	//     This is for backward compatibility with projects created with templates older than the generator version 0.6.0.
-	//     In this mode, we don't really do anything here - we just load the 'aspnet-prerendering' NPM module (which must
-	//     exist in node_modules, and must be v1.x (not v2+)), and pass through all the parameters to it. Code in
-	//     'aspnet-prerendering' v1.x will locate the boot function and invoke it.
-	//     The drawback to this mode is that, for it to work, you have to deploy node_modules to production.
-	// [2] Current mode
-	//     This is for projects created with the Yeoman generator 0.6.0+ (or projects manually updated). In this mode,
-	//     we don't invoke 'require' at runtime at all. All our dependencies are bundled into the NuGet package, so you
-	//     don't have to deploy node_modules to production.
-	// To determine whether we're in mode [1] or [2], the code locates your prerendering boot function, and checks whether
-	// a certain flag is attached to the function instance.
-	function renderToStringImpl(callback, applicationBasePath, bootModule, absoluteRequestUrl, requestPathAndQuery, customDataParameter, overrideTimeoutMilliseconds) {
-	    try {
-	        var forceLegacy = isLegacyAspNetPrerendering();
-	        var renderToStringFunc = !forceLegacy && findRenderToStringFunc(applicationBasePath, bootModule);
-	        var isNotLegacyMode = renderToStringFunc && renderToStringFunc['isServerRenderer'];
-	        if (isNotLegacyMode) {
-	            // Current (non-legacy) mode - we invoke the exported function directly (instead of going through aspnet-prerendering)
-	            // It's type-safe to just apply the incoming args to this function, because we already type-checked that it's a RenderToStringFunc,
-	            // just like renderToStringImpl itself is.
-	            renderToStringFunc.apply(null, arguments);
-	        }
-	        else {
-	            // Legacy mode - just hand off execution to 'aspnet-prerendering' v1.x, which must exist in node_modules at runtime
-	            var aspNetPrerenderingV1RenderToString = __webpack_require__(3).renderToString;
-	            if (aspNetPrerenderingV1RenderToString) {
-	                aspNetPrerenderingV1RenderToString(callback, applicationBasePath, bootModule, absoluteRequestUrl, requestPathAndQuery, customDataParameter, overrideTimeoutMilliseconds);
-	            }
-	            else {
-	                callback('If you use aspnet-prerendering >= 2.0.0, you must update your server-side boot module to call createServerRenderer. '
-	                    + 'Either update your boot module code, or revert to aspnet-prerendering version 1.x');
-	            }
-	        }
-	    }
-	    catch (ex) {
-	        // Make sure loading errors are reported back to the .NET part of the app
-	        callback('Prerendering failed because of error: '
-	            + ex.stack
-	            + '\nCurrent directory is: '
-	            + process.cwd());
-	    }
-	}
-	;
-	function findBootModule(applicationBasePath, bootModule) {
-	    var bootModuleNameFullPath = path.resolve(applicationBasePath, bootModule.moduleName);
-	    if (bootModule.webpackConfig) {
-	        // If you're using asp-prerender-webpack-config, you're definitely in legacy mode
-	        return null;
-	    }
-	    else {
-	        return require(bootModuleNameFullPath);
-	    }
-	}
-	function findRenderToStringFunc(applicationBasePath, bootModule) {
-	    // First try to load the module
-	    var foundBootModule = findBootModule(applicationBasePath, bootModule);
-	    if (foundBootModule === null) {
-	        return null; // Must be legacy mode
-	    }
-	    // Now try to pick out the function they want us to invoke
-	    var renderToStringFunc;
-	    if (bootModule.exportName) {
-	        // Explicitly-named export
-	        renderToStringFunc = foundBootModule[bootModule.exportName];
-	    }
-	    else if (typeof foundBootModule !== 'function') {
-	        // TypeScript-style default export
-	        renderToStringFunc = foundBootModule.default;
-	    }
-	    else {
-	        // Native default export
-	        renderToStringFunc = foundBootModule;
-	    }
-	    // Validate the result
-	    if (typeof renderToStringFunc !== 'function') {
-	        if (bootModule.exportName) {
-	            throw new Error("The module at " + bootModule.moduleName + " has no function export named " + bootModule.exportName + ".");
-	        }
-	        else {
-	            throw new Error("The module at " + bootModule.moduleName + " does not export a default function, and you have not specified which export to invoke.");
-	        }
-	    }
-	    return renderToStringFunc;
-	}
-	function isLegacyAspNetPrerendering() {
-	    var version = getAspNetPrerenderingPackageVersion();
-	    return version && /^1\./.test(version);
-	}
-	function getAspNetPrerenderingPackageVersion() {
-	    try {
-	        var packageEntryPoint = require.resolve('aspnet-prerendering');
-	        var packageDir = path.dirname(packageEntryPoint);
-	        var packageJsonPath = path.join(packageDir, 'package.json');
-	        var packageJson = require(packageJsonPath);
-	        return packageJson.version.toString();
-	    }
-	    catch (ex) {
-	        // Implies aspnet-prerendering isn't in node_modules at all (or node_modules itself doesn't exist,
-	        // which will be the case in production based on latest templates).
-	        return null;
-	    }
-	}
-
-
-/***/ },
-/* 2 */
-/***/ function(module, exports) {
-
-	module.exports = require("path");
-
-/***/ },
-/* 3 */
-/***/ function(module, exports) {
-
-	module.exports = require("aspnet-prerendering");
-
-/***/ }
-/******/ ])));
+    return aspNetPrerendering.renderToString.apply(this, arguments);
+};
--- a/src/Microsoft.AspNetCore.SpaServices/Content/Node/webpack-dev-middleware.js
+++ b/src/Microsoft.AspNetCore.SpaServices/Content/Node/webpack-dev-middleware.js
@@ -1,86 +1,20 @@
-(function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
+// Pass through the invocation to the 'aspnet-webpack' package, verifying that it can be loaded
+module.exports.createWebpackDevServer = function (callback) {
+    var aspNetWebpack;
+    try {
+        aspNetWebpack = require('aspnet-webpack');
+    } catch (ex) {
+        // Developers sometimes have trouble with badly-configured Node installations, where it's unable
+        // to find node_modules. Or they accidentally fail to deploy node_modules, or even to run 'npm install'.
+        // Make sure such errors are reported back to the .NET part of the app.
+        callback(
+            'Webpack dev middleware failed because of an error while loading \'aspnet-webpack\'. Error was: '
+            + ex.stack
+            + '\nCurrent directory is: '
+            + process.cwd()
+        );
+        return;
+    }

-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
-/******/ 			return installedModules[moduleId].exports;
-
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			exports: {},
-/******/ 			id: moduleId,
-/******/ 			loaded: false
-/******/ 		};
-
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ 		// Flag the module as loaded
-/******/ 		module.loaded = true;
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ function(module, exports, __webpack_require__) {
-
-	module.exports = __webpack_require__(4);
-
-
-/***/ },
-/* 1 */,
-/* 2 */,
-/* 3 */,
-/* 4 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	// Pass through the invocation to the 'aspnet-webpack' package, verifying that it can be loaded
-	function createWebpackDevServer(callback) {
-	    var aspNetWebpack;
-	    try {
-	        aspNetWebpack = __webpack_require__(5);
-	    }
-	    catch (ex) {
-	        // Developers sometimes have trouble with badly-configured Node installations, where it's unable
-	        // to find node_modules. Or they accidentally fail to deploy node_modules, or even to run 'npm install'.
-	        // Make sure such errors are reported back to the .NET part of the app.
-	        callback('Webpack dev middleware failed because of an error while loading \'aspnet-webpack\'. Error was: '
-	            + ex.stack
-	            + '\nCurrent directory is: '
-	            + process.cwd());
-	        return;
-	    }
-	    return aspNetWebpack.createWebpackDevServer.apply(this, arguments);
-	}
-	exports.createWebpackDevServer = createWebpackDevServer;
-
-
-/***/ },
-/* 5 */
-/***/ function(module, exports) {
-
-	module.exports = require("aspnet-webpack");
-
-/***/ }
-/******/ ])));
+    return aspNetWebpack.createWebpackDevServer.apply(this, arguments);
+};
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/JavaScriptModuleExport.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/JavaScriptModuleExport.cs
@@ -1,36 +1,14 @@
-using System;
-
 namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
-    /// <summary>
-    /// Describes how to find the JavaScript code that performs prerendering.
-    /// </summary>
    public class JavaScriptModuleExport
    {
-        /// <summary>
-        /// Creates a new instance of <see cref="JavaScriptModuleExport"/>.
-        /// </summary>
-        /// <param name="moduleName">The path to the JavaScript module containing prerendering code.</param>
        public JavaScriptModuleExport(string moduleName)
        {
            ModuleName = moduleName;
        }

-        /// <summary>
-        /// Specifies the path to the JavaScript module containing prerendering code.
-        /// </summary>
        public string ModuleName { get; private set; }
-
-        /// <summary>
-        /// If set, specifies the name of the CommonJS export that is the prerendering function to execute.
-        /// If not set, the JavaScript module's default CommonJS export must itself be the prerendering function.
-        /// </summary>
        public string ExportName { get; set; }
-
-        /// <summary>
-        /// Obsolete. Do not use. Instead, configure Webpack to build a Node.js-compatible bundle and reference that directly.
-        /// </summary>
-        [Obsolete("Do not use. This feature will be removed. Instead, configure Webpack to build a Node.js-compatible bundle and reference that directly.")]
        public string WebpackConfig { get; set; }
    }
 }
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
@@ -11,9 +11,6 @@ using Newtonsoft.Json;

 namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
-    /// <summary>
-    /// A tag helper for prerendering JavaScript applications on the server.
-    /// </summary>
    [HtmlTargetElement(Attributes = PrerenderModuleAttributeName)]
    public class PrerenderTagHelper : TagHelper
    {
@@ -27,10 +24,6 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
        private readonly string _applicationBasePath;
        private readonly INodeServices _nodeServices;

-        /// <summary>
-        /// Creates a new instance of <see cref="PrerenderTagHelper"/>.
-        /// </summary>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
        public PrerenderTagHelper(IServiceProvider serviceProvider)
        {
            var hostEnv = (IHostingEnvironment) serviceProvider.GetService(typeof(IHostingEnvironment));
@@ -46,51 +39,25 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
            }
        }

-        /// <summary>
-        /// Specifies the path to the JavaScript module containing prerendering code.
-        /// </summary>
        [HtmlAttributeName(PrerenderModuleAttributeName)]
        public string ModuleName { get; set; }

-        /// <summary>
-        /// If set, specifies the name of the CommonJS export that is the prerendering function to execute.
-        /// If not set, the JavaScript module's default CommonJS export must itself be the prerendering function.
-        /// </summary>
        [HtmlAttributeName(PrerenderExportAttributeName)]
        public string ExportName { get; set; }

-        /// <summary>
-        /// Obsolete. Do not use. Instead, configure Webpack to build a Node.js-compatible bundle and reference that directly.
-        /// </summary>
-        [Obsolete("Do not use. This feature will be removed. Instead, configure Webpack to build a Node.js-compatible bundle and reference that directly.")]
        [HtmlAttributeName(PrerenderWebpackConfigAttributeName)]
        public string WebpackConfigPath { get; set; }

-        /// <summary>
-        /// An optional JSON-serializable parameter to be supplied to the prerendering code.
-        /// </summary>
        [HtmlAttributeName(PrerenderDataAttributeName)]
        public object CustomDataParameter { get; set; }

-        /// <summary>
-        /// The maximum duration to wait for prerendering to complete.
-        /// </summary>
        [HtmlAttributeName(PrerenderTimeoutAttributeName)]
        public int TimeoutMillisecondsParameter { get; set; }

-        /// <summary>
-        /// The <see cref="ViewContext"/>.
-        /// </summary>
        [HtmlAttributeNotBound]
        [ViewContext]
        public ViewContext ViewContext { get; set; }

-        /// <summary>
-        /// Executes the tag helper to perform server-side prerendering.
-        /// </summary>
-        /// <param name="context">The <see cref="TagHelperContext"/>.</param>
-        /// <param name="output">The <see cref="TagHelperOutput"/>.</param>
-        /// <returns>A <see cref="Task"/> representing the operation.</returns>
        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
        {
            // We want to pass the original, unencoded incoming URL data through to Node, so that
@@ -112,15 +79,12 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
                new JavaScriptModuleExport(ModuleName)
                {
                    ExportName = ExportName,
-#pragma warning disable CS0618 // Type or member is obsolete
                    WebpackConfig = WebpackConfigPath
-#pragma warning restore CS0618 // Type or member is obsolete
                },
                unencodedAbsoluteUrl,
                unencodedPathAndQuery,
                CustomDataParameter,
-                TimeoutMillisecondsParameter,
-                request.PathBase.ToString());
+                TimeoutMillisecondsParameter);

            if (!string.IsNullOrEmpty(result.RedirectUrl))
            {
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs
@@ -4,9 +4,6 @@ using Microsoft.AspNetCore.NodeServices;

 namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
-    /// <summary>
-    /// Performs server-side prerendering by invoking code in Node.js.
-    /// </summary>
    public static class Prerenderer
    {
        private static readonly Lazy<StringAsTempFile> NodeScript;
@@ -20,18 +17,6 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
            });
        }

-        /// <summary>
-        /// Performs server-side prerendering by invoking code in Node.js.
-        /// </summary>
-        /// <param name="applicationBasePath">The root path to your application. This is used when resolving project-relative paths.</param>
-        /// <param name="nodeServices">The instance of <see cref="INodeServices"/> that will be used to invoke JavaScript code.</param>
-        /// <param name="bootModule">The path to the JavaScript file containing the prerendering logic.</param>
-        /// <param name="requestAbsoluteUrl">The URL of the currently-executing HTTP request. This is supplied to the prerendering code.</param>
-        /// <param name="requestPathAndQuery">The path and query part of the URL of the currently-executing HTTP request. This is supplied to the prerendering code.</param>
-        /// <param name="customDataParameter">An optional JSON-serializable parameter to be supplied to the prerendering code.</param>
-        /// <param name="timeoutMilliseconds">The maximum duration to wait for prerendering to complete.</param>
-        /// <param name="requestPathBase">The PathBase for the currently-executing HTTP request.</param>
-        /// <returns></returns>
        public static Task<RenderToStringResult> RenderToString(
            string applicationBasePath,
            INodeServices nodeServices,
@@ -39,8 +24,7 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
            string requestAbsoluteUrl,
            string requestPathAndQuery,
            object customDataParameter,
-            int timeoutMilliseconds,
-            string requestPathBase)
+            int timeoutMilliseconds)
        {
            return nodeServices.InvokeExportAsync<RenderToStringResult>(
                NodeScript.Value.FileName,
@@ -50,8 +34,7 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
                requestAbsoluteUrl,
                requestPathAndQuery,
                customDataParameter,
-                timeoutMilliseconds,
-                requestPathBase);
+                timeoutMilliseconds);
        }
    }
 }
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs
@@ -2,28 +2,10 @@ using Newtonsoft.Json.Linq;

 namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
-    /// <summary>
-    /// Describes the prerendering result returned by JavaScript code.
-    /// </summary>
    public class RenderToStringResult
    {
-        /// <summary>
-        /// If set, specifies JSON-serializable data that should be added as a set of global JavaScript variables in the document.
-        /// This can be used to transfer arbitrary data from server-side prerendering code to client-side code (for example, to
-        /// transfer the state of a Redux store).
-        /// </summary>
        public JObject Globals { get; set; }
-
-        /// <summary>
-        /// The HTML generated by the prerendering logic.
-        /// </summary>
        public string Html { get; set; }
-
-        /// <summary>
-        /// If set, specifies that instead of rendering HTML, the response should be an HTTP redirection to this URL.
-        /// This can be used if the prerendering code determines that the requested URL would lead to a redirection according
-        /// to the SPA's routing configuration.
-        /// </summary>
        public string RedirectUrl { get; set; }
    }
 }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1,2 @@`

				`/// <reference path="es6-shim/es6-shim.d.ts" />`