Update dependencies.props

[auto-updated: dependencies]

.vsts-pipelines/builds/ci-internal.yml

@@ -0,0 +1,13 @@
+trigger:
+- master
+- release/*
+
+resources:
+  repositories:
+  - repository: buildtools
+    type: git
+    name: aspnet-BuildTools
+    ref: refs/heads/release/2.2
+
+phases:
+- template: .vsts-pipelines/templates/project-ci.yml@buildtools

.vsts-pipelines/builds/ci-public.yml

@@ -0,0 +1,15 @@
+trigger:
+- master
+- release/*
+
+# See https://github.com/aspnet/BuildTools
+resources:
+  repositories:
+  - repository: buildtools
+    type: github
+    endpoint: DotNet-Bot GitHub Connection
+    name: aspnet/BuildTools
+    ref: refs/heads/release/2.2
+
+phases:
+- template: .vsts-pipelines/templates/project-ci.yml@buildtools

Directory.Build.props

@@ -10,7 +10,6 @@
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 </Project>

Directory.Build.targets

@@ -1,7 +1,10 @@
-<Project>
+<Project>
   <PropertyGroup>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
     <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
+    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
+    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
 </Project>

build/dependencies.props

@@ -2,35 +2,30 @@
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
-
-  <!-- These package versions may be overridden or updated by automation. -->
-  <PropertyGroup Label="Package Versions: Auto">
-    <InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15802</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
+  <PropertyGroup Label="Package Versions">
+    <InternalAspNetCoreSdkPackageVersion>2.2.0-preview2-20181004.6</InternalAspNetCoreSdkPackageVersion>
+    <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreDiagnosticsPackageVersion>
+    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreHostingPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreHostingPackageVersion>
+    <MicrosoftAspNetCoreMvcPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreMvcPackageVersion>
+    <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
+    <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
+    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
+    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreServerKestrelPackageVersion>
+    <MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreStaticFilesPackageVersion>
+    <MicrosoftAspNetCoreWebSocketsPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreWebSocketsPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
+    <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
+    <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview3-27001-02</MicrosoftNETCoreApp22PackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview3-35425</MicrosoftNETSdkRazorPackageVersion>
     <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
     <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
     <SystemThreadingTasksDataflowPackageVersion>4.9.0</SystemThreadingTasksDataflowPackageVersion>
   </PropertyGroup>
-
-  <!-- This may import a generated file which may override the variables above. -->
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-
-  <!-- These are package versions that should not be overridden or updated by automation. -->
-  <PropertyGroup Label="Package Versions: Pinned">
-    <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.1</MicrosoftAspNetCoreDiagnosticsPackageVersion>
-    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreHostingPackageVersion>2.1.1</MicrosoftAspNetCoreHostingPackageVersion>
-    <MicrosoftAspNetCoreMvcPackageVersion>2.1.1</MicrosoftAspNetCoreMvcPackageVersion>
-    <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>2.1.1</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
-    <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>2.1.1</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
-    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.1</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.2</MicrosoftAspNetCoreServerKestrelPackageVersion>
-    <MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.1</MicrosoftAspNetCoreStaticFilesPackageVersion>
-    <MicrosoftAspNetCoreWebSocketsPackageVersion>2.1.1</MicrosoftAspNetCoreWebSocketsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.1.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>2.1.1</MicrosoftExtensionsLoggingDebugPackageVersion>
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Label="Package Versions: Pinned" />
+</Project>

build/repo.props

@@ -4,12 +4,13 @@
   <PropertyGroup>
     <!-- These properties are use by the automation that updates dependencies.props -->
     <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
-    <LineupPackageVersion>2.1.0-rc1-*</LineupPackageVersion>
+    <LineupPackageVersion>2.2.0-*</LineupPackageVersion>
     <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
   </PropertyGroup>
 
   <ItemGroup>
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
   </ItemGroup>
 </Project>

korebuild-lock.txt

@@ -1,2 +1,2 @@
-version:2.1.3-rtm-15802
-commithash:a7c08b45b440a7d2058a0aa1eaa3eb6ba811976a
+version:2.2.0-preview2-20181004.6
+commithash:c04c4b2f5018632647f96210ab01876661302dac

korebuild.json

@@ -1,6 +1,6 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
-  "channel": "release/2.1",
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json",
+  "channel": "release/2.2",
   "toolsets": {
     "nodejs": {
       "required": true,

run.ps1

@@ -26,12 +26,18 @@ The base url where build tools can be downloaded. Overrides the value from the c
 .PARAMETER Update
 Updates KoreBuild to the latest version even if a lock file is present.
 
+.PARAMETER Reinstall
+Re-installs KoreBuild
+
 .PARAMETER ConfigFile
 The path to the configuration file that stores values. Defaults to korebuild.json.
 
 .PARAMETER ToolsSourceSuffix
 The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores.
 
+.PARAMETER CI
+Sets up CI specific settings and variables.
+
 .PARAMETER Arguments
 Arguments to be passed to the command
 
@@ -46,8 +52,8 @@ in the file are overridden by command line parameters.
 Example config file:
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
-  "channel": "dev",
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
+  "channel": "master",
   "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
 }
 ```
@@ -65,8 +71,10 @@ param(
     [string]$ToolsSource,
     [Alias('u')]
     [switch]$Update,
-    [string]$ConfigFile,
+    [switch]$Reinstall,
     [string]$ToolsSourceSuffix,
+    [string]$ConfigFile = $null,
+    [switch]$CI,
     [Parameter(ValueFromRemainingArguments = $true)]
     [string[]]$Arguments
 )
@@ -93,6 +101,10 @@ function Get-KoreBuild {
     $version = $version.TrimStart('version:').Trim()
     $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version)
 
+    if ($Reinstall -and (Test-Path $korebuildPath)) {
+        Remove-Item -Force -Recurse $korebuildPath
+    }
+
     if (!(Test-Path $korebuildPath)) {
         Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version"
         New-Item -ItemType Directory -Path $korebuildPath | Out-Null
@@ -101,9 +113,9 @@ function Get-KoreBuild {
         try {
             $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip"
             Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix
-            if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) {
+            if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) {
                 # Use built-in commands where possible as they are cross-plat compatible
-                Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
+                Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
             }
             else {
                 # Fallback to old approach for old installations of PowerShell
@@ -167,8 +179,9 @@ if (Test-Path $ConfigFile) {
         }
     }
     catch {
-        Write-Warning "$ConfigFile could not be read. Its settings will be ignored."
-        Write-Warning $Error[0]
+        Write-Host -ForegroundColor Red $Error[0]
+        Write-Error "$ConfigFile contains invalid JSON."
+        exit 1
     }
 }
 
@@ -179,7 +192,7 @@ if (!$DotNetHome) {
         else { Join-Path $PSScriptRoot '.dotnet'}
 }
 
-if (!$Channel) { $Channel = 'dev' }
+if (!$Channel) { $Channel = 'master' }
 if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
 
 # Execute
@@ -188,7 +201,7 @@ $korebuildPath = Get-KoreBuild
 Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')
 
 try {
-    Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile
+    Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI
     Invoke-KoreBuildCommand $Command @Arguments
 }
 finally {

run.sh

@@ -14,10 +14,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 [ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
 verbose=false
 update=false
+reinstall=false
 repo_path="$DIR"
 channel=''
 tools_source=''
 tools_source_suffix=''
+ci=false
 
 #
 # Functions
@@ -38,6 +40,8 @@ __usage() {
     echo "    -s|--tools-source|-ToolsSource <URL>                  The base url where build tools can be downloaded. Overrides the value from the config file."
     echo "    --tools-source-suffix|-ToolsSourceSuffix <SUFFIX>     The suffix to append to tools-source. Useful for query strings."
     echo "    -u|--update                                           Update to the latest KoreBuild even if the lock file is present."
+    echo "    --reinstall                                           Reinstall KoreBuild."
+    echo "    --ci                                                  Apply CI specific settings and environment variables."
     echo ""
     echo "Description:"
     echo "    This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be."
@@ -62,6 +66,10 @@ get_korebuild() {
     version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
     local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version"
 
+    if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then
+        rm -rf "$korebuild_path"
+    fi
+
     {
         if [ ! -d "$korebuild_path" ]; then
             mkdir -p "$korebuild_path"
@@ -175,6 +183,12 @@ while [[ $# -gt 0 ]]; do
         -u|--update|-Update)
             update=true
             ;;
+        --reinstall|-[Rr]einstall)
+            reinstall=true
+            ;;
+        --ci|-[Cc][Ii])
+            ci=true
+            ;;
         --verbose|-Verbose)
             verbose=true
             ;;
@@ -206,26 +220,37 @@ if [ -f "$config_file" ]; then
             config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
             config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
         else
-            __warn "$config_file is invalid JSON. Its settings will be ignored."
+            __error "$config_file contains invalid JSON."
+            exit 1
         fi
     elif __machine_has python ; then
         if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
             config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
             config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
         else
-            __warn "$config_file is invalid JSON. Its settings will be ignored."
+            __error "$config_file contains invalid JSON."
+            exit 1
+        fi
+    elif __machine_has python3 ; then
+        if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
+            config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
+            config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
+        else
+            __error "$config_file contains invalid JSON."
+            exit 1
         fi
     else
-        __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.'
+        __error 'Missing required command: jq or python. Could not parse the JSON file.'
+        exit 1
     fi
 
     [ ! -z "${config_channel:-}" ] && channel="$config_channel"
     [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
 fi
 
-[ -z "$channel" ] && channel='dev'
+[ -z "$channel" ] && channel='master'
 [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
 
 get_korebuild
-set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file"
+set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci"
 invoke_korebuild_command "$command" "$@"

samples/misc/LatencyTest/LatencyTest.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <OutputType>exe</OutputType>
   </PropertyGroup>

samples/misc/NodeServicesExamples/NodeServicesExamples.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">

samples/misc/Webpack/Webpack.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">

scripts/Regenerate-JSFiles.ps1

@@ -0,0 +1,28 @@
+[cmdletbinding(SupportsShouldProcess = $true)]
+param(
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2
+
+Push-Location "src"
+try {
+    $dirs = Get-ChildItem -Directory
+    foreach($dir in $dirs)
+    {
+        Push-Location $dir
+        try{
+            if(Test-Path -Path "package.json")
+            {
+                npm install
+                npm run build
+            }
+        }
+        finally{
+            Pop-Location
+        }
+    }
+}
+finally {
+    Pop-Location
+}

src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts

@@ -27,7 +27,7 @@ export class VirtualConnection extends Duplex {
 
     public _write(chunk: Buffer | string, encodingIfString: string, callback: EndWriteCallback) {
         if (typeof chunk === 'string') {
-            chunk = new Buffer(chunk as string, encodingIfString);
+            chunk = Buffer.from(chunk as string, encodingIfString);
         }
 
         this._beginWriteCallback(chunk as Buffer, callback);

src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts

@@ -113,7 +113,7 @@ class VirtualConnectionsCollection {
         newVirtualConnection.on('finish', () => {
             // The virtual connection was closed locally. Clean up locally, and notify the remote that we're done.
             this._onVirtualConnectionWasClosed(header.connectionIdString);
-            this._sendFrame(header.connectionIdBinary, new Buffer(0));
+            this._sendFrame(header.connectionIdBinary, Buffer.alloc(0));
         });
 
         this._virtualConnections[header.connectionIdString] = newVirtualConnection;
@@ -180,7 +180,7 @@ class VirtualConnectionsCollection {
      * Sends a number serialized in the correct format for .NET to receive as a System.Int32
      */
     private _sendInt32LE(value: number, callback?: EndWriteCallback) {
-        const buf = new Buffer(4);
+        const buf = Buffer.alloc(4);
         buf.writeInt32LE(value, 0);
         this._socket.write(buf, callback);
     }

