Compare commits

..

30 Commits

Author SHA1 Message Date
Steve Sanderson
c0c47e3def Example of using BrowserAnimationsModule 2017-08-24 15:44:56 -07:00
Steve Sanderson
e5f1299239 Use devDependencies consistently in templates (no packages required in production, as webpack publish builds are standalone). Fixes #747 2017-08-24 15:31:34 -07:00
Steve Sanderson
c922eee1d6 Fix artifacts dir for test 2017-08-23 17:15:37 -07:00
Steve Sanderson
8b243e8cc7 Simplify build script further 2017-08-23 17:12:06 -07:00
Steve Sanderson
28920c7691 Simplify .gitignore 2017-08-23 16:57:43 -07:00
Steve Sanderson
412ec1b427 Build templates nupkgs directly from source without copying to staging location 2017-08-23 16:56:07 -07:00
Steve Sanderson
c62a3b491c Fix templates directory structure to produce correct nupkg output 2017-08-23 16:38:16 -07:00
Steve Sanderson
559832bb6d Remove dynamic content replacement from nuspec files 2017-08-23 15:41:09 -07:00
Steve Sanderson
45d645931b Remove template build dynamic filename replacement. Working towards eliminating template build process completely. 2017-08-23 15:27:15 -07:00
Steve Sanderson
8d6119f31d Remove the Yeoman-specific gitignore workaround 2017-08-23 15:04:04 -07:00
Steve Sanderson
0291686b20 Reorganize templates into dir structure matching 'dotnet new' templates 2017-08-23 14:58:49 -07:00
Steve Sanderson
7c52be5e42 Stop generating .template.config files dynamically. Convert them to plain files on disk. 2017-08-22 18:06:48 -07:00
Steve Sanderson
900e9ca835 Add deprecation notice to Yeoman package 2017-08-22 17:11:02 -07:00
Steve Sanderson
ad758b1060 Update AppVeyor config to remove Yeoman artifact reference 2017-08-22 16:20:25 -07:00
Steve Sanderson
cd9ad38a99 Run tests against 'dotnet new' output instead of Yeoman output 2017-08-22 16:13:34 -07:00
Steve Sanderson
e057cb35ec Remove Yeoman from the template build process 2017-08-22 14:43:51 -07:00
Steve Sanderson
eea2066a6d Remove Yeoman generator - replace it with deprecation notice. 2017-08-22 14:33:30 -07:00
Steve Sanderson
d6ae8829b6 In HMR, don't rely on default JsonSerializer settings. Fixes #688 2017-08-21 17:11:47 -07:00
Steve Sanderson
a94ac6f37e For Redux dev tools, use newer __REDUX_DEVTOOLS_EXTENSION__ API. Fixes #1196 2017-08-21 16:48:30 -07:00
Steve Sanderson
a40adab38d In non-ASP.NET apps, default project path to current working directory. Fixes #1100. 2017-08-21 16:40:59 -07:00
Stephan Troyer
c2a284d5b8 small Knockout cleanup 2017-08-21 16:17:10 -07:00
frederikprijck
fc398d602a Allow lazy loading with AngularSpa in dev build
Previously, the AngularSpa didn't include `angular2-router-loader`.
This commit ensures it does.

Closes #1194
2017-08-21 16:06:18 -07:00
Steve Sanderson
90c59ff4e7 Merge branch 'fix-angular-material-publishing' into dev 2017-08-21 15:53:19 -07:00
Steve Lathrop
a7e715c88f Small grammatical fix to README.md 2017-08-21 15:37:58 -07:00
alejandro garcia
6dddc9d01d Removed json loader from react redux template 2017-08-21 15:37:26 -07:00
Steve Sanderson
5ed1a35ce0 Fix problems with AoT when using Angular Material. Fixes #1168 2017-08-03 18:00:46 +01:00
Steve Sanderson
680ba7497a Merge branch 'rel/2.0.0-templates' into dev 2017-08-03 10:52:54 +01:00
Steve Sanderson
287c10fd2e Bump additional SPA templates package version to 1.0.0 2017-08-03 10:52:08 +01:00
John Luo
63f7ac9330 Ensure fallback to curl after failed wget 2017-08-02 14:32:21 -07:00
John Luo
d2858beaa1 Update __get_remote_file logic 2017-08-02 12:44:45 -07:00
244 changed files with 1104 additions and 861 deletions

9
.gitignore vendored
View File

