Merge remote-tracking branch 'refs/remotes/aspnet/dev' into dev

Author: MarkPieszak

.gitignore

@@ -36,3 +36,4 @@ npm-debug.log
 # repo have to be excluded here.
 /templates/*/node_modules/
 /templates/*/wwwroot/dist/
+.vscode/

README.md

@@ -20,7 +20,7 @@ This repo contains:
  * A Yeoman generator that creates preconfigured app starting points ([guide](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/))
  * Samples and docs
 
-Everything here is cross-platform, and works with .NET Core 1.0 RC2 or later on Windows, Linux, or OS X.
+Everything here is cross-platform, and works with .NET Core 1.0 (RTM) or later on Windows, Linux, or OS X.
 
 ## Creating new applications
 
@@ -69,8 +69,10 @@ Also in this repo, [the `samples` directory](https://github.com/aspnet/JavaScrip
 **To run the samples:**
 
  * Clone this repo
- * Change directory to the same you want to run (e.g., `cd samples/angular/MusicStore`)
- * Restore dependencies (run `dotnet restore` and `npm install`)
+ * At the repo's root directory (the one containing `src`, `samples`, etc.), run `dotnet restore`
+ * Change directory to the sample you want to run (e.g., `cd samples/angular/MusicStore`)
+ * Restore Node dependencies by running `npm install`
+   * If you're trying to run the Angular 2 "Music Store" sample, then also run `gulp` (which you need to have installed globally). None of the other samples require this.
  * Run the application (`dotnet run`)
  * Browse to [http://localhost:5000](http://localhost:5000)
 

samples/angular/MusicStore/Views/Home/Index.cshtml

@@ -4,8 +4,8 @@
 
 <cache vary-by="@Context.Request.Path">
     <app asp-prerender-module="wwwroot/ng-app/boot-server">Loading...</app>
-    @await Html.PrimeCache(Url.Action("GenreMenuList", "GenresApi"))
-    @await Html.PrimeCache(Url.Action("MostPopular", "AlbumsApi"))
+    @await Html.PrimeCacheAsync(Url.Action("GenreMenuList", "GenresApi"))
+    @await Html.PrimeCacheAsync(Url.Action("MostPopular", "AlbumsApi"))
 </cache>
 
 @section scripts {

samples/misc/LatencyTest/Program.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.NodeServices;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace ConsoleApplication
 {
@@ -12,7 +13,17 @@ namespace ConsoleApplication
     public class Program
     {
         public static void Main(string[] args) {
-            using (var nodeServices = CreateNodeServices(NodeServicesOptions.DefaultNodeHostingModel)) {
+            // Set up the DI system
+            var services = new ServiceCollection();
+            services.AddNodeServices(options => {
+                options.HostingModel = NodeServicesOptions.DefaultNodeHostingModel;
+                options.ProjectPath = Directory.GetCurrentDirectory();
+                options.WatchFileExtensions = new string[] {}; // Don't watch anything
+            });
+            var serviceProvider = services.BuildServiceProvider();
+
+            // Now instantiate an INodeServices and use it
+            using (var nodeServices = serviceProvider.GetRequiredService<INodeServices>()) {
                 MeasureLatency(nodeServices).Wait();
             }
         }
@@ -34,13 +45,5 @@ private static async Task MeasureLatency(INodeServices nodeServices) {
             Console.WriteLine("\nTotal time: {0:F2} milliseconds", 1000 * elapsedSeconds);
             Console.WriteLine("\nTime per invocation: {0:F2} milliseconds", 1000 * elapsedSeconds / requestCount);
         }
-
-        private static INodeServices CreateNodeServices(NodeHostingModel hostingModel) {
-            return Configuration.CreateNodeServices(new NodeServicesOptions {
-                HostingModel = hostingModel,
-                ProjectPath = Directory.GetCurrentDirectory(),
-                WatchFileExtensions = new string[] {} // Don't watch anything
-            });
-        }
     }
 }

samples/misc/LatencyTest/project.json

@@ -8,7 +8,8 @@
       "version": "1.0.0",
       "type": "platform"
     },
-    "Microsoft.AspNetCore.NodeServices": "1.0.0-*"
+    "Microsoft.AspNetCore.NodeServices": "1.0.0-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0"
   },
   "frameworks": {
     "netcoreapp1.0": {

samples/misc/Webpack/Webpack.xproj

@@ -10,11 +10,11 @@
     <ProjectGuid>a8905301-8492-42fd-9e83-f715a0fdc3a2</ProjectGuid>
     <RootNamespace>Webpack</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\JavaScriptServices.sln\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\JavaScriptServices.sln\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <DevelopmentServerPort>2018</DevelopmentServerPort>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

samples/misc/Webpack/webpack.config.js

@@ -10,7 +10,7 @@ module.exports = merge({
     },
     module: {
         loaders: [
-            { test: /\.ts(x?)$/, exclude: /node_modules/, loader: 'ts-loader' }
+            { test: /\.ts(x?)$/, exclude: /node_modules/, loader: 'ts-loader?silent' }
         ],
     },
     entry: {

samples/react/MusicStore/MusicStore.xproj

@@ -10,11 +10,11 @@
     <ProjectGuid>c870a92c-9e3f-4bf2-82b8-5758545a8b7c</ProjectGuid>
     <RootNamespace>MusicStore</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\JavaScriptServices.sln\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\JavaScriptServices.sln\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <DevelopmentServerPort>2018</DevelopmentServerPort>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx

@@ -5,6 +5,10 @@ import { fakeData } from '../data/fakeData.js';
 import { columnMeta } from '../data/columnMeta.jsx';
 const resultsPerPage = 10;
 
+// Griddle requires each row to have a property matching each column, even if you're not displaying
+// any data from the row in that column
+fakeData.forEach(row => { row.actions = ''; });
+
 export class PeopleGrid extends React.Component {
     render() {
         var pageIndex = this.props.params ? (this.props.params.pageIndex || 1) - 1 : 0;

samples/react/ReactGrid/package.json

@@ -2,38 +2,38 @@
   "name": "ReactExample",
   "version": "0.0.0",
   "dependencies": {
-    "babel-core": "^6.4.5",
-    "bootstrap": "^3.3.5",
-    "domain-task": "^2.0.0",
-    "formsy-react": "^0.17.0",
-    "formsy-react-components": "^0.6.3",
-    "griddle-react": "^0.3.1",
-    "history": "^1.12.6",
+    "babel-core": "^6.13.2",
+    "bootstrap": "^3.3.7",
+    "domain-task": "^2.0.1",
+    "formsy-react": "^0.18.1",
+    "formsy-react-components": "^0.8.1",
+    "griddle-react": "^0.6.1",
+    "history": "^3.0.0",
     "memory-fs": "^0.3.0",
-    "react": "^0.14.7",
-    "react-dom": "^0.14.7",
-    "react-router": "^2.0.0-rc5",
-    "require-from-string": "^1.1.0",
+    "react": "^15.3.0",
+    "react-dom": "^15.3.0",
+    "react-router": "^2.6.1",
+    "require-from-string": "^1.2.0",
     "underscore": "^1.8.3",
     "webpack-externals-plugin": "^1.0.0"
   },
   "devDependencies": {
-    "aspnet-prerendering": "^1.0.0",
-    "aspnet-webpack": "^1.0.3",
+    "aspnet-prerendering": "^1.0.4",
+    "aspnet-webpack": "^1.0.9",
     "aspnet-webpack-react": "^1.0.1",
-    "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.21.0",
-    "express": "^4.13.4",
-    "extract-text-webpack-plugin": "^0.8.2",
-    "file-loader": "^0.8.4",
-    "react-transform-hmr": "^1.0.1",
-    "style-loader": "^0.13.0",
-    "url-loader": "^0.5.6",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.5.1",
-    "webpack-hot-middleware": "^2.6.4"
+    "babel-loader": "^6.2.4",
+    "babel-plugin-react-transform": "^2.0.2",
+    "babel-preset-es2015": "^6.13.2",
+    "babel-preset-react": "^6.11.1",
+    "css-loader": "^0.23.1",
+    "express": "^4.14.0",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.9.0",
+    "react-transform-hmr": "^1.0.4",
+    "style-loader": "^0.13.1",
+    "url-loader": "^0.5.7",
+    "webpack": "^1.13.1",
+    "webpack-dev-middleware": "^1.6.1",
+    "webpack-hot-middleware": "^2.12.2"
   }
 }