src/Microsoft.AspNetCore.NodeServices.Sockets/package.json

@@ -5,14 +5,15 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "./node_modules/.bin/webpack"
+    "build": "webpack --mode production"
   },
   "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"
+    "@types/node": "^10.9.2",
+    "ts-loader": "^4.5.0",
+    "typescript": "^3.0.1",
+    "webpack": "^4.17.1",
+    "webpack-cli": "^3.1.0"
   }
 }

src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js

@@ -1,12 +1,13 @@
+const path = require('path');
+
 module.exports = {
     target: 'node',
-    externals: ['fs', 'net', 'events', 'readline', 'stream'],
     resolve: {
         extensions: [ '.ts' ]
     },
     module: {
-        loaders: [
-            { test: /\.ts$/, loader: 'ts-loader' },
+        rules: [
+            { test: /\.ts$/, use: 'ts-loader' },
         ]
     },
     entry: {
@@ -14,7 +15,10 @@ module.exports = {
     },
     output: {
         libraryTarget: 'commonjs',
-        path: './Content/Node',
+        path: path.join(__dirname, 'Content', 'Node'),
         filename: '[name].js'
+    },
+    optimization: {
+        minimize: false
     }
 };

src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js

@@ -1,361 +1,416 @@
 (function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
-
+/******/
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
-
+/******/
 /******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
+/******/ 		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
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
 /******/ 		};
-
+/******/
 /******/ 		// Execute the module function
 /******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
+/******/
 /******/ 		// Flag the module as loaded
-/******/ 		module.loaded = true;
-
+/******/ 		module.l = 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;
-
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "";
-
+/******/
+/******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(0);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports) {
 
-	module.exports = __webpack_require__(1);
+module.exports = require("path");
 
-
-/***/ },
+/***/ }),
 /* 1 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (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);
-	__webpack_require__(4);
-	var http = __webpack_require__(5);
-	var path = __webpack_require__(3);
-	var ArgsUtil_1 = __webpack_require__(6);
-	var ExitWhenParentExits_1 = __webpack_require__(7);
-	// 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');
-	var server = http.createServer(function (req, res) {
-	    readRequestBodyAsJson(req, function (bodyJson) {
-	        var hasSentResult = false;
-	        var callback = function (errorValue, successValue) {
-	            if (!hasSentResult) {
-	                hasSentResult = true;
-	                if (errorValue) {
-	                    respondWithError(res, errorValue);
-	                }
-	                else if (typeof successValue !== 'string') {
-	                    // Arbitrary object/number/etc - JSON-serialize it
-	                    var successValueJson = void 0;
-	                    try {
-	                        successValueJson = JSON.stringify(successValue);
-	                    }
-	                    catch (ex) {
-	                        // JSON serialization error - pass it back to .NET
-	                        respondWithError(res, ex);
-	                        return;
-	                    }
-	                    res.setHeader('Content-Type', 'application/json');
-	                    res.end(successValueJson);
-	                }
-	                else {
-	                    // String - can bypass JSON-serialization altogether
-	                    res.setHeader('Content-Type', 'text/plain');
-	                    res.end(successValue);
-	                }
-	            }
-	        };
-	        // Support streamed responses
-	        Object.defineProperty(callback, 'stream', {
-	            enumerable: true,
-	            get: function () {
-	                if (!hasSentResult) {
-	                    hasSentResult = true;
-	                    res.setHeader('Content-Type', 'application/octet-stream');
-	                }
-	                return res;
-	            }
-	        });
-	        try {
-	            var resolvedPath = path.resolve(process.cwd(), bodyJson.moduleName);
-	            var invokedModule = dynamicRequire(resolvedPath);
-	            var func = bodyJson.exportedFunctionName ? invokedModule[bodyJson.exportedFunctionName] : invokedModule;
-	            if (!func) {
-	                throw new Error('The module "' + resolvedPath + '" has no export named "' + bodyJson.exportedFunctionName + '"');
-	            }
-	            func.apply(null, [callback].concat(bodyJson.args));
-	        }
-	        catch (synchronousException) {
-	            callback(synchronousException, null);
-	        }
-	    });
-	});
-	var parsedArgs = ArgsUtil_1.parseArgs(process.argv);
-	var requestedPortOrZero = parsedArgs.port || 0; // 0 means 'let the OS decide'
-	server.listen(requestedPortOrZero, 'localhost', function () {
-	    // Signal to HttpNodeHost which loopback IP address (IPv4 or IPv6) and port it should make its HTTP connections on
-	    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on {' + server.address().address + '} port ' + server.address().port + '\]');
-	    // Signal to the NodeServices base class that we're ready to accept invocations
-	    console.log('[Microsoft.AspNetCore.NodeServices:Listening]');
-	});
-	ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid), /* ignoreSigint */ true);
-	function readRequestBodyAsJson(request, callback) {
-	    var requestBodyAsString = '';
-	    request.on('data', function (chunk) { requestBodyAsString += chunk; });
-	    request.on('end', function () { callback(JSON.parse(requestBodyAsString)); });
-	}
-	function respondWithError(res, errorValue) {
-	    res.statusCode = 500;
-	    res.end(JSON.stringify({
-	        errorMessage: errorValue.message || errorValue,
-	        errorDetails: errorValue.stack || null
-	    }));
-	}
+module.exports = __webpack_require__(2);
 
 
-/***/ },
+/***/ }),
 /* 2 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
-	"use strict";
-	var path = __webpack_require__(3);
-	var startsWith = function (str, prefix) { return str.substring(0, prefix.length) === prefix; };
-	var appRootDir = process.cwd();
-	function patchedLStat(pathToStatLong, fsReqWrap) {
-	    try {
-	        // If the lstat completes without errors, we don't modify its behavior at all
-	        return origLStat.apply(this, arguments);
-	    }
-	    catch (ex) {
-	        var shouldOverrideError = startsWith(ex.message, 'EPERM') // It's a permissions error
-	            && typeof appRootDirLong === 'string'
-	            && startsWith(appRootDirLong, pathToStatLong) // ... for an ancestor directory
-	            && ex.stack.indexOf('Object.realpathSync ') >= 0; // ... during symlink resolution
-	        if (shouldOverrideError) {
-	            // Fake the result to give the same result as an 'lstat' on the app root dir.
-	            // This stops Node failing to load modules just because it doesn't know whether
-	            // ancestor directories are symlinks or not. If there's a genuine file
-	            // permissions issue, it will still surface later when Node actually
-	            // tries to read the file.
-	            return origLStat.call(this, appRootDir, fsReqWrap);
-	        }
-	        else {
-	            // In any other case, preserve the original error
-	            throw ex;
-	        }
-	    }
-	}
-	;
-	// It's only necessary to apply this workaround on Windows
-	var appRootDirLong = null;
-	var origLStat = null;
-	if (/^win/.test(process.platform)) {
-	    try {
-	        // Get the app's root dir in Node's internal "long" format (e.g., \\?\C:\dir\subdir)
-	        appRootDirLong = path._makeLong(appRootDir);
-	        // Actually apply the patch, being as defensive as possible
-	        var bindingFs = process.binding('fs');
-	        origLStat = bindingFs.lstat;
-	        if (typeof origLStat === 'function') {
-	            bindingFs.lstat = patchedLStat;
-	        }
-	    }
-	    catch (ex) {
-	    }
-	}
+"use strict";
+
+exports.__esModule = true;
+// 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__(3);
+__webpack_require__(4);
+var http = __webpack_require__(5);
+var path = __webpack_require__(0);
+var ArgsUtil_1 = __webpack_require__(6);
+var ExitWhenParentExits_1 = __webpack_require__(7);
+// 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');
+var server = http.createServer(function (req, res) {
+    readRequestBodyAsJson(req, function (bodyJson) {
+        var hasSentResult = false;
+        var callback = function (errorValue, successValue) {
+            if (!hasSentResult) {
+                hasSentResult = true;
+                if (errorValue) {
+                    respondWithError(res, errorValue);
+                }
+                else if (typeof successValue !== 'string') {
+                    // Arbitrary object/number/etc - JSON-serialize it
+                    var successValueJson = void 0;
+                    try {
+                        successValueJson = JSON.stringify(successValue);
+                    }
+                    catch (ex) {
+                        // JSON serialization error - pass it back to .NET
+                        respondWithError(res, ex);
+                        return;
+                    }
+                    res.setHeader('Content-Type', 'application/json');
+                    res.end(successValueJson);
+                }
+                else {
+                    // String - can bypass JSON-serialization altogether
+                    res.setHeader('Content-Type', 'text/plain');
+                    res.end(successValue);
+                }
+            }
+        };
+        // Support streamed responses
+        Object.defineProperty(callback, 'stream', {
+            enumerable: true,
+            get: function () {
+                if (!hasSentResult) {
+                    hasSentResult = true;
+                    res.setHeader('Content-Type', 'application/octet-stream');
+                }
+                return res;
+            }
+        });
+        try {
+            var resolvedPath = path.resolve(process.cwd(), bodyJson.moduleName);
+            var invokedModule = dynamicRequire(resolvedPath);
+            var func = bodyJson.exportedFunctionName ? invokedModule[bodyJson.exportedFunctionName] : invokedModule;
+            if (!func) {
+                throw new Error('The module "' + resolvedPath + '" has no export named "' + bodyJson.exportedFunctionName + '"');
+            }
+            func.apply(null, [callback].concat(bodyJson.args));
+        }
+        catch (synchronousException) {
+            callback(synchronousException, null);
+        }
+    });
+});
+var parsedArgs = ArgsUtil_1.parseArgs(process.argv);
+var requestedPortOrZero = parsedArgs.port || 0; // 0 means 'let the OS decide'
+server.listen(requestedPortOrZero, 'localhost', function () {
+    var addressInfo = server.address();
+    // Signal to HttpNodeHost which loopback IP address (IPv4 or IPv6) and port it should make its HTTP connections on
+    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on {' + addressInfo.address + '} port ' + addressInfo.port + '\]');
+    // Signal to the NodeServices base class that we're ready to accept invocations
+    console.log('[Microsoft.AspNetCore.NodeServices:Listening]');
+});
+ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid), /* ignoreSigint */ true);
+function readRequestBodyAsJson(request, callback) {
+    var requestBodyAsString = '';
+    request.on('data', function (chunk) { requestBodyAsString += chunk; });
+    request.on('end', function () { callback(JSON.parse(requestBodyAsString)); });
+}
+function respondWithError(res, errorValue) {
+    res.statusCode = 500;
+    res.end(JSON.stringify({
+        errorMessage: errorValue.message || errorValue,
+        errorDetails: errorValue.stack || null
+    }));
+}
 
 
-/***/ },
+/***/ }),
 /* 3 */