@@ -29,16 +29,7 @@ nuget.exe
npm-debug.log npm-debug.log
/.build/ /.build/
# The templates can't contain their own .gitignore files, because Yeoman has strange default handling for
# files with that name (https://github.com/npm/npm/issues/1862). So, each template instead has a template_gitignore
# file which gets renamed after the files are copied. And so any files that need to be excluded in the source
# repo have to be excluded here.
/templates/*/node_modules/
/templates/*/wwwroot/dist/
/templates/*/ClientApp/dist/
/templates/*/yarn.lock
.vscode/ .vscode/
/templates/*/Properties/launchSettings.json
global.json global.json
korebuild-lock.txt korebuild-lock.txt

View File

@@ -18,9 +18,7 @@ build_script:
- npm run build - npm run build
- ps: Pop-Location - ps: Pop-Location
artifacts: artifacts:
- path: templates\package-builder\dist\artifacts\generator-aspnetcore-spa.tar.gz - path: templates\package-builder\artifacts\*.nupkg
name: generator-aspnetcore-spa
- path: templates\package-builder\dist\artifacts\*.nupkg
name: Microsoft.AspNetCore.SpaTemplates name: Microsoft.AspNetCore.SpaTemplates
type: NuGetPackage type: NuGetPackage
# - ps: .\build.ps1 # - ps: .\build.ps1

View File

@@ -99,9 +99,11 @@ __get_remote_file() {
return 0 return 0
fi fi
failed=false local failed=false
if __machine_has wget; then if __machine_has wget; then
wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true
else
failed=true
fi fi
if [ "$failed" = true ] && __machine_has curl; then if [ "$failed" = true ] && __machine_has curl; then

View File

@@ -21,7 +21,6 @@ namespace ConsoleApplication
// Since .NET Core 1.1, the HTTP hosting model has become basically as fast as the Socket hosting model // Since .NET Core 1.1, the HTTP hosting model has become basically as fast as the Socket hosting model
//options.UseSocketHosting(); //options.UseSocketHosting();
options.ProjectPath = Directory.GetCurrentDirectory();
options.WatchFileExtensions = new string[] {}; // Don't watch anything options.WatchFileExtensions = new string[] {}; // Don't watch anything
}); });
var serviceProvider = services.BuildServiceProvider(); var serviceProvider = services.BuildServiceProvider();

View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Threading; using System.Threading;
using Microsoft.AspNetCore.NodeServices.HostingModels; using Microsoft.AspNetCore.NodeServices.HostingModels;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@@ -34,14 +35,18 @@ namespace Microsoft.AspNetCore.NodeServices
InvocationTimeoutMilliseconds = DefaultInvocationTimeoutMilliseconds; InvocationTimeoutMilliseconds = DefaultInvocationTimeoutMilliseconds;
WatchFileExtensions = (string[])DefaultWatchFileExtensions.Clone(); WatchFileExtensions = (string[])DefaultWatchFileExtensions.Clone();
// In an ASP.NET environment, we can use the IHostingEnvironment data to auto-populate a few
// things that you'd otherwise have to specify manually
var hostEnv = serviceProvider.GetService<IHostingEnvironment>(); var hostEnv = serviceProvider.GetService<IHostingEnvironment>();
if (hostEnv != null) if (hostEnv != null)
{ {
// In an ASP.NET environment, we can use the IHostingEnvironment data to auto-populate a few
// things that you'd otherwise have to specify manually
ProjectPath = hostEnv.ContentRootPath; ProjectPath = hostEnv.ContentRootPath;
EnvironmentVariables["NODE_ENV"] = hostEnv.IsDevelopment() ? "development" : "production"; // De-facto standard values for Node EnvironmentVariables["NODE_ENV"] = hostEnv.IsDevelopment() ? "development" : "production"; // De-facto standard values for Node
} }
else
{
ProjectPath = Directory.GetCurrentDirectory();
}
var applicationLifetime = serviceProvider.GetService<IApplicationLifetime>(); var applicationLifetime = serviceProvider.GetService<IApplicationLifetime>();
if (applicationLifetime != null) if (applicationLifetime != null)

View File

@@ -317,7 +317,7 @@ module.exports = {
## Hosting models ## Hosting models
NodeServices has a pluggable hosting/transport mechanism, because it is an abstraction over various possible ways to invoke Node.js from .NET. This allows more high-level facilities (e.g., for Angular prerendering) to be agnostic to the details of launching Node and communicating it - those high-level facilities can just trust that *somehow* we can invoke code in Node for them. NodeServices has a pluggable hosting/transport mechanism, because it is an abstraction over various possible ways to invoke Node.js from .NET. This allows more high-level facilities (e.g., for Angular prerendering) to be agnostic to the details of launching Node and communicating with it - those high-level facilities can just trust that *somehow* we can invoke code in Node for them.
Using this abstraction, we could run Node inside the .NET process, in a separate process on the same machine, or even on a different machine altogether. At the time of writing, all the built-in hosting mechanisms work by launching Node as a separate process on the same machine as your .NET code. Using this abstraction, we could run Node inside the .NET process, in a separate process on the same machine, or even on a different machine altogether. At the time of writing, all the built-in hosting mechanisms work by launching Node as a separate process on the same machine as your .NET code.

View File

@@ -15,6 +15,12 @@ namespace Microsoft.AspNetCore.Builder
{ {
private const string DefaultConfigFile = "webpack.config.js"; private const string DefaultConfigFile = "webpack.config.js";
private static readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings
{
ContractResolver = new CamelCasePropertyNamesContractResolver(),
TypeNameHandling = TypeNameHandling.None
};
/// <summary> /// <summary>
/// Enables Webpack dev middleware support. This hosts an instance of the Webpack compiler in memory /// Enables Webpack dev middleware support. This hosts an instance of the Webpack compiler in memory
/// in your application so that you can always serve up-to-date Webpack-built resources without having /// in your application so that you can always serve up-to-date Webpack-built resources without having
@@ -88,7 +94,7 @@ namespace Microsoft.AspNetCore.Builder
}; };
var devServerInfo = var devServerInfo =
nodeServices.InvokeExportAsync<WebpackDevServerInfo>(nodeScript.FileName, "createWebpackDevServer", nodeServices.InvokeExportAsync<WebpackDevServerInfo>(nodeScript.FileName, "createWebpackDevServer",
JsonConvert.SerializeObject(devServerOptions, new JsonSerializerSettings() { ContractResolver = new DefaultContractResolver() })).Result; JsonConvert.SerializeObject(devServerOptions, jsonSerializerSettings)).Result;
// If we're talking to an older version of aspnet-webpack, it will return only a single PublicPath, // If we're talking to an older version of aspnet-webpack, it will return only a single PublicPath,
// not an array of PublicPaths. Handle that scenario. // not an array of PublicPaths. Handle that scenario.

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>Microsoft.AspNetCore.SpaTemplates</id> <id>Microsoft.AspNetCore.SpaTemplates</id>
<version>{yeomanversion}</version> <version>0.0.0</version>
<description>Single Page Application templates for ASP.NET Core</description> <description>Single Page Application templates for ASP.NET Core</description>
<authors>Microsoft</authors> <authors>Microsoft</authors>
<language>en-US</language> <language>en-US</language>
@@ -14,4 +14,10 @@
<packageType name="Template" /> <packageType name="Template" />
</packageTypes> </packageTypes>
</metadata> </metadata>
<files>
<file
src="**/*"
exclude="*/node_modules/**;*/bin/**;*/obj/**;*/ClientApp/dist/**;*/wwwroot/dist/**"
target="Content" />
</files>
</package> </package>