-/***/ function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
-	module.exports = require("path");
+"use strict";
 
-/***/ },
+exports.__esModule = true;
+var path = __webpack_require__(0);
+var startsWith = function (str, prefix) { return str.substring(0, prefix.length) === prefix; };
+var appRootDir = process.cwd();
+function patchedLStat(pathToStatLong, fsReqWrap) {
+    try {
+        // If the lstat completes without errors, we don't modify its behavior at all
+        return origLStat.apply(this, arguments);
+    }
+    catch (ex) {
+        var shouldOverrideError = startsWith(ex.message, 'EPERM') // It's a permissions error
+            && typeof appRootDirLong === 'string'
+            && startsWith(appRootDirLong, pathToStatLong) // ... for an ancestor directory
+            && ex.stack.indexOf('Object.realpathSync ') >= 0; // ... during symlink resolution
+        if (shouldOverrideError) {
+            // Fake the result to give the same result as an 'lstat' on the app root dir.
+            // This stops Node failing to load modules just because it doesn't know whether
+            // ancestor directories are symlinks or not. If there's a genuine file
+            // permissions issue, it will still surface later when Node actually
+            // tries to read the file.
+            return origLStat.call(this, appRootDir, fsReqWrap);
+        }
+        else {
+            // In any other case, preserve the original error
+            throw ex;
+        }
+    }
+}
+;
+// It's only necessary to apply this workaround on Windows
+var appRootDirLong = null;
+var origLStat = null;
+if (/^win/.test(process.platform)) {
+    try {
+        // Get the app's root dir in Node's internal "long" format (e.g., \\?\C:\dir\subdir)
+        appRootDirLong = path._makeLong(appRootDir);
+        // Actually apply the patch, being as defensive as possible
+        var bindingFs = process.binding('fs');
+        origLStat = bindingFs.lstat;
+        if (typeof origLStat === 'function') {
+            bindingFs.lstat = patchedLStat;
+        }
+    }
+    catch (ex) {
+        // If some future version of Node throws (e.g., to prevent use of process.binding()),
+        // don't apply the patch, but still let the application run.
+    }
+}
+
+
+/***/ }),
 /* 4 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
-	// When Node writes to stdout/strerr, we capture that and convert the lines into calls on the
-	// active .NET ILogger. But by default, stdout/stderr don't have any way of distinguishing
-	// linebreaks inside log messages from the linebreaks that delimit separate log messages,
-	// so multiline strings will end up being written to the ILogger as multiple independent
-	// log messages. This makes them very hard to make sense of, especially when they represent
-	// something like stack traces.
-	//
-	// To fix this, we intercept stdout/stderr writes, and replace internal linebreaks with a
-	// marker token. When .NET receives the lines, it converts the marker tokens back to regular
-	// linebreaks within the logged messages.
-	//
-	// Note that it's better to do the interception at the stdout/stderr level, rather than at
-	// the console.log/console.error (etc.) level, because this takes place after any native
-	// message formatting has taken place (e.g., inserting values for % placeholders).
-	var findInternalNewlinesRegex = /\n(?!$)/g;
-	var encodedNewline = '__ns_newline__';
-	encodeNewlinesWrittenToStream(process.stdout);
-	encodeNewlinesWrittenToStream(process.stderr);
-	function encodeNewlinesWrittenToStream(outputStream) {
-	    var origWriteFunction = outputStream.write;
-	    outputStream.write = function (value) {
-	        // Only interfere with the write if it's definitely a string
-	        if (typeof value === 'string') {
-	            var argsClone = Array.prototype.slice.call(arguments, 0);
-	            argsClone[0] = encodeNewlinesInString(value);
-	            origWriteFunction.apply(this, argsClone);
-	        }
-	        else {
-	            origWriteFunction.apply(this, arguments);
-	        }
-	    };
-	}
-	function encodeNewlinesInString(str) {
-	    return str.replace(findInternalNewlinesRegex, encodedNewline);
-	}
+// When Node writes to stdout/strerr, we capture that and convert the lines into calls on the
+// active .NET ILogger. But by default, stdout/stderr don't have any way of distinguishing
+// linebreaks inside log messages from the linebreaks that delimit separate log messages,
+// so multiline strings will end up being written to the ILogger as multiple independent
+// log messages. This makes them very hard to make sense of, especially when they represent
+// something like stack traces.
+//
+// To fix this, we intercept stdout/stderr writes, and replace internal linebreaks with a
+// marker token. When .NET receives the lines, it converts the marker tokens back to regular
+// linebreaks within the logged messages.
+//
+// Note that it's better to do the interception at the stdout/stderr level, rather than at
+// the console.log/console.error (etc.) level, because this takes place after any native
+// message formatting has taken place (e.g., inserting values for % placeholders).
+var findInternalNewlinesRegex = /\n(?!$)/g;
+var encodedNewline = '__ns_newline__';
+encodeNewlinesWrittenToStream(process.stdout);
+encodeNewlinesWrittenToStream(process.stderr);
+function encodeNewlinesWrittenToStream(outputStream) {
+    var origWriteFunction = outputStream.write;
+    outputStream.write = function (value) {
+        // Only interfere with the write if it's definitely a string
+        if (typeof value === 'string') {
+            var argsClone = Array.prototype.slice.call(arguments, 0);
+            argsClone[0] = encodeNewlinesInString(value);
+            origWriteFunction.apply(this, argsClone);
+        }
+        else {
+            origWriteFunction.apply(this, arguments);
+        }
+    };
+}
+function encodeNewlinesInString(str) {
+    return str.replace(findInternalNewlinesRegex, encodedNewline);
+}
 
 
-/***/ },
+/***/ }),
 /* 5 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
-	module.exports = require("http");
+module.exports = require("http");
 
-/***/ },
+/***/ }),
 /* 6 */
-/***/ function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
-	"use strict";
-	function parseArgs(args) {
-	    // Very simplistic parsing which is sufficient for the cases needed. We don't want to bring in any external
-	    // dependencies (such as an args-parsing library) to this file.
-	    var result = {};
-	    var currentKey = null;
-	    args.forEach(function (arg) {
-	        if (arg.indexOf('--') === 0) {
-	            var argName = arg.substring(2);
-	            result[argName] = undefined;
-	            currentKey = argName;
-	        }
-	        else if (currentKey) {
-	            result[currentKey] = arg;
-	            currentKey = null;
-	        }
-	    });
-	    return result;
-	}
-	exports.parseArgs = parseArgs;
+"use strict";
+
+exports.__esModule = true;
+function parseArgs(args) {
+    // Very simplistic parsing which is sufficient for the cases needed. We don't want to bring in any external
+    // dependencies (such as an args-parsing library) to this file.
+    var result = {};
+    var currentKey = null;
+    args.forEach(function (arg) {
+        if (arg.indexOf('--') === 0) {
+            var argName = arg.substring(2);
+            result[argName] = undefined;
+            currentKey = argName;
+        }
+        else if (currentKey) {
+            result[currentKey] = arg;
+            currentKey = null;
+        }
+    });
+    return result;
+}
+exports.parseArgs = parseArgs;
 
 
-/***/ },
+/***/ }),
 /* 7 */