View File

@@ -0,0 +1,17 @@
{
"$schema": "http://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"TargetFrameworkOverride": {
"isHidden": "true",
"longName": "target-framework-override",
"shortName": ""
},
"Framework": {
"longName": "framework"
},
"skipRestore": {
"longName": "no-restore",
"shortName": ""
}
}
}

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -0,0 +1,87 @@
{
"author": "Microsoft",
"classifications": [
"Web",
"MVC",
"SPA"
],
"groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Aurelia",
"identity": "Microsoft.AspNetCore.SpaTemplates.Aurelia.CSharp",
"name": "ASP.NET Core with Aurelia",
"preferNameDirectory": true,
"primaryOutputs": [
{
"path": "AureliaSpa.csproj"
}
],
"shortName": "aurelia",
"sourceName": "AureliaSpa",
"sources": [
{
"source": "./",
"target": "./",
"exclude": [
".template.config/**"
]
}
],
"symbols": {
"TargetFrameworkOverride": {
"type": "parameter",
"description": "Overrides the target framework",
"replaces": "TargetFrameworkOverride",
"datatype": "string",
"defaultValue": ""
},
"Framework": {
"type": "parameter",
"description": "The target framework for the project.",
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.0",
"description": "Target netcoreapp2.0"
}
],
"replaces": "netcoreapp2.0",
"defaultValue": "netcoreapp2.0"
},
"HostIdentifier": {
"type": "bind",
"binding": "HostIdentifier"
},
"skipRestore": {
"type": "parameter",
"datatype": "bool",
"description": "If specified, skips the automatic restore of the project on create.",
"defaultValue": "false"
}
},
"tags": {
"language": "C#",
"type": "project"
},
"postActions": [
{
"condition": "(!skipRestore)",
"description": "Restore NuGet packages required by this project.",
"manualInstructions": [
{
"text": "Run 'dotnet restore'"
}
],
"actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025",
"continueOnError": true
},
{
"condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")",
"actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C",
"description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n",
"manualInstructions": [
{
"text": "Run \"npm install\""
}
]
}
]
}