-/***/ function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
-	/*
-	In general, we want the Node child processes to be terminated as soon as the parent .NET processes exit,
-	because we have no further use for them. If the .NET process shuts down gracefully, it will run its
-	finalizers, one of which (in OutOfProcessNodeInstance.cs) will kill its associated Node process immediately.
+"use strict";
 
-	But if the .NET process is terminated forcefully (e.g., on Linux/OSX with 'kill -9'), then it won't have
-	any opportunity to shut down its child processes, and by default they will keep running. In this case, it's
-	up to the child process to detect this has happened and terminate itself.
+/*
+In general, we want the Node child processes to be terminated as soon as the parent .NET processes exit,
+because we have no further use for them. If the .NET process shuts down gracefully, it will run its
+finalizers, one of which (in OutOfProcessNodeInstance.cs) will kill its associated Node process immediately.
 
-	There are many possible approaches to detecting when a parent process has exited, most of which behave
-	differently between Windows and Linux/OS X:
+But if the .NET process is terminated forcefully (e.g., on Linux/OSX with 'kill -9'), then it won't have
+any opportunity to shut down its child processes, and by default they will keep running. In this case, it's
+up to the child process to detect this has happened and terminate itself.
 
-	 - On Windows, the parent process can mark its child as being a 'job' that should auto-terminate when
-	   the parent does (http://stackoverflow.com/a/4657392). Not cross-platform.
-	 - The child Node process can get a callback when the parent disconnects (process.on('disconnect', ...)).
-	   But despite http://stackoverflow.com/a/16487966, no callback fires in any case I've tested (Windows / OS X).
-	 - The child Node process can get a callback when its stdin/stdout are disconnected, as described at
-	   http://stackoverflow.com/a/15693934. This works well on OS X, but calling stdout.resume() on Windows
-	   causes the process to terminate prematurely.
-	 - I don't know why, but on Windows, it's enough to invoke process.stdin.resume(). For some reason this causes
-	   the child Node process to exit as soon as the parent one does, but I don't see this documented anywhere.
-	 - You can poll to see if the parent process, or your stdin/stdout connection to it, is gone
-	   - You can directly pass a parent process PID to the child, and then have the child poll to see if it's
-	     still running (e.g., using process.kill(pid, 0), which doesn't kill it but just tests whether it exists,
-	     as per https://nodejs.org/api/process.html#process_process_kill_pid_signal)
-	   - Or, on each poll, you can try writing to process.stdout. If the parent has died, then this will throw.
-	     However I don't see this documented anywhere. It would be nice if you could just poll for whether or not
-	     process.stdout is still connected (without actually writing to it) but I haven't found any property whose
-	     value changes until you actually try to write to it.
+There are many possible approaches to detecting when a parent process has exited, most of which behave
+differently between Windows and Linux/OS X:
 
-	Of these, the only cross-platform approach that is actually documented as a valid strategy is simply polling
-	to check whether the parent PID is still running. So that's what we do here.
-	*/
-	"use strict";
-	var pollIntervalMs = 1000;
-	function exitWhenParentExits(parentPid, ignoreSigint) {
-	    setInterval(function () {
-	        if (!processExists(parentPid)) {
-	            // Can't log anything at this point, because out stdout was connected to the parent,
-	            // but the parent is gone.
-	            process.exit();
-	        }
-	    }, pollIntervalMs);
-	    if (ignoreSigint) {
-	        // Pressing ctrl+c in the terminal sends a SIGINT to all processes in the foreground process tree.
-	        // By default, the Node process would then exit before the .NET process, because ASP.NET implements
-	        // a delayed shutdown to allow ongoing requests to complete.
-	        //
-	        // This is problematic, because if Node exits first, the CopyToAsync code in ConditionalProxyMiddleware
-	        // will experience a read fault, and logs a huge load of errors. Fortunately, since the Node process is
-	        // already set up to shut itself down if it detects the .NET process is terminated, all we have to do is
-	        // ignore the SIGINT. The Node process will then terminate automatically after the .NET process does.
-	        //
-	        // A better solution would be to have WebpackDevMiddleware listen for SIGINT and gracefully close any
-	        // ongoing EventSource connections before letting the Node process exit, independently of the .NET
-	        // process exiting. However, doing this well in general is very nontrivial (see all the discussion at
-	        // https://github.com/nodejs/node/issues/2642).
-	        process.on('SIGINT', function () {
-	            console.log('Received SIGINT. Waiting for .NET process to exit...');
-	        });
-	    }
-	}
-	exports.exitWhenParentExits = exitWhenParentExits;
-	function processExists(pid) {
-	    try {
-	        // Sending signal 0 - on all platforms - tests whether the process exists. As long as it doesn't
-	        // throw, that means it does exist.
-	        process.kill(pid, 0);
-	        return true;
-	    }
-	    catch (ex) {
-	        // If the reason for the error is that we don't have permission to ask about this process,
-	        // report that as a separate problem.
-	        if (ex.code === 'EPERM') {
-	            throw new Error("Attempted to check whether process " + pid + " was running, but got a permissions error.");
-	        }
-	        return false;
-	    }
-	}
+ - On Windows, the parent process can mark its child as being a 'job' that should auto-terminate when
+   the parent does (http://stackoverflow.com/a/4657392). Not cross-platform.
+ - The child Node process can get a callback when the parent disconnects (process.on('disconnect', ...)).
+   But despite http://stackoverflow.com/a/16487966, no callback fires in any case I've tested (Windows / OS X).
+ - The child Node process can get a callback when its stdin/stdout are disconnected, as described at
+   http://stackoverflow.com/a/15693934. This works well on OS X, but calling stdout.resume() on Windows
+   causes the process to terminate prematurely.
+ - I don't know why, but on Windows, it's enough to invoke process.stdin.resume(). For some reason this causes
+   the child Node process to exit as soon as the parent one does, but I don't see this documented anywhere.
+ - You can poll to see if the parent process, or your stdin/stdout connection to it, is gone
+   - You can directly pass a parent process PID to the child, and then have the child poll to see if it's
+     still running (e.g., using process.kill(pid, 0), which doesn't kill it but just tests whether it exists,
+     as per https://nodejs.org/api/process.html#process_process_kill_pid_signal)
+   - Or, on each poll, you can try writing to process.stdout. If the parent has died, then this will throw.
+     However I don't see this documented anywhere. It would be nice if you could just poll for whether or not
+     process.stdout is still connected (without actually writing to it) but I haven't found any property whose
+     value changes until you actually try to write to it.
+
+Of these, the only cross-platform approach that is actually documented as a valid strategy is simply polling
+to check whether the parent PID is still running. So that's what we do here.
+*/
+exports.__esModule = true;
+var pollIntervalMs = 1000;
+function exitWhenParentExits(parentPid, ignoreSigint) {
+    setInterval(function () {
+        if (!processExists(parentPid)) {
+            // Can't log anything at this point, because out stdout was connected to the parent,
+            // but the parent is gone.
+            process.exit();
+        }
+    }, pollIntervalMs);
+    if (ignoreSigint) {
+        // Pressing ctrl+c in the terminal sends a SIGINT to all processes in the foreground process tree.
+        // By default, the Node process would then exit before the .NET process, because ASP.NET implements
+        // a delayed shutdown to allow ongoing requests to complete.
+        //
+        // This is problematic, because if Node exits first, the CopyToAsync code in ConditionalProxyMiddleware
+        // will experience a read fault, and logs a huge load of errors. Fortunately, since the Node process is
+        // already set up to shut itself down if it detects the .NET process is terminated, all we have to do is
+        // ignore the SIGINT. The Node process will then terminate automatically after the .NET process does.
+        //
+        // A better solution would be to have WebpackDevMiddleware listen for SIGINT and gracefully close any
+        // ongoing EventSource connections before letting the Node process exit, independently of the .NET
+        // process exiting. However, doing this well in general is very nontrivial (see all the discussion at
+        // https://github.com/nodejs/node/issues/2642).
+        process.on('SIGINT', function () {
+            console.log('Received SIGINT. Waiting for .NET process to exit...');
+        });
+    }
+}
+exports.exitWhenParentExits = exitWhenParentExits;
+function processExists(pid) {
+    try {
+        // Sending signal 0 - on all platforms - tests whether the process exists. As long as it doesn't
+        // throw, that means it does exist.
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (ex) {
+        // If the reason for the error is that we don't have permission to ask about this process,
+        // report that as a separate problem.
+        if (ex.code === 'EPERM') {
+            throw new Error("Attempted to check whether process " + pid + " was running, but got a permissions error.");
+        }
+        return false;
+    }
+}
 
 
-/***/ }
+/***/ })
 /******/ ])));

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

@@ -6,6 +6,7 @@ import * as http from 'http';
 import * as path from 'path';
 import { parseArgs } from './Util/ArgsUtil';
 import { exitWhenParentExits } from './Util/ExitWhenParentExits';
+import { AddressInfo } from 'net';
 
 // Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct
 // reference to Node's runtime 'require' function.
@@ -70,8 +71,10 @@ const server = http.createServer((req, res) => {
 const parsedArgs = parseArgs(process.argv);
 const requestedPortOrZero = parsedArgs.port || 0; // 0 means 'let the OS decide'
 server.listen(requestedPortOrZero, 'localhost', function () {
+    const addressInfo = server.address() as AddressInfo;
+
     // Signal to HttpNodeHost which loopback IP address (IPv4 or IPv6) and port it should make its HTTP connections on
-    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on {' + server.address().address + '} port ' + server.address().port + '\]');
+    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on {' + addressInfo.address + '} port ' + addressInfo.port + '\]');
 
     // Signal to the NodeServices base class that we're ready to accept invocations
     console.log('[Microsoft.AspNetCore.NodeServices:Listening]');

src/Microsoft.AspNetCore.NodeServices/package.json

@@ -5,14 +5,15 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "./node_modules/.bin/webpack"
+    "build": "webpack --mode production"
   },
   "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"
+    "@types/node": "^10.9.2",
+    "ts-loader": "^4.5.0",
+    "typescript": "^3.0.1",
+    "webpack": "^4.17.1",
+    "webpack-cli": "^3.1.0"
   }
 }