View File

@@ -0,0 +1,20 @@
{
"$schema": "http://json.schemastore.org/vs-2017.3.host",
"name": {
"text": "Aurelia",
"package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}",
"id": "1200"
},
"description": {
"text": "A project template for creating an ASP.NET Core application with Aurelia",
"package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}",
"id": "1201"
},
"order": 301,
"icon": "icon.png",
"learnMoreLink": "https://github.com/aspnet/JavaScriptServices",
"uiFilters": [
"oneaspnet"
],
"minFullFrameworkVersion": "4.6.1"
}

View File

@@ -9,7 +9,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="#/home">WebApplicationBasic</a> <a class="navbar-brand" href="#/home">AureliaSpa</a>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse">

View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace WebApplicationBasic.Controllers namespace AureliaSpa.Controllers
{ {
public class HomeController : Controller public class HomeController : Controller
{ {

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace WebApplicationBasic.Controllers namespace AureliaSpa.Controllers
{ {
[Route("api/[controller]")] [Route("api/[controller]")]
public class SampleDataController : Controller public class SampleDataController : Controller

View File

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace WebApplicationBasic namespace AureliaSpa
{ {
public class Program public class Program
{ {

View File

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.SpaServices.Webpack;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace WebApplicationBasic namespace AureliaSpa
{ {
public class Startup public class Startup
{ {

View File

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - WebApplicationBasic</title> <title>@ViewData["Title"] - AureliaSpa</title>
<base href="~/" /> <base href="~/" />
<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" /> <link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />

View File

@@ -1,3 +1,3 @@
@using WebApplicationBasic @using AureliaSpa
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Microsoft.AspNetCore.SpaServices @addTagHelper *, Microsoft.AspNetCore.SpaServices

View File

@@ -1,5 +1,5 @@
{ {
"name": "WebApplicationBasic", "name": "AureliaSpa",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"@types/webpack-env": { "@types/webpack-env": {

View File

@@ -1,26 +1,24 @@
{ {
"name": "WebApplicationBasic", "name": "AureliaSpa",
"private": true, "private": true,
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "devDependencies": {
"@types/webpack-env": "^1.13.0",
"aspnet-webpack": "^2.0.1",
"aurelia-bootstrapper": "^2.0.1", "aurelia-bootstrapper": "^2.0.1",
"aurelia-fetch-client": "^1.0.1", "aurelia-fetch-client": "^1.0.1",
"aurelia-framework": "^1.1.0", "aurelia-framework": "^1.1.0",
"aurelia-loader-webpack": "^2.0.0", "aurelia-loader-webpack": "^2.0.0",
"aurelia-pal": "^1.3.0", "aurelia-pal": "^1.3.0",
"aurelia-router": "^1.2.1", "aurelia-router": "^1.2.1",
"bootstrap": "^3.3.7",
"isomorphic-fetch": "^2.2.1",
"jquery": "^3.2.1"
},
"devDependencies": {
"@types/webpack-env": "^1.13.0",
"aspnet-webpack": "^2.0.1",
"aurelia-webpack-plugin": "^2.0.0-rc.2", "aurelia-webpack-plugin": "^2.0.0-rc.2",
"bootstrap": "^3.3.7",
"css-loader": "^0.28.0", "css-loader": "^0.28.0",
"extract-text-webpack-plugin": "^2.1.0", "extract-text-webpack-plugin": "^2.1.0",
"file-loader": "^0.11.1", "file-loader": "^0.11.1",
"html-loader": "^0.4.5", "html-loader": "^0.4.5",
"isomorphic-fetch": "^2.2.1",
"jquery": "^3.2.1",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"style-loader": "^0.16.1", "style-loader": "^0.16.1",
"ts-loader": "^2.0.3", "ts-loader": "^2.0.3",

View File

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 83 KiB

View File

@@ -0,0 +1,17 @@
{
"$schema": "http://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"TargetFrameworkOverride": {
"isHidden": "true",
"longName": "target-framework-override",
"shortName": ""
},
"Framework": {
"longName": "framework"
},
"skipRestore": {
"longName": "no-restore",
"shortName": ""
}
}
}

View File

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

@@ -0,0 +1,87 @@
{
"author": "Microsoft",
"classifications": [
"Web",
"MVC",
"SPA"
],
"groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Knockout",
"identity": "Microsoft.AspNetCore.SpaTemplates.Knockout.CSharp",
"name": "ASP.NET Core with Knockout.js",
"preferNameDirectory": true,
"primaryOutputs": [
{
"path": "KnockoutSpa.csproj"
}
],
"shortName": "knockout",
"sourceName": "KnockoutSpa",
"sources": [
{
"source": "./",
"target": "./",
"exclude": [
".template.config/**"
]
}
],
"symbols": {
"TargetFrameworkOverride": {
"type": "parameter",
"description": "Overrides the target framework",
"replaces": "TargetFrameworkOverride",
"datatype": "string",
"defaultValue": ""
},
"Framework": {
"type": "parameter",
"description": "The target framework for the project.",
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.0",
"description": "Target netcoreapp2.0"
}
],
"replaces": "netcoreapp2.0",
"defaultValue": "netcoreapp2.0"
},
"HostIdentifier": {
"type": "bind",
"binding": "HostIdentifier"
},
"skipRestore": {
"type": "parameter",
"datatype": "bool",
"description": "If specified, skips the automatic restore of the project on create.",
"defaultValue": "false"
}
},
"tags": {
"language": "C#",
"type": "project"
},
"postActions": [
{
"condition": "(!skipRestore)",
"description": "Restore NuGet packages required by this project.",
"manualInstructions": [
{
"text": "Run 'dotnet restore'"
}
],
"actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025",
"continueOnError": true
},
{
"condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")",
"actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C",
"description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n",
"manualInstructions": [
{
"text": "Run \"npm install\""
}
]
}
]
}

View File

@@ -0,0 +1,20 @@
{
"$schema": "http://json.schemastore.org/vs-2017.3.host",
"name": {
"text": "Knockout.js",
"package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}",
"id": "1300"
},
"description": {
"text": "A project template for creating an ASP.NET Core application with Knockout.js",
"package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}",
"id": "1301"
},
"order": 301,
"icon": "icon.png",
"learnMoreLink": "https://github.com/aspnet/JavaScriptServices",
"uiFilters": [
"oneaspnet"
],
"minFullFrameworkVersion": "4.6.1"
}

View File

@@ -7,7 +7,7 @@
<span class='icon-bar'></span> <span class='icon-bar'></span>
<span class='icon-bar'></span> <span class='icon-bar'></span>
</button> </button>
<a class='navbar-brand' href='/'>WebApplicationBasic</a> <a class='navbar-brand' href='/'>KnockoutSpa</a>
</div> </div>
<div class='clearfix'></div> <div class='clearfix'></div>
<div class='navbar-collapse collapse'> <div class='navbar-collapse collapse'>

View File

@@ -43,8 +43,7 @@ export class Router {
$(document).on('click', 'a', this.clickEventListener); $(document).on('click', 'a', this.clickEventListener);
// Initialize Crossroads with starting location // Initialize Crossroads with starting location
// Need to cast history to 'any' because @types/history is out-of-date crossroads.parse(history.location.pathname);
crossroads.parse((history as any).location.pathname);
} }
public link(url: string): string { public link(url: string): string {

View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace WebApplicationBasic.Controllers namespace KnockoutSpa.Controllers
{ {
public class HomeController : Controller public class HomeController : Controller
{ {

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace WebApplicationBasic.Controllers namespace KnockoutSpa.Controllers
{ {
[Route("api/[controller]")] [Route("api/[controller]")]
public class SampleDataController : Controller public class SampleDataController : Controller

View File

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace WebApplicationBasic namespace KnockoutSpa
{ {
public class Program public class Program
{ {

View File

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.SpaServices.Webpack;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace WebApplicationBasic namespace KnockoutSpa
{ {
public class Startup public class Startup
{ {

View File

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - WebApplicationBasic</title> <title>@ViewData["Title"] - KnockoutSpa</title>
<base href="~/" /> <base href="~/" />
<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" /> <link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />

View File

@@ -1,3 +1,3 @@
@using WebApplicationBasic @using KnockoutSpa
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Microsoft.AspNetCore.SpaServices @addTagHelper *, Microsoft.AspNetCore.SpaServices

View File

@@ -1,5 +1,5 @@
{ {
"name": "WebApplicationBasic", "name": "KnockoutSpa",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"@types/core-js": { "@types/core-js": {

View File

@@ -1,5 +1,5 @@
{ {
"name": "WebApplicationBasic", "name": "KnockoutSpa",
"private": true, "private": true,
"version": "0.0.0", "version": "0.0.0",
"devDependencies": { "devDependencies": {

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@@ -0,0 +1,17 @@
{
"$schema": "http://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"TargetFrameworkOverride": {
"isHidden": "true",
"longName": "target-framework-override",
"shortName": ""
},
"Framework": {
"longName": "framework"
},
"skipRestore": {
"longName": "no-restore",
"shortName": ""
}
}
}

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -0,0 +1,87 @@
{
"author": "Microsoft",
"classifications": [
"Web",
"MVC",
"SPA"
],
"groupIdentity": "Microsoft.AspNetCore.SpaTemplates.Vue",
"identity": "Microsoft.AspNetCore.SpaTemplates.Vue.CSharp",
"name": "ASP.NET Core with Vue.js",
"preferNameDirectory": true,
"primaryOutputs": [
{
"path": "VueSpa.csproj"
}
],
"shortName": "vue",
"sourceName": "VueSpa",
"sources": [
{
"source": "./",
"target": "./",
"exclude": [
".template.config/**"
]
}
],
"symbols": {
"TargetFrameworkOverride": {
"type": "parameter",
"description": "Overrides the target framework",
"replaces": "TargetFrameworkOverride",
"datatype": "string",
"defaultValue": ""
},
"Framework": {
"type": "parameter",
"description": "The target framework for the project.",
"datatype": "choice",
"choices": [
{
"choice": "netcoreapp2.0",
"description": "Target netcoreapp2.0"
}
],
"replaces": "netcoreapp2.0",
"defaultValue": "netcoreapp2.0"
},
"HostIdentifier": {
"type": "bind",
"binding": "HostIdentifier"
},
"skipRestore": {
"type": "parameter",
"datatype": "bool",
"description": "If specified, skips the automatic restore of the project on create.",
"defaultValue": "false"
}
},
"tags": {
"language": "C#",
"type": "project"
},
"postActions": [
{
"condition": "(!skipRestore)",
"description": "Restore NuGet packages required by this project.",
"manualInstructions": [
{
"text": "Run 'dotnet restore'"
}
],
"actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025",
"continueOnError": true
},
{
"condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")",
"actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C",
"description": "\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n you must restore NPM packages by running \"npm install\"\n-------------------------------------------------------------------\n",
"manualInstructions": [
{
"text": "Run \"npm install\""
}
]
}
]
}

View File

@@ -0,0 +1,20 @@
{
"$schema": "http://json.schemastore.org/vs-2017.3.host",
"name": {
"text": "Vue.js",
"package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}",
"id": "1600"
},
"description": {
"text": "A project template for creating an ASP.NET Core application with Vue.js",
"package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}",
"id": "1601"
},
"order": 301,
"icon": "icon.png",
"learnMoreLink": "https://github.com/aspnet/JavaScriptServices",
"uiFilters": [
"oneaspnet"
],
"minFullFrameworkVersion": "4.6.1"
}

View File

@@ -8,7 +8,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="/">WebApplicationBasic</a> <a class="navbar-brand" href="/">VueSpa</a>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse">

View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace WebApplicationBasic.Controllers namespace VueSpa.Controllers
{ {
public class HomeController : Controller public class HomeController : Controller
{ {

View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace WebApplicationBasic.Controllers namespace VueSpa.Controllers
{ {
[Route("api/[controller]")] [Route("api/[controller]")]
public class SampleDataController : Controller public class SampleDataController : Controller

View File

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace WebApplicationBasic namespace VueSpa
{ {
public class Program public class Program
{ {

View File

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.SpaServices.Webpack;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace WebApplicationBasic namespace VueSpa
{ {
public class Startup public class Startup
{ {

Some files were not shown because too many files have changed in this diff Show More