src/Microsoft.AspNetCore.NodeServices/webpack.config.js

@@ -1,12 +1,13 @@
+const path = require('path');
+
 module.exports = {
     target: 'node',
-    externals: ['fs', 'net', 'events', 'readline', 'stream'],
     resolve: {
         extensions: [ '.ts' ]
     },
     module: {
-        loaders: [
-            { test: /\.ts$/, loader: 'ts-loader' },
+        rules: [
+            { test: /\.ts$/, use: 'ts-loader' },
         ]
     },
     entry: {
@@ -14,7 +15,10 @@ module.exports = {
     },
     output: {
         libraryTarget: 'commonjs',
-        path: './Content/Node',
+        path: path.join(__dirname, 'Content', 'Node'),
         filename: '[name].js'
+    },
+    optimization: {
+        minimize: false
     }
 };

src/Microsoft.AspNetCore.SpaServices/Content/Node/prerenderer.js

@@ -1,178 +1,224 @@
 (function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
-
+/******/
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
-
+/******/
 /******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
+/******/ 		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
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
 /******/ 		};
-
+/******/
 /******/ 		// Execute the module function
 /******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
+/******/
 /******/ 		// Flag the module as loaded
-/******/ 		module.loaded = true;
-
+/******/ 		module.l = 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;
-
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "";
-
+/******/
+/******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(0);
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
-	module.exports = __webpack_require__(1);
+module.exports = __webpack_require__(1);
 
 
-/***/ },
+/***/ }),
 /* 1 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (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;
-	    }
-	}
+"use strict";
+
+exports.__esModule = true;
+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) {
+/***/ (function(module, exports) {
 
-	module.exports = require("path");
+module.exports = require("path");
 
-/***/ },
+/***/ }),
 /* 3 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
-	module.exports = require("aspnet-prerendering");
+module.exports = require("aspnet-prerendering");
 
-/***/ }
+/***/ })
 /******/ ])));

src/Microsoft.AspNetCore.SpaServices/Content/Node/webpack-dev-middleware.js

@@ -1,86 +1,133 @@
 (function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
-
+/******/
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
-
+/******/
 /******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
+/******/ 		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
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
 /******/ 		};
-
+/******/
 /******/ 		// Execute the module function
 /******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
+/******/
 /******/ 		// Flag the module as loaded
-/******/ 		module.loaded = true;
-
+/******/ 		module.l = 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;
-
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "";
-
+/******/
+/******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(0);
+/******/ 	return __webpack_require__(__webpack_require__.s = 4);
 /******/ })
 /************************************************************************/
 /******/ ([
-/* 0 */
-/***/ function(module, exports, __webpack_require__) {
-
-	module.exports = __webpack_require__(4);
-
-
-/***/ },
+/* 0 */,
 /* 1 */,
 /* 2 */,
 /* 3 */,
 /* 4 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (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;
+module.exports = __webpack_require__(5);
 
 
-/***/ },
+/***/ }),
 /* 5 */
-/***/ function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
-	module.exports = require("aspnet-webpack");
+"use strict";
 
-/***/ }
+exports.__esModule = true;
+// Pass through the invocation to the 'aspnet-webpack' package, verifying that it can be loaded
+function createWebpackDevServer(callback) {
+    var aspNetWebpack;
+    try {
+        aspNetWebpack = __webpack_require__(6);
+    }
+    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;
+
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports) {
+
+module.exports = require("aspnet-webpack");
+
+/***/ })
 /******/ ])));

src/Microsoft.AspNetCore.SpaServices/TypeScript/Prerenderer.ts

@@ -1,7 +1,5 @@
-/// <reference path="../npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts" />
-import * as url from 'url';
+import { BootModuleInfo, RenderToStringFunc, RenderToStringCallback } from '../npm/aspnet-prerendering/src/PrerenderingInterfaces';
 import * as path from 'path';
-import * as fs from 'fs';
 declare var __non_webpack_require__;
 
 // Separate declaration and export just to add type checking on function signature

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

@@ -1,6 +1,6 @@
 {
   "name": "aspnet-webpack",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
   "main": "index.js",
   "scripts": {
@@ -21,18 +21,18 @@
     "es6-promise": "^3.1.2",
     "memory-fs": "^0.3.0",
     "require-from-string": "^1.1.0",
-    "webpack-dev-middleware": "^1.8.4",
     "webpack-node-externals": "^1.4.3"
   },
   "devDependencies": {
     "@types/connect": "^3.4.30",
     "@types/node": "^6.0.42",
-    "@types/webpack": "^2.2.0",
+    "@types/webpack": "^4.1.3",
     "rimraf": "^2.5.4",
     "typescript": "^2.0.0",
-    "webpack": "^1.13.2"
+    "webpack": "^4.5.0"
   },
   "peerDependencies": {
-    "webpack": "^1.13.2 || ^2.1.0-beta || ^3.0.0"
+    "webpack": "^1.13.2 || ^2.1.0-beta || ^3.0.0 || ^4.0.0",
+    "webpack-dev-middleware": "^1.8.4 || ^3.0.0"
   }
 }

src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts

@@ -90,9 +90,12 @@ function loadViaWebpackNoCache<T>(webpackConfigPath: string, modulePath: string)
         }));
 
         // The CommonsChunkPlugin is not compatible with a CommonJS environment like Node, nor is it needed in that case
-        webpackConfig.plugins = webpackConfig.plugins.filter(plugin => {
-            return !(plugin instanceof webpack.optimize.CommonsChunkPlugin);
-        });
+        const ChunkPlugin = webpack.optimize['CommonsChunkPlugin'];
+        if (ChunkPlugin !== undefined) {
+            webpackConfig.plugins = webpackConfig.plugins.filter(plugin => {
+                return !(plugin instanceof ChunkPlugin);
+            });
+        }
 
         // The typical use case for DllReferencePlugin is for referencing vendor modules. In a Node
         // environment, it doesn't make sense to load them from a DLL bundle, nor would that even

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

@@ -121,6 +121,7 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati
     const compiler = webpack(webpackConfig);
     app.use(require('webpack-dev-middleware')(compiler, {
         noInfo: true,
+        stats: webpackConfig.stats,
         publicPath: ensureLeadingSlash(webpackConfig.output.publicPath),
         watchOptions: webpackConfig.watchOptions
     }));
@@ -133,9 +134,12 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati
     // middleware's in-memory filesystem only (and not on disk) would confuse the debugger, because the
     // file on disk wouldn't match the file served to the browser, and the source map line numbers wouldn't
     // match up. Breakpoints would either not be hit, or would hit the wrong lines.
-    (compiler as any).plugin('done', stats => {
-        copyRecursiveToRealFsSync(compiler.outputFileSystem, '/', [/\.hot-update\.(js|json|js\.map)$/]);
-    });
+    const copy = stats => copyRecursiveToRealFsSync(compiler.outputFileSystem, '/', [/\.hot-update\.(js|json|js\.map)$/]);
+    if (compiler.hooks) {
+        compiler.hooks.done.tap('aspnet-webpack', copy);
+    } else {
+        compiler.plugin('done', copy);
+    }
 
     if (enableHotModuleReplacement) {
         let webpackHotMiddlewareModule;

src/Microsoft.AspNetCore.SpaServices/package.json

@@ -5,14 +5,15 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "./node_modules/.bin/webpack"
+    "build": "webpack --mode production"
   },
   "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"
+    "@types/node": "^10.9.2",
+    "ts-loader": "^4.5.0",
+    "typescript": "^3.0.1",
+    "webpack": "^4.17.1",
+    "webpack-cli": "^3.1.0"
   }
 }

src/Microsoft.AspNetCore.SpaServices/webpack.config.js

@@ -1,3 +1,5 @@
+const path = require('path');
+
 module.exports = {
     target: 'node',
     externals: [
@@ -10,8 +12,8 @@ module.exports = {
         extensions: [ '.ts' ]
     },
     module: {
-        loaders: [
-            { test: /\.ts$/, loader: 'ts-loader' },
+        rules: [
+            { test: /\.ts$/, use: 'ts-loader' },
         ]
     },
     entry: {
@@ -20,7 +22,10 @@ module.exports = {
     },
     output: {
         libraryTarget: 'commonjs',
-        path: './Content/Node',
+        path: path.join(__dirname, 'Content', 'Node'),
         filename: '[name].js'
+    },
+    optimization: {
+        minimize: false
     }
 };

version.props

@@ -1,7 +1,7 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <VersionPrefix>2.1.1</VersionPrefix>
-    <VersionSuffix>rtm</VersionSuffix>
+    <VersionPrefix>2.2.0</VersionPrefix>
+    <VersionSuffix>preview3</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>