From a83a6a9bef283c39845467457dd50358b007c6f8 Mon Sep 17 00:00:00 2001 From: nemad Date: Tue, 1 Aug 2017 01:13:07 +0200 Subject: [PATCH 001/103] #336 Fixed duplicate pages on hot module reload (#346) Closes #336 --- Client/main.browser.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Client/main.browser.ts b/Client/main.browser.ts index f1e76b9d..01723608 100644 --- a/Client/main.browser.ts +++ b/Client/main.browser.ts @@ -9,10 +9,6 @@ const rootElemTagName = 'app'; // Update this if you change your root component if (module['hot']) { module['hot'].accept(); module['hot'].dispose(() => { - // Before restarting the app, we create a new root element and dispose the old one - const oldRootElem = document.querySelector(rootElemTagName); - const newRootElem = document.createElement(rootElemTagName); - oldRootElem.parentNode.insertBefore(newRootElem, oldRootElem); modulePromise.then(appModule => appModule.destroy()); }); } else { From 9cfd9c5b64e4c37b3330603c75ac7afae6194e3b Mon Sep 17 00:00:00 2001 From: Isaac Levin Date: Fri, 18 Aug 2017 10:08:16 -0400 Subject: [PATCH 002/103] Port Project to .NET CORE 2.0/EFCore 2.0/.NET Standard 2.0 (#371) Also fixed issue with Lazy Module (took + out of path) Closes #369 --- Asp2017.csproj | 18 +- Client/app/app.module.ts | 4 +- .../{+lazy => lazy}/lazy.component.ts | 0 .../containers/{+lazy => lazy}/lazy.module.ts | 0 Server/Controllers/HomeController.cs | 159 +++++++++--------- Startup.cs | 48 +++--- global.json | 3 - 7 files changed, 114 insertions(+), 118 deletions(-) rename Client/app/containers/{+lazy => lazy}/lazy.component.ts (100%) rename Client/app/containers/{+lazy => lazy}/lazy.module.ts (100%) delete mode 100644 global.json diff --git a/Asp2017.csproj b/Asp2017.csproj index 0cb19457..712d1b94 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -1,18 +1,16 @@  - netcoreapp1.1 + netcoreapp2.0 true false - - - - - - - - + + + + + + @@ -45,7 +43,7 @@ - + diff --git a/Client/app/app.module.ts b/Client/app/app.module.ts index 7c92f103..753aed35 100644 --- a/Client/app/app.module.ts +++ b/Client/app/app.module.ts @@ -1,4 +1,4 @@ -import { NgModule, Inject } from '@angular/core'; +import { NgModule, Inject } from '@angular/core'; import { RouterModule } from '@angular/router'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { HttpModule, Http } from '@angular/http'; @@ -135,7 +135,7 @@ export function createTranslateLoader(http: Http, baseHref) { } }, - { path: 'lazy', loadChildren: './containers/+lazy/lazy.module#LazyModule'}, + { path: 'lazy', loadChildren: './containers/lazy/lazy.module#LazyModule'}, { path: '**', component: NotFoundComponent, diff --git a/Client/app/containers/+lazy/lazy.component.ts b/Client/app/containers/lazy/lazy.component.ts similarity index 100% rename from Client/app/containers/+lazy/lazy.component.ts rename to Client/app/containers/lazy/lazy.component.ts diff --git a/Client/app/containers/+lazy/lazy.module.ts b/Client/app/containers/lazy/lazy.module.ts similarity index 100% rename from Client/app/containers/+lazy/lazy.module.ts rename to Client/app/containers/lazy/lazy.module.ts diff --git a/Server/Controllers/HomeController.cs b/Server/Controllers/HomeController.cs index 7311cf45..3f19192d 100644 --- a/Server/Controllers/HomeController.cs +++ b/Server/Controllers/HomeController.cs @@ -12,32 +12,37 @@ namespace AspCoreServer.Controllers { - public class HomeController : Controller + public class HomeController : Controller + { + [HttpGet] + public async Task Index() { - [HttpGet] - public async Task Index() - { - var nodeServices = Request.HttpContext.RequestServices.GetRequiredService(); - var hostEnv = Request.HttpContext.RequestServices.GetRequiredService(); - - var applicationBasePath = hostEnv.ContentRootPath; - var requestFeature = Request.HttpContext.Features.Get(); - var unencodedPathAndQuery = requestFeature.RawTarget; - var unencodedAbsoluteUrl = $"{Request.Scheme}://{Request.Host}{unencodedPathAndQuery}"; - - // ** TransferData concept ** - // Here we can pass any Custom Data we want ! - - // By default we're passing down Cookies, Headers, Host from the Request object here - TransferData transferData = new TransferData(); - transferData.request = AbstractHttpContextRequestInfo(Request); - transferData.thisCameFromDotNET = "Hi Angular it's asp.net :)"; - // Add more customData here, add it to the TransferData class - - // Prerender / Serialize application (with Universal) - var prerenderResult = await Prerenderer.RenderToString( + var nodeServices = Request.HttpContext.RequestServices.GetRequiredService(); + var hostEnv = Request.HttpContext.RequestServices.GetRequiredService(); + + var applicationBasePath = hostEnv.ContentRootPath; + var requestFeature = Request.HttpContext.Features.Get(); + var unencodedPathAndQuery = requestFeature.RawTarget; + var unencodedAbsoluteUrl = $"{Request.Scheme}://{Request.Host}{unencodedPathAndQuery}"; + + // ** TransferData concept ** + // Here we can pass any Custom Data we want ! + + // By default we're passing down Cookies, Headers, Host from the Request object here + TransferData transferData = new TransferData(); + transferData.request = AbstractHttpContextRequestInfo(Request); + transferData.thisCameFromDotNET = "Hi Angular it's asp.net :)"; + // Add more customData here, add it to the TransferData class + + //Prerender now needs CancellationToken + System.Threading.CancellationTokenSource cancelSource = new System.Threading.CancellationTokenSource(); + System.Threading.CancellationToken cancelToken = cancelSource.Token; + + // Prerender / Serialize application (with Universal) + var prerenderResult = await Prerenderer.RenderToString( "/", nodeServices, + cancelToken, new JavaScriptModuleExport(applicationBasePath + "/Client/dist/main-server"), unencodedAbsoluteUrl, unencodedPathAndQuery, @@ -46,66 +51,66 @@ public async Task Index() Request.PathBase.ToString() ); - ViewData["SpaHtml"] = prerenderResult.Html; // our from Angular - ViewData["Title"] = prerenderResult.Globals["title"]; // set our from Angular - ViewData["Styles"] = prerenderResult.Globals["styles"]; // put styles in the correct place - ViewData["Meta"] = prerenderResult.Globals["meta"]; // set our <meta> SEO tags - ViewData["Links"] = prerenderResult.Globals["links"]; // set our <link rel="canonical"> etc SEO tags - ViewData["TransferData"] = prerenderResult.Globals["transferData"]; // our transfer data set to window.TRANSFER_CACHE = {}; - - return View(); - } - - [HttpGet] - [Route("sitemap.xml")] - public async Task<IActionResult> SitemapXml() - { - String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; - - xml += "<sitemapindex xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9/">"; - xml += "<sitemap>"; - xml += "<loc>http://localhost:4251/home</loc>"; - xml += "<lastmod>" + DateTime.Now.ToString("yyyy-MM-dd") + "</lastmod>"; - xml += "</sitemap>"; - xml += "<sitemap>"; - xml += "<loc>http://localhost:4251/counter</loc>"; - xml += "<lastmod>" + DateTime.Now.ToString("yyyy-MM-dd") + "</lastmod>"; - xml += "</sitemap>"; - xml += "</sitemapindex>"; - - return Content(xml, "text/xml"); - - } - - public IActionResult Error() - { - return View(); - } - - private IRequest AbstractHttpContextRequestInfo(HttpRequest request) - { - - IRequest requestSimplified = new IRequest(); - requestSimplified.cookies = request.Cookies; - requestSimplified.headers = request.Headers; - requestSimplified.host = request.Host; - - return requestSimplified; - } + ViewData["SpaHtml"] = prerenderResult.Html; // our <app> from Angular + ViewData["Title"] = prerenderResult.Globals["title"]; // set our <title> from Angular + ViewData["Styles"] = prerenderResult.Globals["styles"]; // put styles in the correct place + ViewData["Meta"] = prerenderResult.Globals["meta"]; // set our <meta> SEO tags + ViewData["Links"] = prerenderResult.Globals["links"]; // set our <link rel="canonical"> etc SEO tags + ViewData["TransferData"] = prerenderResult.Globals["transferData"]; // our transfer data set to window.TRANSFER_CACHE = {}; + + return View(); } - public class IRequest + [HttpGet] + [Route("sitemap.xml")] + public async Task<IActionResult> SitemapXml() { - public object cookies { get; set; } - public object headers { get; set; } - public object host { get; set; } + String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; + + xml += "<sitemapindex xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9/">"; + xml += "<sitemap>"; + xml += "<loc>http://localhost:4251/home</loc>"; + xml += "<lastmod>" + DateTime.Now.ToString("yyyy-MM-dd") + "</lastmod>"; + xml += "</sitemap>"; + xml += "<sitemap>"; + xml += "<loc>http://localhost:4251/counter</loc>"; + xml += "<lastmod>" + DateTime.Now.ToString("yyyy-MM-dd") + "</lastmod>"; + xml += "</sitemap>"; + xml += "</sitemapindex>"; + + return Content(xml, "text/xml"); + + } + + public IActionResult Error() + { + return View(); } - public class TransferData + private IRequest AbstractHttpContextRequestInfo(HttpRequest request) { - public dynamic request { get; set; } - // Your data here ? - public object thisCameFromDotNET { get; set; } + IRequest requestSimplified = new IRequest(); + requestSimplified.cookies = request.Cookies; + requestSimplified.headers = request.Headers; + requestSimplified.host = request.Host; + + return requestSimplified; } + } + + public class IRequest + { + public object cookies { get; set; } + public object headers { get; set; } + public object host { get; set; } + } + + public class TransferData + { + public dynamic request { get; set; } + + // Your data here ? + public object thisCameFromDotNET { get; set; } + } } diff --git a/Startup.cs b/Startup.cs index 54e456be..00fc9291 100644 --- a/Startup.cs +++ b/Startup.cs @@ -1,17 +1,12 @@ -using System; +using System; using System.IO; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Antiforgery; - using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; - -using Microsoft.AspNetCore.NodeServices; using AspCoreServer.Data; using Swashbuckle.AspNetCore.Swagger; @@ -69,26 +64,27 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF loggerFactory.AddConsole(Configuration.GetSection("Logging")); loggerFactory.AddDebug(); - app.UseStaticFiles(); + app.UseStaticFiles(); - DbInitializer.Initialize(context); + DbInitializer.Initialize(context); if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions + { HotModuleReplacement = true }); - app.UseSwagger(); - - // Enable middleware to serve swagger-ui (HTML, JS, CSS etc.), specifying the Swagger JSON endpoint. app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1"); }); - app.MapWhen(x => !x.Request.Path.Value.StartsWith("/swagger"), builder => + // Enable middleware to serve swagger-ui (HTML, JS, CSS etc.), specifying the Swagger JSON endpoint. + + + app.MapWhen(x => !x.Request.Path.Value.StartsWith("/swagger", StringComparison.OrdinalIgnoreCase), builder => { builder.UseMvc(routes => { @@ -101,19 +97,19 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF else { app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - - routes.MapRoute( - "Sitemap", - "sitemap.xml", - new { controller = "Home", action = "SitemapXml" }); - - routes.MapSpaFallbackRoute( - name: "spa-fallback", - defaults: new { controller = "Home", action = "Index" }); + { + routes.MapRoute( + name: "default", + template: "{controller=Home}/{action=Index}/{id?}"); + + routes.MapRoute( + "Sitemap", + "sitemap.xml", + new { controller = "Home", action = "SitemapXml" }); + + routes.MapSpaFallbackRoute( + name: "spa-fallback", + defaults: new { controller = "Home", action = "Index" }); }); app.UseExceptionHandler("/Home/Error"); diff --git a/global.json b/global.json deleted file mode 100644 index 5c5ead2f..00000000 --- a/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "sdk": { "version": "1.0.0" } -} From cae82e8e3065ec67d5146820a85acc273fa8034c Mon Sep 17 00:00:00 2001 From: Isaac Levin <isaac2004@users.noreply.github.com> Date: Fri, 18 Aug 2017 10:36:19 -0400 Subject: [PATCH 003/103] Update Readme file to show Core 2.0 Support (#374) * Port Project to .NET CORE 2.0/EFCore 2.0/.NET Standard 2.0 Also fixed issue with Lazy Module (took + out of path) * update readme for Core 2.0 --- README.md | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 8f2e730b..84e58f91 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# ASP.NET Core & Angular 4 (+) advanced starter - with Server-side prerendering (for Angular SEO)! +# ASP.NET Core 2.0 & Angular 4 (+) advanced starter - with Server-side prerendering (for Angular SEO)! <p align="center"> - <img src="http://github.com/docs/architecture.png" alt="ASP.NET Core Angular 2+ Starter" title="ASP.NET Core Angular 2+ Starter"> + <img src="http://github.com/docs/architecture.png" alt="ASP.NET Core 2.0 Angular 2+ Starter" title="ASP.NET Core 2.0 Angular 2+ Starter"> </p> -### Harness the power of Angular 2+, ASP.NET Core, now with SEO ! +### Harness the power of Angular 2+, ASP.NET Core 2.0, now with SEO ! Angular SEO in action: @@ -15,7 +15,7 @@ Angular SEO in action: ### What is this repo? Live Demo here: http://aspnetcore-angular2-universal.azurewebsites.net This repository is maintained by [Angular Universal](https://github.com/angular/universal) and is meant to be an advanced starter -for both ASP.NET Core using Angular 4.0+, not only for the client-side, but to be rendered on the server for instant +for both ASP.NET Core 2.0 using Angular 4.0+, not only for the client-side, but to be rendered on the server for instant application paints (Note: If you don't need Universal (SSR) [read here](#faq) on how to disable it). This is meant to be a Feature-Rich Starter application containing all of the latest technologies, best build systems available, and include many real-world examples and libraries needed in todays Single Page Applications (SPAs). @@ -40,7 +40,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual > These are just some of the features found in this starter! -- ASP.NET 1.0 - VS2017 support now! +- ASP.NET 2.0 - VS2017 15.3 support now! - Azure delpoyment straight from VS2017 - Built in docker support through VS2017 - RestAPI (WebAPI) integration @@ -68,9 +68,8 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - Typescript 2 - Codelyzer (for Real-time static code analysis) - VSCode & Atom provide real-time analysis out of the box. - - **NOTE**: Does not fully work with Visual Studio yet. (Even with VS2017 and .NET core 1.0) -- **ASP.NET Core 1.1** +- **ASP.NET Core 2.0** - Integration with NodeJS to provide pre-rendering, as well as any other Node module asset you want to use. @@ -100,7 +99,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual ### Visual Studio 2017 -Make sure you have .NET Core 1.0+ installed and/or VS2017. +Make sure you have .NET Core 2.0 installed and/or VS2017 15.3. VS2017 will automatically install all the neccessary npm & .NET dependencies when you open the project. Simply push F5 to start debugging ! @@ -134,12 +133,6 @@ export ASPNETCORE_ENVIRONMENT=Development - Update to use npm [ngAspnetCoreEngine](https://github.com/angular/universal/pull/682) (still need to tweak a few things there) - Potractor e2e testing - Add basic Redux State store (Will also hold state durijg HMR builds) -- ~~Add Azure application insights module (or at least demo how to use it)~~ -- ~~Add i18n support~~ -- ~~DONE - Fix old README to match new project~~ -- ~~Add AoT compilation~~ -- ~~Add Bootstrap with SCSS~~ -- ~~Add REST API CRUD Demo~~ ---- From 8b5d2e08e3727de4f9802bd5b91b3b37af5d5bae Mon Sep 17 00:00:00 2001 From: Bill <OceansideBill@users.noreply.github.com> Date: Fri, 18 Aug 2017 07:37:49 -0700 Subject: [PATCH 004/103] Pull Request: 1.Changes to the top level scss file to support multiple display widths. 2.Changes to the navmenu component to make the 'hamburger' menu visible on mobile displays. (#372) --- Client/app/app.component.scss | 45 ++++++++++++++-- .../components/navmenu/navmenu.component.css | 51 ++++++++++++++++++- .../components/navmenu/navmenu.component.html | 20 ++++---- .../components/navmenu/navmenu.component.ts | 12 ++++- 4 files changed, 112 insertions(+), 16 deletions(-) diff --git a/Client/app/app.component.scss b/Client/app/app.component.scss index 9ba6e4bf..481063dc 100644 --- a/Client/app/app.component.scss +++ b/Client/app/app.component.scss @@ -14,13 +14,50 @@ $icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/'; Note: This Component has ViewEncapsulation.None so the styles will bleed out */ +@media (max-width: 767px) { + body { + background: #f1f1f1; + line-height: 18px; + padding-top: 30px; + } + + h1 { + border-bottom: 3px #4189C7 solid; + font-size: 24px; + } + + h2 { + font-size: 20px; + } + + h1, h2, h3 { + padding: 3px 0; + } +} + +@media (min-width: 768px) { + body { + background: #f1f1f1; + line-height: 18px; + padding-top: 0px; + } + + h1 { + border-bottom: 5px #4189C7 solid; + font-size: 36px; + } + + h2 { + font-size: 30px; + } + + h1, h2, h3 { + padding: 10px 0; + } +} -body { background: #f1f1f1; line-height: 18px; } ul { padding: 10px 25px; } ul li { padding: 5px 0; } -h1 { border-bottom: 5px #4189C7 solid; } -h1, h2, h3 { padding: 10px 0; } - blockquote { margin: 25px 10px; padding: 10px 35px 10px 10px; border-left: 10px #158a15 solid; background: #edffed; } blockquote a, blockquote a:hover { color: #068006; } diff --git a/Client/app/components/navmenu/navmenu.component.css b/Client/app/components/navmenu/navmenu.component.css index e15c6128..8d86aa03 100644 --- a/Client/app/components/navmenu/navmenu.component.css +++ b/Client/app/components/navmenu/navmenu.component.css @@ -1,4 +1,4 @@ -li .glyphicon { +li .glyphicon { margin-right: 10px; } @@ -19,10 +19,51 @@ li.link-active a:focus { z-index: 1; } +.icon-bar { + background-color: #4189C7; +} + + +@media (max-width: 767px) { + /* Apply for small displays */ + .main-nav { + width: 100%; + } + + .navbar-brand { + font-size: 14px; + background-color: #f1f1f1; + } + .navbar-toggle { + padding: 0px 5px; + margin-top: 0px; + height: 26px; + } + + .navbar-link { + margin-top: 4px; + margin-left: 45px; + position: fixed; + } + + .navbar-collapse { + background-color: white; + } + + .navbar a { + /* If a menu item's text is too long, truncate it */ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + padding-right: 5px; + } +} + @media (min-width: 768px) { /* On small screens, convert the nav menu to a vertical sidebar */ .main-nav { height: 100%; + max-width: 330px; width: calc(25% - 20px); } .navbar { @@ -30,6 +71,13 @@ li.link-active a:focus { border-width: 0px; height: 100%; } + .navbar-brand{ + width: 100%; + } + .navbar-link { + display: block; + width: 100% + } .navbar-header { float: none; } @@ -51,7 +99,6 @@ li.link-active a:focus { } .navbar a { /* If a menu item's text is too long, truncate it */ - width: 100%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/Client/app/components/navmenu/navmenu.component.html b/Client/app/components/navmenu/navmenu.component.html index 277923a1..b92d8671 100644 --- a/Client/app/components/navmenu/navmenu.component.html +++ b/Client/app/components/navmenu/navmenu.component.html @@ -1,16 +1,18 @@ -<div class='main-nav'> +<div class='main-nav'> <div class='navbar'> <div class='navbar-header'> - <button type='button' class='navbar-toggle' data-toggle='collapse' data-target='.navbar-collapse'> - <span class='sr-only'>Toggle navigation</span> - <span class='icon-bar'></span> - <span class='icon-bar'></span> - <span class='icon-bar'></span> - </button> - <a class='navbar-brand' [routerLink]="['/home']">Angular 4 Universal & ASP.NET Core </a> + <div class='navbar-brand'> + <button type='button' class='navbar-toggle' (click)="collapseNavbar()"> + <span class='sr-only'>Toggle navigation</span> + <span class='icon-bar'></span> + <span class='icon-bar'></span> + <span class='icon-bar'></span> + </button> + <a [routerLink]="['/home']" class='navbar-link'>Angular 4 Universal & ASP.NET Core</a> + </div> </div> <div class='clearfix'></div> - <div class='navbar-collapse collapse'> + <div class='navbar-collapse {{collapse}}'> <ul class='nav navbar-nav'> <li [routerLinkActive]="['link-active']"> <a [routerLink]="['/home']"> diff --git a/Client/app/components/navmenu/navmenu.component.ts b/Client/app/components/navmenu/navmenu.component.ts index 7a1691cb..3287431d 100644 --- a/Client/app/components/navmenu/navmenu.component.ts +++ b/Client/app/components/navmenu/navmenu.component.ts @@ -1,9 +1,19 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nav-menu', templateUrl: './navmenu.component.html', styleUrls: ['./navmenu.component.css'] }) + export class NavMenuComponent { + collapse: string = "collapse"; + + collapseNavbar(): void { + if (this.collapse.length > 1) { + this.collapse = ""; + } else { + this.collapse = "collapse"; + } + } } From 309b61681e3d0d3e7388273e20ee6615a97a2a59 Mon Sep 17 00:00:00 2001 From: markoj21 <markoj21@gmail.com> Date: Fri, 18 Aug 2017 07:38:06 -0700 Subject: [PATCH 005/103] Update transfer-http.ts (#321) Fixed the missing body parameters, which caused issues with the options. --- Client/modules/transfer-http/transfer-http.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Client/modules/transfer-http/transfer-http.ts b/Client/modules/transfer-http/transfer-http.ts index e8667b58..3f9b5d84 100644 --- a/Client/modules/transfer-http/transfer-http.ts +++ b/Client/modules/transfer-http/transfer-http.ts @@ -37,7 +37,7 @@ export class TransferHttp { * Performs a request with `post` http method. */ post(url: string, body: any, options?: RequestOptionsArgs): Observable<any> { - return this.getPostData(url, body, options, (url: string, options: RequestOptionsArgs) => { + return this.getPostData(url, body, options, (url: string, body: any, options: RequestOptionsArgs) => { return this.http.post(url, body, options); }); } @@ -46,7 +46,7 @@ export class TransferHttp { */ put(url: string, body: any, options?: RequestOptionsArgs): Observable<any> { - return this.getPostData(url, body, options, (url: string, options: RequestOptionsArgs) => { + return this.getPostData(url, body, options, (url: string, body: any, options: RequestOptionsArgs) => { return this.http.put(url, body, options); }); } @@ -62,7 +62,7 @@ export class TransferHttp { * Performs a request with `patch` http method. */ patch(url: string, body: any, options?: RequestOptionsArgs): Observable<any> { - return this.getPostData(url, body, options, (url: string, options: RequestOptionsArgs) => { + return this.getPostData(url, body, options, (url: string, body: any, options: RequestOptionsArgs) => { return this.http.patch(url, body.options); }); } From fe9ab9c151c79a8ff919ff2f71253c243e2ffb97 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Fri, 18 Aug 2017 10:42:21 -0400 Subject: [PATCH 006/103] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 84e58f91..183ab0b0 100644 --- a/README.md +++ b/README.md @@ -408,6 +408,7 @@ To support IE9 through IE11 open the `polyfills.ts` file in the `polyfills` fold Many thanks go out to Steve Sanderson ([@SteveSandersonMS](https://github.com/SteveSandersonMS)) from Microsoft and his amazing work on JavaScriptServices and integrating the world of Node with ASP.NET Core. Also thank you to the many Contributors ! +- [@Isaac2004](https://github.com/Isaac2004) - [@AbrarJahin](https://github.com/AbrarJahin) - [@LiverpoolOwen](https://github.com/LiverpoolOwen) - [@hakonamatata](https://github.com/hakonamatata) From 55684364d0bfcfa9bee99a98deb6c1829bf446bd Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Thu, 24 Aug 2017 10:15:06 -0400 Subject: [PATCH 007/103] WIP - Re-sync with JavaScriptServices (#376) * WIP - Re-sync with JavaScriptServices Main goal is to re-align a bit more with JavaScriptServices to ensure people coming from there, wanting to add additional features, have an easier time syncing with this repo. Adds back vendor builds, Adds back fast HMR (but waiting for https://github.com/aspnet/JavaScriptServices/issues/1204) AoT faster Cleans up multiple tsconfigs etc etc... * fix gitignore * fix HMR, VS builds, misc updates * add package-lock to gitignore closes #307 closes #318 closes #296 closes #294 closes #271 closes #267 closes #230 closes #161 --- .gitignore | 6 +- .vscode/launch.json | 6 +- Asp2017.csproj | 67 ++++++---- Client/main.server.aot.ts | 41 ------ Client/tsconfig.browser.json | 9 -- Client/tsconfig.server.aot.json | 8 -- Client/tsconfig.server.json | 9 -- {Client => ClientApp}/app/app.component.html | 2 +- {Client => ClientApp}/app/app.component.scss | 0 {Client => ClientApp}/app/app.component.ts | 0 .../app/app.module.browser.ts | 7 +- .../app/app.module.server.ts | 6 +- {Client => ClientApp}/app/app.module.ts | 15 ++- .../components/navmenu/navmenu.component.css | 0 .../components/navmenu/navmenu.component.html | 0 .../components/navmenu/navmenu.component.ts | 0 .../user-detail/user-detail.component.html | 0 .../user-detail/user-detail.component.ts | 0 .../app/containers/chat/chat.component.html | 0 .../app/containers/chat/chat.component.scss | 0 .../app/containers/chat/chat.component.ts | 2 +- .../containers/counter/counter.component.html | 0 .../counter/counter.component.spec.ts | 0 .../containers/counter/counter.component.ts | 0 .../app/containers/home/home.component.html | 15 +-- .../app/containers/home/home.component.ts | 6 +- .../app/containers/lazy/lazy.component.ts | 0 .../app/containers/lazy/lazy.module.ts | 0 .../ngx-bootstrap.component.html | 0 .../ngx-bootstrap.component.ts | 0 .../not-found/not-found.component.html | 0 .../not-found/not-found.component.ts | 0 .../app/containers/users/users.component.css | 0 .../app/containers/users/users.component.html | 0 .../app/containers/users/users.component.ts | 0 {Client => ClientApp}/app/models/User.ts | 0 .../app/shared/constants/baseurl.constants.ts | 0 .../app/shared/constants/request.ts | 0 .../app/shared/link.service.ts | 0 .../app/shared/route.resolver.ts | 0 .../app/shared/user.service.ts | 0 .../boot.browser.ts | 4 +- .../boot.server.ts | 4 +- .../transfer-http/transfer-http.module.ts | 0 .../modules/transfer-http/transfer-http.ts | 0 .../browser-transfer-state.module.ts | 0 .../server-transfer-state.module.ts | 0 .../transfer-state/server-transfer-state.ts | 0 .../modules/transfer-state/transfer-state.ts | 0 .../polyfills/browser.polyfills.ts | 0 {Client => ClientApp}/polyfills/polyfills.ts | 0 {Client => ClientApp}/polyfills/rx-imports.ts | 0 .../polyfills/server.polyfills.ts | 0 .../polyfills/temporary-aspnetcore-engine.ts | 0 {Client => ClientApp}/test/jestGlobalMocks.ts | 0 {Client => ClientApp}/test/setupJest.ts | 0 {Client => ClientApp}/tsconfig.spec.json | 0 {Client => ClientApp}/typings.d.ts | 0 README.md | 3 +- Server/Controllers/HomeController.cs | 2 +- Startup.cs | 3 +- Views/Home/Index.cshtml | 3 +- Views/Shared/_Layout.cshtml | 43 +++--- package.json | 43 +++--- tsconfig.json | 7 +- webpack.additions.js | 18 +++ webpack.config.js | 125 ++++++++++++------ webpack.config.vendor.js | 97 ++++++++++++++ 68 files changed, 341 insertions(+), 210 deletions(-) delete mode 100644 Client/main.server.aot.ts delete mode 100644 Client/tsconfig.browser.json delete mode 100644 Client/tsconfig.server.aot.json delete mode 100644 Client/tsconfig.server.json rename {Client => ClientApp}/app/app.component.html (94%) rename {Client => ClientApp}/app/app.component.scss (100%) rename {Client => ClientApp}/app/app.component.ts (100%) rename Client/app/browser-app.module.ts => ClientApp/app/app.module.browser.ts (94%) rename Client/app/server-app.module.ts => ClientApp/app/app.module.server.ts (90%) rename {Client => ClientApp}/app/app.module.ts (96%) rename {Client => ClientApp}/app/components/navmenu/navmenu.component.css (100%) rename {Client => ClientApp}/app/components/navmenu/navmenu.component.html (100%) rename {Client => ClientApp}/app/components/navmenu/navmenu.component.ts (100%) rename {Client => ClientApp}/app/components/user-detail/user-detail.component.html (100%) rename {Client => ClientApp}/app/components/user-detail/user-detail.component.ts (100%) rename {Client => ClientApp}/app/containers/chat/chat.component.html (100%) rename Client/app/containers/chat/chat.component.css => ClientApp/app/containers/chat/chat.component.scss (100%) rename {Client => ClientApp}/app/containers/chat/chat.component.ts (97%) rename {Client => ClientApp}/app/containers/counter/counter.component.html (100%) rename {Client => ClientApp}/app/containers/counter/counter.component.spec.ts (100%) rename {Client => ClientApp}/app/containers/counter/counter.component.ts (100%) rename {Client => ClientApp}/app/containers/home/home.component.html (90%) rename {Client => ClientApp}/app/containers/home/home.component.ts (78%) rename {Client => ClientApp}/app/containers/lazy/lazy.component.ts (100%) rename {Client => ClientApp}/app/containers/lazy/lazy.module.ts (100%) rename {Client => ClientApp}/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html (100%) rename {Client => ClientApp}/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts (100%) rename {Client => ClientApp}/app/containers/not-found/not-found.component.html (100%) rename {Client => ClientApp}/app/containers/not-found/not-found.component.ts (100%) rename {Client => ClientApp}/app/containers/users/users.component.css (100%) rename {Client => ClientApp}/app/containers/users/users.component.html (100%) rename {Client => ClientApp}/app/containers/users/users.component.ts (100%) rename {Client => ClientApp}/app/models/User.ts (100%) rename {Client => ClientApp}/app/shared/constants/baseurl.constants.ts (100%) rename {Client => ClientApp}/app/shared/constants/request.ts (100%) rename {Client => ClientApp}/app/shared/link.service.ts (100%) rename {Client => ClientApp}/app/shared/route.resolver.ts (100%) rename {Client => ClientApp}/app/shared/user.service.ts (100%) rename Client/main.browser.ts => ClientApp/boot.browser.ts (77%) rename Client/main.server.ts => ClientApp/boot.server.ts (94%) rename {Client => ClientApp}/modules/transfer-http/transfer-http.module.ts (100%) rename {Client => ClientApp}/modules/transfer-http/transfer-http.ts (100%) rename {Client => ClientApp}/modules/transfer-state/browser-transfer-state.module.ts (100%) rename {Client => ClientApp}/modules/transfer-state/server-transfer-state.module.ts (100%) rename {Client => ClientApp}/modules/transfer-state/server-transfer-state.ts (100%) rename {Client => ClientApp}/modules/transfer-state/transfer-state.ts (100%) rename {Client => ClientApp}/polyfills/browser.polyfills.ts (100%) rename {Client => ClientApp}/polyfills/polyfills.ts (100%) rename {Client => ClientApp}/polyfills/rx-imports.ts (100%) rename {Client => ClientApp}/polyfills/server.polyfills.ts (100%) rename {Client => ClientApp}/polyfills/temporary-aspnetcore-engine.ts (100%) rename {Client => ClientApp}/test/jestGlobalMocks.ts (100%) rename {Client => ClientApp}/test/setupJest.ts (100%) rename {Client => ClientApp}/tsconfig.spec.json (100%) rename {Client => ClientApp}/typings.d.ts (100%) create mode 100644 webpack.additions.js create mode 100644 webpack.config.vendor.js diff --git a/.gitignore b/.gitignore index 9812c3c4..2f41fd03 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,7 @@ Obj/ .vs/ /wwwroot/dist/ -/Client/dist/ +/ClientApp/dist/ # MSTest test Results [Tt]est[Rr]esult*/ @@ -187,6 +187,7 @@ BundleArtifacts/ !*.[Cc]ache/ # Others +*.db ClientBin/ ~$* *~ @@ -259,3 +260,6 @@ _Pvt_Extensions # Jest Code Coverage report coverage/ + +.DS_Store +package-lock.json diff --git a/.vscode/launch.json b/.vscode/launch.json index c3669663..08d4edf9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -20,7 +20,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceRoot}/bin/Debug/netcoreapp1.1/Asp2017.dll", + "program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Asp2017.dll", "args": [], "cwd": "${workspaceRoot}", "stopAtEntry": false, @@ -51,7 +51,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceRoot}/bin/Debug/netcoreapp1.1/Asp2017.dll", + "program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Asp2017.dll", "args": [], "cwd": "${workspaceRoot}", "stopAtEntry": false, @@ -82,7 +82,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceRoot}/bin/Debug/netcoreapp1.1/Asp2017.dll", + "program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Asp2017.dll", "args": [], "cwd": "${workspaceRoot}", "stopAtEntry": false, diff --git a/Asp2017.csproj b/Asp2017.csproj index 712d1b94..e373e9ae 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -1,51 +1,68 @@ <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web"> + <PropertyGroup> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework> + <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> + <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <IsPackable>false</IsPackable> </PropertyGroup> - <ItemGroup> - <!-- New Meta Package has SpaServices in It --> + + <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> + <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" /> + <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" /> + <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" /> + <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" /> + </ItemGroup> + <ItemGroup> <PackageReference Include="NETStandard.Library" Version="2.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" /> </ItemGroup> - <ItemGroup> - <!-- Files not to show in IDE --> - <None Remove="yarn.lock" /> - <Content Remove="wwwroot\dist\**" /> - <None Remove="Client\dist\**" /> - <Content Remove="coverage\**" /> - <!-- Files not to publish (note that the 'dist' subfolders are re-added below) --> - <Content Remove="Client\**" /> + <ItemGroup> + <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" /> </ItemGroup> + <ItemGroup> - <Content Include="Client\tsconfig.browser.json" /> - <Content Include="Client\tsconfig.server.aot.json" /> - <Content Include="Client\tsconfig.server.json" /> + <!-- Files not to publish (note that the 'dist' subfolders are re-added below) --> + <Content Remove="ClientApp\**" /> </ItemGroup> - <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish"> + + <!--/-:cnd:noEmit --> + <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') "> + <!-- Ensure Node.js is installed --> + <Exec Command="node --version" ContinueOnError="true"> + <Output TaskParameter="ExitCode" PropertyName="ErrorCode" /> + </Exec> + <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." /> + + <!-- In development, the dist files won't exist on the first run or when cloning to + a different machine, so rebuild them if not already present. --> + <Message Importance="high" Text="Performing first-run Webpack build..." /> + <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js" /> + <Exec Command="node node_modules/webpack/bin/webpack.js" /> + </Target> + <!--/+:cnd:noEmit --> + + <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish"> <!-- As part of publishing, ensure the JS resources are freshly built in production mode --> <Exec Command="npm install" /> - <Exec Command="node node_modules/webpack/bin/webpack.js --env.aot --env.client" /> - <Exec Command="node node_modules/webpack/bin/webpack.js --env.aot --env.server" /> + <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod" /> + <Exec Command="node node_modules/webpack/bin/webpack.js --env.prod" /> + <!-- Include the newly-built files in the publish output --> <ItemGroup> - <DistFiles Include="wwwroot\dist\**; Client\dist\**" /> + <DistFiles Include="wwwroot\dist\**; ClientApp\dist\**" /> <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)"> <RelativePath>%(DistFiles.Identity)</RelativePath> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> </ResolvedFileToPublish> </ItemGroup> </Target> - <Target Name="CleanDist" AfterTargets="Clean"> - <ItemGroup> - <FilesToDelete Include="Client\dist\**; wwwroot\dist\**" /> - </ItemGroup> - <Delete Files="@(FilesToDelete)" /> - <RemoveDir Directories="Client\dist; wwwroot\dist" /> - </Target> + </Project> diff --git a/Client/main.server.aot.ts b/Client/main.server.aot.ts deleted file mode 100644 index eb4f0699..00000000 --- a/Client/main.server.aot.ts +++ /dev/null @@ -1,41 +0,0 @@ -import 'zone.js/dist/zone-node'; -import './polyfills/server.polyfills'; -import { enableProdMode } from '@angular/core'; -import { INITIAL_CONFIG } from '@angular/platform-server'; -import { APP_BASE_HREF } from '@angular/common'; -import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; - -import { ORIGIN_URL } from './app/shared/constants/baseurl.constants'; -// Grab the (Node) server-specific NgModule -import { ServerAppModuleNgFactory } from './ngfactory/app/server-app.module.ngfactory'; -// Temporary * the engine will be on npm soon (`@universal/ng-aspnetcore-engine`) -import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from './polyfills/temporary-aspnetcore-engine'; - -enableProdMode(); - -export default createServerRenderer(params => { - - // Platform-server provider configuration - const setupOptions: IEngineOptions = { - appSelector: '<app></app>', - ngModule: ServerAppModuleNgFactory, - request: params, - providers: [ - // Optional - Any other Server providers you want to pass (remember you'll have to provide them for the Browser as well) - ] - }; - - return ngAspnetCoreEngine(setupOptions).then(response => { - // Apply your transferData to response.globals - response.globals.transferData = createTransferScript({ - someData: 'Transfer this to the client on the window.TRANSFER_CACHE {} object' - }); - - return ({ - html: response.html, - globals: response.globals - }); - }); -}); - -/* -------- THIS FILE IS TEMPORARY and will be gone when @ngtools/webpack can handle dual files (w server) ---------- */ diff --git a/Client/tsconfig.browser.json b/Client/tsconfig.browser.json deleted file mode 100644 index d04b9e60..00000000 --- a/Client/tsconfig.browser.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../tsconfig.json", - "angularCompilerOptions": { - "entryModule": "./app/browser-app.module#BrowserAppModule" - }, - "exclude": [ - "./main.server.aot.ts" - ] -} diff --git a/Client/tsconfig.server.aot.json b/Client/tsconfig.server.aot.json deleted file mode 100644 index 2407460a..00000000 --- a/Client/tsconfig.server.aot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.server.json", - "angularCompilerOptions": { - "genDir": "ngfactory", - "entryModule": "./app/server-app.module#ServerAppModule" - }, - "exclude": [] -} diff --git a/Client/tsconfig.server.json b/Client/tsconfig.server.json deleted file mode 100644 index 6fecd055..00000000 --- a/Client/tsconfig.server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../tsconfig.json", - "angularCompilerOptions": { - "entryModule": "./app/server-app.module#ServerAppModule" - }, - "exclude": [ - "./main.server.aot.ts" - ] -} diff --git a/Client/app/app.component.html b/ClientApp/app/app.component.html similarity index 94% rename from Client/app/app.component.html rename to ClientApp/app/app.component.html index 12a962a5..a3e3bf9b 100644 --- a/Client/app/app.component.html +++ b/ClientApp/app/app.component.html @@ -3,4 +3,4 @@ </div> <div class="col-sm-9 body-content"> <router-outlet></router-outlet> -</div> \ No newline at end of file +</div> diff --git a/Client/app/app.component.scss b/ClientApp/app/app.component.scss similarity index 100% rename from Client/app/app.component.scss rename to ClientApp/app/app.component.scss diff --git a/Client/app/app.component.ts b/ClientApp/app/app.component.ts similarity index 100% rename from Client/app/app.component.ts rename to ClientApp/app/app.component.ts diff --git a/Client/app/browser-app.module.ts b/ClientApp/app/app.module.browser.ts similarity index 94% rename from Client/app/browser-app.module.ts rename to ClientApp/app/app.module.browser.ts index 0150d22c..0af291d4 100644 --- a/Client/app/browser-app.module.ts +++ b/ClientApp/app/app.module.browser.ts @@ -6,7 +6,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { SignalRModule, SignalRConfiguration } from 'ng2-signalr'; import { ORIGIN_URL } from './shared/constants/baseurl.constants'; -import { AppModule } from './app.module'; +import { AppModuleShared } from './app.module'; import { AppComponent } from './app.component'; import { REQUEST } from './shared/constants/request'; import { BrowserTransferStateModule } from '../modules/transfer-state/browser-transfer-state.module'; @@ -41,7 +41,7 @@ export function getRequest() { BrowserTransferStateModule, // Our Common AppModule - AppModule, + AppModuleShared, SignalRModule.forRoot(createConfig) ], @@ -58,5 +58,4 @@ export function getRequest() { } ] }) -export class BrowserAppModule { -} +export class AppModule { } diff --git a/Client/app/server-app.module.ts b/ClientApp/app/app.module.server.ts similarity index 90% rename from Client/app/server-app.module.ts rename to ClientApp/app/app.module.server.ts index ac91990a..9ccbfb52 100644 --- a/Client/app/server-app.module.ts +++ b/ClientApp/app/app.module.server.ts @@ -3,7 +3,7 @@ import { ServerModule } from '@angular/platform-server'; import { BrowserModule } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { AppModule } from './app.module'; +import { AppModuleShared } from './app.module'; import { AppComponent } from './app.component'; import { ServerTransferStateModule } from '../modules/transfer-state/server-transfer-state.module'; import { TransferState } from '../modules/transfer-state/transfer-state'; @@ -20,10 +20,10 @@ import { TransferState } from '../modules/transfer-state/transfer-state'; ServerTransferStateModule, // Our Common AppModule - AppModule + AppModuleShared ] }) -export class ServerAppModule { +export class AppModule { constructor(private transferState: TransferState) { } diff --git a/Client/app/app.module.ts b/ClientApp/app/app.module.ts similarity index 96% rename from Client/app/app.module.ts rename to ClientApp/app/app.module.ts index 753aed35..57498bb8 100644 --- a/Client/app/app.module.ts +++ b/ClientApp/app/app.module.ts @@ -1,5 +1,5 @@ import { NgModule, Inject } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import { RouterModule, PreloadAllModules } from '@angular/router'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { HttpModule, Http } from '@angular/http'; import { FormsModule } from '@angular/forms'; @@ -134,9 +134,9 @@ export function createTranslateLoader(http: Http, baseHref) { ] } }, - + { path: 'lazy', loadChildren: './containers/lazy/lazy.module#LazyModule'}, - + { path: '**', component: NotFoundComponent, data: { @@ -148,7 +148,12 @@ export function createTranslateLoader(http: Http, baseHref) { ] } } - ]) + ], { + // Router options + useHash: false, + preloadingStrategy: PreloadAllModules, + initialNavigation: 'enabled' + }) ], providers: [ LinkService, @@ -157,5 +162,5 @@ export function createTranslateLoader(http: Http, baseHref) { TranslateModule ] }) -export class AppModule { +export class AppModuleShared { } diff --git a/Client/app/components/navmenu/navmenu.component.css b/ClientApp/app/components/navmenu/navmenu.component.css similarity index 100% rename from Client/app/components/navmenu/navmenu.component.css rename to ClientApp/app/components/navmenu/navmenu.component.css diff --git a/Client/app/components/navmenu/navmenu.component.html b/ClientApp/app/components/navmenu/navmenu.component.html similarity index 100% rename from Client/app/components/navmenu/navmenu.component.html rename to ClientApp/app/components/navmenu/navmenu.component.html diff --git a/Client/app/components/navmenu/navmenu.component.ts b/ClientApp/app/components/navmenu/navmenu.component.ts similarity index 100% rename from Client/app/components/navmenu/navmenu.component.ts rename to ClientApp/app/components/navmenu/navmenu.component.ts diff --git a/Client/app/components/user-detail/user-detail.component.html b/ClientApp/app/components/user-detail/user-detail.component.html similarity index 100% rename from Client/app/components/user-detail/user-detail.component.html rename to ClientApp/app/components/user-detail/user-detail.component.html diff --git a/Client/app/components/user-detail/user-detail.component.ts b/ClientApp/app/components/user-detail/user-detail.component.ts similarity index 100% rename from Client/app/components/user-detail/user-detail.component.ts rename to ClientApp/app/components/user-detail/user-detail.component.ts diff --git a/Client/app/containers/chat/chat.component.html b/ClientApp/app/containers/chat/chat.component.html similarity index 100% rename from Client/app/containers/chat/chat.component.html rename to ClientApp/app/containers/chat/chat.component.html diff --git a/Client/app/containers/chat/chat.component.css b/ClientApp/app/containers/chat/chat.component.scss similarity index 100% rename from Client/app/containers/chat/chat.component.css rename to ClientApp/app/containers/chat/chat.component.scss diff --git a/Client/app/containers/chat/chat.component.ts b/ClientApp/app/containers/chat/chat.component.ts similarity index 97% rename from Client/app/containers/chat/chat.component.ts rename to ClientApp/app/containers/chat/chat.component.ts index ca9dc8ea..8bbd9ed9 100644 --- a/Client/app/containers/chat/chat.component.ts +++ b/ClientApp/app/containers/chat/chat.component.ts @@ -11,7 +11,7 @@ export class ChatMessage { @Component({ selector: 'chat', templateUrl: './chat.component.html', - styleUrls: ['./chat.component.css'] + styleUrls: ['./chat.component.scss'] }) export class ChatComponent implements OnInit { diff --git a/Client/app/containers/counter/counter.component.html b/ClientApp/app/containers/counter/counter.component.html similarity index 100% rename from Client/app/containers/counter/counter.component.html rename to ClientApp/app/containers/counter/counter.component.html diff --git a/Client/app/containers/counter/counter.component.spec.ts b/ClientApp/app/containers/counter/counter.component.spec.ts similarity index 100% rename from Client/app/containers/counter/counter.component.spec.ts rename to ClientApp/app/containers/counter/counter.component.spec.ts diff --git a/Client/app/containers/counter/counter.component.ts b/ClientApp/app/containers/counter/counter.component.ts similarity index 100% rename from Client/app/containers/counter/counter.component.ts rename to ClientApp/app/containers/counter/counter.component.ts diff --git a/Client/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html similarity index 90% rename from Client/app/containers/home/home.component.html rename to ClientApp/app/containers/home/home.component.html index 3f872f90..06d801e7 100644 --- a/Client/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -1,23 +1,20 @@ -<h1> - {{ title }}</h1> +<h1>{{ title }}</h1> <blockquote> <strong>Enjoy the latest features from .NET Core & Angular 4.0!</strong> <br> For more info check the repo here: <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal">AspNetCore-Angular2-Universal repo</a> - <br><br> </blockquote> - <div class="row"> <div class="col-lg-6"> <h2>{{ 'HOME_FEATURE_LIST_TITLE' | translate }} </h2> <ul> - <li>ASP.NET Core 1.1 :: ( Visual Studio 2017 )</li> + <li>ASP.NET Core 2.0 :: ( Visual Studio 2017 )</li> <li> Angular 4.* front-end UI framework <ul> - <li>Angular **platform-server** (Universal moved into Core here) - server-side rendering for SEO, deep-linking, and + <li>Angular **platform-server** (aka: Universal) - server-side rendering for SEO, deep-linking, and incredible performance.</li> <!--<li>HMR State Management - Don't lose your applications state during HMR!</li>--> <li>AoT (Ahead-of-time) production compilation for even faster Prod builds.</li> @@ -33,7 +30,7 @@ <h2>{{ 'HOME_FEATURE_LIST_TITLE' | translate }} </h2> </ul>--> </li> <li> - Webpack 2 + Webpack <ul> <!--<li>TS2 aware path support</li>--> <li>Hot Module Reloading/Replacement for an amazing development experience.</li> @@ -65,11 +62,11 @@ <h2>{{ 'HOME_ISSUES_TITLE' | translate }}</h2> <h2> {{ 'SWITCH_LANGUAGE' | translate }}</h2> <button class="btn btn-default" (click)="setLanguage('en')"> - <span class="flag-icon flag-icon-us"></span> {{ 'ENGLISH' | translate }} + <span class="flag-icon flag-icon-us"></span> {{ 'ENGLISH' | translate }} </button> <button class="btn btn-default" (click)="setLanguage('no')"> - <span class="flag-icon flag-icon-no"></span> {{ 'NORWEGIAN' | translate }} + <span class="flag-icon flag-icon-no"></span> {{ 'NORWEGIAN' | translate }} </button> </div> diff --git a/Client/app/containers/home/home.component.ts b/ClientApp/app/containers/home/home.component.ts similarity index 78% rename from Client/app/containers/home/home.component.ts rename to ClientApp/app/containers/home/home.component.ts index ed7e6f0a..3065c0b1 100644 --- a/Client/app/containers/home/home.component.ts +++ b/ClientApp/app/containers/home/home.component.ts @@ -8,10 +8,12 @@ import { TranslateService } from '@ngx-translate/core'; }) export class HomeComponent implements OnInit { - title: string = 'Angular 4.0 Universal & ASP.NET Core advanced starter-kit'; + title: string = 'Angular 4.0 Universal & ASP.NET Core 2.0 advanced starter-kit'; // Use "constructor"s only for dependency injection - constructor(public translate: TranslateService) { } + constructor( + public translate: TranslateService + ) { } // Here you want to handle anything with @Input()'s @Output()'s // Data retrieval / etc - this is when the Component is "ready" and wired up diff --git a/Client/app/containers/lazy/lazy.component.ts b/ClientApp/app/containers/lazy/lazy.component.ts similarity index 100% rename from Client/app/containers/lazy/lazy.component.ts rename to ClientApp/app/containers/lazy/lazy.component.ts diff --git a/Client/app/containers/lazy/lazy.module.ts b/ClientApp/app/containers/lazy/lazy.module.ts similarity index 100% rename from Client/app/containers/lazy/lazy.module.ts rename to ClientApp/app/containers/lazy/lazy.module.ts diff --git a/Client/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html b/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html similarity index 100% rename from Client/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html rename to ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html diff --git a/Client/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts b/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts similarity index 100% rename from Client/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts rename to ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts diff --git a/Client/app/containers/not-found/not-found.component.html b/ClientApp/app/containers/not-found/not-found.component.html similarity index 100% rename from Client/app/containers/not-found/not-found.component.html rename to ClientApp/app/containers/not-found/not-found.component.html diff --git a/Client/app/containers/not-found/not-found.component.ts b/ClientApp/app/containers/not-found/not-found.component.ts similarity index 100% rename from Client/app/containers/not-found/not-found.component.ts rename to ClientApp/app/containers/not-found/not-found.component.ts diff --git a/Client/app/containers/users/users.component.css b/ClientApp/app/containers/users/users.component.css similarity index 100% rename from Client/app/containers/users/users.component.css rename to ClientApp/app/containers/users/users.component.css diff --git a/Client/app/containers/users/users.component.html b/ClientApp/app/containers/users/users.component.html similarity index 100% rename from Client/app/containers/users/users.component.html rename to ClientApp/app/containers/users/users.component.html diff --git a/Client/app/containers/users/users.component.ts b/ClientApp/app/containers/users/users.component.ts similarity index 100% rename from Client/app/containers/users/users.component.ts rename to ClientApp/app/containers/users/users.component.ts diff --git a/Client/app/models/User.ts b/ClientApp/app/models/User.ts similarity index 100% rename from Client/app/models/User.ts rename to ClientApp/app/models/User.ts diff --git a/Client/app/shared/constants/baseurl.constants.ts b/ClientApp/app/shared/constants/baseurl.constants.ts similarity index 100% rename from Client/app/shared/constants/baseurl.constants.ts rename to ClientApp/app/shared/constants/baseurl.constants.ts diff --git a/Client/app/shared/constants/request.ts b/ClientApp/app/shared/constants/request.ts similarity index 100% rename from Client/app/shared/constants/request.ts rename to ClientApp/app/shared/constants/request.ts diff --git a/Client/app/shared/link.service.ts b/ClientApp/app/shared/link.service.ts similarity index 100% rename from Client/app/shared/link.service.ts rename to ClientApp/app/shared/link.service.ts diff --git a/Client/app/shared/route.resolver.ts b/ClientApp/app/shared/route.resolver.ts similarity index 100% rename from Client/app/shared/route.resolver.ts rename to ClientApp/app/shared/route.resolver.ts diff --git a/Client/app/shared/user.service.ts b/ClientApp/app/shared/user.service.ts similarity index 100% rename from Client/app/shared/user.service.ts rename to ClientApp/app/shared/user.service.ts diff --git a/Client/main.browser.ts b/ClientApp/boot.browser.ts similarity index 77% rename from Client/main.browser.ts rename to ClientApp/boot.browser.ts index 01723608..a7830543 100644 --- a/Client/main.browser.ts +++ b/ClientApp/boot.browser.ts @@ -1,7 +1,7 @@ import './polyfills/browser.polyfills'; import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { BrowserAppModule } from './app/browser-app.module'; +import { AppModule } from './app/app.module.browser'; const rootElemTagName = 'app'; // Update this if you change your root component selector @@ -15,4 +15,4 @@ if (module['hot']) { enableProdMode(); } -const modulePromise = platformBrowserDynamic().bootstrapModule(BrowserAppModule); +const modulePromise = platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/Client/main.server.ts b/ClientApp/boot.server.ts similarity index 94% rename from Client/main.server.ts rename to ClientApp/boot.server.ts index e20e4f9f..d93a4f56 100644 --- a/Client/main.server.ts +++ b/ClientApp/boot.server.ts @@ -7,7 +7,7 @@ import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; import { ORIGIN_URL } from './app/shared/constants/baseurl.constants'; // Grab the (Node) server-specific NgModule -import { ServerAppModule } from './app/server-app.module'; +import { AppModule } from './app/app.module.server'; // Temporary * the engine will be on npm soon (`@universal/ng-aspnetcore-engine`) import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from './polyfills/temporary-aspnetcore-engine'; @@ -18,7 +18,7 @@ export default createServerRenderer((params: BootFuncParams) => { // Platform-server provider configuration const setupOptions: IEngineOptions = { appSelector: '<app></app>', - ngModule: ServerAppModule, + ngModule: AppModule, request: params, providers: [ // Optional - Any other Server providers you want to pass (remember you'll have to provide them for the Browser as well) diff --git a/Client/modules/transfer-http/transfer-http.module.ts b/ClientApp/modules/transfer-http/transfer-http.module.ts similarity index 100% rename from Client/modules/transfer-http/transfer-http.module.ts rename to ClientApp/modules/transfer-http/transfer-http.module.ts diff --git a/Client/modules/transfer-http/transfer-http.ts b/ClientApp/modules/transfer-http/transfer-http.ts similarity index 100% rename from Client/modules/transfer-http/transfer-http.ts rename to ClientApp/modules/transfer-http/transfer-http.ts diff --git a/Client/modules/transfer-state/browser-transfer-state.module.ts b/ClientApp/modules/transfer-state/browser-transfer-state.module.ts similarity index 100% rename from Client/modules/transfer-state/browser-transfer-state.module.ts rename to ClientApp/modules/transfer-state/browser-transfer-state.module.ts diff --git a/Client/modules/transfer-state/server-transfer-state.module.ts b/ClientApp/modules/transfer-state/server-transfer-state.module.ts similarity index 100% rename from Client/modules/transfer-state/server-transfer-state.module.ts rename to ClientApp/modules/transfer-state/server-transfer-state.module.ts diff --git a/Client/modules/transfer-state/server-transfer-state.ts b/ClientApp/modules/transfer-state/server-transfer-state.ts similarity index 100% rename from Client/modules/transfer-state/server-transfer-state.ts rename to ClientApp/modules/transfer-state/server-transfer-state.ts diff --git a/Client/modules/transfer-state/transfer-state.ts b/ClientApp/modules/transfer-state/transfer-state.ts similarity index 100% rename from Client/modules/transfer-state/transfer-state.ts rename to ClientApp/modules/transfer-state/transfer-state.ts diff --git a/Client/polyfills/browser.polyfills.ts b/ClientApp/polyfills/browser.polyfills.ts similarity index 100% rename from Client/polyfills/browser.polyfills.ts rename to ClientApp/polyfills/browser.polyfills.ts diff --git a/Client/polyfills/polyfills.ts b/ClientApp/polyfills/polyfills.ts similarity index 100% rename from Client/polyfills/polyfills.ts rename to ClientApp/polyfills/polyfills.ts diff --git a/Client/polyfills/rx-imports.ts b/ClientApp/polyfills/rx-imports.ts similarity index 100% rename from Client/polyfills/rx-imports.ts rename to ClientApp/polyfills/rx-imports.ts diff --git a/Client/polyfills/server.polyfills.ts b/ClientApp/polyfills/server.polyfills.ts similarity index 100% rename from Client/polyfills/server.polyfills.ts rename to ClientApp/polyfills/server.polyfills.ts diff --git a/Client/polyfills/temporary-aspnetcore-engine.ts b/ClientApp/polyfills/temporary-aspnetcore-engine.ts similarity index 100% rename from Client/polyfills/temporary-aspnetcore-engine.ts rename to ClientApp/polyfills/temporary-aspnetcore-engine.ts diff --git a/Client/test/jestGlobalMocks.ts b/ClientApp/test/jestGlobalMocks.ts similarity index 100% rename from Client/test/jestGlobalMocks.ts rename to ClientApp/test/jestGlobalMocks.ts diff --git a/Client/test/setupJest.ts b/ClientApp/test/setupJest.ts similarity index 100% rename from Client/test/setupJest.ts rename to ClientApp/test/setupJest.ts diff --git a/Client/tsconfig.spec.json b/ClientApp/tsconfig.spec.json similarity index 100% rename from Client/tsconfig.spec.json rename to ClientApp/tsconfig.spec.json diff --git a/Client/typings.d.ts b/ClientApp/typings.d.ts similarity index 100% rename from Client/typings.d.ts rename to ClientApp/typings.d.ts diff --git a/README.md b/README.md index 183ab0b0..040dc0e0 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ npm install && npm run build:dev && dotnet restore # or yarn install ``` -If you're running the project from command line with `dotnet run` make sure you set your environment variables to Development (otherwise things like HMR won't work). +If you're running the project from command line with `dotnet run` make sure you set your environment variables to Development (otherwise things like HMR might not work). ```bash # on Windows: @@ -129,7 +129,6 @@ export ASPNETCORE_ENVIRONMENT=Development # Upcoming Features: -- **Fix and update Webpack build / Vendor chunking and overall compilation speed.** ( important ) - Update to use npm [ngAspnetCoreEngine](https://github.com/angular/universal/pull/682) (still need to tweak a few things there) - Potractor e2e testing - Add basic Redux State store (Will also hold state durijg HMR builds) diff --git a/Server/Controllers/HomeController.cs b/Server/Controllers/HomeController.cs index 3f19192d..87b41ff2 100644 --- a/Server/Controllers/HomeController.cs +++ b/Server/Controllers/HomeController.cs @@ -43,7 +43,7 @@ public async Task<IActionResult> Index() "/", nodeServices, cancelToken, - new JavaScriptModuleExport(applicationBasePath + "/Client/dist/main-server"), + new JavaScriptModuleExport(applicationBasePath + "/ClientApp/dist/main-server"), unencodedAbsoluteUrl, unencodedPathAndQuery, transferData, // Our simplified Request object & any other CustommData you want to send! diff --git a/Startup.cs b/Startup.cs index 00fc9291..7736f9e9 100644 --- a/Startup.cs +++ b/Startup.cs @@ -73,7 +73,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseDeveloperExceptionPage(); app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { - HotModuleReplacement = true + HotModuleReplacement = true, + HotModuleReplacementEndpoint = "/dist/__webpack_hmr" }); app.UseSwagger(); app.UseSwaggerUI(c => diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml index 418bb1fd..b0796562 100644 --- a/Views/Home/Index.cshtml +++ b/Views/Home/Index.cshtml @@ -1,6 +1,7 @@ @Html.Raw(ViewData["SpaHtml"]) +<script src="http://github.com/~/dist/vendor.js" asp-append-version="true"></script> @section scripts { <!-- Our webpack bundle --> - <script src="http://github.com/~/dist/main-browser.js" asp-append-version="true"></script> + <script src="http://github.com/~/dist/main-client.js" asp-append-version="true"></script> } diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index 8d8fb071..509c52db 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -1,32 +1,33 @@ <!DOCTYPE html> <html> - <head> - <base href="http://github.com/" /> - <title>@ViewData["Title"] + + + @ViewData["Title"] - - - @Html.Raw(ViewData["Meta"]) - @Html.Raw(ViewData["Links"]) + + + @Html.Raw(ViewData["Meta"]) + @Html.Raw(ViewData["Links"]) - + + - @Html.Raw(ViewData["Styles"]) + @Html.Raw(ViewData["Styles"]) - - - @RenderBody() + + + @RenderBody() - - + + - + - - @Html.Raw(ViewData["TransferData"]) + + @Html.Raw(ViewData["TransferData"]) - @RenderSection("scripts", required: false) - + @RenderSection("scripts", required: false) + diff --git a/package.json b/package.json index 3d0e18c9..f3b00472 100644 --- a/package.json +++ b/package.json @@ -6,40 +6,44 @@ "test:watch": "npm run test -- --watch", "test:ci": "npm run test -- --runInBand", "test:coverage": "npm run test -- --coverage", - "build:dev": "webpack --progress --color", - "build:aot": "webpack --env.aot --env.client & webpack --env.aot --env.server" + "build:dev": "npm run build:vendor && npm run build:webpack", + "build:webpack": "webpack --progress --color", + "build:prod": "npm run build:vendor -- --env.prod && npm run build:dev -- --env.prod", + "build:vendor": "webpack --config webpack.config.vendor.js --progress --color" }, "jest": { "preset": "jest-preset-angular", - "setupTestFrameworkScriptFile": "./Client/test/setupJest.ts", + "setupTestFrameworkScriptFile": "./ClientApp/test/setupJest.ts", "globals": { - "__TS_CONFIG__": "Client/tsconfig.spec.json", + "__TS_CONFIG__": "ClientApp/tsconfig.spec.json", "__TRANSFORM_HTML__": true }, "coveragePathIgnorePatterns": [ "/node_modules/", - "/Client/test/.*.ts" + "/ClientApp/test/.*.ts" ], "coverageDirectory": "coverage" }, "dependencies": { - "@angular/animations": "^4.0.0", - "@angular/common": "^4.0.0", - "@angular/compiler": "^4.0.0", - "@angular/compiler-cli": "^4.0.0", - "@angular/core": "^4.0.0", - "@angular/forms": "^4.0.0", - "@angular/http": "^4.0.0", - "@angular/platform-browser": "^4.0.0", - "@angular/platform-browser-dynamic": "^4.0.0", - "@angular/platform-server": "^4.0.0", - "@angular/router": "^4.0.0", + "@angular/animations": "^4.3.0", + "@angular/common": "^4.3.0", + "@angular/compiler": "^4.3.0", + "@angular/compiler-cli": "^4.3.0", + "@angular/core": "^4.3.0", + "@angular/forms": "^4.3.0", + "@angular/http": "^4.3.0", + "@angular/platform-browser": "^4.3.0", + "@angular/platform-browser-dynamic": "^4.3.0", + "@angular/platform-server": "^4.3.0", + "@angular/router": "^4.3.0", + "@nguniversal/aspnetcore-engine": "^1.0.0-beta.2", "@ngx-translate/core": "^6.0.1", "@ngx-translate/http-loader": "0.0.3", "@types/node": "^7.0.12", + "angular2-router-loader": "^0.3.4", "angular2-template-loader": "0.6.0", "aspnet-prerendering": "2.0.3", - "aspnet-webpack": "^1.0.17", + "aspnet-webpack": "^2.0.1", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.7", "bootstrap-sass": "^3.3.7", @@ -55,7 +59,7 @@ "jquery": "^2.2.1", "json-loader": "^0.5.4", "ng2-signalr": "2.0.4", - "ngx-bootstrap": "^1.7.1", + "ngx-bootstrap": "^2.0.0-beta.2", "node-sass": "^4.5.2", "preboot": "^4.5.2", "raw-loader": "^0.5.1", @@ -78,7 +82,8 @@ "@types/jasmine": "^2.5.37", "@types/jest": "^19.2.3", "chai": "^3.5.0", - "codelyzer": "^3.0.0-beta.4", + "codelyzer": "^3.0.0", + "tslint": "^5.0.0", "jasmine-core": "^2.5.2", "jest": "^20.0.0", "jest-preset-angular": "^2.0.1" diff --git a/tsconfig.json b/tsconfig.json index 8728ffab..0e68aae4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,10 +4,11 @@ "module": "es2015", "target": "es5", "noImplicitAny": false, - "sourceMap": false, + "sourceMap": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, - "noStrictGenericChecks": true, + "skipDefaultLibCheck": true, + "skipLibCheck": true, "lib": [ "es2016", "dom" @@ -15,6 +16,6 @@ "types": [ "node" ] }, "include": [ - "Client" + "ClientApp" ] } diff --git a/webpack.additions.js b/webpack.additions.js new file mode 100644 index 00000000..62bf4bb3 --- /dev/null +++ b/webpack.additions.js @@ -0,0 +1,18 @@ +/* [ Webpack Additions ] + * + * This file contains ADD-ONS we are adding on-top of the traditional JavaScriptServices repo + * We do this so that those already using JavaScriptServices can easily figure out how to combine this repo into it. + */ + +// Shared rules[] we need to add +const sharedModuleRules = [ + // sass + { test: /\.scss$/, loaders: ['to-string-loader', 'css-loader', 'sass-loader'] }, + // font-awesome + { test: /\.(woff2?|ttf|eot|svg)$/, loader: 'url-loader?limit=10000' } +]; + + +module.exports = { + sharedModuleRules +}; diff --git a/webpack.config.js b/webpack.config.js index 76980b9c..06435301 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,46 +1,97 @@ -const path = require('path'); -const webpackMerge = require('webpack-merge'); -const commonPartial = require('./webpack/webpack.common'); -const clientPartial = require('./webpack/webpack.client'); -const serverPartial = require('./webpack/webpack.server'); -const prodPartial = require('./webpack/webpack.prod'); -const { getAotPlugin } = require('./webpack/webpack.aot'); +/* + * Webpack (JavaScriptServices) with a few changes & updates + * - This is to keep us inline with JSServices, and help those using that template to add things from this one + * + * Things updated or changed: + * module -> rules [] + * .ts$ test : Added 'angular2-router-loader' for lazy-loading in development + * added ...sharedModuleRules (for scss & font-awesome loaders) + */ -module.exports = function (options, webpackOptions) { - options = options || {}; - webpackOptions = webpackOptions || {}; +const path = require('path'); +const webpack = require('webpack'); +const merge = require('webpack-merge'); +const AotPlugin = require('@ngtools/webpack').AotPlugin; +const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; - if (options.aot) { - console.log(`Running build for ${options.client ? 'client' : 'server'} with AoT Compilation`) - } +const { sharedModuleRules } = require('./webpack.additions'); - const serverConfig = webpackMerge({}, commonPartial, serverPartial, { - entry: options.aot ? { 'main-server' : './Client/main.server.aot.ts' } : serverPartial.entry, // Temporary +module.exports = (env) => { + // Configuration in common to both client-side and server-side bundles + const isDevBuild = !(env && env.prod); + const sharedConfig = { + stats: { modules: false }, + context: __dirname, + resolve: { extensions: [ '.js', '.ts' ] }, + output: { + filename: '[name].js', + publicPath: 'dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix + }, + module: { + rules: [ + { test: /\.ts$/, use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader', 'angular2-router-loader'] : '@ngtools/webpack' }, + { test: /\.html$/, use: 'html-loader?minimize=false' }, + { test: /\.css$/, use: [ 'to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] }, + { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' }, + ...sharedModuleRules + ] + }, + plugins: [new CheckerPlugin()] + }; + + // Configuration for client-side bundle suitable for running in browsers + const clientBundleOutputDir = './wwwroot/dist'; + const clientBundleConfig = merge(sharedConfig, { + entry: { 'main-client': './ClientApp/boot.browser.ts' }, + output: { path: path.join(__dirname, clientBundleOutputDir) }, plugins: [ - getAotPlugin('server', !!options.aot) - ] + new webpack.DllReferencePlugin({ + context: __dirname, + manifest: require('./wwwroot/dist/vendor-manifest.json') + }) + ].concat(isDevBuild ? [ + // Plugins that apply in development builds only + new webpack.SourceMapDevToolPlugin({ + filename: '[file].map', // Remove this line if you prefer inline source maps + moduleFilenameTemplate: path.relative(clientBundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk + }) + ] : [ + // Plugins that apply in production builds only + new webpack.optimize.UglifyJsPlugin(), + new AotPlugin({ + tsConfigPath: './tsconfig.json', + entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), + exclude: ['./**/*.server.ts'] + }) + ]) }); - let clientConfig = webpackMerge({}, commonPartial, clientPartial, { + // Configuration for server-side (prerendering) bundle suitable for running in Node + const serverBundleConfig = merge(sharedConfig, { + resolve: { mainFields: ['main'] }, + entry: { 'main-server': './ClientApp/boot.server.ts' }, plugins: [ - getAotPlugin('client', !!options.aot) - ] + new webpack.DllReferencePlugin({ + context: __dirname, + manifest: require('./ClientApp/dist/vendor-manifest.json'), + sourceType: 'commonjs2', + name: './vendor' + }) + ].concat(isDevBuild ? [] : [ + // Plugins that apply in production builds only + new AotPlugin({ + tsConfigPath: './tsconfig.json', + entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), + exclude: ['./**/*.browser.ts'] + }) + ]), + output: { + libraryTarget: 'commonjs', + path: path.join(__dirname, './ClientApp/dist') + }, + target: 'node', + devtool: 'inline-source-map' }); - if (webpackOptions.prod) { - clientConfig = webpackMerge({}, clientConfig, prodPartial); - } - - const configs = []; - if (!options.aot) { - configs.push(clientConfig, serverConfig); - - } else if (options.client) { - configs.push(clientConfig); - - } else if (options.server) { - configs.push(serverConfig); - } - - return configs; -} + return [clientBundleConfig, serverBundleConfig]; +}; diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js new file mode 100644 index 00000000..7ae8a6d2 --- /dev/null +++ b/webpack.config.vendor.js @@ -0,0 +1,97 @@ +const path = require('path'); +const webpack = require('webpack'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const merge = require('webpack-merge'); +const treeShakableModules = [ + '@angular/animations', + '@angular/common', + '@angular/compiler', + '@angular/core', + '@angular/forms', + '@angular/http', + '@angular/platform-browser', + '@angular/platform-browser-dynamic', + '@angular/router', + 'ngx-bootstrap', + 'zone.js', +]; +const nonTreeShakableModules = [ + 'bootstrap', + 'bootstrap/dist/css/bootstrap.css', + 'core-js', + // 'es6-promise', + // 'es6-shim', + 'event-source-polyfill', + // 'jquery', +]; +const allModules = treeShakableModules.concat(nonTreeShakableModules); + +module.exports = (env) => { + console.log(`env = ${JSON.stringify(env)}`) + const extractCSS = new ExtractTextPlugin('vendor.css'); + const isDevBuild = !(env && env.prod); + const sharedConfig = { + stats: { modules: false }, + resolve: { extensions: [ '.js' ] }, + module: { + rules: [ + { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' } + ] + }, + output: { + publicPath: 'dist/', + filename: '[name].js', + library: '[name]_[hash]' + }, + plugins: [ + // new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) + new webpack.ContextReplacementPlugin(/\@angular\b.*\b(bundles|linker)/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/11580 + new webpack.ContextReplacementPlugin(/angular(\\|\/)core(\\|\/)@angular/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/14898 + new webpack.IgnorePlugin(/^vertx$/) // Workaround for https://github.com/stefanpenner/es6-promise/issues/100 + ] + }; + + const clientBundleConfig = merge(sharedConfig, { + entry: { + // To keep development builds fast, include all vendor dependencies in the vendor bundle. + // But for production builds, leave the tree-shakable ones out so the AOT compiler can produce a smaller bundle. + vendor: isDevBuild ? allModules : nonTreeShakableModules + }, + output: { path: path.join(__dirname, 'wwwroot', 'dist') }, + module: { + rules: [ + { test: /\.css(\?|$)/, use: extractCSS.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) } + ] + }, + plugins: [ + extractCSS, + new webpack.DllPlugin({ + path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), + name: '[name]_[hash]' + }) + ].concat(isDevBuild ? [] : [ + new webpack.optimize.UglifyJsPlugin() + ]) + }); + + const serverBundleConfig = merge(sharedConfig, { + target: 'node', + resolve: { mainFields: ['main'] }, + entry: { vendor: allModules.concat(['aspnet-prerendering']) }, + output: { + path: path.join(__dirname, 'ClientApp', 'dist'), + libraryTarget: 'commonjs2', + }, + module: { + rules: [ { test: /\.css(\?|$)/, use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] } ] + }, + plugins: [ + new webpack.DllPlugin({ + path: path.join(__dirname, 'ClientApp', 'dist', '[name]-manifest.json'), + name: '[name]_[hash]' + }) + ] + }); + + return [clientBundleConfig, serverBundleConfig]; +} From c490c6916fabf27e65409a92f863198ef630718a Mon Sep 17 00:00:00 2001 From: Isaac Levin Date: Thu, 24 Aug 2017 10:16:18 -0400 Subject: [PATCH 008/103] update to readme to clean up some things (#384) --- README.md | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 040dc0e0..c900ba32 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,22 @@ -# ASP.NET Core 2.0 & Angular 4 (+) advanced starter - with Server-side prerendering (for Angular SEO)! +# ASP.NET Core 2.0 & Angular 4 (+) advanced starter - with Server-side prerendering (for Angular SEO)!

- ASP.NET Core 2.0 Angular 2+ Starter + ASP.NET Core 2.0 Angular 4+ Starter

-### Harness the power of Angular 2+, ASP.NET Core 2.0, now with SEO ! +### Harness the power of Angular 4+, ASP.NET Core 2.0, now with SEO ! Angular SEO in action:

- ASP.NET Core Angular2 SEO + ASP.NET Core Angular4 SEO

### What is this repo? Live Demo here: http://aspnetcore-angular2-universal.azurewebsites.net -This repository is maintained by [Angular Universal](https://github.com/angular/universal) and is meant to be an advanced starter +This repository is maintained by [Angular](https://github.com/angular/angular) and is meant to be an advanced starter for both ASP.NET Core 2.0 using Angular 4.0+, not only for the client-side, but to be rendered on the server for instant -application paints (Note: If you don't need Universal (SSR) [read here](#faq) on how to disable it). +application paints (Note: If you don't need SSR [read here](#faq) on how to disable it). This is meant to be a Feature-Rich Starter application containing all of the latest technologies, best build systems available, and include many real-world examples and libraries needed in todays Single Page Applications (SPAs). @@ -29,7 +29,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual * [Deployment](#deployment) * [Upcoming Features](#upcoming-features) * [Application Structure](#application-structure) -* [Universal Gotchas](#universal-gotchas) +* [Gotchas](#gotchas) * [FAQ](#faq---also-check-out-the-faq-issues-label) * [Special Thanks](#special-thanks) * [License](#license) @@ -46,10 +46,10 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - RestAPI (WebAPI) integration - SQL Database CRUD demo - Swagger WebAPI documentation when running in development mode - - SignalR Chat demo! (Thanks to [@hakonamatata](https://github.com/hakonamatata) + - SignalR Chat demo! (Thanks to [@hakonamatata](https://github.com/hakonamatata)) - **Angular 4.0.0** : - - Featuring Server-side rendering (Platform-Server (basically Angular Universal, but moved into Angular Core) + - Featuring Server-side rendering (Platform-Server) - Faster initial paints, SEO (Search-engine optimization w Title/Meta/Link tags), social media link-previews, etc - i18n internationalization support (via/ ngx-translate) - Baked in best-practices (follows Angular style guide) @@ -95,7 +95,9 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual # Getting Started? -**Make sure you have at least Node 6.x or higher (w/ npm 3+) installed!** +- **Make sure you have at least Node 6.x or higher (w/ npm 3+) installed!** +- **This repository uses ASP.Net Core 2.0, which has a hard requirement on .NET Core Runtime 2.0.0 and .NET Core SDK 2.0.0. Please install these items from [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.0-download.md)** + ### Visual Studio 2017 @@ -261,7 +263,7 @@ The short-version is that we invoke that Node process, passing in our Request ob A more detailed explanation can be found here: [ng-AspnetCore-Engine Readme](https://github.com/angular/universal/tree/master/modules/ng-aspnetcore-engine) ```csharp -// Prerender / Serialize application (with Universal) +// Prerender / Serialize application var prerenderResult = await Prerenderer.RenderToString( /* all of our parameters / options / boot-server file / customData object goes here */ ); @@ -283,7 +285,7 @@ Take a look at the `_Layout.cshtml` file for example, notice how we let .NET han - @ViewData["Title"] - AspNET.Core Angular 4.0.0 (+) Universal starter + @ViewData["Title"] - AspNET.Core Angular 4.0.0 (+) starter @@ -320,9 +322,10 @@ Well now, your Client-side Angular will take over, and you'll have a fully funct ---- -# Universal "Gotchas" +# "Gotchas" +- This repository uses ASP.Net Core 2.0, which has a hard requirement on .NET Core Runtime 2.0.0 and .NET Core SDK 2.0.0. Please install these items from [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.0-download.md) -> When building Universal components in Angular 2 there are a few things to keep in mind. +> When building components in Angular 4 there are a few things to keep in mind. - **`window`**, **`document`**, **`navigator`**, and other browser types - _do not exist on the server_ - so using them, or any library that uses them (jQuery for example) will not work. You do have some options, if you truly need some of this functionality: - If you need to use them, consider limiting them to only your client and wrapping them situationally. You can use the Object injected using the PLATFORM_ID token to check whether the current platform is browser or server. @@ -364,7 +367,7 @@ constructor(element: ElementRef, renderer: Renderer) { # FAQ - Also check out the [FAQ Issues label](https://github.com/MarkPieszak/aspnetcore-angular2-universal/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq) -### How can I disable Universal / SSR (Server-side rendering)? +### How can I disable SSR (Server-side rendering)? Simply comment out the logic within HomeController, and replace `@Html.Raw(ViewData["SpaHtml"])` with just your applications root AppComponent tag ("app" in our case): ``. @@ -373,16 +376,16 @@ AppComponent tag ("app" in our case): ``. ### How do I have code run only in the Browser? -Check the [Universal Gotchas](#universal-gotchas) on how to use `isPlatformBrowser()`. +Check the [Gotchas](#gotchas) on how to use `isPlatformBrowser()`. ### How do I Material2 with this repo? -You'll either want to remove SSR for now, or wait as support should be coming to handle Universal/platform-server rendering. +You'll either want to remove SSR for now, or wait as support should be coming to handle platform-server rendering. -### How can I use jQuery and/or some jQuery plugins with Angular Universal? +### How can I use jQuery and/or some jQuery plugins with this repo? > Note: If at all possible, try to avoid using jQuery or libraries dependent on it, as there are -better, more abstract ways of dealing with the DOM in Angular (2+) such as using the Renderer, etc. +better, more abstract ways of dealing with the DOM in Angular (4+) such as using the Renderer, etc. Yes, of course but there are a few things you need to setup before doing this. First, make sure jQuery is included in webpack vendor file, and that you have a webpack Plugin setup for it. `new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' })` From 8c73209f2f82778b7c8c09ca9f41d9ec8280cfda Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Thu, 24 Aug 2017 10:23:03 -0400 Subject: [PATCH 009/103] docs(readme): update to reflect new naming --- README.md | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index c900ba32..7b53a279 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - **Webpack build system (Webpack 2)** - HMR : Hot Module Reloading/Replacement - - Production builds + - Production builds w/ AoT Compilation - **Testing frameworks** - Unit testing with Karma/Jasmine @@ -106,7 +106,7 @@ VS2017 will automatically install all the neccessary npm & .NET dependencies whe Simply push F5 to start debugging ! -**Note**: If you get any errors after this such as `module not found: main.server` (or similar), open up command line and run `npm run build:dev` to make sure all the assets have been properly built by Webpack. +**Note**: If you get any errors after this such as `module not found: boot.server` (or similar), open up command line and run `npm run build:dev` to make sure all the assets have been properly built by Webpack. ### Visual Studio Code @@ -177,14 +177,14 @@ Here we have the *usual suspects* found at the root level. - `protractor` - config files (e2e testing) - `tslint` - TypeScript code linting rules -### /Client/ - Everything Angular +### /ClientApp/ - Everything Angular > Let's take a look at how this is structured so we can make some sense of it all! -With Angular Universal, we need to split our applicatoin logic **per platform** so [if we look inside this folder](./Client), +With Angular Universal, we need to split our applicatoin logic **per platform** so [if we look inside this folder](./ClientApp), you'll see the 2 root files, that branch the entire logic for browser & server respectively. -- [**Main.Browser.ts**](./Client/main.browser.ts) - +- [**Boot.Browser.ts**](./ClientApp/main.browser.ts) - This file starts up the entire Angular application for the Client/browser platform. Here we setup a few things, client Angular bootstrapping. @@ -192,24 +192,24 @@ Here we setup a few things, client Angular bootstrapping. You'll barely need to touch this file, but something to note, this is the file where you would import libraries that you **only** want being used in the Browser. (Just know that you'd have to provide a mock implementation for the Server when doing that). -- [**Main-Server.ts**](./Client/main.server.ts) - +- [**Boot.Server.ts**](./ClientApp/boot.server.ts) - This file is where Angular _platform-server_ *serializes* the Angular application itself on the .NET server within a very quick Node process, and renders it a string. This is what causes that initial fast paint of the entire application to the Browser, and helps us get all our _SEO_ goodness :sparkles: --- -Notice the folder structure here in `./Client/` : +Notice the folder structure here in `./ClientApp/` : ```diff -+ /Client/ ++ /ClientApp/ + /app/ App NgModule - our Root NgModule (you'll insert Components/etc here most often) AppComponent / App Routes / global css styles * Notice that we have 2 dividing NgModules: - browser-app.module & server-app.module + app.module.browser & app.module.server You'll almost always be using the common app.module, but these 2 are used to split up platform logic for situations where you need to use Dependency Injection / etc, between platforms. @@ -226,21 +226,21 @@ Note: You could use whatever folder conventions you'd like, I prefer to split up ``` When adding new features/components/etc to your application you'll be commonly adding things to the Root **NgModule** (located -in `/Client/app/app.module.ts`), but why are there **two** other NgModules in this folder? +in `/ClientApp/app/app.module.ts`), but why are there **two** other NgModules in this folder? This is because we want to split our logic **per Platform**, but notice they both share the Common NgModule named `app.module.ts`. When adding most things to your application, this is the only place you'll have to add in your new Component / Directive / Pipe / etc. You'll only occassional need to manually -add in the Platform specific things to either `browser-app.module || server-app.module`. +add in the Platform specific things to either `app.module.browser || app.module.server`. To illustrate this point with an example, you can see how we're using Dependency Injection to inject a `StorageService` that is different for the Browser & Server. ```typescript -// For the Browser (browser-app.module) +// For the Browser (app.module.browser) { provide: StorageService, useClass: BrowserStorage } -// For the Server (server-app.module) +// For the Server (app.module.server) { provide: StorageService, useClass: ServerStorage } ``` @@ -258,14 +258,14 @@ Angular application gets serialized into a String, sent to the Browser, along wi --- -The short-version is that we invoke that Node process, passing in our Request object & invoke the `boot-server` file, and we get back a nice object that we pass into .NETs `ViewData` object, and sprinkle through out our `Views/Shared/_Layout.cshtml` and `/Views/Home/index.cshtml` files! +The short-version is that we invoke that Node process, passing in our Request object & invoke the `boot.server` file, and we get back a nice object that we pass into .NETs `ViewData` object, and sprinkle through out our `Views/Shared/_Layout.cshtml` and `/Views/Home/index.cshtml` files! A more detailed explanation can be found here: [ng-AspnetCore-Engine Readme](https://github.com/angular/universal/tree/master/modules/ng-aspnetcore-engine) ```csharp // Prerender / Serialize application var prerenderResult = await Prerenderer.RenderToString( - /* all of our parameters / options / boot-server file / customData object goes here */ + /* all of our parameters / options / boot.server file / customData object goes here */ ); ViewData["SpaHtml"] = prerenderResult.Html; @@ -323,6 +323,7 @@ Well now, your Client-side Angular will take over, and you'll have a fully funct ---- # "Gotchas" + - This repository uses ASP.Net Core 2.0, which has a hard requirement on .NET Core Runtime 2.0.0 and .NET Core SDK 2.0.0. Please install these items from [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.0-download.md) > When building components in Angular 4 there are a few things to keep in mind. @@ -372,7 +373,7 @@ constructor(element: ElementRef, renderer: Renderer) { Simply comment out the logic within HomeController, and replace `@Html.Raw(ViewData["SpaHtml"])` with just your applications root AppComponent tag ("app" in our case): ``. -> You could also remove any `isPlatformBrowser/etc` logic, and delete the boot-server, browser-app.module & server-app.module files, just make sure your `boot-client` file points to `app.module`. +> You could also remove any `isPlatformBrowser/etc` logic, and delete the boot.server, app.module.browser & app.module.server files, just make sure your `boot.browser` file points to `app.module`. ### How do I have code run only in the Browser? @@ -433,6 +434,8 @@ Nothing's ever perfect, but please let me know by creating an issue (make sure t Copyright (c) 2016-2017 [Mark Pieszak](https://github.com/MarkPieszak) +### Follow me online: + Twitter: [@MarkPieszak](http://twitter.com/MarkPieszak) | Medium: [@MarkPieszak](https://medium.com/@MarkPieszak) ---- From 76108b67a9f664bf09927a1d8b137ce2d86d1c4c Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Thu, 24 Aug 2017 10:24:08 -0400 Subject: [PATCH 010/103] docs(readme): naming fix --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b53a279..b42ca3b6 100644 --- a/README.md +++ b/README.md @@ -184,7 +184,7 @@ Here we have the *usual suspects* found at the root level. With Angular Universal, we need to split our applicatoin logic **per platform** so [if we look inside this folder](./ClientApp), you'll see the 2 root files, that branch the entire logic for browser & server respectively. -- [**Boot.Browser.ts**](./ClientApp/main.browser.ts) - +- [**Boot.Browser.ts**](./ClientApp/boot.browser.ts) - This file starts up the entire Angular application for the Client/browser platform. Here we setup a few things, client Angular bootstrapping. @@ -391,7 +391,7 @@ better, more abstract ways of dealing with the DOM in Angular (4+) such as using Yes, of course but there are a few things you need to setup before doing this. First, make sure jQuery is included in webpack vendor file, and that you have a webpack Plugin setup for it. `new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' })` -Now, make sure any "plugins" etc that you have, are only included in your `main.browser.ts` file. (ie: `import 'slick-carousel';`) +Now, make sure any "plugins" etc that you have, are only included in your `boot.browser.ts` file. (ie: `import 'slick-carousel';`) In a Component you want to use jQuery, make sure to import it near the top like so: ```typescript From 265e9a791fbe1b9376d80a49d9a1a2894d620313 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Thu, 24 Aug 2017 16:09:33 -0400 Subject: [PATCH 011/103] fix(csproj): update csproj file to open in vs2017 --- Asp2017.csproj | 54 ++++++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/Asp2017.csproj b/Asp2017.csproj index e373e9ae..db3c39eb 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -1,55 +1,29 @@ - - + - netcoreapp2.0 - TargetFrameworkOverride + netcoreapp2.0 true Latest false - - - - - - - - - - + + - - - + + + + + - - - - - - - - - - - - - - - - - - + @@ -64,5 +38,11 @@ - + + + + + + + From 94605d604a4fa0b054da4819017764ce5db1e82c Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Thu, 24 Aug 2017 16:27:47 -0400 Subject: [PATCH 012/103] feat(angular-cli): add basic angular-cli support for generators ## Minimal) Angular-CLI integration - This is to be used mainly for Generating Components/Services/etc. - Usage examples: - `ng g c components/example-component` - `ng g s shared/some-service` --- .angular-cli.json | 17 +++++++++++++++++ README.md | 9 +++++++-- package.json | 5 +++-- 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 .angular-cli.json diff --git a/.angular-cli.json b/.angular-cli.json new file mode 100644 index 00000000..3382816f --- /dev/null +++ b/.angular-cli.json @@ -0,0 +1,17 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "project": { + "name": "AspnetCore-Angular-Universal" + }, + "apps": [ + { + "root": "ClientApp" + } + ], + "defaults": { + "styleExt": "scss", + "component": { + "spec": false + } + } +} diff --git a/README.md b/README.md index b42ca3b6..dac4e4d3 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,12 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - SignalR Chat demo! (Thanks to [@hakonamatata](https://github.com/hakonamatata)) - **Angular 4.0.0** : - - Featuring Server-side rendering (Platform-Server) + - (Minimal) Angular-CLI integration + - This is to be used mainly for Generating Components/Services/etc. + - Usage examples: + - `ng g c components/example-component` + - `ng g s shared/some-service` + - Featuring Server-side rendering (Platform-Server, aka: "Universal") - Faster initial paints, SEO (Search-engine optimization w Title/Meta/Link tags), social media link-previews, etc - i18n internationalization support (via/ ngx-translate) - Baked in best-practices (follows Angular style guide) @@ -62,7 +67,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - Production builds w/ AoT Compilation - **Testing frameworks** - - Unit testing with Karma/Jasmine + - Unit testing with Jest (Going back to Karma soon) - **Productivity** - Typescript 2 diff --git a/package.json b/package.json index f3b00472..49da51e0 100644 --- a/package.json +++ b/package.json @@ -77,15 +77,16 @@ "zone.js": "^0.8.9" }, "devDependencies": { + "@angular/cli": "^1.3.2", "@ngtools/webpack": "^1.3.0", "@types/chai": "^3.4.34", "@types/jasmine": "^2.5.37", "@types/jest": "^19.2.3", "chai": "^3.5.0", "codelyzer": "^3.0.0", - "tslint": "^5.0.0", "jasmine-core": "^2.5.2", "jest": "^20.0.0", - "jest-preset-angular": "^2.0.1" + "jest-preset-angular": "^2.0.1", + "tslint": "^5.0.0" } } From 469a7a705b8aa8d2f8487c458fb4d625288ffade Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Fri, 25 Aug 2017 10:34:44 -0400 Subject: [PATCH 013/103] fix(signal-r): updated signalr chatroom --- .../components/navmenu/navmenu.component.html | 10 +-- .../app/containers/chat/chat.component.html | 80 ++++++++++--------- .../app/containers/chat/chat.component.scss | 4 +- .../app/containers/chat/chat.component.ts | 26 +++--- Views/Shared/_Layout.cshtml | 6 +- 5 files changed, 68 insertions(+), 58 deletions(-) diff --git a/ClientApp/app/components/navmenu/navmenu.component.html b/ClientApp/app/components/navmenu/navmenu.component.html index b92d8671..a4cffbdc 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.html +++ b/ClientApp/app/components/navmenu/navmenu.component.html @@ -39,11 +39,11 @@ Lazy-loaded demo - +
  • + + Chat + +
    • diff --git a/ClientApp/app/containers/chat/chat.component.html b/ClientApp/app/containers/chat/chat.component.html index e29d109b..d44cc419 100644 --- a/ClientApp/app/containers/chat/chat.component.html +++ b/ClientApp/app/containers/chat/chat.component.html @@ -1,45 +1,51 @@ -

    SignalR chat example

    +

    WebSockets (SignalR) Chatroom Example

    -
    -
    -
    -
    - Chat -
    -
    -
      +
      + Data is stored in Azure here - so even in localhost you might be chatting with other people! +
      -
    • - +
      +
      +
      +
      + Angular Chat +
      +
      +
        -
        -
        - {{message.user}} - x mins ago -
        -

        - {{message.content}} -

        -
        - +
      • + + User Avatar + -
      +
      +
      + {{message.user}} + x mins ago +
      +

      + {{ message.content }} +

      -
      -
      - - - - - - - -
      -
      -
      +
      • + +
    +
    +
    +
    +
    + + + + + + + +
    +
    +
    +
    -
    {{chatMessages | json}}
    \ No newline at end of file +
    {{ chatMessages | json }}
    diff --git a/ClientApp/app/containers/chat/chat.component.scss b/ClientApp/app/containers/chat/chat.component.scss index d6fefaad..8e085732 100644 --- a/ClientApp/app/containers/chat/chat.component.scss +++ b/ClientApp/app/containers/chat/chat.component.scss @@ -33,7 +33,7 @@ .panel-body { overflow-y: scroll; - height: 600px; + height: 500px; } ::-webkit-scrollbar-track { @@ -49,4 +49,4 @@ ::-webkit-scrollbar-thumb { -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); background-color: #555; -} \ No newline at end of file +} diff --git a/ClientApp/app/containers/chat/chat.component.ts b/ClientApp/app/containers/chat/chat.component.ts index 8bbd9ed9..78cbdb47 100644 --- a/ClientApp/app/containers/chat/chat.component.ts +++ b/ClientApp/app/containers/chat/chat.component.ts @@ -5,7 +5,7 @@ import { SignalR, BroadcastEventListener, SignalRConnection } from 'ng2-signalr' import { Subscription } from 'rxjs/Subscription'; export class ChatMessage { - constructor(public user: string, public content: string) { } + constructor(public content: string, public user: string) { } } @Component({ @@ -21,23 +21,25 @@ export class ChatComponent implements OnInit { private _subscription: Subscription; constructor(route: ActivatedRoute) { - this._connection = route.snapshot.data['connection']; + this._connection = route.snapshot.data['connection']; } ngOnInit() { - const onMessageSent$ = new BroadcastEventListener('OnMessageSent'); - this._connection.listen(onMessageSent$); - this._subscription = onMessageSent$.subscribe((chatMessage: ChatMessage) => { - this.chatMessages.push(chatMessage); - console.log('chat messages', this.chatMessages); - }); + const onMessageSent$ = new BroadcastEventListener('OnMessageSent'); + this._connection.listen(onMessageSent$); + this._subscription = onMessageSent$.subscribe((chatMessage: ChatMessage) => { + this.chatMessages.push(chatMessage); + console.log('chat messages', this.chatMessages); + }); } // send chat message to server - sendMessage(user, message) { - console.log('send message', user, message); - this._connection.invoke('Chat', new ChatMessage(user, message)) - .catch((err: any) => console.log('Failed to invoke', err)); + sendMessage(user, messageInput) { + console.log('send message', user, messageInput.value); + this._connection.invoke('Chat', new ChatMessage(messageInput.value, user)) + .catch((err: any) => console.log('Failed to invoke', err)); + + messageInput.value = ''; } } diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index 509c52db..7fb24bdb 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -18,16 +18,18 @@ @RenderBody() - + - + @Html.Raw(ViewData["TransferData"]) @RenderSection("scripts", required: false) + From 593622f3cbc7cf47047e9109b172334984d6a2d5 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Fri, 25 Aug 2017 10:39:22 -0400 Subject: [PATCH 014/103] fix(signal-r): update resolve --- ClientApp/app/shared/route.resolver.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ClientApp/app/shared/route.resolver.ts b/ClientApp/app/shared/route.resolver.ts index 9b7e02c0..43b0078c 100644 --- a/ClientApp/app/shared/route.resolver.ts +++ b/ClientApp/app/shared/route.resolver.ts @@ -1,15 +1,21 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; +import { Resolve, Router } from '@angular/router'; import { SignalR, ISignalRConnection } from 'ng2-signalr'; @Injectable() export class ConnectionResolver implements Resolve { - constructor(private _signalR: SignalR) { } + constructor( + private _signalR: SignalR, + private _router: Router + ) { } - resolve() { - console.log('ConnectionResolver. Resolving...'); - return this._signalR.connect(); + resolve(): Promise { + return this._signalR.connect().then((item) => { + return item; + }).catch(() => { + return this._router.navigate(['/']); + }); } -} +} From 34c67fbf0631a625f8d5a2388f2525cedc1f538e Mon Sep 17 00:00:00 2001 From: David Gnanasekaran Date: Sat, 26 Aug 2017 17:27:03 +0530 Subject: [PATCH 015/103] Modified .csproject to emit the wwwroot/dist folder, if the folder is not created yet (#390) --- Asp2017.csproj | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Asp2017.csproj b/Asp2017.csproj index db3c39eb..1bebcdf2 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -23,6 +23,20 @@ + + + + + + + + + + + + + From 85558da2b2a0573629b705548b3dad8e0938df94 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Wed, 30 Aug 2017 12:04:36 -0400 Subject: [PATCH 016/103] chore(webpack): remove old deprecated webpack folder --- webpack/helpers.js | 9 -------- webpack/webpack.aot.js | 48 --------------------------------------- webpack/webpack.client.js | 20 ---------------- webpack/webpack.common.js | 25 -------------------- webpack/webpack.prod.js | 4 ---- webpack/webpack.server.js | 22 ------------------ 6 files changed, 128 deletions(-) delete mode 100644 webpack/helpers.js delete mode 100644 webpack/webpack.aot.js delete mode 100644 webpack/webpack.client.js delete mode 100644 webpack/webpack.common.js delete mode 100644 webpack/webpack.prod.js delete mode 100644 webpack/webpack.server.js diff --git a/webpack/helpers.js b/webpack/helpers.js deleted file mode 100644 index 2b49ccc0..00000000 --- a/webpack/helpers.js +++ /dev/null @@ -1,9 +0,0 @@ -const { resolve } = require('path'); - -function root(path) { - return resolve(__dirname, '..', path); -} - -module.exports = { - root: root -}; diff --git a/webpack/webpack.aot.js b/webpack/webpack.aot.js deleted file mode 100644 index 5af7ca50..00000000 --- a/webpack/webpack.aot.js +++ /dev/null @@ -1,48 +0,0 @@ -const { root } = require('./helpers'); -const { AotPlugin } = require('@ngtools/webpack'); - -const tsconfigs = { - client: root('./Client/tsconfig.browser.json'), - server: root('./Client/tsconfig.server.json') -}; - -const aotTsconfigs = { - client: root('./Client/tsconfig.browser.json'), - server: root('./Client/tsconfig.server.aot.json') -}; - -/** - * Generates a AotPlugin for @ngtools/webpack - * - * @param {string} platform Should either be client or server - * @param {boolean} aot Enables/Disables AoT Compilation - * @returns - */ -function getAotPlugin(platform, aot) { - - var aotPlugin = new AotPlugin({ - tsConfigPath: aot ? aotTsconfigs[platform] : tsconfigs[platform], - skipCodeGeneration: !aot - }); - - // TEMPORARY fix for Windows 10 - will be gone when fixed - aotPlugin._compilerHost._resolve = function (path_to_resolve) { - path_1 = require("path"); - path_to_resolve = aotPlugin._compilerHost._normalizePath(path_to_resolve); - if (path_to_resolve[0] == '.') { - return aotPlugin._compilerHost._normalizePath(path_1.join(aotPlugin._compilerHost.getCurrentDirectory(), path_to_resolve)); - } - else if (path_to_resolve[0] == '/' || path_to_resolve.match(/^\w:\//)) { - return path_to_resolve; - } - else { - return aotPlugin._compilerHost._normalizePath(path_1.join(aotPlugin._compilerHost._basePath, path_to_resolve)); - } - }; - - return aotPlugin; -} - -module.exports = { - getAotPlugin: getAotPlugin -}; diff --git a/webpack/webpack.client.js b/webpack/webpack.client.js deleted file mode 100644 index 1c50c612..00000000 --- a/webpack/webpack.client.js +++ /dev/null @@ -1,20 +0,0 @@ -const { AotPlugin } = require('@ngtools/webpack'); - -const { root } = require('./helpers'); -const clientBundleOutputDir = root('./wwwroot/dist'); - -/** - * This is a client config which should be merged on top of common config - */ -module.exports = { - entry: { - 'main-browser': root('./Client/main.browser.ts') - }, - output: { - path: root('./wwwroot/dist'), - }, - target: 'web', - plugins: [ - - ] -}; diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js deleted file mode 100644 index 254ecf86..00000000 --- a/webpack/webpack.common.js +++ /dev/null @@ -1,25 +0,0 @@ -const { root } = require('./helpers'); - -/** - * This is a common webpack config which is the base for all builds - */ -module.exports = { - devtool: 'source-map', - resolve: { - extensions: ['.ts', '.js'] - }, - output: { - filename: '[name].js', - publicPath: '/dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix - }, - module: { - rules: [ - { test: /\.ts$/, loader: '@ngtools/webpack' }, - { test: /\.css$/, loader: ['to-string-loader', 'css-loader'] }, - { test: /\.html$/, loader: 'html-loader' }, - { test: /\.scss$/, loaders: ['to-string-loader', 'css-loader', 'sass-loader'] }, - { test: /\.(woff2?|ttf|eot|svg)$/, loader: 'url-loader?limit=10000' } - ] - }, - plugins: [] -}; diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js deleted file mode 100644 index 658f1cd7..00000000 --- a/webpack/webpack.prod.js +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This is a prod config to be merged with the Client config - */ -module.exports = {}; diff --git a/webpack/webpack.server.js b/webpack/webpack.server.js deleted file mode 100644 index e968400a..00000000 --- a/webpack/webpack.server.js +++ /dev/null @@ -1,22 +0,0 @@ -const { root } = require('./helpers'); -const { AotPlugin } = require('@ngtools/webpack'); - -/** - * This is a server config which should be merged on top of common config - */ -module.exports = { - devtool: 'inline-source-map', - resolve: { - extensions: ['.ts', '.js', '.json'], - // An array of directory names to be resolved to the current directory - modules: [root('Client'), root('node_modules')], - }, - entry: { - 'main-server': root('./Client/main.server.ts') - }, - output: { - libraryTarget: 'commonjs', - path: root('./Client/dist') - }, - target: 'node' -}; From 234f246320f691f1a1956cc0b3cef17c5c7ce2ca Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Fri, 1 Sep 2017 18:32:23 -0400 Subject: [PATCH 017/103] fix(build): fix prod flag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49da51e0..66b937c3 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "test:coverage": "npm run test -- --coverage", "build:dev": "npm run build:vendor && npm run build:webpack", "build:webpack": "webpack --progress --color", - "build:prod": "npm run build:vendor -- --env.prod && npm run build:dev -- --env.prod", + "build:prod": "npm run build:vendor -- --env.prod && npm run build:webpack -- --env.prod", "build:vendor": "webpack --config webpack.config.vendor.js --progress --color" }, "jest": { From af574fc67955ea8a1eb487e6e8bc9035c2a303f9 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Sat, 2 Sep 2017 12:41:09 -0400 Subject: [PATCH 018/103] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dac4e4d3..073623ee 100644 --- a/README.md +++ b/README.md @@ -445,7 +445,7 @@ Twitter: [@MarkPieszak](http://twitter.com/MarkPieszak) | Medium: [@MarkPieszak] ---- -# Looking for Angular Consulting / Training / support? +# Looking for Angular & ASP.NET Consulting / Training / support? [Contact me](mpieszak84@gmail.com), and let's talk about your projects needs! From 359623e4c623f1be2f696658f2693e723bda91d9 Mon Sep 17 00:00:00 2001 From: Bill Sheldon <30598595+BillSheldon-HunterIndustries@users.noreply.github.com> Date: Sun, 3 Sep 2017 15:53:19 -0700 Subject: [PATCH 019/103] Minor updates related to the menu when in a mobile size display. When a menu item is selected this update causes the menu to automatically collapse. (#397) --- .../components/navmenu/navmenu.component.html | 18 +++++++++--------- .../components/navmenu/navmenu.component.ts | 6 +++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ClientApp/app/components/navmenu/navmenu.component.html b/ClientApp/app/components/navmenu/navmenu.component.html index a4cffbdc..57b9c351 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.html +++ b/ClientApp/app/components/navmenu/navmenu.component.html @@ -14,35 +14,35 @@
    diff --git a/ClientApp/app/components/navmenu/navmenu.component.ts b/ClientApp/app/components/navmenu/navmenu.component.ts index 3287431d..ac36f036 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.ts +++ b/ClientApp/app/components/navmenu/navmenu.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'nav-menu', @@ -16,4 +16,8 @@ export class NavMenuComponent { this.collapse = "collapse"; } } + + collapseMenu() { + this.collapse = "collapse" + } } From 9e2583d18d68effa39a6816a0682788778556dab Mon Sep 17 00:00:00 2001 From: David Gnanasekaran Date: Mon, 4 Sep 2017 20:19:13 +0530 Subject: [PATCH 020/103] (Unit testing) using Karma test runner (#399) * Modified .csproject to emit the wwwroot/dist folder, if the folder is not created yet * Remove Jest and added Karma test runner for executing unit test cases --- Asp2017.csproj | 2 +- ClientApp/test/boot-tests.js | 30 +++++++ ClientApp/test/jestGlobalMocks.ts | 15 ---- ClientApp/test/karma.conf.js | 46 +++++++++++ ClientApp/test/setupJest.ts | 2 - ClientApp/test/webpack.config.test.js | 112 ++++++++++++++++++++++++++ package.json | 30 +++---- 7 files changed, 201 insertions(+), 36 deletions(-) create mode 100644 ClientApp/test/boot-tests.js delete mode 100644 ClientApp/test/jestGlobalMocks.ts create mode 100644 ClientApp/test/karma.conf.js delete mode 100644 ClientApp/test/setupJest.ts create mode 100644 ClientApp/test/webpack.config.test.js diff --git a/Asp2017.csproj b/Asp2017.csproj index 1bebcdf2..d944c48d 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -54,7 +54,7 @@     - + diff --git a/ClientApp/test/boot-tests.js b/ClientApp/test/boot-tests.js new file mode 100644 index 00000000..eba839d2 --- /dev/null +++ b/ClientApp/test/boot-tests.js @@ -0,0 +1,30 @@ +Error.stackTraceLimit = Infinity; +// Load required polyfills and testing libraries +require('reflect-metadata'); +require('zone.js'); +require('zone.js/dist/long-stack-trace-zone'); +require('zone.js/dist/proxy.js'); +require('zone.js/dist/sync-test'); +require('zone.js/dist/jasmine-patch'); +require('zone.js/dist/async-test'); +require('zone.js/dist/fake-async-test'); +const testing = require('@angular/core/testing'); +const testingBrowser = require('@angular/platform-browser-dynamic/testing'); + +// Prevent Karma from running prematurely +__karma__.loaded = function () {}; + +// First, initialize the Angular testing environment +testing.getTestBed().initTestEnvironment( + testingBrowser.BrowserDynamicTestingModule, + testingBrowser.platformBrowserDynamicTesting() +); + +// Then we find all the tests +const context = require.context('../', true, /\.spec\.ts$/); + +// And load the modules +context.keys().map(context); + +// Finally, start Karma to run the tests +__karma__.start(); diff --git a/ClientApp/test/jestGlobalMocks.ts b/ClientApp/test/jestGlobalMocks.ts deleted file mode 100644 index e5e90ebc..00000000 --- a/ClientApp/test/jestGlobalMocks.ts +++ /dev/null @@ -1,15 +0,0 @@ -const mock = () => { - let storage = {}; - return { - getItem: key => key in storage ? storage[key] : null, - setItem: (key, value) => storage[key] = value || '', - removeItem: key => delete storage[key], - clear: () => storage = {} - }; -}; - -Object.defineProperty(window, 'localStorage', {value: mock()}); -Object.defineProperty(window, 'sessionStorage', {value: mock()}); -Object.defineProperty(window, 'getComputedStyle', { - value: () => ['-webkit-appearance'] -}); diff --git a/ClientApp/test/karma.conf.js b/ClientApp/test/karma.conf.js new file mode 100644 index 00000000..0ae99871 --- /dev/null +++ b/ClientApp/test/karma.conf.js @@ -0,0 +1,46 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/0.13/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '.', + frameworks: ['jasmine'], + exclude: [], + files: [ + './boot-tests.js' + ], + preprocessors: { + './boot-tests.js': ['coverage', 'webpack', 'sourcemap'] + }, + client: { + captureConsole: false + }, + coverageReporter: { + type: 'in-memory' + }, + remapCoverageReporter: { + 'text-summary': null, + json: './coverage/coverage.json', + html: './coverage/html' + }, + reporters: ['mocha', 'coverage', 'remap-coverage'], + port: 9876, + colors: true, + logLevel: config.LOG_WARN, + autoWatch: false, + browsers: ['Chrome'], + mime: { + 'application/javascript': ['ts', 'tsx'] + }, + singleRun: true, + webpack: require('./webpack.config.test.js')({ + env: 'test' + }), + webpackMiddleware: { + noInfo: true, + stats: { + chunks: false + } + } + }); +}; diff --git a/ClientApp/test/setupJest.ts b/ClientApp/test/setupJest.ts deleted file mode 100644 index 1d3bd024..00000000 --- a/ClientApp/test/setupJest.ts +++ /dev/null @@ -1,2 +0,0 @@ -import 'jest-preset-angular'; -import './jestGlobalMocks'; diff --git a/ClientApp/test/webpack.config.test.js b/ClientApp/test/webpack.config.test.js new file mode 100644 index 00000000..6818b46c --- /dev/null +++ b/ClientApp/test/webpack.config.test.js @@ -0,0 +1,112 @@ +const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin'); +const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin'); + +var path = require('path'); +var rootPath = path.join.bind(path, path.resolve(__dirname, '../../')); + +module.exports = function (options) { + return { + devtool: 'inline-source-map', + resolve: { + extensions: ['.ts', '.js'], + modules: [rootPath('ClientApp'), 'node_modules'] + }, + module: { + rules: [{ + enforce: 'pre', + test: /\.js$/, + loader: 'source-map-loader', + exclude: [ + rootPath('node_modules/rxjs'), + rootPath('node_modules/@angular') + ] + }, + { + test: /\.ts$/, + use: [{ + loader: 'awesome-typescript-loader', + query: { + sourceMap: false, + inlineSourceMap: true, + compilerOptions: { + removeComments: true + } + }, + }, + 'angular2-template-loader' + ], + exclude: [/\.e2e\.ts$/] + }, + { + test: /\.css$/, + loader: ['to-string-loader', 'css-loader'] + }, + { + test: /\.scss$/, + loader: ['raw-loader', 'sass-loader'] + }, + { + test: /\.html$/, + loader: 'raw-loader' + }, + { + enforce: 'post', + test: /\.(js|ts)$/, + loader: 'istanbul-instrumenter-loader', + options: { + esModules: true + }, + include: rootPath('ClientApp'), + exclude: [ + /ClientApp\\test/, + /\.(e2e|spec)\.ts$/, + /node_modules/ + ] + } + + ] + }, + plugins: [ + new ContextReplacementPlugin( + /** + * The (\\|\/) piece accounts for path separators in *nix and Windows + */ + /angular(\\|\/)core(\\|\/)@angular/, + rootPath('ClientApp'), // location of your src + { + /** + * your Angular Async Route paths relative to this root directory + */ + } + ), + new LoaderOptionsPlugin({ + debug: false, + options: { + /** + * legacy options go here + */ + } + }), + + ], + performance: { + hints: false + }, + + /** + * Include polyfills or mocks for various node stuff + * Description: Node configuration + * + * See: https://webpack.github.io/docs/configuration.html#node + */ + node: { + global: true, + process: false, + crypto: 'empty', + module: false, + clearImmediate: false, + setImmediate: false + } + + }; +} diff --git a/package.json b/package.json index 66b937c3..6072e16c 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "angular4-aspnetcore-universal", "version": "1.0.0-rc3", "scripts": { - "test": "jest", - "test:watch": "npm run test -- --watch", + "test": "karma start ClientApp/test/karma.conf.js", + "test:watch": "npm run test -- --auto-watch --no-single-run", "test:ci": "npm run test -- --runInBand", "test:coverage": "npm run test -- --coverage", "build:dev": "npm run build:vendor && npm run build:webpack", @@ -11,19 +11,6 @@ "build:prod": "npm run build:vendor -- --env.prod && npm run build:webpack -- --env.prod", "build:vendor": "webpack --config webpack.config.vendor.js --progress --color" }, - "jest": { - "preset": "jest-preset-angular", - "setupTestFrameworkScriptFile": "./ClientApp/test/setupJest.ts", - "globals": { - "__TS_CONFIG__": "ClientApp/tsconfig.spec.json", - "__TRANSFORM_HTML__": true - }, - "coveragePathIgnorePatterns": [ - "/node_modules/", - "/ClientApp/test/.*.ts" - ], - "coverageDirectory": "coverage" - }, "dependencies": { "@angular/animations": "^4.3.0", "@angular/common": "^4.3.0", @@ -81,12 +68,19 @@ "@ngtools/webpack": "^1.3.0", "@types/chai": "^3.4.34", "@types/jasmine": "^2.5.37", - "@types/jest": "^19.2.3", "chai": "^3.5.0", "codelyzer": "^3.0.0", + "istanbul-instrumenter-loader": "^3.0.0", "jasmine-core": "^2.5.2", - "jest": "^20.0.0", - "jest-preset-angular": "^2.0.1", + "karma": "^1.7.1", + "karma-chai": "^0.1.0", + "karma-chrome-launcher": "^2.2.0", + "karma-coverage": "^1.1.1", + "karma-jasmine": "^1.1.0", + "karma-mocha-reporter": "^2.2.4", + "karma-remap-coverage": "^0.1.4", + "karma-sourcemap-loader": "^0.3.7", + "karma-webpack": "^2.0.3", "tslint": "^5.0.0" } } From 2f11294427ef5da2d6929798c8628e25296aca75 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Tue, 5 Sep 2017 19:02:50 -0400 Subject: [PATCH 021/103] feat(preboot): add preboot functionality & fix aspnetcore-engine (#401) Closes #363 --- ClientApp/app/app.module.browser.ts | 3 +++ ClientApp/app/app.module.server.ts | 3 +++ ClientApp/polyfills/temporary-aspnetcore-engine.ts | 8 ++++++++ Server/Controllers/HomeController.cs | 1 + Views/Shared/_Layout.cshtml | 1 + package.json | 2 +- 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ClientApp/app/app.module.browser.ts b/ClientApp/app/app.module.browser.ts index 0af291d4..70918765 100644 --- a/ClientApp/app/app.module.browser.ts +++ b/ClientApp/app/app.module.browser.ts @@ -11,6 +11,8 @@ import { AppComponent } from './app.component'; import { REQUEST } from './shared/constants/request'; import { BrowserTransferStateModule } from '../modules/transfer-state/browser-transfer-state.module'; +import { BrowserPrebootModule } from 'preboot/browser'; + export function createConfig(): SignalRConfiguration { const signalRConfig = new SignalRConfiguration(); @@ -37,6 +39,7 @@ export function getRequest() { BrowserModule.withServerTransition({ appId: 'my-app-id' // make sure this matches with your Server NgModule }), + BrowserPrebootModule.replayEvents(), BrowserAnimationsModule, BrowserTransferStateModule, diff --git a/ClientApp/app/app.module.server.ts b/ClientApp/app/app.module.server.ts index 9ccbfb52..9e22b71e 100644 --- a/ClientApp/app/app.module.server.ts +++ b/ClientApp/app/app.module.server.ts @@ -8,6 +8,8 @@ import { AppComponent } from './app.component'; import { ServerTransferStateModule } from '../modules/transfer-state/server-transfer-state.module'; import { TransferState } from '../modules/transfer-state/transfer-state'; +import { ServerPrebootModule } from 'preboot/server'; + @NgModule({ bootstrap: [AppComponent], imports: [ @@ -15,6 +17,7 @@ import { TransferState } from '../modules/transfer-state/transfer-state'; appId: 'my-app-id' // make sure this matches with your Browser NgModule }), ServerModule, + ServerPrebootModule.recordEvents({ appRoot: 'app' }), NoopAnimationsModule, ServerTransferStateModule, diff --git a/ClientApp/polyfills/temporary-aspnetcore-engine.ts b/ClientApp/polyfills/temporary-aspnetcore-engine.ts index a68986c2..5a2ce9df 100644 --- a/ClientApp/polyfills/temporary-aspnetcore-engine.ts +++ b/ClientApp/polyfills/temporary-aspnetcore-engine.ts @@ -122,6 +122,7 @@ export function ngAspnetCoreEngine( // Strip out Styles / Meta-tags / Title const STYLES = []; + const SCRIPTS = []; const META = []; const LINKS = []; let TITLE = ''; @@ -148,6 +149,12 @@ export function ngAspnetCoreEngine( TITLE = element.children[0].data; } + if (element.name === 'script') { + SCRIPTS.push( + `` + ); + } + // Broken after 4.0 (worked in rc) // if (element.name === 'style') { // let styleTag = '') + 8 - //); - let STYLES_STRING: string = htmlDoc.indexOf('') + 8) : null; - // STYLES_STRING = STYLES_STRING.replace(/\s/g, '').replace(', NgModuleFactory<{}>>(); function getFactory( moduleOrFactory: Type<{}> | NgModuleFactory<{}>, compiler: Compiler ): Promise> { + return new Promise>((resolve, reject) => { // If module has been compiled AoT if (moduleOrFactory instanceof NgModuleFactory) { - console.log('Already AoT?'); resolve(moduleOrFactory); return; } else { @@ -244,7 +237,6 @@ function getFactory( // If module factory is cached if (moduleFactory) { - console.log('\n\n\n WE FOUND ONE!! USE IT!!\n\n\n'); resolve(moduleFactory); return; } @@ -252,7 +244,6 @@ function getFactory( // Compile the module and cache it compiler.compileModuleAsync(moduleOrFactory) .then((factory) => { - console.log('\n\n\n\n MAP THIS THING!!!!\n\n\n '); factoryCacheMap.set(moduleOrFactory, factory); resolve(factory); }, (err => { From 8a02df7d09f3934464684472fa49c31cf8ca209f Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Thu, 21 Sep 2017 17:40:08 -0400 Subject: [PATCH 027/103] bug(ngx-bootstrap): pin to beta.3 for now fixes MouseEvent issue from latest beta release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b35ac7ab..03efe97c 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "jquery": "^2.2.1", "json-loader": "^0.5.4", "ng2-signalr": "2.0.4", - "ngx-bootstrap": "^2.0.0-beta.2", + "ngx-bootstrap": "2.0.0-beta.3", "node-sass": "^4.5.2", "preboot": "^5.0.0", "raw-loader": "^0.5.1", From 3848e4357d24a04d39d3931d0a36d383c07cc005 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Fri, 22 Sep 2017 17:01:57 -0400 Subject: [PATCH 028/103] docs(readme): renderer2 fix --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f24dfc64..9e30c7a4 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ Well now, your Client-side Angular will take over, and you'll have a fully funct - **`window`**, **`document`**, **`navigator`**, and other browser types - _do not exist on the server_ - so using them, or any library that uses them (jQuery for example) will not work. You do have some options, if you truly need some of this functionality: - If you need to use them, consider limiting them to only your client and wrapping them situationally. You can use the Object injected using the PLATFORM_ID token to check whether the current platform is browser or server. - ``` + ```typescript import { PLATFORM_ID } from '@angular/core'; import { isPlatformBrowser, isPlatformServer } from '@angular/common'; @@ -358,9 +358,9 @@ Well now, your Client-side Angular will take over, and you'll have a fully funct - Try to *limit or* **avoid** using **`setTimeout`**. It will slow down the server-side rendering process. Make sure to remove them [`ngOnDestroy`](https://angular.io/docs/ts/latest/api/core/index/OnDestroy-class.html) in Components. - Also for RxJs timeouts, make sure to _cancel_ their stream on success, for they can slow down rendering as well. - **Don't manipulate the nativeElement directly**. Use the _Renderer2_. We do this to ensure that in any environment we're able to change our view. -``` -constructor(element: ElementRef, renderer: Renderer) { - renderer.setElementStyle(element.nativeElement, 'font-size', 'x-large'); +```typescript +constructor(element: ElementRef, renderer: Renderer2) { + this.renderer.setStyle(element.nativeElement, 'font-size', 'x-large'); } ``` - The application runs XHR requests on the server & once again on the Client-side (when the application bootstraps) From e627f3ac9bcadf2a7021587d343bdfa1fea9fc3a Mon Sep 17 00:00:00 2001 From: David Gnanasekaran Date: Fri, 29 Sep 2017 23:38:36 +0530 Subject: [PATCH 029/103] fix (AoT - Lazy load) : lazy modules chunks creation on Server bundle (#410) Closes #422 Closes #413 * Modified .csproject to emit the wwwroot/dist folder, if the folder is not created yet * Remove Jest and added Karma test runner for executing unit test cases * Added PhantomJS for running test in CI environments. Removed deprecated tslint rules and amended existing rules. * adding tslint config to angular-cli for the ng lint command (#407) * fix (AoT - Lazy load) : commented code that prevented lazy modules chunks from getting created on PlatformServer * packages updated to fix 1) Zone already loaded error, 2) issue with not-found component template load issue * Update README.md * Update README.md * chore(engine): remove comments * Enable uglifyjs on server bundle to reduce bundle size * Mangling and compress options disabled for Server bundle to fix preboot script issue. Removed duplicated Bootstrap css from vendor bundle --- .../not-found/not-found.component.ts | 1 - ClientApp/boot.server.ts | 2 +- Views/Shared/_Layout.cshtml | 2 +- package.json | 46 ++++++++++--------- webpack.config.js | 10 +++- webpack.config.vendor.js | 8 ++-- 6 files changed, 39 insertions(+), 30 deletions(-) diff --git a/ClientApp/app/containers/not-found/not-found.component.ts b/ClientApp/app/containers/not-found/not-found.component.ts index 0ebd7e90..e39faa05 100644 --- a/ClientApp/app/containers/not-found/not-found.component.ts +++ b/ClientApp/app/containers/not-found/not-found.component.ts @@ -3,7 +3,6 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'not-found', templateUrl: './not-found.component.html' - // styleUrls: ['./not-found.component.css'] }) export class NotFoundComponent implements OnInit { constructor() { } diff --git a/ClientApp/boot.server.ts b/ClientApp/boot.server.ts index d93a4f56..86d65086 100644 --- a/ClientApp/boot.server.ts +++ b/ClientApp/boot.server.ts @@ -13,7 +13,7 @@ import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from './poly enableProdMode(); -export default createServerRenderer((params: BootFuncParams) => { +export default createServerRenderer((params) => { // Platform-server provider configuration const setupOptions: IEngineOptions = { diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index 3f6d8aff..49ecd9b0 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -10,7 +10,7 @@ @Html.Raw(ViewData["Links"]) - + @Html.Raw(ViewData["Styles"]) diff --git a/package.json b/package.json index 03efe97c..f7d886f7 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,9 @@ "test:coverage": "npm run test -- --coverage", "build:dev": "npm run build:vendor && npm run build:webpack", "build:webpack": "webpack --progress --color", - "build:prod": "npm run build:vendor -- --env.prod && npm run build:webpack -- --env.prod", - "build:vendor": "webpack --config webpack.config.vendor.js --progress --color" + "build:prod": "npm run clean && npm run build:vendor -- --env.prod && npm run build:webpack -- --env.prod", + "build:vendor": "webpack --config webpack.config.vendor.js --progress --color", + "clean": "rimraf wwwroot/dist clientapp/dist" }, "dependencies": { "@angular/animations": "^4.3.0", @@ -29,21 +30,21 @@ "@ngx-translate/core": "^6.0.1", "@ngx-translate/http-loader": "0.0.3", "@types/node": "^7.0.12", - "angular2-router-loader": "^0.3.4", - "angular2-template-loader": "0.6.0", - "aspnet-prerendering": "2.0.3", + "angular2-router-loader": "^0.3.5", + "angular2-template-loader": "^0.6.2", + "aspnet-prerendering": "^3.0.1", "aspnet-webpack": "^2.0.1", "awesome-typescript-loader": "^3.0.0", "bootstrap": "^3.3.7", "bootstrap-sass": "^3.3.7", - "core-js": "^2.4.1", + "core-js": "^2.5.1", "css": "^2.2.1", - "css-loader": "^0.25.0", - "event-source-polyfill": "^0.0.7", - "expose-loader": "^0.7.1", - "extract-text-webpack-plugin": "^2.0.0-rc", - "file-loader": "^0.9.0", - "html-loader": "^0.4.4", + "css-loader": "^0.28.7", + "event-source-polyfill": "^0.0.9", + "expose-loader": "^0.7.3", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^0.11.2", + "html-loader": "^0.5.1", "isomorphic-fetch": "^2.2.1", "jquery": "^2.2.1", "json-loader": "^0.5.4", @@ -52,18 +53,18 @@ "node-sass": "^4.5.2", "preboot": "^5.0.0", "raw-loader": "^0.5.1", - "rimraf": "^2.6.1", - "rxjs": "^5.0.1", - "sass-loader": "^6.0.3", + "rimraf": "^2.6.2", + "rxjs": "^5.4.3", + "sass-loader": "^6.0.6", "signalr": "^2.2.1", - "style-loader": "^0.13.1", + "style-loader": "^0.18.2", "to-string-loader": "^1.1.5", - "typescript": "2.3.4", + "typescript": "2.5.2", "url-loader": "^0.5.7", - "webpack": "^2.2.0", - "webpack-hot-middleware": "^2.12.2", - "webpack-merge": "^0.14.1", - "zone.js": "^0.8.9" + "webpack": "^3.6.0", + "webpack-hot-middleware": "^2.19.1", + "webpack-merge": "^4.1.0", + "zone.js": "^0.8.17" }, "devDependencies": { "@angular/cli": "^1.3.2", @@ -84,6 +85,7 @@ "karma-remap-coverage": "^0.1.4", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.3", - "tslint": "^5.0.0" + "tslint": "^5.7.0", + "webpack-bundle-analyzer": "^2.9.0" } } diff --git a/webpack.config.js b/webpack.config.js index 06435301..02ff0a01 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -13,6 +13,7 @@ const webpack = require('webpack'); const merge = require('webpack-merge'); const AotPlugin = require('@ngtools/webpack').AotPlugin; const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; +const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const { sharedModuleRules } = require('./webpack.additions'); @@ -56,6 +57,7 @@ module.exports = (env) => { moduleFilenameTemplate: path.relative(clientBundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk }) ] : [ + // new BundleAnalyzerPlugin(), // Plugins that apply in production builds only new webpack.optimize.UglifyJsPlugin(), new AotPlugin({ @@ -68,7 +70,7 @@ module.exports = (env) => { // Configuration for server-side (prerendering) bundle suitable for running in Node const serverBundleConfig = merge(sharedConfig, { - resolve: { mainFields: ['main'] }, + // resolve: { mainFields: ['main'] }, entry: { 'main-server': './ClientApp/boot.server.ts' }, plugins: [ new webpack.DllReferencePlugin({ @@ -78,6 +80,10 @@ module.exports = (env) => { name: './vendor' }) ].concat(isDevBuild ? [] : [ + new webpack.optimize.UglifyJsPlugin({ + compress: false, + mangle: false + }), // Plugins that apply in production builds only new AotPlugin({ tsConfigPath: './tsconfig.json', @@ -90,7 +96,7 @@ module.exports = (env) => { path: path.join(__dirname, './ClientApp/dist') }, target: 'node', - devtool: 'inline-source-map' + devtool: isDevBuild ? 'inline-source-map': false }); return [clientBundleConfig, serverBundleConfig]; diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js index 7ae8a6d2..3e07b78b 100644 --- a/webpack.config.vendor.js +++ b/webpack.config.vendor.js @@ -16,8 +16,8 @@ const treeShakableModules = [ 'zone.js', ]; const nonTreeShakableModules = [ - 'bootstrap', - 'bootstrap/dist/css/bootstrap.css', + // 'bootstrap', + // 'bootstrap/dist/css/bootstrap.css', 'core-js', // 'es6-promise', // 'es6-shim', @@ -90,7 +90,9 @@ module.exports = (env) => { path: path.join(__dirname, 'ClientApp', 'dist', '[name]-manifest.json'), name: '[name]_[hash]' }) - ] + ].concat(isDevBuild ? [] : [ + new webpack.optimize.UglifyJsPlugin() + ]) }); return [clientBundleConfig, serverBundleConfig]; From b288ff49a35acaa116c34f458ff0819608507af0 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Sat, 30 Sep 2017 19:47:46 -0400 Subject: [PATCH 030/103] fix(moment): temp fix adding moment to repo --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index f7d886f7..d6f32bce 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "isomorphic-fetch": "^2.2.1", "jquery": "^2.2.1", "json-loader": "^0.5.4", + "moment": "2.18.1" "ng2-signalr": "2.0.4", "ngx-bootstrap": "2.0.0-beta.3", "node-sass": "^4.5.2", From ec03396a97aa6ff6f583678bca03057b369864a1 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Sun, 1 Oct 2017 14:00:44 -0400 Subject: [PATCH 031/103] fix(moment): add missing coma --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d6f32bce..aaa5af12 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "isomorphic-fetch": "^2.2.1", "jquery": "^2.2.1", "json-loader": "^0.5.4", - "moment": "2.18.1" + "moment": "2.18.1", "ng2-signalr": "2.0.4", "ngx-bootstrap": "2.0.0-beta.3", "node-sass": "^4.5.2", From 9562cf946e39ee73ff78590a0a72bfca1b1c6273 Mon Sep 17 00:00:00 2001 From: Isaac Levin Date: Tue, 3 Oct 2017 15:40:26 -0400 Subject: [PATCH 032/103] Remove SignalR references, added to howto branch instead --- ClientApp/app/app.module.browser.ts | 16 +----- ClientApp/app/app.module.ts | 13 ----- .../app/containers/chat/chat.component.html | 51 ------------------ .../app/containers/chat/chat.component.scss | 52 ------------------- .../app/containers/chat/chat.component.ts | 45 ---------------- ClientApp/app/shared/route.resolver.ts | 21 -------- Views/Shared/_Layout.cshtml | 10 +--- package.json | 2 - 8 files changed, 2 insertions(+), 208 deletions(-) delete mode 100644 ClientApp/app/containers/chat/chat.component.html delete mode 100644 ClientApp/app/containers/chat/chat.component.scss delete mode 100644 ClientApp/app/containers/chat/chat.component.ts delete mode 100644 ClientApp/app/shared/route.resolver.ts diff --git a/ClientApp/app/app.module.browser.ts b/ClientApp/app/app.module.browser.ts index 70918765..ac318d44 100644 --- a/ClientApp/app/app.module.browser.ts +++ b/ClientApp/app/app.module.browser.ts @@ -3,8 +3,6 @@ import { BrowserModule } from '@angular/platform-browser'; import { APP_BASE_HREF } from '@angular/common'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { SignalRModule, SignalRConfiguration } from 'ng2-signalr'; - import { ORIGIN_URL } from './shared/constants/baseurl.constants'; import { AppModuleShared } from './app.module'; import { AppComponent } from './app.component'; @@ -13,17 +11,6 @@ import { BrowserTransferStateModule } from '../modules/transfer-state/browser-tr import { BrowserPrebootModule } from 'preboot/browser'; -export function createConfig(): SignalRConfiguration { - const signalRConfig = new SignalRConfiguration(); - - signalRConfig.hubName = 'Ng2SignalRHub'; - signalRConfig.qs = { user: 'donald' }; - signalRConfig.url = 'http://ng2-signalr-backend.azurewebsites.net/'; - signalRConfig.logging = true; - - return signalRConfig; -} - export function getOriginUrl() { return window.location.origin; } @@ -44,9 +31,8 @@ export function getRequest() { BrowserTransferStateModule, // Our Common AppModule - AppModuleShared, + AppModuleShared - SignalRModule.forRoot(createConfig) ], providers: [ { diff --git a/ClientApp/app/app.module.ts b/ClientApp/app/app.module.ts index 57498bb8..61297b35 100644 --- a/ClientApp/app/app.module.ts +++ b/ClientApp/app/app.module.ts @@ -110,19 +110,6 @@ export function createTranslateLoader(http: Http, baseHref) { ] } }, - { - path: 'chat', component: ChatComponent, - // Wait until the resolve is finished before loading the Route - resolve: { connection: ConnectionResolver }, - data: { - title: 'SignalR chat example', - meta: [{ name: 'description', content: 'This is an Chat page Description!' }], - links: [ - { rel: 'canonical', href: 'http://blogs.example.com/chat/something' }, - { rel: 'alternate', hreflang: 'es', href: 'http://es.example.com/chat' } - ] - } - }, { path: 'ngx-bootstrap', component: NgxBootstrapComponent, data: { diff --git a/ClientApp/app/containers/chat/chat.component.html b/ClientApp/app/containers/chat/chat.component.html deleted file mode 100644 index d44cc419..00000000 --- a/ClientApp/app/containers/chat/chat.component.html +++ /dev/null @@ -1,51 +0,0 @@ -

    WebSockets (SignalR) Chatroom Example

    - -
    - Data is stored in Azure here - so even in localhost you might be chatting with other people! -
    - -
    -
    -
    -
    - Angular Chat -
    -
    -
      - -
    • - - User Avatar - - -
      -
      - {{message.user}} - x mins ago -
      -

      - {{ message.content }} -

      -
      -
      • - -
    -
    -
    -
    -
    - - - - - - - -
    -
    -
    -
    -
    -
    - -
    {{ chatMessages | json }}
    diff --git a/ClientApp/app/containers/chat/chat.component.scss b/ClientApp/app/containers/chat/chat.component.scss deleted file mode 100644 index 8e085732..00000000 --- a/ClientApp/app/containers/chat/chat.component.scss +++ /dev/null @@ -1,52 +0,0 @@ -.chat { - list-style: none; - margin: 0; - padding: 0; -} - -.chat li { - margin-bottom: 10px; - padding-bottom: 5px; - border-bottom: 1px dotted #B3A9A9; -} - - -/* -.chat li.left .chat-body { - margin-left: 60px; -} -*/ - -.chat li.right .chat-body { - margin-right: 60px; -} - -.chat li .chat-body p { - margin: 0; - color: #777777; -} - -.panel .slidedown .glyphicon, -.chat .glyphicon { - margin-right: 5px; -} - -.panel-body { - overflow-y: scroll; - height: 500px; -} - -::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); - background-color: #F5F5F5; -} - -::-webkit-scrollbar { - width: 12px; - background-color: #F5F5F5; -} - -::-webkit-scrollbar-thumb { - -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); - background-color: #555; -} diff --git a/ClientApp/app/containers/chat/chat.component.ts b/ClientApp/app/containers/chat/chat.component.ts deleted file mode 100644 index 78cbdb47..00000000 --- a/ClientApp/app/containers/chat/chat.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; - -import { SignalR, BroadcastEventListener, SignalRConnection } from 'ng2-signalr'; -import { Subscription } from 'rxjs/Subscription'; - -export class ChatMessage { - constructor(public content: string, public user: string) { } -} - -@Component({ - selector: 'chat', - templateUrl: './chat.component.html', - styleUrls: ['./chat.component.scss'] -}) -export class ChatComponent implements OnInit { - - public chatMessages: ChatMessage[] = []; - - private _connection: SignalRConnection; - private _subscription: Subscription; - - constructor(route: ActivatedRoute) { - this._connection = route.snapshot.data['connection']; - } - - ngOnInit() { - const onMessageSent$ = new BroadcastEventListener('OnMessageSent'); - this._connection.listen(onMessageSent$); - this._subscription = onMessageSent$.subscribe((chatMessage: ChatMessage) => { - this.chatMessages.push(chatMessage); - console.log('chat messages', this.chatMessages); - }); - } - - // send chat message to server - sendMessage(user, messageInput) { - console.log('send message', user, messageInput.value); - this._connection.invoke('Chat', new ChatMessage(messageInput.value, user)) - .catch((err: any) => console.log('Failed to invoke', err)); - - messageInput.value = ''; - } - -} diff --git a/ClientApp/app/shared/route.resolver.ts b/ClientApp/app/shared/route.resolver.ts deleted file mode 100644 index 43b0078c..00000000 --- a/ClientApp/app/shared/route.resolver.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Resolve, Router } from '@angular/router'; - -import { SignalR, ISignalRConnection } from 'ng2-signalr'; - -@Injectable() -export class ConnectionResolver implements Resolve { - - constructor( - private _signalR: SignalR, - private _router: Router - ) { } - - resolve(): Promise { - return this._signalR.connect().then((item) => { - return item; - }).catch(() => { - return this._router.navigate(['/']); - }); - } -} diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index 49ecd9b0..993b5133 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -1,4 +1,4 @@ - + @@ -18,14 +18,6 @@ @RenderBody() - - - - - @Html.Raw(ViewData["TransferData"]) @Html.Raw(ViewData["Scripts"]) diff --git a/package.json b/package.json index aaa5af12..9ebbf620 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ "jquery": "^2.2.1", "json-loader": "^0.5.4", "moment": "2.18.1", - "ng2-signalr": "2.0.4", "ngx-bootstrap": "2.0.0-beta.3", "node-sass": "^4.5.2", "preboot": "^5.0.0", @@ -57,7 +56,6 @@ "rimraf": "^2.6.2", "rxjs": "^5.4.3", "sass-loader": "^6.0.6", - "signalr": "^2.2.1", "style-loader": "^0.18.2", "to-string-loader": "^1.1.5", "typescript": "2.5.2", From 63792d113e91b6f55780f2df41e1dc6be2adb462 Mon Sep 17 00:00:00 2001 From: Isaac Levin Date: Tue, 3 Oct 2017 15:54:34 -0400 Subject: [PATCH 033/103] refactor HomeController --- Server/Controllers/HomeController.cs | 62 ++----------------------- Server/Helpers/HttpRequestExtensions.cs | 23 +++++++++ Server/Helpers/Prerender.cs | 54 +++++++++++++++++++++ Server/Models/IRequest.cs | 14 ++++++ Server/Models/TransferData.cs | 15 ++++++ 5 files changed, 109 insertions(+), 59 deletions(-) create mode 100644 Server/Helpers/HttpRequestExtensions.cs create mode 100644 Server/Helpers/Prerender.cs create mode 100644 Server/Models/IRequest.cs create mode 100644 Server/Models/TransferData.cs diff --git a/Server/Controllers/HomeController.cs b/Server/Controllers/HomeController.cs index 18899d50..71798dd5 100644 --- a/Server/Controllers/HomeController.cs +++ b/Server/Controllers/HomeController.cs @@ -1,3 +1,4 @@ +using Asp2017.Server.Helpers; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -9,6 +10,7 @@ using Microsoft.AspNetCore.Http; using System.Diagnostics; using System; +using Asp2017.Server.Models; namespace AspCoreServer.Controllers { @@ -17,39 +19,7 @@ public class HomeController : Controller [HttpGet] public async Task Index() { - var nodeServices = Request.HttpContext.RequestServices.GetRequiredService(); - var hostEnv = Request.HttpContext.RequestServices.GetRequiredService(); - - var applicationBasePath = hostEnv.ContentRootPath; - var requestFeature = Request.HttpContext.Features.Get(); - var unencodedPathAndQuery = requestFeature.RawTarget; - var unencodedAbsoluteUrl = $"{Request.Scheme}://{Request.Host}{unencodedPathAndQuery}"; - - // ** TransferData concept ** - // Here we can pass any Custom Data we want ! - - // By default we're passing down Cookies, Headers, Host from the Request object here - TransferData transferData = new TransferData(); - transferData.request = AbstractHttpContextRequestInfo(Request); - transferData.thisCameFromDotNET = "Hi Angular it's asp.net :)"; - // Add more customData here, add it to the TransferData class - - //Prerender now needs CancellationToken - System.Threading.CancellationTokenSource cancelSource = new System.Threading.CancellationTokenSource(); - System.Threading.CancellationToken cancelToken = cancelSource.Token; - - // Prerender / Serialize application (with Universal) - var prerenderResult = await Prerenderer.RenderToString( - "/", - nodeServices, - cancelToken, - new JavaScriptModuleExport(applicationBasePath + "/ClientApp/dist/main-server"), - unencodedAbsoluteUrl, - unencodedPathAndQuery, - transferData, // Our simplified Request object & any other CustommData you want to send! - 30000, - Request.PathBase.ToString() - ); + var prerenderResult = await Prerender.BuildPrerender(Request); ViewData["SpaHtml"] = prerenderResult.Html; // our from Angular ViewData["Title"] = prerenderResult.Globals["title"]; // set our from Angular @@ -87,31 +57,5 @@ public IActionResult Error() { return View(); } - - private IRequest AbstractHttpContextRequestInfo(HttpRequest request) - { - - IRequest requestSimplified = new IRequest(); - requestSimplified.cookies = request.Cookies; - requestSimplified.headers = request.Headers; - requestSimplified.host = request.Host; - - return requestSimplified; - } - } - - public class IRequest - { - public object cookies { get; set; } - public object headers { get; set; } - public object host { get; set; } - } - - public class TransferData - { - public dynamic request { get; set; } - - // Your data here ? - public object thisCameFromDotNET { get; set; } } } diff --git a/Server/Helpers/HttpRequestExtensions.cs b/Server/Helpers/HttpRequestExtensions.cs new file mode 100644 index 00000000..81663602 --- /dev/null +++ b/Server/Helpers/HttpRequestExtensions.cs @@ -0,0 +1,23 @@ +using Asp2017.Server.Models; +using Microsoft.AspNetCore.Http; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Asp2017.Server.Helpers +{ + public static class HttpRequestExtensions + { + public static IRequest AbstractRequestInfo(this HttpRequest request) + { + + IRequest requestSimplified = new IRequest(); + requestSimplified.cookies = request.Cookies; + requestSimplified.headers = request.Headers; + requestSimplified.host = request.Host; + + return requestSimplified; + } + } +} diff --git a/Server/Helpers/Prerender.cs b/Server/Helpers/Prerender.cs new file mode 100644 index 00000000..13124d3c --- /dev/null +++ b/Server/Helpers/Prerender.cs @@ -0,0 +1,54 @@ +using Asp2017.Server.Models; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.NodeServices; +using Microsoft.AspNetCore.SpaServices.Prerendering; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Asp2017.Server.Helpers +{ + public static class Prerender + { + public static async Task<RenderToStringResult> BuildPrerender(HttpRequest Request) + { + var nodeServices = Request.HttpContext.RequestServices.GetRequiredService<INodeServices>(); + var hostEnv = Request.HttpContext.RequestServices.GetRequiredService<IHostingEnvironment>(); + + var applicationBasePath = hostEnv.ContentRootPath; + var requestFeature = Request.HttpContext.Features.Get<IHttpRequestFeature>(); + var unencodedPathAndQuery = requestFeature.RawTarget; + var unencodedAbsoluteUrl = $"{Request.Scheme}://{Request.Host}{unencodedPathAndQuery}"; + + // ** TransferData concept ** + // Here we can pass any Custom Data we want ! + + // By default we're passing down Cookies, Headers, Host from the Request object here + TransferData transferData = new TransferData(); + transferData.request = Request.AbstractRequestInfo(); + transferData.thisCameFromDotNET = "Hi Angular it's asp.net :)"; + // Add more customData here, add it to the TransferData class + + //Prerender now needs CancellationToken + System.Threading.CancellationTokenSource cancelSource = new System.Threading.CancellationTokenSource(); + System.Threading.CancellationToken cancelToken = cancelSource.Token; + + // Prerender / Serialize application (with Universal) + return await Prerenderer.RenderToString( + "/", + nodeServices, + cancelToken, + new JavaScriptModuleExport(applicationBasePath + "/ClientApp/dist/main-server"), + unencodedAbsoluteUrl, + unencodedPathAndQuery, + transferData, // Our simplified Request object & any other CustommData you want to send! + 30000, + Request.PathBase.ToString() + ); + } + } +} diff --git a/Server/Models/IRequest.cs b/Server/Models/IRequest.cs new file mode 100644 index 00000000..407cf571 --- /dev/null +++ b/Server/Models/IRequest.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Asp2017.Server.Models +{ + public class IRequest + { + public object cookies { get; set; } + public object headers { get; set; } + public object host { get; set; } + } +} diff --git a/Server/Models/TransferData.cs b/Server/Models/TransferData.cs new file mode 100644 index 00000000..a89ab38d --- /dev/null +++ b/Server/Models/TransferData.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Asp2017.Server.Models +{ + public class TransferData + { + public dynamic request { get; set; } + + // Your data here ? + public object thisCameFromDotNET { get; set; } + } +} From e2d0e6e13dc1f531fc2ae3553115c9ac2339be23 Mon Sep 17 00:00:00 2001 From: Isaac Levin <isaac.r.levin@gmail.com> Date: Tue, 3 Oct 2017 16:29:20 -0400 Subject: [PATCH 034/103] make prerender an extension --- Server/Controllers/HomeController.cs | 2 +- Server/Helpers/HttpRequestExtensions.cs | 42 +++++++++++++++++++ Server/Helpers/Prerender.cs | 54 ------------------------- 3 files changed, 43 insertions(+), 55 deletions(-) delete mode 100644 Server/Helpers/Prerender.cs diff --git a/Server/Controllers/HomeController.cs b/Server/Controllers/HomeController.cs index 71798dd5..8a5a77f6 100644 --- a/Server/Controllers/HomeController.cs +++ b/Server/Controllers/HomeController.cs @@ -19,7 +19,7 @@ public class HomeController : Controller [HttpGet] public async Task<IActionResult> Index() { - var prerenderResult = await Prerender.BuildPrerender(Request); + var prerenderResult = await Request.BuildPrerender(); ViewData["SpaHtml"] = prerenderResult.Html; // our <app> from Angular ViewData["Title"] = prerenderResult.Globals["title"]; // set our <title> from Angular diff --git a/Server/Helpers/HttpRequestExtensions.cs b/Server/Helpers/HttpRequestExtensions.cs index 81663602..12648b60 100644 --- a/Server/Helpers/HttpRequestExtensions.cs +++ b/Server/Helpers/HttpRequestExtensions.cs @@ -1,5 +1,10 @@ using Asp2017.Server.Models; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.NodeServices; +using Microsoft.AspNetCore.SpaServices.Prerendering; +using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; using System.Linq; @@ -19,5 +24,42 @@ public static IRequest AbstractRequestInfo(this HttpRequest request) return requestSimplified; } + + public static async Task<RenderToStringResult> BuildPrerender(this HttpRequest Request) + { + var nodeServices = Request.HttpContext.RequestServices.GetRequiredService<INodeServices>(); + var hostEnv = Request.HttpContext.RequestServices.GetRequiredService<IHostingEnvironment>(); + + var applicationBasePath = hostEnv.ContentRootPath; + var requestFeature = Request.HttpContext.Features.Get<IHttpRequestFeature>(); + var unencodedPathAndQuery = requestFeature.RawTarget; + var unencodedAbsoluteUrl = $"{Request.Scheme}://{Request.Host}{unencodedPathAndQuery}"; + + // ** TransferData concept ** + // Here we can pass any Custom Data we want ! + + // By default we're passing down Cookies, Headers, Host from the Request object here + TransferData transferData = new TransferData(); + transferData.request = Request.AbstractRequestInfo(); + transferData.thisCameFromDotNET = "Hi Angular it's asp.net :)"; + // Add more customData here, add it to the TransferData class + + //Prerender now needs CancellationToken + System.Threading.CancellationTokenSource cancelSource = new System.Threading.CancellationTokenSource(); + System.Threading.CancellationToken cancelToken = cancelSource.Token; + + // Prerender / Serialize application (with Universal) + return await Prerenderer.RenderToString( + "/", + nodeServices, + cancelToken, + new JavaScriptModuleExport(applicationBasePath + "/ClientApp/dist/main-server"), + unencodedAbsoluteUrl, + unencodedPathAndQuery, + transferData, // Our simplified Request object & any other CustommData you want to send! + 30000, + Request.PathBase.ToString() + ); + } } } diff --git a/Server/Helpers/Prerender.cs b/Server/Helpers/Prerender.cs deleted file mode 100644 index 13124d3c..00000000 --- a/Server/Helpers/Prerender.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Asp2017.Server.Models; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.NodeServices; -using Microsoft.AspNetCore.SpaServices.Prerendering; -using Microsoft.Extensions.DependencyInjection; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Asp2017.Server.Helpers -{ - public static class Prerender - { - public static async Task<RenderToStringResult> BuildPrerender(HttpRequest Request) - { - var nodeServices = Request.HttpContext.RequestServices.GetRequiredService<INodeServices>(); - var hostEnv = Request.HttpContext.RequestServices.GetRequiredService<IHostingEnvironment>(); - - var applicationBasePath = hostEnv.ContentRootPath; - var requestFeature = Request.HttpContext.Features.Get<IHttpRequestFeature>(); - var unencodedPathAndQuery = requestFeature.RawTarget; - var unencodedAbsoluteUrl = $"{Request.Scheme}://{Request.Host}{unencodedPathAndQuery}"; - - // ** TransferData concept ** - // Here we can pass any Custom Data we want ! - - // By default we're passing down Cookies, Headers, Host from the Request object here - TransferData transferData = new TransferData(); - transferData.request = Request.AbstractRequestInfo(); - transferData.thisCameFromDotNET = "Hi Angular it's asp.net :)"; - // Add more customData here, add it to the TransferData class - - //Prerender now needs CancellationToken - System.Threading.CancellationTokenSource cancelSource = new System.Threading.CancellationTokenSource(); - System.Threading.CancellationToken cancelToken = cancelSource.Token; - - // Prerender / Serialize application (with Universal) - return await Prerenderer.RenderToString( - "/", - nodeServices, - cancelToken, - new JavaScriptModuleExport(applicationBasePath + "/ClientApp/dist/main-server"), - unencodedAbsoluteUrl, - unencodedPathAndQuery, - transferData, // Our simplified Request object & any other CustommData you want to send! - 30000, - Request.PathBase.ToString() - ); - } - } -} From c0dfc73f2d7179039248638e2dd4f36961f399cc Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Wed, 4 Oct 2017 16:02:02 -0400 Subject: [PATCH 035/103] fix(bug): fix 404 and build issues --- ClientApp/app/app.module.ts | 8 ++++---- ClientApp/app/components/navmenu/navmenu.component.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ClientApp/app/app.module.ts b/ClientApp/app/app.module.ts index 61297b35..1c492f1d 100644 --- a/ClientApp/app/app.module.ts +++ b/ClientApp/app/app.module.ts @@ -16,13 +16,13 @@ import { HomeComponent } from './containers/home/home.component'; import { UsersComponent } from './containers/users/users.component'; import { UserDetailComponent } from './components/user-detail/user-detail.component'; import { CounterComponent } from './containers/counter/counter.component'; -import { ChatComponent } from './containers/chat/chat.component'; +// import { ChatComponent } from './containers/chat/chat.component'; import { NotFoundComponent } from './containers/not-found/not-found.component'; import { NgxBootstrapComponent } from './containers/ngx-bootstrap-demo/ngx-bootstrap.component'; import { LinkService } from './shared/link.service'; import { UserService } from './shared/user.service'; -import { ConnectionResolver } from './shared/route.resolver'; +// import { ConnectionResolver } from './shared/route.resolver'; import { ORIGIN_URL } from './shared/constants/baseurl.constants'; import { TransferHttpModule } from '../modules/transfer-http/transfer-http.module'; @@ -43,7 +43,7 @@ export function createTranslateLoader(http: Http, baseHref) { UsersComponent, UserDetailComponent, HomeComponent, - ChatComponent, + // ChatComponent, NotFoundComponent, NgxBootstrapComponent ], @@ -145,7 +145,7 @@ export function createTranslateLoader(http: Http, baseHref) { providers: [ LinkService, UserService, - ConnectionResolver, + // ConnectionResolver, TranslateModule ] }) diff --git a/ClientApp/app/components/navmenu/navmenu.component.html b/ClientApp/app/components/navmenu/navmenu.component.html index 57b9c351..bd6eadda 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.html +++ b/ClientApp/app/components/navmenu/navmenu.component.html @@ -39,11 +39,11 @@ <span class='glyphicon glyphicon-star-empty'></span> Lazy-loaded demo </a> </li> - <li [routerLinkActive]="['link-active']" (click)="collapseMenu()"> + <!-- <li [routerLinkActive]="['link-active']" (click)="collapseMenu()"> <a [routerLink]="['/chat']"> <span class='glyphicon glyphicon-comment'></span> Chat </a> - </li> + </li> --> </ul> </div> </div> From ba9f260384ed107256dd4f6222adb7a1486968bc Mon Sep 17 00:00:00 2001 From: jamescoffman23 <15820584+jamescoffman23@users.noreply.github.com> Date: Sat, 7 Oct 2017 11:30:18 -0500 Subject: [PATCH 036/103] Update _Layout.cshtml (#433) --- Views/Shared/_Layout.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index 993b5133..bcf5be51 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <base href="http://github.com/" /> + <base href="http://github.com/@(Url.Content("~/"))" /> <title>@ViewData["Title"] From 73da5694435cf014218e57194aad0c718dffd168 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Tue, 10 Oct 2017 19:13:31 -0400 Subject: [PATCH 037/103] docs(demo): update to 5.0 branch in readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9e30c7a4..d7ac5277 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # ASP.NET Core 2.0 & Angular 4 (+) advanced starter - with Server-side prerendering (for Angular SEO)! +> [(upcoming) Angular 5.0 demo Branch Here](https://github.com/MarkPieszak/aspnetcore-angular2-universal/tree/angular-5.0-updates) +

    ASP.NET Core 2.0 Angular 4+ Starter

    From f31ca8a8d054d11806df13e79d48282ea03f1687 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Sat, 28 Oct 2017 22:16:40 -0400 Subject: [PATCH 038/103] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d7ac5277..60f75520 100644 --- a/README.md +++ b/README.md @@ -444,9 +444,11 @@ Copyright (c) 2016-2017 [Mark Pieszak](https://github.com/MarkPieszak) ---- -# Looking for Angular & ASP.NET Consulting / Training / support? +# DevHelp.Online - Angular & ASP.NET - Consulting | Training | Development -Contact me at , and let's talk about your projects needs! +Check out **[www.DevHelp.Online](http://DevHelp.Online)** for more info! + +Contact us at , and let's talk about your projects needs. ---- From 5e32bf18abda567225b1afdc7c4646a27ee137e9 Mon Sep 17 00:00:00 2001 From: Romoku Date: Tue, 31 Oct 2017 06:40:07 +0200 Subject: [PATCH 039/103] Update Asp2017.csproj (#451) The 'Client' folder does not exist, so the 'ClientApp' folder should be removed instead. --- Asp2017.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asp2017.csproj b/Asp2017.csproj index d944c48d..46bd2ffa 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -57,6 +57,6 @@ - +     From d2ab9e0bbb63847b6c194ab47436476d26c4ea2b Mon Sep 17 00:00:00 2001 From: electricessence Date: Sat, 16 Dec 2017 08:19:47 -0800 Subject: [PATCH 040/103] Allow for dotnet watch run command. (#524) --- Asp2017.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Asp2017.csproj b/Asp2017.csproj index 46bd2ffa..efb619c0 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -13,6 +13,9 @@ + + + From d01d2f979e961c2f78d047261f970931eadfc7f3 Mon Sep 17 00:00:00 2001 From: Adam Pine Date: Thu, 21 Dec 2017 17:14:20 -0500 Subject: [PATCH 041/103] Update Read.me to reflect the ability to use Angular Material --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 60f75520..fa942dbf 100644 --- a/README.md +++ b/README.md @@ -389,7 +389,8 @@ Check the [Gotchas](#gotchas) on how to use `isPlatformBrowser()`. ### How do I Material2 with this repo? -You'll either want to remove SSR for now, or wait as support should be coming to handle platform-server rendering. +~~You'll either want to remove SSR for now, or wait as support should be coming to handle platform-server rendering.~~ +This is now possible, with the recently updated Angular Material changes. We do not have a tutorial available for this yet. ### How can I use jQuery and/or some jQuery plugins with this repo? From 26a59053074bc7aa73fde644379058958fa63924 Mon Sep 17 00:00:00 2001 From: Adam Pine Date: Fri, 22 Dec 2017 10:37:09 -0500 Subject: [PATCH 042/103] Fix 5.0 link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa942dbf..10e2f21c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ASP.NET Core 2.0 & Angular 4 (+) advanced starter - with Server-side prerendering (for Angular SEO)! -> [(upcoming) Angular 5.0 demo Branch Here](https://github.com/MarkPieszak/aspnetcore-angular2-universal/tree/angular-5.0-updates) +> [(upcoming) Angular 5.0 demo Branch Here](https://github.com/MarkPieszak/aspnetcore-angular2-universal/tree/angular-5.0-WIP)

    ASP.NET Core 2.0 Angular 4+ Starter From 7eafaf86aa92476c47f34a3d5f407a325b9857d7 Mon Sep 17 00:00:00 2001 From: Adam Pine Date: Fri, 22 Dec 2017 11:24:14 -0500 Subject: [PATCH 043/103] Make links to FAQ more visible Added link to the HOW-TO label --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 10e2f21c..e5578667 100644 --- a/README.md +++ b/README.md @@ -374,7 +374,7 @@ constructor(element: ElementRef, renderer: Renderer2) { ---- -# FAQ - Also check out the [FAQ Issues label](https://github.com/MarkPieszak/aspnetcore-angular2-universal/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq) +# FAQ - Also check out the [!FAQ Issues label!](https://github.com/MarkPieszak/aspnetcore-angular2-universal/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Afaq) and the [!HOW-TO Issues Label!](https://github.com/MarkPieszak/aspnetcore-angular2-universal/issues?q=is%3Aissue+label%3A%22HOW+TO+-+Guide%22) ### How can I disable SSR (Server-side rendering)? From 40bf6c19d233b713fde87330ee50660ed35fd668 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Tue, 23 Jan 2018 15:02:42 -0500 Subject: [PATCH 044/103] Feature(Angular 5.0): Upgrade to working copy of 5.0 (#538) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This works both in Development & Production. 🎁 (Apologies on the delay) Now dotnet publish won't fail, and you can successfully build Production builds. In the future, boot.server.PRODUCTION.ts probably won't be needed. We'll be working on upgrading this to use the CLI version that Steve Sanderson has been working on the past few months - this will clean-up a lot of the configuration so that it's all handled by the CLI itself. (Aka: no more webpack files for us to deal with here) ✨ This should close out many issues: #535 #482 (others as well, can't find them at the moment) --- ClientApp/app/app.component.html | 2 +- ClientApp/app/app.component.ts | 11 +- ClientApp/app/app.module.browser.ts | 10 +- ClientApp/app/app.module.server.ts | 25 +- ClientApp/app/app.module.ts | 28 +- .../components/navmenu/navmenu.component.html | 2 +- .../components/navmenu/navmenu.component.ts | 10 +- .../user-detail/user-detail.component.ts | 2 +- .../containers/counter/counter.component.ts | 2 +- .../app/containers/home/home.component.html | 12 +- .../app/containers/home/home.component.ts | 2 +- .../app/containers/lazy/lazy.component.ts | 2 +- .../not-found/not-found.component.ts | 2 +- .../app/containers/users/users.component.html | 2 +- .../app/containers/users/users.component.ts | 21 +- .../app/shared/constants/baseurl.constants.ts | 3 - ClientApp/app/shared/constants/request.ts | 3 - ClientApp/app/shared/user.service.ts | 53 ++-- ClientApp/boot.browser.ts | 2 - ClientApp/boot.server.PRODUCTION.ts | 38 +++ ClientApp/boot.server.ts | 18 +- .../transfer-http/transfer-http.module.ts | 10 - .../modules/transfer-http/transfer-http.ts | 152 ----------- .../browser-transfer-state.module.ts | 20 -- .../server-transfer-state.module.ts | 12 - .../transfer-state/server-transfer-state.ts | 36 --- .../modules/transfer-state/transfer-state.ts | 40 --- .../polyfills/temporary-aspnetcore-engine.ts | 254 ------------------ ClientApp/tsconfig.app.json | 3 +- README.md | 39 +-- Server/Controllers/HomeController.cs | 2 +- Startup.cs | 4 +- Views/Home/Index.cshtml | 6 +- package.json | 40 +-- tslint.json | 3 +- webpack.config.js | 63 +++-- webpack.config.vendor.js | 2 +- 37 files changed, 232 insertions(+), 704 deletions(-) delete mode 100644 ClientApp/app/shared/constants/baseurl.constants.ts delete mode 100644 ClientApp/app/shared/constants/request.ts create mode 100644 ClientApp/boot.server.PRODUCTION.ts delete mode 100644 ClientApp/modules/transfer-http/transfer-http.module.ts delete mode 100644 ClientApp/modules/transfer-http/transfer-http.ts delete mode 100644 ClientApp/modules/transfer-state/browser-transfer-state.module.ts delete mode 100644 ClientApp/modules/transfer-state/server-transfer-state.module.ts delete mode 100644 ClientApp/modules/transfer-state/server-transfer-state.ts delete mode 100644 ClientApp/modules/transfer-state/transfer-state.ts delete mode 100644 ClientApp/polyfills/temporary-aspnetcore-engine.ts diff --git a/ClientApp/app/app.component.html b/ClientApp/app/app.component.html index a3e3bf9b..0345c682 100644 --- a/ClientApp/app/app.component.html +++ b/ClientApp/app/app.component.html @@ -1,5 +1,5 @@

    - +
    diff --git a/ClientApp/app/app.component.ts b/ClientApp/app/app.component.ts index 02b91787..7a6a75ed 100644 --- a/ClientApp/app/app.component.ts +++ b/ClientApp/app/app.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID } from '@angular/core'; +import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, Injector } from '@angular/core'; import { Router, NavigationEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router'; import { Meta, Title, DOCUMENT, MetaDefinition } from '@angular/platform-browser'; import { Subscription } from 'rxjs/Subscription'; @@ -7,10 +7,10 @@ import { LinkService } from './shared/link.service'; // i18n support import { TranslateService } from '@ngx-translate/core'; -import { REQUEST } from './shared/constants/request'; +import { REQUEST } from '@nguniversal/aspnetcore-engine'; @Component({ - selector: 'app', + selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.scss'], encapsulation: ViewEncapsulation.None @@ -23,6 +23,7 @@ export class AppComponent implements OnInit, OnDestroy { private defaultPageTitle: string = 'My App'; private routerSub$: Subscription; + private request; constructor( private router: Router, @@ -31,7 +32,7 @@ export class AppComponent implements OnInit, OnDestroy { private meta: Meta, private linkService: LinkService, public translate: TranslateService, - @Inject(REQUEST) private request + private injector: Injector ) { // this language will be used as a fallback when a translation isn't found in the current language translate.setDefaultLang('en'); @@ -39,6 +40,8 @@ export class AppComponent implements OnInit, OnDestroy { // the lang to use, if the lang isn't available, it will use the current loader to get them translate.use('en'); + this.request = this.injector.get(REQUEST); + console.log(`What's our REQUEST Object look like?`); console.log(`The Request object only really exists on the Server, but on the Browser we can at least see Cookies`); console.log(this.request); diff --git a/ClientApp/app/app.module.browser.ts b/ClientApp/app/app.module.browser.ts index ac318d44..56d1c20c 100644 --- a/ClientApp/app/app.module.browser.ts +++ b/ClientApp/app/app.module.browser.ts @@ -3,12 +3,10 @@ import { BrowserModule } from '@angular/platform-browser'; import { APP_BASE_HREF } from '@angular/common'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ORIGIN_URL } from './shared/constants/baseurl.constants'; +import { ORIGIN_URL, REQUEST } from '@nguniversal/aspnetcore-engine'; import { AppModuleShared } from './app.module'; import { AppComponent } from './app.component'; -import { REQUEST } from './shared/constants/request'; -import { BrowserTransferStateModule } from '../modules/transfer-state/browser-transfer-state.module'; - +import { BrowserTransferStateModule } from '@angular/platform-browser'; import { BrowserPrebootModule } from 'preboot/browser'; export function getOriginUrl() { @@ -23,12 +21,8 @@ export function getRequest() { @NgModule({ bootstrap: [AppComponent], imports: [ - BrowserModule.withServerTransition({ - appId: 'my-app-id' // make sure this matches with your Server NgModule - }), BrowserPrebootModule.replayEvents(), BrowserAnimationsModule, - BrowserTransferStateModule, // Our Common AppModule AppModuleShared diff --git a/ClientApp/app/app.module.server.ts b/ClientApp/app/app.module.server.ts index 9e22b71e..25711851 100644 --- a/ClientApp/app/app.module.server.ts +++ b/ClientApp/app/app.module.server.ts @@ -5,33 +5,28 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AppModuleShared } from './app.module'; import { AppComponent } from './app.component'; -import { ServerTransferStateModule } from '../modules/transfer-state/server-transfer-state.module'; -import { TransferState } from '../modules/transfer-state/transfer-state'; +import { ServerTransferStateModule } from '@angular/platform-server'; import { ServerPrebootModule } from 'preboot/server'; @NgModule({ bootstrap: [AppComponent], imports: [ - BrowserModule.withServerTransition({ - appId: 'my-app-id' // make sure this matches with your Browser NgModule - }), + // Our Common AppModule + AppModuleShared, + ServerModule, - ServerPrebootModule.recordEvents({ appRoot: 'app' }), + ServerPrebootModule.recordEvents({ appRoot: 'app-root' }), NoopAnimationsModule, - ServerTransferStateModule, - - // Our Common AppModule - AppModuleShared + // HttpTransferCacheModule still needs fixes for 5.0 + // Leave this commented out for now, as it breaks Server-renders + // Looking into fixes for this! - @MarkPieszak + // ServerTransferStateModule // <-- broken for the time-being with ASP.NET ] }) export class AppModule { - constructor(private transferState: TransferState) { } + constructor() { } - // Gotcha (needs to be an arrow function) - ngOnBootstrap = () => { - this.transferState.inject(); - } } diff --git a/ClientApp/app/app.module.ts b/ClientApp/app/app.module.ts index 1c492f1d..d31250c4 100644 --- a/ClientApp/app/app.module.ts +++ b/ClientApp/app/app.module.ts @@ -2,7 +2,10 @@ import { NgModule, Inject } from '@angular/core'; import { RouterModule, PreloadAllModules } from '@angular/router'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { HttpModule, Http } from '@angular/http'; +import { HttpClientModule, HttpClient } from '@angular/common/http'; import { FormsModule } from '@angular/forms'; +import { BrowserModule, BrowserTransferStateModule } from '@angular/platform-browser'; +import { TransferHttpCacheModule } from '@nguniversal/common'; import { Ng2BootstrapModule } from 'ngx-bootstrap'; @@ -16,17 +19,14 @@ import { HomeComponent } from './containers/home/home.component'; import { UsersComponent } from './containers/users/users.component'; import { UserDetailComponent } from './components/user-detail/user-detail.component'; import { CounterComponent } from './containers/counter/counter.component'; -// import { ChatComponent } from './containers/chat/chat.component'; import { NotFoundComponent } from './containers/not-found/not-found.component'; import { NgxBootstrapComponent } from './containers/ngx-bootstrap-demo/ngx-bootstrap.component'; import { LinkService } from './shared/link.service'; import { UserService } from './shared/user.service'; -// import { ConnectionResolver } from './shared/route.resolver'; -import { ORIGIN_URL } from './shared/constants/baseurl.constants'; -import { TransferHttpModule } from '../modules/transfer-http/transfer-http.module'; +import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine'; -export function createTranslateLoader(http: Http, baseHref) { +export function createTranslateLoader(http: HttpClient, baseHref) { // Temporary Azure hack if (baseHref === null && typeof window !== 'undefined') { baseHref = window.location.origin; @@ -43,24 +43,28 @@ export function createTranslateLoader(http: Http, baseHref) { UsersComponent, UserDetailComponent, HomeComponent, - // ChatComponent, NotFoundComponent, NgxBootstrapComponent ], imports: [ CommonModule, - HttpModule, + BrowserModule.withServerTransition({ + appId: 'my-app-id' // make sure this matches with your Server NgModule + }), + HttpClientModule, + TransferHttpCacheModule, + BrowserTransferStateModule, + + FormsModule, Ng2BootstrapModule.forRoot(), // You could also split this up if you don't want the Entire Module imported - TransferHttpModule, // Our Http TransferData method - // i18n support TranslateModule.forRoot({ loader: { provide: TranslateLoader, useFactory: (createTranslateLoader), - deps: [Http, [ORIGIN_URL]] + deps: [HttpClient, [ORIGIN_URL]] } }), @@ -145,9 +149,9 @@ export function createTranslateLoader(http: Http, baseHref) { providers: [ LinkService, UserService, - // ConnectionResolver, TranslateModule - ] + ], + bootstrap: [AppComponent] }) export class AppModuleShared { } diff --git a/ClientApp/app/components/navmenu/navmenu.component.html b/ClientApp/app/components/navmenu/navmenu.component.html index bd6eadda..08e1b0fc 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.html +++ b/ClientApp/app/components/navmenu/navmenu.component.html @@ -8,7 +8,7 @@ - Angular 4 Universal & ASP.NET Core + Angular 5 Universal & ASP.NET Core
    diff --git a/ClientApp/app/components/navmenu/navmenu.component.ts b/ClientApp/app/components/navmenu/navmenu.component.ts index ac36f036..fb0cf22c 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.ts +++ b/ClientApp/app/components/navmenu/navmenu.component.ts @@ -1,23 +1,23 @@ import { Component } from '@angular/core'; @Component({ - selector: 'nav-menu', + selector: 'app-nav-menu', templateUrl: './navmenu.component.html', styleUrls: ['./navmenu.component.css'] }) export class NavMenuComponent { - collapse: string = "collapse"; + collapse: string = 'collapse'; collapseNavbar(): void { if (this.collapse.length > 1) { - this.collapse = ""; + this.collapse = ''; } else { - this.collapse = "collapse"; + this.collapse = 'collapse'; } } collapseMenu() { - this.collapse = "collapse" + this.collapse = 'collapse'; } } diff --git a/ClientApp/app/components/user-detail/user-detail.component.ts b/ClientApp/app/components/user-detail/user-detail.component.ts index 9db88355..d21d3415 100644 --- a/ClientApp/app/components/user-detail/user-detail.component.ts +++ b/ClientApp/app/components/user-detail/user-detail.component.ts @@ -3,7 +3,7 @@ import { IUser } from '../../models/User'; import { UserService } from '../../shared/user.service'; @Component({ - selector: 'user-detail', + selector: 'app-user-detail', templateUrl: './user-detail.component.html' }) export class UserDetailComponent { diff --git a/ClientApp/app/containers/counter/counter.component.ts b/ClientApp/app/containers/counter/counter.component.ts index 69de17d9..5adb5195 100644 --- a/ClientApp/app/containers/counter/counter.component.ts +++ b/ClientApp/app/containers/counter/counter.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'counter', + selector: 'app-counter', templateUrl: './counter.component.html' }) export class CounterComponent { diff --git a/ClientApp/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html index 06d801e7..3a4db63b 100644 --- a/ClientApp/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -1,7 +1,7 @@ 

    {{ title }}

    - Enjoy the latest features from .NET Core & Angular 4.0! + Enjoy the latest features from .NET Core & Angular 5.0!
    For more info check the repo here: AspNetCore-Angular2-Universal repo

    @@ -12,7 +12,7 @@

    {{ 'HOME_FEATURE_LIST_TITLE' | translate }}

    • ASP.NET Core 2.0 :: ( Visual Studio 2017 )
    • - Angular 4.* front-end UI framework + Angular 5.* front-end UI framework
      • Angular **platform-server** (aka: Universal) - server-side rendering for SEO, deep-linking, and incredible performance.
        • @@ -22,17 +22,10 @@

        {{ 'HOME_FEATURE_LIST_TITLE' | translate }}

      • The latest TypeScript 2.* features -
      • Webpack
          -
        • Hot Module Reloading/Replacement for an amazing development experience.
        • Tree-shaking
        @@ -40,7 +33,6 @@

        {{ 'HOME_FEATURE_LIST_TITLE' | translate }}

      • Bootstrap (ngx-bootstrap) : Bootstrap capable of being rendered even on the server.
      • Unit testing via karma & jasmine.
        • -
      diff --git a/ClientApp/app/containers/home/home.component.ts b/ClientApp/app/containers/home/home.component.ts index 3065c0b1..ff10f2d4 100644 --- a/ClientApp/app/containers/home/home.component.ts +++ b/ClientApp/app/containers/home/home.component.ts @@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core'; }) export class HomeComponent implements OnInit { - title: string = 'Angular 4.0 Universal & ASP.NET Core 2.0 advanced starter-kit'; + title: string = 'Angular 5.x Universal & ASP.NET Core 2.0 advanced starter-kit'; // Use "constructor"s only for dependency injection constructor( diff --git a/ClientApp/app/containers/lazy/lazy.component.ts b/ClientApp/app/containers/lazy/lazy.component.ts index 25d6d1a4..97d260fd 100644 --- a/ClientApp/app/containers/lazy/lazy.component.ts +++ b/ClientApp/app/containers/lazy/lazy.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'lazy-view', + selector: 'app-lazy-view', template: `

      Lazy-Loaded Component!

      diff --git a/ClientApp/app/containers/not-found/not-found.component.ts b/ClientApp/app/containers/not-found/not-found.component.ts index e39faa05..c59a5f8f 100644 --- a/ClientApp/app/containers/not-found/not-found.component.ts +++ b/ClientApp/app/containers/not-found/not-found.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'not-found', + selector: 'app-not-found', templateUrl: './not-found.component.html' }) export class NotFoundComponent implements OnInit { diff --git a/ClientApp/app/containers/users/users.component.html b/ClientApp/app/containers/users/users.component.html index 5bb77691..1e661476 100644 --- a/ClientApp/app/containers/users/users.component.html +++ b/ClientApp/app/containers/users/users.component.html @@ -26,4 +26,4 @@

      Users

    - + diff --git a/ClientApp/app/containers/users/users.component.ts b/ClientApp/app/containers/users/users.component.ts index 9dd28781..35cc8517 100644 --- a/ClientApp/app/containers/users/users.component.ts +++ b/ClientApp/app/containers/users/users.component.ts @@ -7,7 +7,7 @@ import { IUser } from '../../models/User'; import { UserService } from '../../shared/user.service'; @Component({ - selector: 'users', + selector: 'app-users', templateUrl: './users.component.html', styleUrls: ['./users.component.css'], animations: [ @@ -31,15 +31,16 @@ export class UsersComponent implements OnInit { selectedUser: IUser; // Use "constructor"s only for dependency injection - constructor(private userService: UserService) { } + constructor( + private userService: UserService + ) { } // Here you want to handle anything with @Input()'s @Output()'s // Data retrieval / etc - this is when the Component is "ready" and wired up ngOnInit() { this.userService.getUsers().subscribe(result => { - console.log('Get user result: ', result); - console.log('TransferHttp [GET] /api/users/allresult', result); - this.users = result as IUser[]; + console.log('HttpClient [GET] /api/users/allresult', result); + this.users = result; }); } @@ -50,10 +51,8 @@ export class UsersComponent implements OnInit { deleteUser(user) { this.userService.deleteUser(user).subscribe(result => { console.log('Delete user result: ', result); - if (result.ok) { - let position = this.users.indexOf(user); - this.users.splice(position, 1); - } + let position = this.users.indexOf(user); + this.users.splice(position, 1); }, error => { console.log(`There was an issue. ${error._body}.`); }); @@ -62,9 +61,7 @@ export class UsersComponent implements OnInit { addUser(newUserName) { this.userService.addUser(newUserName).subscribe(result => { console.log('Post user result: ', result); - if (result.ok) { - this.users.push(result.json()); - } + this.users.push(result); }, error => { console.log(`There was an issue. ${error._body}.`); }); diff --git a/ClientApp/app/shared/constants/baseurl.constants.ts b/ClientApp/app/shared/constants/baseurl.constants.ts deleted file mode 100644 index 58807bc4..00000000 --- a/ClientApp/app/shared/constants/baseurl.constants.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { InjectionToken } from '@angular/core'; - -export const ORIGIN_URL = new InjectionToken('ORIGIN_URL'); diff --git a/ClientApp/app/shared/constants/request.ts b/ClientApp/app/shared/constants/request.ts deleted file mode 100644 index 4c553d8a..00000000 --- a/ClientApp/app/shared/constants/request.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { InjectionToken } from '@angular/core'; - -export const REQUEST = new InjectionToken('REQUEST'); diff --git a/ClientApp/app/shared/user.service.ts b/ClientApp/app/shared/user.service.ts index 8bcc3bb3..9489e32f 100644 --- a/ClientApp/app/shared/user.service.ts +++ b/ClientApp/app/shared/user.service.ts @@ -1,42 +1,41 @@ -import { Injectable, Inject } from '@angular/core'; +import { Injectable, Inject, Injector } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; import { Http, URLSearchParams } from '@angular/http'; import { APP_BASE_HREF } from '@angular/common'; -import { ORIGIN_URL } from './constants/baseurl.constants'; +import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine'; import { IUser } from '../models/User'; -import { TransferHttp } from '../../modules/transfer-http/transfer-http'; import { Observable } from 'rxjs/Observable'; + @Injectable() export class UserService { - constructor( - private transferHttp: TransferHttp, // Use only for GETS that you want re-used between Server render -> Client render - private http: Http, // Use for everything else - @Inject(ORIGIN_URL) private baseUrl: string) { - } + private baseUrl: string; - getUsers(): Observable { - // ** TransferHttp example / concept ** - // - Here we make an Http call on the server, save the result on the window object and pass it down with the SSR, - // The Client then re-uses this Http result instead of hitting the server again! + constructor( + private http: HttpClient, + private injector: Injector + ) { + this.baseUrl = this.injector.get(ORIGIN_URL); + } - // NOTE : transferHttp also automatically does .map(res => res.json()) for you, so no need for these calls - return this.transferHttp.get(`${this.baseUrl}/api/users`); - } + getUsers() { + return this.http.get(`${this.baseUrl}/api/users`); + } - getUser(user: IUser): Observable { - return this.transferHttp.get(`${this.baseUrl}/api/users/` + user.id); - } + getUser(user: IUser) { + return this.http.get(`${this.baseUrl}/api/users/` + user.id); + } - deleteUser(user: IUser): Observable { - return this.http.delete(`${this.baseUrl}/api/users/` + user.id); - } + deleteUser(user: IUser) { + return this.http.delete(`${this.baseUrl}/api/users/` + user.id); + } - updateUser(user: IUser): Observable { - return this.http.put(`${this.baseUrl}/api/users/` + user.id, user); - } + updateUser(user: IUser){ + return this.http.put(`${this.baseUrl}/api/users/` + user.id, user); + } - addUser(newUserName: string): Observable { - return this.http.post(`${this.baseUrl}/api/users`, { name: newUserName }) - } + addUser(newUserName: string) { + return this.http.post(`${this.baseUrl}/api/users`, { name: newUserName }); + } } diff --git a/ClientApp/boot.browser.ts b/ClientApp/boot.browser.ts index a7830543..329344f7 100644 --- a/ClientApp/boot.browser.ts +++ b/ClientApp/boot.browser.ts @@ -3,8 +3,6 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module.browser'; -const rootElemTagName = 'app'; // Update this if you change your root component selector - // // Enable either Hot Module Reloading or production mode if (module['hot']) { module['hot'].accept(); diff --git a/ClientApp/boot.server.PRODUCTION.ts b/ClientApp/boot.server.PRODUCTION.ts new file mode 100644 index 00000000..30f8deb0 --- /dev/null +++ b/ClientApp/boot.server.PRODUCTION.ts @@ -0,0 +1,38 @@ +import 'zone.js/dist/zone-node'; +import './polyfills/server.polyfills'; +import { enableProdMode } from '@angular/core'; +import { createServerRenderer } from 'aspnet-prerendering'; + +// Grab the (Node) server-specific NgModule +const { AppModuleNgFactory } = require('./app/app.module.server.ngfactory'); // <-- ignore this - this is Production only +import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from '@nguniversal/aspnetcore-engine'; + +enableProdMode(); + +export default createServerRenderer((params) => { + + // Platform-server provider configuration + const setupOptions: IEngineOptions = { + appSelector: '', + ngModule: AppModuleNgFactory, + request: params, + providers: [ + // Optional - Any other Server providers you want to pass + // (remember you'll have to provide them for the Browser as well) + ] + }; + + return ngAspnetCoreEngine(setupOptions).then(response => { + + // Apply your transferData to response.globals + response.globals.transferData = createTransferScript({ + someData: 'Transfer this to the client on the window.TRANSFER_CACHE {} object', + fromDotnet: params.data.thisCameFromDotNET // example of data coming from dotnet, in HomeController + }); + + return ({ + html: response.html, // our serialized + globals: response.globals // all of our styles/scripts/meta-tags/link-tags for aspnet to serve up + }); + }); +}); diff --git a/ClientApp/boot.server.ts b/ClientApp/boot.server.ts index 86d65086..c2c0fb47 100644 --- a/ClientApp/boot.server.ts +++ b/ClientApp/boot.server.ts @@ -1,15 +1,11 @@ import 'zone.js/dist/zone-node'; import './polyfills/server.polyfills'; import { enableProdMode } from '@angular/core'; -import { INITIAL_CONFIG } from '@angular/platform-server'; -import { APP_BASE_HREF } from '@angular/common'; -import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; +import { createServerRenderer } from 'aspnet-prerendering'; -import { ORIGIN_URL } from './app/shared/constants/baseurl.constants'; // Grab the (Node) server-specific NgModule import { AppModule } from './app/app.module.server'; -// Temporary * the engine will be on npm soon (`@universal/ng-aspnetcore-engine`) -import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from './polyfills/temporary-aspnetcore-engine'; +import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from '@nguniversal/aspnetcore-engine'; enableProdMode(); @@ -17,15 +13,17 @@ export default createServerRenderer((params) => { // Platform-server provider configuration const setupOptions: IEngineOptions = { - appSelector: '', + appSelector: '', ngModule: AppModule, request: params, providers: [ - // Optional - Any other Server providers you want to pass (remember you'll have to provide them for the Browser as well) + // Optional - Any other Server providers you want to pass + // (remember you'll have to provide them for the Browser as well) ] }; return ngAspnetCoreEngine(setupOptions).then(response => { + // Apply your transferData to response.globals response.globals.transferData = createTransferScript({ someData: 'Transfer this to the client on the window.TRANSFER_CACHE {} object', @@ -33,8 +31,8 @@ export default createServerRenderer((params) => { }); return ({ - html: response.html, - globals: response.globals + html: response.html, // our serialized + globals: response.globals // all of our styles/scripts/meta-tags/link-tags for aspnet to serve up }); }); }); diff --git a/ClientApp/modules/transfer-http/transfer-http.module.ts b/ClientApp/modules/transfer-http/transfer-http.module.ts deleted file mode 100644 index c2875b33..00000000 --- a/ClientApp/modules/transfer-http/transfer-http.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Http, HttpModule } from '@angular/http'; -import { TransferHttp } from './transfer-http'; - -@NgModule({ - providers: [ - TransferHttp - ] -}) -export class TransferHttpModule {} diff --git a/ClientApp/modules/transfer-http/transfer-http.ts b/ClientApp/modules/transfer-http/transfer-http.ts deleted file mode 100644 index 3f9b5d84..00000000 --- a/ClientApp/modules/transfer-http/transfer-http.ts +++ /dev/null @@ -1,152 +0,0 @@ -import { Injectable, Inject, PLATFORM_ID } from '@angular/core'; -import { ConnectionBackend, Http, Request, RequestOptions, RequestOptionsArgs, Response } from '@angular/http'; -import { Observable } from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; -import { TransferState } from '../transfer-state/transfer-state'; -import { isPlatformServer } from '@angular/common'; - -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/do'; -import 'rxjs/add/observable/fromPromise'; - -@Injectable() -export class TransferHttp { - - private isServer = isPlatformServer(this.platformId); - - constructor( - @Inject(PLATFORM_ID) private platformId, - private http: Http, - protected transferState: TransferState - ) { } - - request(uri: string | Request, options?: RequestOptionsArgs): Observable { - return this.getData(uri, options, (url: string, options: RequestOptionsArgs) => { - return this.http.request(url, options); - }); - } - /** - * Performs a request with `get` http method. - */ - get(url: string, options?: RequestOptionsArgs): Observable { - return this.getData(url, options, (url: string, options: RequestOptionsArgs) => { - return this.http.get(url, options); - }); - } - /** - * Performs a request with `post` http method. - */ - post(url: string, body: any, options?: RequestOptionsArgs): Observable { - return this.getPostData(url, body, options, (url: string, body: any, options: RequestOptionsArgs) => { - return this.http.post(url, body, options); - }); - } - /** - * Performs a request with `put` http method. - */ - put(url: string, body: any, options?: RequestOptionsArgs): Observable { - - return this.getPostData(url, body, options, (url: string, body: any, options: RequestOptionsArgs) => { - return this.http.put(url, body, options); - }); - } - /** - * Performs a request with `delete` http method. - */ - delete(url: string, options?: RequestOptionsArgs): Observable { - return this.getData(url, options, (url: string, options: RequestOptionsArgs) => { - return this.http.delete(url, options); - }); - } - /** - * Performs a request with `patch` http method. - */ - patch(url: string, body: any, options?: RequestOptionsArgs): Observable { - return this.getPostData(url, body, options, (url: string, body: any, options: RequestOptionsArgs) => { - return this.http.patch(url, body.options); - }); - } - /** - * Performs a request with `head` http method. - */ - head(url: string, options?: RequestOptionsArgs): Observable { - return this.getData(url, options, (url: string, options: RequestOptionsArgs) => { - return this.http.head(url, options); - }); - } - /** - * Performs a request with `options` http method. - */ - options(url: string, options?: RequestOptionsArgs): Observable { - return this.getData(url, options, (url: string, options: RequestOptionsArgs) => { - return this.http.options(url, options); - }); - } - - private getData(uri: string | Request, options: RequestOptionsArgs, callback: (uri: string | Request, options?: RequestOptionsArgs) => Observable) { - - let url = uri; - - if (typeof uri !== 'string') { - url = uri.url; - } - - const key = url + JSON.stringify(options); - - try { - return this.resolveData(key); - - } catch (e) { - return callback(url, options) - .map(res => res.json()) - .do(data => { - if (this.isServer) { - this.setCache(key, data); - } - }); - } - } - - private getPostData(uri: string | Request, body: any, options: RequestOptionsArgs, callback: (uri: string | Request, body: any, options?: RequestOptionsArgs) => Observable) { - - let url = uri; - - if (typeof uri !== 'string') { - url = uri.url; - } - - const key = url + JSON.stringify(body); - - try { - - return this.resolveData(key); - - } catch (e) { - return callback(uri, body, options) - .map(res => res.json()) - .do(data => { - if (this.isServer) { - this.setCache(key, data); - } - }); - } - } - - private resolveData(key: string) { - const data = this.getFromCache(key); - - if (!data) { - throw new Error(); - } - - return Observable.fromPromise(Promise.resolve(data)); - } - - private setCache(key, data) { - return this.transferState.set(key, data); - } - - private getFromCache(key): any { - return this.transferState.get(key); - } -} diff --git a/ClientApp/modules/transfer-state/browser-transfer-state.module.ts b/ClientApp/modules/transfer-state/browser-transfer-state.module.ts deleted file mode 100644 index 20e11421..00000000 --- a/ClientApp/modules/transfer-state/browser-transfer-state.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule, PLATFORM_ID } from '@angular/core'; -import { TransferState } from './transfer-state'; - -export function getTransferState(): TransferState { - const transferState = new TransferState(); - transferState.initialize(window['TRANSFER_STATE'] || {}); - return transferState; -} - -@NgModule({ - providers: [ - { - provide: TransferState, - useFactory: getTransferState - } - ] -}) -export class BrowserTransferStateModule { - -} diff --git a/ClientApp/modules/transfer-state/server-transfer-state.module.ts b/ClientApp/modules/transfer-state/server-transfer-state.module.ts deleted file mode 100644 index 1a77f653..00000000 --- a/ClientApp/modules/transfer-state/server-transfer-state.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { ServerTransferState } from './server-transfer-state'; -import { TransferState } from './transfer-state'; - -@NgModule({ - providers: [ - { provide: TransferState, useClass: ServerTransferState } - ] -}) -export class ServerTransferStateModule { - -} diff --git a/ClientApp/modules/transfer-state/server-transfer-state.ts b/ClientApp/modules/transfer-state/server-transfer-state.ts deleted file mode 100644 index b2890b26..00000000 --- a/ClientApp/modules/transfer-state/server-transfer-state.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Injectable, Optional, RendererFactory2, ViewEncapsulation, Inject, PLATFORM_ID } from '@angular/core'; -import { TransferState } from './transfer-state'; -import { PlatformState } from '@angular/platform-server'; -@Injectable() -export class ServerTransferState extends TransferState { - constructor(private state: PlatformState, private rendererFactory: RendererFactory2) { - super(); - } - - /** - * Inject the State into the bottom of the - */ - inject() { - try { - const document: any = this.state.getDocument(); - const transferStateString = JSON.stringify(this.toJson()); - const renderer = this.rendererFactory.createRenderer(document, { - id: '-1', - encapsulation: ViewEncapsulation.None, - styles: [], - data: {} - }); - - const body = document.body; - - const script = renderer.createElement('script'); - renderer.setValue(script, `window['TRANSFER_STATE'] = ${transferStateString}`); - renderer.appendChild(body, script); - } catch (e) { - console.log('Failed to append TRANSFER_STATE to body'); - console.error(e); - } - } - - -} diff --git a/ClientApp/modules/transfer-state/transfer-state.ts b/ClientApp/modules/transfer-state/transfer-state.ts deleted file mode 100644 index cc963b8f..00000000 --- a/ClientApp/modules/transfer-state/transfer-state.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { Injectable, Inject, PLATFORM_ID } from '@angular/core'; - -@Injectable() -export class TransferState { - private _map = new Map(); - - constructor() { } - - keys() { - return this._map.keys(); - } - - get(key: string): any { - const cachedValue = this._map.get(key); - this._map.delete(key); - return cachedValue; - } - - set(key: string, value: any): Map { - return this._map.set(key, value); - } - - toJson(): any { - const obj = {}; - Array.from(this.keys()) - .forEach(key => { - obj[key] = this.get(key); - }); - return obj; - } - - initialize(obj: any): void { - Object.keys(obj) - .forEach(key => { - this.set(key, obj[key]); - }); - } - - inject(): void { } -} diff --git a/ClientApp/polyfills/temporary-aspnetcore-engine.ts b/ClientApp/polyfills/temporary-aspnetcore-engine.ts deleted file mode 100644 index d3157a1b..00000000 --- a/ClientApp/polyfills/temporary-aspnetcore-engine.ts +++ /dev/null @@ -1,254 +0,0 @@ -/* ********* TEMPORARILY HERE ************** - * - will be on npm soon - - * import { ngAspnetCoreEngine } from `@nguniversal/aspnetcore-engine`; - */ -import { Type, NgModuleFactory, NgModuleRef, ApplicationRef, Provider, CompilerFactory, Compiler } from '@angular/core'; -import { platformServer, platformDynamicServer, PlatformState, INITIAL_CONFIG, renderModuleFactory } from '@angular/platform-server'; -import { ResourceLoader } from '@angular/compiler'; -import * as fs from 'fs'; - -import { REQUEST } from '../app/shared/constants/request'; -import { ORIGIN_URL } from '../app/shared/constants/baseurl.constants'; - -export function createTransferScript(transferData: Object): string { - return ``; -} - -export class FileLoader implements ResourceLoader { - get(url: string): Promise { - return new Promise((resolve, reject) => { - fs.readFile(url, (err: NodeJS.ErrnoException, buffer: Buffer) => { - if (err) { - return reject(err); - } - - resolve(buffer.toString()); - }); - }); - } -} - -export interface IRequestParams { - location: any; // e.g., Location object containing information '/some/path' - origin: string; // e.g., 'https://example.com:1234/' - url: string; // e.g., '/some/path' - baseUrl: string; // e.g., '' or '/myVirtualDir' - absoluteUrl: string; // e.g., 'https://example.com:1234/some/path' - domainTasks: Promise; - data: any; // any custom object passed through from .NET -} - -export interface IEngineOptions { - appSelector: string; - request: IRequestParams; - ngModule: Type<{}> | NgModuleFactory<{}>; - providers?: Provider[]; -}; - -export function ngAspnetCoreEngine( - options: IEngineOptions -): Promise<{ html: string, globals: { styles: string, title: string, meta: string, transferData?: {}, [key: string]: any } }> { - - options.providers = options.providers || []; - - const compilerFactory: CompilerFactory = platformDynamicServer().injector.get(CompilerFactory); - const compiler: Compiler = compilerFactory.createCompiler([ - { - providers: [ - { provide: ResourceLoader, useClass: FileLoader } - ] - } - ]); - - return new Promise((resolve, reject) => { - - try { - const moduleOrFactory = options.ngModule; - if (!moduleOrFactory) { - throw new Error('You must pass in a NgModule or NgModuleFactory to be bootstrapped'); - } - - const extraProviders = options.providers.concat( - options.providers, - [ - { - provide: INITIAL_CONFIG, - useValue: { - document: options.appSelector, - url: options.request.url - } - }, - { - provide: ORIGIN_URL, - useValue: options.request.origin - }, { - provide: REQUEST, - useValue: options.request.data.request - } - ] - ); - - const platform = platformServer(extraProviders); - - getFactory(moduleOrFactory, compiler) - .then((factory: NgModuleFactory<{}>) => { - - return platform.bootstrapModuleFactory(factory).then((moduleRef: NgModuleRef<{}>) => { - - const state: PlatformState = moduleRef.injector.get(PlatformState); - const appRef: ApplicationRef = moduleRef.injector.get(ApplicationRef); - - appRef.isStable - .filter((isStable: boolean) => isStable) - .first() - .subscribe((stable) => { - - // Fire the TransferState Cache - const bootstrap = moduleRef.instance['ngOnBootstrap']; - bootstrap && bootstrap(); - - // The parse5 Document itself - const AST_DOCUMENT = state.getDocument(); - - // Strip out the Angular application - const htmlDoc = state.renderToString(); - - const APP_HTML = htmlDoc.substring( - htmlDoc.indexOf('') + 6, - htmlDoc.indexOf('') - ); - - // Strip out Styles / Meta-tags / Title - const STYLES = []; - const SCRIPTS = []; - const META = []; - const LINKS = []; - let TITLE = ''; - - let STYLES_STRING: string = htmlDoc.indexOf('') + 8) - : null; - - const HEAD = AST_DOCUMENT.head; - - let count = 0; - - for (let i = 0; i < HEAD.children.length; i++) { - let element = HEAD.children[i]; - - if (element.name === 'title') { - TITLE = element.children[0].data; - } - - if (element.name === 'script') { - SCRIPTS.push( - `` - ); - } - - // Broken after 4.0 (worked in rc) - // if (element.name === 'style') { - // let styleTag = '`; - // STYLES.push(styleTag); - // } - - if (element.name === 'meta') { - count = count + 1; - let metaString = '\n`); - } - - if (element.name === 'link') { - let linkString = '\n`); - } - } - - resolve({ - html: APP_HTML, - globals: { - styles: STYLES_STRING, - title: TITLE, - scripts: SCRIPTS.join(' '), - meta: META.join(' '), - links: LINKS.join(' ') - } - }); - - moduleRef.destroy(); - - }, (err) => { - // isStable subscription error (Template / code error) - reject(err); - }); - - }, err => { - // bootstrapModuleFactory error - reject(err); - }); - - }, err => { - // getFactory error - reject(err); - }); - - } catch (ex) { - // try/catch error - reject(ex); - } - - }); - -} - -/* ********************** Private / Internal ****************** */ - -const factoryCacheMap = new Map, NgModuleFactory<{}>>(); -function getFactory( - moduleOrFactory: Type<{}> | NgModuleFactory<{}>, compiler: Compiler -): Promise> { - - return new Promise>((resolve, reject) => { - // If module has been compiled AoT - if (moduleOrFactory instanceof NgModuleFactory) { - resolve(moduleOrFactory); - return; - } else { - let moduleFactory = factoryCacheMap.get(moduleOrFactory); - - // If module factory is cached - if (moduleFactory) { - resolve(moduleFactory); - return; - } - - // Compile the module and cache it - compiler.compileModuleAsync(moduleOrFactory) - .then((factory) => { - factoryCacheMap.set(moduleOrFactory, factory); - resolve(factory); - }, (err => { - reject(err); - })); - } - }); -} diff --git a/ClientApp/tsconfig.app.json b/ClientApp/tsconfig.app.json index 5e2507db..3f094c64 100644 --- a/ClientApp/tsconfig.app.json +++ b/ClientApp/tsconfig.app.json @@ -8,6 +8,7 @@ }, "exclude": [ "test.ts", - "**/*.spec.ts" + "**/*.spec.ts", + "boot.server.PRODUCTION.ts" ] } diff --git a/README.md b/README.md index e5578667..9dd99499 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,27 @@ -# ASP.NET Core 2.0 & Angular 4 (+) advanced starter - with Server-side prerendering (for Angular SEO)! +# ASP.NET Core 2.0 & Angular 5(+) Advanced Starter - with Server-side prerendering (for Angular SEO)! -> [(upcoming) Angular 5.0 demo Branch Here](https://github.com/MarkPieszak/aspnetcore-angular2-universal/tree/angular-5.0-WIP) +## By [DevHelp.Online](http://www.DevHelp.Online) + +> Updated to the latest Angular 5.x + +> Note ServerTransferModule still in the works - fix coming soon

    - ASP.NET Core 2.0 Angular 4+ Starter + ASP.NET Core 2.0 Angular 5+ Starter

    -### Harness the power of Angular 4+, ASP.NET Core 2.0, now with SEO ! +### Harness the power of Angular 5+, ASP.NET Core 2.0, now with SEO ! Angular SEO in action:

    - ASP.NET Core Angular4 SEO + ASP.NET Core Angular5 SEO

    ### What is this repo? Live Demo here: http://aspnetcore-angular2-universal.azurewebsites.net This repository is maintained by [Angular](https://github.com/angular/angular) and is meant to be an advanced starter -for both ASP.NET Core 2.0 using Angular 4.0+, not only for the client-side, but to be rendered on the server for instant +for both ASP.NET Core 2.0 using Angular 5.0+, not only for the client-side, but to be rendered on the server for instant application paints (Note: If you don't need SSR [read here](#faq) on how to disable it). This is meant to be a Feature-Rich Starter application containing all of the latest technologies, best build systems available, and include many real-world examples and libraries needed in todays Single Page Applications (SPAs). @@ -51,7 +55,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - Swagger WebAPI documentation when running in development mode - SignalR Chat demo! (Thanks to [@hakonamatata](https://github.com/hakonamatata)) -- **Angular 4.0.0** : +- **Angular 5.0.0** : - (Minimal) Angular-CLI integration - This is to be used mainly for Generating Components/Services/etc. - Usage examples: @@ -139,9 +143,8 @@ export ASPNETCORE_ENVIRONMENT=Development # Upcoming Features: -- Update to use npm [ngAspnetCoreEngine](https://github.com/angular/universal/pull/682) (still need to tweak a few things there) -- Potractor e2e testing -- Add basic Redux State store (Will also hold state durijg HMR builds) +- Fix HttpTransferCacheModule & ServerTransferModule to work with aspnet-engine +- ~~Update to use npm [ngAspnetCoreEngine](https://github.com/angular/universal/pull/682) (still need to tweak a few things there)~~ ---- @@ -268,7 +271,7 @@ Angular application gets serialized into a String, sent to the Browser, along wi The short-version is that we invoke that Node process, passing in our Request object & invoke the `boot.server` file, and we get back a nice object that we pass into .NETs `ViewData` object, and sprinkle through out our `Views/Shared/_Layout.cshtml` and `/Views/Home/index.cshtml` files! -A more detailed explanation can be found here: [ng-AspnetCore-Engine Readme](https://github.com/angular/universal/tree/master/modules/ng-aspnetcore-engine) +A more detailed explanation can be found here: [ng-AspnetCore-Engine Readme](https://github.com/angular/universal/tree/master/modules/aspnetcore-engine) ```csharp // Prerender / Serialize application @@ -293,7 +296,7 @@ Take a look at the `_Layout.cshtml` file for example, notice how we let .NET han - @ViewData["Title"] - AspNET.Core Angular 4.0.0 (+) starter + @ViewData["Title"] - AspNET.Core Angular 5.0.0 (+) starter @@ -334,7 +337,7 @@ Well now, your Client-side Angular will take over, and you'll have a fully funct - This repository uses ASP.Net Core 2.0, which has a hard requirement on .NET Core Runtime 2.0.0 and .NET Core SDK 2.0.0. Please install these items from [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.0-download.md) -> When building components in Angular 4 there are a few things to keep in mind. +> When building components in Angular 5 there are a few things to keep in mind. - **`window`**, **`document`**, **`navigator`**, and other browser types - _do not exist on the server_ - so using them, or any library that uses them (jQuery for example) will not work. You do have some options, if you truly need some of this functionality: - If you need to use them, consider limiting them to only your client and wrapping them situationally. You can use the Object injected using the PLATFORM_ID token to check whether the current platform is browser or server. @@ -379,7 +382,7 @@ constructor(element: ElementRef, renderer: Renderer2) { ### How can I disable SSR (Server-side rendering)? Simply comment out the logic within HomeController, and replace `@Html.Raw(ViewData["SpaHtml"])` with just your applications root -AppComponent tag ("app" in our case): ``. +AppComponent tag ("app-root" in our case): ``. > You could also remove any `isPlatformBrowser/etc` logic, and delete the boot.server, app.module.browser & app.module.server files, just make sure your `boot.browser` file points to `app.module`. @@ -395,7 +398,7 @@ This is now possible, with the recently updated Angular Material changes. We do ### How can I use jQuery and/or some jQuery plugins with this repo? > Note: If at all possible, try to avoid using jQuery or libraries dependent on it, as there are -better, more abstract ways of dealing with the DOM in Angular (4+) such as using the Renderer, etc. +better, more abstract ways of dealing with the DOM in Angular (5+) such as using the Renderer, etc. Yes, of course but there are a few things you need to setup before doing this. First, make sure jQuery is included in webpack vendor file, and that you have a webpack Plugin setup for it. `new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' })` @@ -447,10 +450,14 @@ Copyright (c) 2016-2017 [Mark Pieszak](https://github.com/MarkPieszak) # DevHelp.Online - Angular & ASP.NET - Consulting | Training | Development -Check out **[www.DevHelp.Online](http://DevHelp.Online)** for more info! +Check out **[www.DevHelp.Online](http://DevHelp.Online)** for more info! Twitter [@DevHelpOnline](http://www.twitter.com/DevHelpOnline) Contact us at , and let's talk about your projects needs. +

    + DevHelp.Online - Angular ASPNET JavaScript Consulting Development and Training +

    + ---- ## Follow me online: diff --git a/Server/Controllers/HomeController.cs b/Server/Controllers/HomeController.cs index 8a5a77f6..0a674a60 100644 --- a/Server/Controllers/HomeController.cs +++ b/Server/Controllers/HomeController.cs @@ -21,7 +21,7 @@ public async Task Index() { var prerenderResult = await Request.BuildPrerender(); - ViewData["SpaHtml"] = prerenderResult.Html; // our from Angular + ViewData["SpaHtml"] = prerenderResult.Html; // our from Angular ViewData["Title"] = prerenderResult.Globals["title"]; // set our from Angular ViewData["Styles"] = prerenderResult.Globals["styles"]; // put styles in the correct place ViewData["Scripts"] = prerenderResult.Globals["scripts"]; // scripts (that were in our header) diff --git a/Startup.cs b/Startup.cs index 7736f9e9..b7773ac0 100644 --- a/Startup.cs +++ b/Startup.cs @@ -54,7 +54,7 @@ public void ConfigureServices(IServiceCollection services) // Register the Swagger generator, defining one or more Swagger documents services.AddSwaggerGen(c => { - c.SwaggerDoc("v1", new Info { Title = "Angular 4.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); + c.SwaggerDoc("v1", new Info { Title = "Angular 5.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); }); } @@ -74,7 +74,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { HotModuleReplacement = true, - HotModuleReplacementEndpoint = "/dist/__webpack_hmr" + HotModuleReplacementEndpoint = "/dist/" }); app.UseSwagger(); app.UseSwaggerUI(c => diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml index b0796562..8c18039d 100644 --- a/Views/Home/Index.cshtml +++ b/Views/Home/Index.cshtml @@ -1,4 +1,8 @@ -@Html.Raw(ViewData["SpaHtml"]) +<!-- Remove this if you want to remove Server-side rendering --> +@Html.Raw(ViewData["SpaHtml"]) + +<!-- if you only want Client-side rendering uncomment this --> +<!-- <app-root></app-root> --> <script src="http://github.com/~/dist/vendor.js" asp-append-version="true"></script> @section scripts { diff --git a/package.json b/package.json index 9ebbf620..b86fbe7f 100644 --- a/package.json +++ b/package.json @@ -11,24 +11,25 @@ "build:dev": "npm run build:vendor && npm run build:webpack", "build:webpack": "webpack --progress --color", "build:prod": "npm run clean && npm run build:vendor -- --env.prod && npm run build:webpack -- --env.prod", + "build:p": "npm run build:webpack -- --env.prod", "build:vendor": "webpack --config webpack.config.vendor.js --progress --color", "clean": "rimraf wwwroot/dist clientapp/dist" }, "dependencies": { - "@angular/animations": "^4.3.0", - "@angular/common": "^4.3.0", - "@angular/compiler": "^4.3.0", - "@angular/compiler-cli": "^4.3.0", - "@angular/core": "^4.3.0", - "@angular/forms": "^4.3.0", - "@angular/http": "^4.3.0", - "@angular/platform-browser": "^4.3.0", - "@angular/platform-browser-dynamic": "^4.3.0", - "@angular/platform-server": "^4.3.0", - "@angular/router": "^4.3.0", - "@nguniversal/aspnetcore-engine": "^1.0.0-beta.2", - "@ngx-translate/core": "^6.0.1", - "@ngx-translate/http-loader": "0.0.3", + "@angular/animations": "^5.0.0", + "@angular/common": "^5.0.0", + "@angular/compiler": "^5.0.0", + "@angular/core": "^5.0.0", + "@angular/forms": "^5.0.0", + "@angular/http": "^5.0.0", + "@angular/platform-browser": "^5.0.0", + "@angular/platform-browser-dynamic": "^5.0.0", + "@angular/platform-server": "^5.0.0", + "@angular/router": "^5.0.0", + "@nguniversal/aspnetcore-engine": "^5.0.0-beta.5", + "@nguniversal/common": "^5.0.0-beta.5", + "@ngx-translate/core": "^8.0.0", + "@ngx-translate/http-loader": "^2.0.0", "@types/node": "^7.0.12", "angular2-router-loader": "^0.3.5", "angular2-template-loader": "^0.6.2", @@ -49,16 +50,16 @@ "jquery": "^2.2.1", "json-loader": "^0.5.4", "moment": "2.18.1", - "ngx-bootstrap": "2.0.0-beta.3", + "ngx-bootstrap": "2.0.0-beta.6", "node-sass": "^4.5.2", "preboot": "^5.0.0", "raw-loader": "^0.5.1", "rimraf": "^2.6.2", - "rxjs": "^5.4.3", + "rxjs": "^5.5.6", "sass-loader": "^6.0.6", "style-loader": "^0.18.2", "to-string-loader": "^1.1.5", - "typescript": "2.5.2", + "typescript": "~2.5.0", "url-loader": "^0.5.7", "webpack": "^3.6.0", "webpack-hot-middleware": "^2.19.1", @@ -66,8 +67,9 @@ "zone.js": "^0.8.17" }, "devDependencies": { - "@angular/cli": "^1.3.2", - "@ngtools/webpack": "^1.3.0", + "@angular/cli": "^1.7.0-beta.1", + "@angular/compiler-cli": "^5.2.1", + "@ngtools/webpack": "^1.9.0", "@types/chai": "^3.4.34", "@types/jasmine": "^2.5.37", "chai": "^3.5.0", diff --git a/tslint.json b/tslint.json index 657d49b6..f318a0b8 100644 --- a/tslint.json +++ b/tslint.json @@ -1,4 +1,5 @@ { + "defaultSeverity": "warn", "rules": { "align": false, "ban": false, @@ -75,7 +76,7 @@ "no-switch-case-fall-through": true, "no-trailing-whitespace": false, "no-unused-expression": true, - "no-unused-variable": false, + "no-unused-variable": true, "no-use-before-declare": true, "no-var-keyword": true, "no-var-requires": false, diff --git a/webpack.config.js b/webpack.config.js index 02ff0a01..02ee879f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,7 +11,7 @@ const path = require('path'); const webpack = require('webpack'); const merge = require('webpack-merge'); -const AotPlugin = require('@ngtools/webpack').AotPlugin; +const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin; const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; @@ -59,36 +59,60 @@ module.exports = (env) => { ] : [ // new BundleAnalyzerPlugin(), // Plugins that apply in production builds only - new webpack.optimize.UglifyJsPlugin(), - new AotPlugin({ - tsConfigPath: './tsconfig.json', - entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), - exclude: ['./**/*.server.ts'] - }) - ]) + new AngularCompilerPlugin({ + mainPath: path.join(__dirname, 'ClientApp/boot.browser.ts'), + tsConfigPath: './tsconfig.json', + entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), + exclude: ['./**/*.server.ts'] + }), + // new webpack.optimize.UglifyJsPlugin({ + // compress: false, + // mangle: false + // }) + ]), + devtool: isDevBuild ? 'cheap-eval-source-map' : false, + node: { + fs: "empty" + } }); // Configuration for server-side (prerendering) bundle suitable for running in Node const serverBundleConfig = merge(sharedConfig, { // resolve: { mainFields: ['main'] }, - entry: { 'main-server': './ClientApp/boot.server.ts' }, + entry: { + 'main-server': + isDevBuild ? './ClientApp/boot.server.ts' : './ClientApp/boot.server.PRODUCTION.ts' + }, plugins: [ new webpack.DllReferencePlugin({ context: __dirname, manifest: require('./ClientApp/dist/vendor-manifest.json'), sourceType: 'commonjs2', name: './vendor' - }) - ].concat(isDevBuild ? [] : [ - new webpack.optimize.UglifyJsPlugin({ - compress: false, - mangle: false }), + new webpack.ContextReplacementPlugin( + // fixes WARNING Critical dependency: the request of a dependency is an expression + /(.+)?angular(\\|\/)core(.+)?/, + path.join(__dirname, 'src'), // location of your src + {} // a map of your routes + ), + new webpack.ContextReplacementPlugin( + // fixes WARNING Critical dependency: the request of a dependency is an expression + /(.+)?express(\\|\/)(.+)?/, + path.join(__dirname, 'src'), + {} + ) + ].concat(isDevBuild ? [] : [ + // new webpack.optimize.UglifyJsPlugin({ + // compress: false, + // mangle: false + // }), // Plugins that apply in production builds only - new AotPlugin({ - tsConfigPath: './tsconfig.json', - entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), - exclude: ['./**/*.browser.ts'] + new AngularCompilerPlugin({ + mainPath: path.join(__dirname, 'ClientApp/boot.server.PRODUCTION.ts'), + tsConfigPath: './tsconfig.json', + entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), + exclude: ['./**/*.browser.ts'] }) ]), output: { @@ -96,7 +120,8 @@ module.exports = (env) => { path: path.join(__dirname, './ClientApp/dist') }, target: 'node', - devtool: isDevBuild ? 'inline-source-map': false + // switch to "inline-source-map" if you want to debug the TS during SSR + devtool: isDevBuild ? 'cheap-eval-source-map' : false }); return [clientBundleConfig, serverBundleConfig]; diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js index 3e07b78b..6d35d3ba 100644 --- a/webpack.config.vendor.js +++ b/webpack.config.vendor.js @@ -46,7 +46,7 @@ module.exports = (env) => { plugins: [ // new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) new webpack.ContextReplacementPlugin(/\@angular\b.*\b(bundles|linker)/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/11580 - new webpack.ContextReplacementPlugin(/angular(\\|\/)core(\\|\/)@angular/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/14898 + new webpack.ContextReplacementPlugin(/(.+)?angular(\\|\/)core(.+)?/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/14898 new webpack.IgnorePlugin(/^vertx$/) // Workaround for https://github.com/stefanpenner/es6-promise/issues/100 ] }; From 7252a4524bd83a3256883607bbc090cb2280b599 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Tue, 23 Jan 2018 15:24:42 -0500 Subject: [PATCH 045/103] docs(readme): gotchas --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9dd99499..8cffbc2f 100644 --- a/README.md +++ b/README.md @@ -339,6 +339,10 @@ Well now, your Client-side Angular will take over, and you'll have a fully funct > When building components in Angular 5 there are a few things to keep in mind. + - Make sure you provide Absolute URLs when calling any APIs. (The server can't understand relative paths, so `/api/whatever` will fail). + + - API calls will be ran during a server, and once again during the client render, so make sure you're using transfering data that's important to you so that you don't see a flicker. + - **`window`**, **`document`**, **`navigator`**, and other browser types - _do not exist on the server_ - so using them, or any library that uses them (jQuery for example) will not work. You do have some options, if you truly need some of this functionality: - If you need to use them, consider limiting them to only your client and wrapping them situationally. You can use the Object injected using the PLATFORM_ID token to check whether the current platform is browser or server. @@ -444,7 +448,7 @@ Nothing's ever perfect, but please let me know by creating an issue (make sure t [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](/LICENSE) -Copyright (c) 2016-2017 [Mark Pieszak](https://github.com/MarkPieszak) +Copyright (c) 2016-2018 [Mark Pieszak](https://github.com/MarkPieszak) ---- From 45d6eaaa1063af25255a7d633524ed06f965471f Mon Sep 17 00:00:00 2001 From: Luiz Machado <machado@odahcam.com> Date: Thu, 25 Jan 2018 13:31:17 -0200 Subject: [PATCH 046/103] fix(webpack): moved context replacement plugin to dev builds only (#545) closes #543 --- webpack.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 02ee879f..6c348162 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -89,7 +89,8 @@ module.exports = (env) => { manifest: require('./ClientApp/dist/vendor-manifest.json'), sourceType: 'commonjs2', name: './vendor' - }), + }) + ].concat(isDevBuild ? [ new webpack.ContextReplacementPlugin( // fixes WARNING Critical dependency: the request of a dependency is an expression /(.+)?angular(\\|\/)core(.+)?/, @@ -102,7 +103,7 @@ module.exports = (env) => { path.join(__dirname, 'src'), {} ) - ].concat(isDevBuild ? [] : [ + ] : [ // new webpack.optimize.UglifyJsPlugin({ // compress: false, // mangle: false From b7dd580acff001996ded91a13a29aa44a34eb2f0 Mon Sep 17 00:00:00 2001 From: Jan Sviland <jan@sviland.org> Date: Thu, 25 Jan 2018 16:31:52 +0100 Subject: [PATCH 047/103] browser caching (#542) closes #541 --- Startup.cs | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Startup.cs b/Startup.cs index b7773ac0..db1d5d8d 100644 --- a/Startup.cs +++ b/Startup.cs @@ -9,6 +9,8 @@ using Microsoft.EntityFrameworkCore; using AspCoreServer.Data; using Swashbuckle.AspNetCore.Swagger; +using Microsoft.AspNetCore.Http; +using Microsoft.Net.Http.Headers; namespace AspCoreServer { @@ -64,7 +66,30 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF loggerFactory.AddConsole(Configuration.GetSection("Logging")); loggerFactory.AddDebug(); - app.UseStaticFiles(); + // app.UseStaticFiles(); + + app.UseStaticFiles(new StaticFileOptions() + { + OnPrepareResponse = c => + { + //Do not add cache to json files. We need to have new versions when we add new translations. + + if (!c.Context.Request.Path.Value.Contains(".json")) + { + c.Context.Response.GetTypedHeaders().CacheControl = new CacheControlHeaderValue() + { + MaxAge = TimeSpan.FromDays(30) // Cache everything except json for 30 days + }; + } + else + { + c.Context.Response.GetTypedHeaders().CacheControl = new CacheControlHeaderValue() + { + MaxAge = TimeSpan.FromMinutes(15) // Cache json for 15 minutes + }; + } + } + }); DbInitializer.Initialize(context); From c8f3a1e5606f2e5115adf2b4dc6fc62d6b625380 Mon Sep 17 00:00:00 2001 From: Eugen Tatuev <eugentatuev@gmail.com> Date: Tue, 30 Jan 2018 08:33:03 +0300 Subject: [PATCH 048/103] fix(webpack): enable uglifyjs for non-vendor bundles --- webpack.config.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 6c348162..a54d3135 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -65,10 +65,11 @@ module.exports = (env) => { entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), exclude: ['./**/*.server.ts'] }), - // new webpack.optimize.UglifyJsPlugin({ - // compress: false, - // mangle: false - // }) + new webpack.optimize.UglifyJsPlugin({ + output: { + ascii_only: true, + } + }), ]), devtool: isDevBuild ? 'cheap-eval-source-map' : false, node: { @@ -104,10 +105,13 @@ module.exports = (env) => { {} ) ] : [ - // new webpack.optimize.UglifyJsPlugin({ - // compress: false, - // mangle: false - // }), + new webpack.optimize.UglifyJsPlugin({ + mangle: false, + compress: false, + output: { + ascii_only: true, + } + }), // Plugins that apply in production builds only new AngularCompilerPlugin({ mainPath: path.join(__dirname, 'ClientApp/boot.server.PRODUCTION.ts'), From 0ad0f60766bc08f3a1e2f36fc2944db874b44b9d Mon Sep 17 00:00:00 2001 From: Isaac Levin <isaac.r.levin@gmail.com> Date: Mon, 5 Feb 2018 12:25:45 -0500 Subject: [PATCH 049/103] Update to REST Api to better handle PUT/DELETE --- .../user-detail/user-detail.component.ts | 7 +- .../app/containers/users/users.component.html | 4 +- .../app/containers/users/users.component.ts | 120 ++++++++++-------- Server/RestAPI/UsersController.cs | 6 +- 4 files changed, 75 insertions(+), 62 deletions(-) diff --git a/ClientApp/app/components/user-detail/user-detail.component.ts b/ClientApp/app/components/user-detail/user-detail.component.ts index d21d3415..75a8369e 100644 --- a/ClientApp/app/components/user-detail/user-detail.component.ts +++ b/ClientApp/app/components/user-detail/user-detail.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, Output, EventEmitter } from '@angular/core'; import { IUser } from '../../models/User'; import { UserService } from '../../shared/user.service'; @@ -8,7 +8,7 @@ import { UserService } from '../../shared/user.service'; }) export class UserDetailComponent { @Input() user: IUser; - + @Output() userUpdate: EventEmitter<any> = new EventEmitter(); constructor(private userService: UserService) { } @@ -17,6 +17,7 @@ export class UserDetailComponent { console.log('Put user result: ', result); }, error => { console.log(`There was an issue. ${error._body}.`); - }); + }); + this.userUpdate.emit(null); } } diff --git a/ClientApp/app/containers/users/users.component.html b/ClientApp/app/containers/users/users.component.html index 1e661476..b90c06aa 100644 --- a/ClientApp/app/containers/users/users.component.html +++ b/ClientApp/app/containers/users/users.component.html @@ -1,4 +1,4 @@ -<h1>This is a RestAPI Example (hitting WebAPI in our case)</h1> +<h1>This is a RestAPI Example (hitting WebAPI in our case)</h1> <blockquote> Let's get some fake users from Rest:<br> @@ -26,4 +26,4 @@ <h2>Users</h2> </button> </li> </ul> -<app-user-detail [user]="selectedUser"></app-user-detail> +<app-user-detail (userUpdate)="onUserUpdate($event)" [user]="selectedUser"></app-user-detail> diff --git a/ClientApp/app/containers/users/users.component.ts b/ClientApp/app/containers/users/users.component.ts index 35cc8517..6bca6a73 100644 --- a/ClientApp/app/containers/users/users.component.ts +++ b/ClientApp/app/containers/users/users.component.ts @@ -1,69 +1,81 @@ -import { - Component, OnInit, - // animation imports - trigger, state, style, transition, animate, Inject +import { + Component, OnInit, + // animation imports + trigger, state, style, transition, animate, Inject } from '@angular/core'; import { IUser } from '../../models/User'; import { UserService } from '../../shared/user.service'; @Component({ - selector: 'app-users', - templateUrl: './users.component.html', - styleUrls: ['./users.component.css'], - animations: [ - // Animation example - // Triggered in the ngFor with [@flyInOut] - trigger('flyInOut', [ - state('in', style({ transform: 'translateY(0)' })), - transition('void => *', [ - style({ transform: 'translateY(-100%)' }), - animate(1000) - ]), - transition('* => void', [ - animate(1000, style({ transform: 'translateY(100%)' })) - ]) - ]) - ] + selector: 'app-users', + templateUrl: './users.component.html', + styleUrls: ['./users.component.css'], + animations: [ + // Animation example + // Triggered in the ngFor with [@flyInOut] + trigger('flyInOut', [ + state('in', style({ transform: 'translateY(0)' })), + transition('void => *', [ + style({ transform: 'translateY(-100%)' }), + animate(1000) + ]), + transition('* => void', [ + animate(1000, style({ transform: 'translateY(100%)' })) + ]) + ]) + ] }) export class UsersComponent implements OnInit { - users: IUser[]; - selectedUser: IUser; + users: IUser[]; + selectedUser: IUser; - // Use "constructor"s only for dependency injection - constructor( - private userService: UserService - ) { } + // Use "constructor"s only for dependency injection + constructor( + private userService: UserService + ) { } - // Here you want to handle anything with @Input()'s @Output()'s - // Data retrieval / etc - this is when the Component is "ready" and wired up - ngOnInit() { - this.userService.getUsers().subscribe(result => { - console.log('HttpClient [GET] /api/users/allresult', result); - this.users = result; - }); - } + // Here you want to handle anything with @Input()'s @Output()'s + // Data retrieval / etc - this is when the Component is "ready" and wired up + ngOnInit() { + this.userService.getUsers().subscribe(result => { + console.log('HttpClient [GET] /api/users/allresult', result); + this.users = result; + }); + } - onSelect(user: IUser): void { - this.selectedUser = user; - } + onSelect(user: IUser): void { + this.selectedUser = user; + } - deleteUser(user) { - this.userService.deleteUser(user).subscribe(result => { - console.log('Delete user result: ', result); - let position = this.users.indexOf(user); - this.users.splice(position, 1); - }, error => { - console.log(`There was an issue. ${error._body}.`); - }); - } + deleteUser(user) { + this.clearUser(); + this.userService.deleteUser(user).subscribe(result => { + console.log('Delete user result: ', result); + let position = this.users.indexOf(user); + this.users.splice(position, 1); + }, error => { + console.log(`There was an issue. ${error._body}.`); + }); + } + + onUserUpdate(event) { + this.clearUser(); + } + + addUser(newUserName) { + this.clearUser(); + this.userService.addUser(newUserName).subscribe(result => { + console.log('Post user result: ', result); + this.users.push(result); + }, error => { + console.log(`There was an issue. ${error._body}.`); + }); + } - addUser(newUserName) { - this.userService.addUser(newUserName).subscribe(result => { - console.log('Post user result: ', result); - this.users.push(result); - }, error => { - console.log(`There was an issue. ${error._body}.`); - }); + clearUser() { + if (this.selectedUser) { + this.selectedUser = null; } + } } diff --git a/Server/RestAPI/UsersController.cs b/Server/RestAPI/UsersController.cs index 2938eb8e..3a7fe3d2 100644 --- a/Server/RestAPI/UsersController.cs +++ b/Server/RestAPI/UsersController.cs @@ -1,4 +1,4 @@ -using AspCoreServer.Data; +using AspCoreServer.Data; using AspCoreServer.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -89,7 +89,7 @@ public async Task<IActionResult> Put(int id, [FromBody]User userUpdateValue) { _context.Update(userUpdateValue); await _context.SaveChangesAsync(); - return Ok("Updated user - " + userUpdateValue.Name); + return Json("Updated user - " + userUpdateValue.Name); } } catch (DbUpdateException) @@ -116,7 +116,7 @@ public async Task<IActionResult> Delete(int id) { _context.User.Remove(userToRemove); await _context.SaveChangesAsync(); - return Ok("Deleted user - " + userToRemove.Name); + return Json("Deleted user - " + userToRemove.Name); } } } From 0f2609c93aaad591d73db99acc7e7957c5051bd8 Mon Sep 17 00:00:00 2001 From: peterdobson <petedobson@gmail.com> Date: Wed, 7 Mar 2018 03:16:04 +1100 Subject: [PATCH 050/103] fix(sitemap): update homecontroller sitemap tags Renamed the "sitemapindex" & "sitemap" SitemapXml tags to "urlset" & "url" to allow Google Search Console to process sitemap.xml without errors closes #562 --- Server/Controllers/HomeController.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Server/Controllers/HomeController.cs b/Server/Controllers/HomeController.cs index 0a674a60..bd9ad008 100644 --- a/Server/Controllers/HomeController.cs +++ b/Server/Controllers/HomeController.cs @@ -38,16 +38,16 @@ public async Task<IActionResult> SitemapXml() { String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; - xml += "<sitemapindex xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9/">"; - xml += "<sitemap>"; + xml += "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9/">"; + xml += "<url>"; xml += "<loc>http://localhost:4251/home</loc>"; xml += "<lastmod>" + DateTime.Now.ToString("yyyy-MM-dd") + "</lastmod>"; - xml += "</sitemap>"; - xml += "<sitemap>"; + xml += "</url>"; + xml += "<url>"; xml += "<loc>http://localhost:4251/counter</loc>"; xml += "<lastmod>" + DateTime.Now.ToString("yyyy-MM-dd") + "</lastmod>"; - xml += "</sitemap>"; - xml += "</sitemapindex>"; + xml += "</url>"; + xml += "</urlset>"; return Content(xml, "text/xml"); From fdef986e352f980bf9091458fd7a1dd2dd8ec0f5 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Thu, 22 Mar 2018 15:08:45 -0400 Subject: [PATCH 051/103] fix(nguniversal): pin to beta.5 until new release --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b86fbe7f..d2adcd26 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,8 @@ "@angular/platform-browser-dynamic": "^5.0.0", "@angular/platform-server": "^5.0.0", "@angular/router": "^5.0.0", - "@nguniversal/aspnetcore-engine": "^5.0.0-beta.5", - "@nguniversal/common": "^5.0.0-beta.5", + "@nguniversal/aspnetcore-engine": "5.0.0-beta.5", + "@nguniversal/common": "5.0.0-beta.5", "@ngx-translate/core": "^8.0.0", "@ngx-translate/http-loader": "^2.0.0", "@types/node": "^7.0.12", From dfa802628d895cfbff61ccfb5c4556e50860fb42 Mon Sep 17 00:00:00 2001 From: CaerusKaru <caerus.karu@gmail.com> Date: Fri, 23 Mar 2018 18:40:24 -0400 Subject: [PATCH 052/103] chore: update to latest nguniversal and fix imports (#578) closes #577 --- ClientApp/app/app.component.ts | 2 +- ClientApp/app/app.module.browser.ts | 2 +- ClientApp/app/app.module.ts | 2 +- ClientApp/app/shared/user.service.ts | 2 +- package.json | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ClientApp/app/app.component.ts b/ClientApp/app/app.component.ts index 7a6a75ed..d8b28150 100644 --- a/ClientApp/app/app.component.ts +++ b/ClientApp/app/app.component.ts @@ -7,7 +7,7 @@ import { LinkService } from './shared/link.service'; // i18n support import { TranslateService } from '@ngx-translate/core'; -import { REQUEST } from '@nguniversal/aspnetcore-engine'; +import { REQUEST } from '@nguniversal/aspnetcore-engine/tokens'; @Component({ selector: 'app-root', diff --git a/ClientApp/app/app.module.browser.ts b/ClientApp/app/app.module.browser.ts index 56d1c20c..fa983b67 100644 --- a/ClientApp/app/app.module.browser.ts +++ b/ClientApp/app/app.module.browser.ts @@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { APP_BASE_HREF } from '@angular/common'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ORIGIN_URL, REQUEST } from '@nguniversal/aspnetcore-engine'; +import { ORIGIN_URL, REQUEST } from '@nguniversal/aspnetcore-engine/tokens'; import { AppModuleShared } from './app.module'; import { AppComponent } from './app.component'; import { BrowserTransferStateModule } from '@angular/platform-browser'; diff --git a/ClientApp/app/app.module.ts b/ClientApp/app/app.module.ts index d31250c4..5394d67d 100644 --- a/ClientApp/app/app.module.ts +++ b/ClientApp/app/app.module.ts @@ -24,7 +24,7 @@ import { NgxBootstrapComponent } from './containers/ngx-bootstrap-demo/ngx-boots import { LinkService } from './shared/link.service'; import { UserService } from './shared/user.service'; -import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine'; +import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine/tokens'; export function createTranslateLoader(http: HttpClient, baseHref) { // Temporary Azure hack diff --git a/ClientApp/app/shared/user.service.ts b/ClientApp/app/shared/user.service.ts index 9489e32f..6a3d7cb7 100644 --- a/ClientApp/app/shared/user.service.ts +++ b/ClientApp/app/shared/user.service.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Http, URLSearchParams } from '@angular/http'; import { APP_BASE_HREF } from '@angular/common'; -import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine'; +import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine/tokens'; import { IUser } from '../models/User'; import { Observable } from 'rxjs/Observable'; diff --git a/package.json b/package.json index d2adcd26..86dacd20 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,8 @@ "@angular/platform-browser-dynamic": "^5.0.0", "@angular/platform-server": "^5.0.0", "@angular/router": "^5.0.0", - "@nguniversal/aspnetcore-engine": "5.0.0-beta.5", - "@nguniversal/common": "5.0.0-beta.5", + "@nguniversal/aspnetcore-engine": "^5.0.0-beta.8", + "@nguniversal/common": "^5.0.0-beta.8", "@ngx-translate/core": "^8.0.0", "@ngx-translate/http-loader": "^2.0.0", "@types/node": "^7.0.12", From 3a8bfe242a31caba034f55162d9f1be972f406ab Mon Sep 17 00:00:00 2001 From: Rune Antonsen <rune.antonsen@gmail.com> Date: Tue, 27 Mar 2018 14:21:40 +0200 Subject: [PATCH 053/103] fix(polyfills): move reflect-metadata to polyfills.ts (#581) No need to have it in both browser.polyfills.ts and server.polyfills.ts when it's the same. Closes #580 --- ClientApp/polyfills/browser.polyfills.ts | 1 - ClientApp/polyfills/polyfills.ts | 3 +++ ClientApp/polyfills/server.polyfills.ts | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ClientApp/polyfills/browser.polyfills.ts b/ClientApp/polyfills/browser.polyfills.ts index fa02ffab..dd813a13 100644 --- a/ClientApp/polyfills/browser.polyfills.ts +++ b/ClientApp/polyfills/browser.polyfills.ts @@ -1,4 +1,3 @@ import './polyfills.ts'; import 'zone.js/dist/zone'; -import 'reflect-metadata'; diff --git a/ClientApp/polyfills/polyfills.ts b/ClientApp/polyfills/polyfills.ts index fe3a6bd6..39ccb969 100644 --- a/ClientApp/polyfills/polyfills.ts +++ b/ClientApp/polyfills/polyfills.ts @@ -18,6 +18,9 @@ import 'core-js/es6/map'; import 'core-js/es6/set'; + /** */ + import 'reflect-metadata'; + /** IE10 and IE11 requires the following for NgClass support on SVG elements */ // import 'classlist.js'; // Run `npm install --save classlist.js`. diff --git a/ClientApp/polyfills/server.polyfills.ts b/ClientApp/polyfills/server.polyfills.ts index 7d3dc3bf..7044895f 100644 --- a/ClientApp/polyfills/server.polyfills.ts +++ b/ClientApp/polyfills/server.polyfills.ts @@ -1,4 +1,3 @@ import './polyfills.ts'; -import 'reflect-metadata'; import 'zone.js'; From 3269cf0ef6bd4b6aad3357cbdb472b1ca07dc4f0 Mon Sep 17 00:00:00 2001 From: Rune Antonsen <rune.antonsen@gmail.com> Date: Tue, 27 Mar 2018 14:46:57 +0200 Subject: [PATCH 054/103] fix(polyfills): web-animations-js should be in browser.polyfills.ts (#582) --- ClientApp/polyfills/browser.polyfills.ts | 2 ++ ClientApp/polyfills/polyfills.ts | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ClientApp/polyfills/browser.polyfills.ts b/ClientApp/polyfills/browser.polyfills.ts index dd813a13..1db98ac8 100644 --- a/ClientApp/polyfills/browser.polyfills.ts +++ b/ClientApp/polyfills/browser.polyfills.ts @@ -1,3 +1,5 @@ import './polyfills.ts'; import 'zone.js/dist/zone'; +import 'reflect-metadata'; +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. diff --git a/ClientApp/polyfills/polyfills.ts b/ClientApp/polyfills/polyfills.ts index 39ccb969..4382a0e1 100644 --- a/ClientApp/polyfills/polyfills.ts +++ b/ClientApp/polyfills/polyfills.ts @@ -24,8 +24,6 @@ /** IE10 and IE11 requires the following for NgClass support on SVG elements */ // import 'classlist.js'; // Run `npm install --save classlist.js`. -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - /** Evergreen browsers require these. **/ import 'core-js/es6/reflect'; import 'core-js/es7/reflect'; From 82afbb5781165081e6167e4679a89ed1caeba8b6 Mon Sep 17 00:00:00 2001 From: Flood <linusflood@gmail.com> Date: Fri, 6 Apr 2018 15:25:58 +0200 Subject: [PATCH 055/103] fix(cache): add cache busting to js files This fix makes the cache busting work. When using asp-append-version="true" in Index.cshtml like this: <script src="http://github.com/~/dist/vendor.js" asp-append-version="true"></script> It will turn that into: <script src="http://github.com/~/dist/vendor.js?v=37182361827361" ></script> When you publish. --- Views/_ViewImports.cshtml | 1 + 1 file changed, 1 insertion(+) diff --git a/Views/_ViewImports.cshtml b/Views/_ViewImports.cshtml index 8629c125..1872fd6b 100644 --- a/Views/_ViewImports.cshtml +++ b/Views/_ViewImports.cshtml @@ -1,2 +1,3 @@ @using AspCoreServer @addTagHelper "*, Microsoft.AspNetCore.SpaServices" +@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" From a019c9b9f01c22e66e1b75538bb6f39991ad698c Mon Sep 17 00:00:00 2001 From: Bill <OceansideBill@users.noreply.github.com> Date: Sat, 19 May 2018 09:56:10 -0700 Subject: [PATCH 056/103] feat(rxjs6): added modifications to support updates to ngx-bootstrap and get translation functioning with RXJS 6. --- ClientApp/app/app.component.ts | 20 +++++---- ClientApp/app/app.module.ts | 4 +- ClientApp/app/shared/user.service.ts | 4 +- ClientApp/polyfills/polyfills.ts | 9 +--- ClientApp/polyfills/rx-imports.ts | 30 ------------- package.json | 67 ++++++++++++++-------------- 6 files changed, 50 insertions(+), 84 deletions(-) delete mode 100644 ClientApp/polyfills/rx-imports.ts diff --git a/ClientApp/app/app.component.ts b/ClientApp/app/app.component.ts index d8b28150..614cba3e 100644 --- a/ClientApp/app/app.component.ts +++ b/ClientApp/app/app.component.ts @@ -1,7 +1,9 @@ -import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, Injector } from '@angular/core'; + +import {mergeMap, map, filter} from 'rxjs/operators'; +import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, Injector } from '@angular/core'; import { Router, NavigationEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router'; import { Meta, Title, DOCUMENT, MetaDefinition } from '@angular/platform-browser'; -import { Subscription } from 'rxjs/Subscription'; +import { Subscription } from 'rxjs'; import { isPlatformServer } from '@angular/common'; import { LinkService } from './shared/link.service'; @@ -60,15 +62,15 @@ export class AppComponent implements OnInit, OnDestroy { private _changeTitleOnNavigation() { - this.routerSub$ = this.router.events - .filter(event => event instanceof NavigationEnd) - .map(() => this.activatedRoute) - .map(route => { + this.routerSub$ = this.router.events.pipe( + filter(event => event instanceof NavigationEnd), + map(() => this.activatedRoute), + map(route => { while (route.firstChild) route = route.firstChild; return route; - }) - .filter(route => route.outlet === 'primary') - .mergeMap(route => route.data) + }), + filter(route => route.outlet === 'primary'), + mergeMap(route => route.data),) .subscribe((event) => { this._setMetaAndLinks(event); }); diff --git a/ClientApp/app/app.module.ts b/ClientApp/app/app.module.ts index 5394d67d..c0fa0985 100644 --- a/ClientApp/app/app.module.ts +++ b/ClientApp/app/app.module.ts @@ -7,7 +7,7 @@ import { FormsModule } from '@angular/forms'; import { BrowserModule, BrowserTransferStateModule } from '@angular/platform-browser'; import { TransferHttpCacheModule } from '@nguniversal/common'; -import { Ng2BootstrapModule } from 'ngx-bootstrap'; +import { AccordionModule } from 'ngx-bootstrap'; // i18n support import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; @@ -57,7 +57,7 @@ export function createTranslateLoader(http: HttpClient, baseHref) { FormsModule, - Ng2BootstrapModule.forRoot(), // You could also split this up if you don't want the Entire Module imported + AccordionModule.forRoot(), // You could also split this up if you don't want the Entire Module imported // i18n support TranslateModule.forRoot({ diff --git a/ClientApp/app/shared/user.service.ts b/ClientApp/app/shared/user.service.ts index 6a3d7cb7..31110e7e 100644 --- a/ClientApp/app/shared/user.service.ts +++ b/ClientApp/app/shared/user.service.ts @@ -1,10 +1,10 @@ -import { Injectable, Inject, Injector } from '@angular/core'; +import { Injectable, Inject, Injector } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Http, URLSearchParams } from '@angular/http'; import { APP_BASE_HREF } from '@angular/common'; import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine/tokens'; import { IUser } from '../models/User'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; @Injectable() diff --git a/ClientApp/polyfills/polyfills.ts b/ClientApp/polyfills/polyfills.ts index 4382a0e1..fd43e294 100644 --- a/ClientApp/polyfills/polyfills.ts +++ b/ClientApp/polyfills/polyfills.ts @@ -1,4 +1,4 @@ - + /*************************************************************************************************** * BROWSER POLYFILLS */ @@ -28,10 +28,3 @@ import 'core-js/es6/reflect'; import 'core-js/es7/reflect'; -/** - * Date, currency, decimal and percent pipes. - * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 - */ -// import 'intl'; // Run `npm install --save intl`. - -import './rx-imports'; diff --git a/ClientApp/polyfills/rx-imports.ts b/ClientApp/polyfills/rx-imports.ts deleted file mode 100644 index 506f102b..00000000 --- a/ClientApp/polyfills/rx-imports.ts +++ /dev/null @@ -1,30 +0,0 @@ - -/* -=- RxJs imports -=- - * - * Here you can place any RxJs imports so you don't have to constantly - * import them throughout your App :) - * - * This file is automatically imported into `polyfills.ts` (which is imported into browser/server modules) - */ - -// General Operators -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/do'; -import 'rxjs/add/operator/throttleTime'; -import 'rxjs/add/operator/distinctUntilChanged'; -import 'rxjs/add/operator/switchMap'; -import 'rxjs/add/operator/take'; -import 'rxjs/add/operator/debounceTime'; -import 'rxjs/add/operator/filter'; -import 'rxjs/add/operator/mergeMap'; -import 'rxjs/add/operator/concat'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/first'; - -// Observable operators -import 'rxjs/add/observable/fromEvent'; -import 'rxjs/add/observable/interval'; -import 'rxjs/add/observable/fromPromise'; -import 'rxjs/add/observable/of'; -import 'rxjs/add/observable/concat'; - diff --git a/package.json b/package.json index 86dacd20..848a12a2 100644 --- a/package.json +++ b/package.json @@ -28,65 +28,66 @@ "@angular/router": "^5.0.0", "@nguniversal/aspnetcore-engine": "^5.0.0-beta.8", "@nguniversal/common": "^5.0.0-beta.8", - "@ngx-translate/core": "^8.0.0", - "@ngx-translate/http-loader": "^2.0.0", + "@ngx-translate/core": "^9.1.1", + "@ngx-translate/http-loader": "^2.0.1", "@types/node": "^7.0.12", "angular2-router-loader": "^0.3.5", "angular2-template-loader": "^0.6.2", "aspnet-prerendering": "^3.0.1", - "aspnet-webpack": "^2.0.1", - "awesome-typescript-loader": "^3.0.0", - "bootstrap": "^3.3.7", + "aspnet-webpack": "^2.0.3", + "awesome-typescript-loader": "^3.2.3", + "bootstrap": "^4.1.1", "bootstrap-sass": "^3.3.7", - "core-js": "^2.5.1", - "css": "^2.2.1", - "css-loader": "^0.28.7", - "event-source-polyfill": "^0.0.9", - "expose-loader": "^0.7.3", - "extract-text-webpack-plugin": "^3.0.0", - "file-loader": "^0.11.2", - "html-loader": "^0.5.1", + "core-js": "^2.5.6", + "css": "^2.2.3", + "css-loader": "^0.28.11", + "event-source-polyfill": "^0.0.12", + "expose-loader": "^0.7.5", + "extract-text-webpack-plugin": "^3.0.2", + "file-loader": "^1.1.11", + "html-loader": "^0.5.5", "isomorphic-fetch": "^2.2.1", - "jquery": "^2.2.1", - "json-loader": "^0.5.4", + "jquery": "^3.3.1", + "json-loader": "^0.5.7", "moment": "2.18.1", - "ngx-bootstrap": "2.0.0-beta.6", - "node-sass": "^4.5.2", + "ngx-bootstrap": "2.0.5", + "node-sass": "^4.9.0", "preboot": "^5.0.0", "raw-loader": "^0.5.1", "rimraf": "^2.6.2", - "rxjs": "^5.5.6", + "rxjs": "^6.1.0", + "rxjs-compat": "^6.1.0", "sass-loader": "^6.0.6", "style-loader": "^0.18.2", "to-string-loader": "^1.1.5", - "typescript": "~2.5.0", - "url-loader": "^0.5.7", + "typescript": "~2.7.2", + "url-loader": "^1.0.1", "webpack": "^3.6.0", - "webpack-hot-middleware": "^2.19.1", + "webpack-hot-middleware": "^2.22.1", "webpack-merge": "^4.1.0", - "zone.js": "^0.8.17" + "zone.js": "^0.8.26" }, "devDependencies": { "@angular/cli": "^1.7.0-beta.1", "@angular/compiler-cli": "^5.2.1", "@ngtools/webpack": "^1.9.0", - "@types/chai": "^3.4.34", - "@types/jasmine": "^2.5.37", - "chai": "^3.5.0", - "codelyzer": "^3.0.0", - "istanbul-instrumenter-loader": "^3.0.0", + "@types/chai": "^4.1.3", + "@types/jasmine": "^2.8.7", + "chai": "^4.1.2", + "codelyzer": "^3.1.2", + "istanbul-instrumenter-loader": "^3.0.1", "jasmine-core": "^2.5.2", "karma": "^1.7.1", "karma-chai": "^0.1.0", "karma-chrome-launcher": "^2.2.0", "karma-coverage": "^1.1.1", - "karma-jasmine": "^1.1.0", - "karma-mocha-reporter": "^2.2.4", + "karma-jasmine": "^1.1.2", + "karma-mocha-reporter": "^2.2.5", "karma-phantomjs-launcher": "^1.0.4", - "karma-remap-coverage": "^0.1.4", + "karma-remap-coverage": "^0.1.5", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^2.0.3", - "tslint": "^5.7.0", - "webpack-bundle-analyzer": "^2.9.0" + "karma-webpack": "^2.0.4", + "tslint": "^5.10.0", + "webpack-bundle-analyzer": "^2.12.0" } } From 0360ad5a8ef1830dd88d6c76aceae4a0f1879bf3 Mon Sep 17 00:00:00 2001 From: Robert Zeni <robert.zeni@mohawkcollege.ca> Date: Mon, 28 May 2018 13:40:45 -0400 Subject: [PATCH 057/103] feat(angular6): upgrade .net core 2.1, bootstrap 4, ngx-bootsrap 3, rxjs 6, etc closes #619 --- .vscode/launch.json | 6 +- Asp2017.csproj | 12 ++-- Asp2017.sln | 25 ++++++++ ClientApp/app/app.module.browser.ts | 4 +- ClientApp/app/app.module.server.ts | 4 +- .../app/containers/home/home.component.html | 2 +- .../app/containers/users/users.component.ts | 11 +++- README.md | 8 +-- package.json | 64 ++++++++++--------- webpack.config.js | 47 ++++++++++---- webpack.config.vendor.js | 40 ++++++++++-- 11 files changed, 152 insertions(+), 71 deletions(-) create mode 100644 Asp2017.sln diff --git a/.vscode/launch.json b/.vscode/launch.json index 08d4edf9..c26ab807 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -20,7 +20,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Asp2017.dll", + "program": "${workspaceRoot}/bin/Debug/netcoreapp2.1/Asp2017.dll", "args": [], "cwd": "${workspaceRoot}", "stopAtEntry": false, @@ -51,7 +51,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Asp2017.dll", + "program": "${workspaceRoot}/bin/Debug/netcoreapp2.1/Asp2017.dll", "args": [], "cwd": "${workspaceRoot}", "stopAtEntry": false, @@ -82,7 +82,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Asp2017.dll", + "program": "${workspaceRoot}/bin/Debug/netcoreapp2.1/Asp2017.dll", "args": [], "cwd": "${workspaceRoot}", "stopAtEntry": false, diff --git a/Asp2017.csproj b/Asp2017.csproj index efb619c0..fe12d77e 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -1,17 +1,17 @@ <Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <IsPackable>false</IsPackable> </PropertyGroup> <ItemGroup> <!-- New Meta Package has SpaServices in It --> - <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" /> - <PackageReference Include="NETStandard.Library" Version="2.0.0" /> - <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.0" /> - <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" /> + <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-rc1-final" /> + <PackageReference Include="NETStandard.Library" Version="2.0.3" /> + <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0-rc1-final" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0-rc1-final" /> + <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> </ItemGroup> <ItemGroup> <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" /> diff --git a/Asp2017.sln b/Asp2017.sln new file mode 100644 index 00000000..56a99822 --- /dev/null +++ b/Asp2017.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2018 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Asp2017", "Asp2017.csproj", "{BC28E9F7-E6EC-447D-AABD-17683BEAD625}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BC28E9F7-E6EC-447D-AABD-17683BEAD625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BC28E9F7-E6EC-447D-AABD-17683BEAD625}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BC28E9F7-E6EC-447D-AABD-17683BEAD625}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BC28E9F7-E6EC-447D-AABD-17683BEAD625}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DE341460-9041-458F-99D5-43FC7572CFA6} + EndGlobalSection +EndGlobal diff --git a/ClientApp/app/app.module.browser.ts b/ClientApp/app/app.module.browser.ts index fa983b67..f7371e80 100644 --- a/ClientApp/app/app.module.browser.ts +++ b/ClientApp/app/app.module.browser.ts @@ -7,7 +7,7 @@ import { ORIGIN_URL, REQUEST } from '@nguniversal/aspnetcore-engine/tokens'; import { AppModuleShared } from './app.module'; import { AppComponent } from './app.component'; import { BrowserTransferStateModule } from '@angular/platform-browser'; -import { BrowserPrebootModule } from 'preboot/browser'; +import { PrebootModule } from 'preboot'; export function getOriginUrl() { return window.location.origin; @@ -21,7 +21,7 @@ export function getRequest() { @NgModule({ bootstrap: [AppComponent], imports: [ - BrowserPrebootModule.replayEvents(), + PrebootModule.withConfig({ appRoot: 'app-root' }), BrowserAnimationsModule, // Our Common AppModule diff --git a/ClientApp/app/app.module.server.ts b/ClientApp/app/app.module.server.ts index 25711851..642a774c 100644 --- a/ClientApp/app/app.module.server.ts +++ b/ClientApp/app/app.module.server.ts @@ -7,7 +7,7 @@ import { AppModuleShared } from './app.module'; import { AppComponent } from './app.component'; import { ServerTransferStateModule } from '@angular/platform-server'; -import { ServerPrebootModule } from 'preboot/server'; +import { PrebootModule } from 'preboot'; @NgModule({ bootstrap: [AppComponent], @@ -16,7 +16,7 @@ import { ServerPrebootModule } from 'preboot/server'; AppModuleShared, ServerModule, - ServerPrebootModule.recordEvents({ appRoot: 'app-root' }), + PrebootModule.withConfig({ appRoot: 'app-root' }), NoopAnimationsModule, // HttpTransferCacheModule still needs fixes for 5.0 diff --git a/ClientApp/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html index 3a4db63b..3c08c588 100644 --- a/ClientApp/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -12,7 +12,7 @@ <h2>{{ 'HOME_FEATURE_LIST_TITLE' | translate }} </h2> <ul> <li>ASP.NET Core 2.0 :: ( Visual Studio 2017 )</li> <li> - Angular 5.* front-end UI framework + Angular 6.* front-end UI framework <ul> <li>Angular **platform-server** (aka: Universal) - server-side rendering for SEO, deep-linking, and incredible performance.</li> diff --git a/ClientApp/app/containers/users/users.component.ts b/ClientApp/app/containers/users/users.component.ts index 6bca6a73..f6a0aa2d 100644 --- a/ClientApp/app/containers/users/users.component.ts +++ b/ClientApp/app/containers/users/users.component.ts @@ -1,8 +1,13 @@ import { - Component, OnInit, - // animation imports - trigger, state, style, transition, animate, Inject + Component, OnInit, Inject } from '@angular/core'; +import { + trigger, + state, + style, + animate, + transition +} from '@angular/animations'; import { IUser } from '../../models/User'; import { UserService } from '../../shared/user.service'; diff --git a/README.md b/README.md index 8cffbc2f..d2b1db31 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# ASP.NET Core 2.0 & Angular 5(+) Advanced Starter - with Server-side prerendering (for Angular SEO)! +# ASP.NET Core 2.0 & Angular 6(+) Advanced Starter - with Server-side prerendering (for Angular SEO)! ## By [DevHelp.Online](http://www.DevHelp.Online) -> Updated to the latest Angular 5.x +> Updated to the latest Angular 6.x > Note ServerTransferModule still in the works - fix coming soon @@ -81,7 +81,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - Codelyzer (for Real-time static code analysis) - VSCode & Atom provide real-time analysis out of the box. -- **ASP.NET Core 2.0** +- **ASP.NET Core 2.1** - Integration with NodeJS to provide pre-rendering, as well as any other Node module asset you want to use. @@ -113,7 +113,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual ### Visual Studio 2017 -Make sure you have .NET Core 2.0 installed and/or VS2017 15.3. +Make sure you have .NET Core 2.1 installed and/or VS2017 15.3. VS2017 will automatically install all the neccessary npm & .NET dependencies when you open the project. Simply push F5 to start debugging ! diff --git a/package.json b/package.json index 848a12a2..9765601e 100644 --- a/package.json +++ b/package.json @@ -16,26 +16,26 @@ "clean": "rimraf wwwroot/dist clientapp/dist" }, "dependencies": { - "@angular/animations": "^5.0.0", - "@angular/common": "^5.0.0", - "@angular/compiler": "^5.0.0", - "@angular/core": "^5.0.0", - "@angular/forms": "^5.0.0", - "@angular/http": "^5.0.0", - "@angular/platform-browser": "^5.0.0", - "@angular/platform-browser-dynamic": "^5.0.0", - "@angular/platform-server": "^5.0.0", - "@angular/router": "^5.0.0", - "@nguniversal/aspnetcore-engine": "^5.0.0-beta.8", - "@nguniversal/common": "^5.0.0-beta.8", - "@ngx-translate/core": "^9.1.1", - "@ngx-translate/http-loader": "^2.0.1", - "@types/node": "^7.0.12", + "@angular/animations": "^6.0.3", + "@angular/common": "^6.0.3", + "@angular/compiler": "^6.0.3", + "@angular/core": "^6.0.3", + "@angular/forms": "^6.0.3", + "@angular/http": "^6.0.3", + "@angular/platform-browser": "^6.0.3", + "@angular/platform-browser-dynamic": "^6.0.3", + "@angular/platform-server": "^6.0.3", + "@angular/router": "^6.0.3", + "@nguniversal/aspnetcore-engine": "^6.0.0", + "@nguniversal/common": "^6.0.0", + "@ngx-translate/core": "^10.0.2", + "@ngx-translate/http-loader": "^3.0.1", + "@types/node": "^10.1.2", "angular2-router-loader": "^0.3.5", "angular2-template-loader": "^0.6.2", "aspnet-prerendering": "^3.0.1", "aspnet-webpack": "^2.0.3", - "awesome-typescript-loader": "^3.2.3", + "awesome-typescript-loader": "^5.0.0", "bootstrap": "^4.1.1", "bootstrap-sass": "^3.3.7", "core-js": "^2.5.6", @@ -43,38 +43,38 @@ "css-loader": "^0.28.11", "event-source-polyfill": "^0.0.12", "expose-loader": "^0.7.5", - "extract-text-webpack-plugin": "^3.0.2", "file-loader": "^1.1.11", "html-loader": "^0.5.5", "isomorphic-fetch": "^2.2.1", "jquery": "^3.3.1", "json-loader": "^0.5.7", - "moment": "2.18.1", - "ngx-bootstrap": "2.0.5", + "moment": "2.22.1", + "ngx-bootstrap": "^3.0.0", "node-sass": "^4.9.0", - "preboot": "^5.0.0", + "preboot": "^6.0.0-beta.4", "raw-loader": "^0.5.1", "rimraf": "^2.6.2", - "rxjs": "^6.1.0", - "rxjs-compat": "^6.1.0", - "sass-loader": "^6.0.6", - "style-loader": "^0.18.2", + "rxjs": "^6.2.0", + "rxjs-compat": "^6.2.0", + "sass-loader": "^7.0.1", + "style-loader": "^0.21.0", "to-string-loader": "^1.1.5", "typescript": "~2.7.2", "url-loader": "^1.0.1", - "webpack": "^3.6.0", - "webpack-hot-middleware": "^2.22.1", - "webpack-merge": "^4.1.0", + "webpack": "^4.9.1", + "webpack-hot-middleware": "^2.22.2", + "webpack-merge": "^4.1.2", "zone.js": "^0.8.26" }, "devDependencies": { - "@angular/cli": "^1.7.0-beta.1", - "@angular/compiler-cli": "^5.2.1", - "@ngtools/webpack": "^1.9.0", + "@angular/cli": "^6.0.5", + "@angular/compiler-cli": "6.0.3", + "@ngtools/webpack": "^6.0.5", "@types/chai": "^4.1.3", "@types/jasmine": "^2.8.7", "chai": "^4.1.2", "codelyzer": "^3.1.2", + "extract-text-webpack-plugin": "^4.0.0-beta.0", "istanbul-instrumenter-loader": "^3.0.1", "jasmine-core": "^2.5.2", "karma": "^1.7.1", @@ -88,6 +88,8 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.4", "tslint": "^5.10.0", - "webpack-bundle-analyzer": "^2.12.0" + "uglifyjs-webpack-plugin": "^1.2.5", + "webpack-bundle-analyzer": "^2.13.1", + "webpack-cli": "^2.1.4" } } diff --git a/webpack.config.js b/webpack.config.js index a54d3135..d55cb8de 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -21,6 +21,7 @@ module.exports = (env) => { // Configuration in common to both client-side and server-side bundles const isDevBuild = !(env && env.prod); const sharedConfig = { + mode: isDevBuild ? "development" : "production", stats: { modules: false }, context: __dirname, resolve: { extensions: [ '.js', '.ts' ] }, @@ -64,16 +65,26 @@ module.exports = (env) => { tsConfigPath: './tsconfig.json', entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), exclude: ['./**/*.server.ts'] - }), - new webpack.optimize.UglifyJsPlugin({ - output: { - ascii_only: true, - } - }), + }) ]), devtool: isDevBuild ? 'cheap-eval-source-map' : false, node: { fs: "empty" + }, + optimization: { + minimizer: [].concat(isDevBuild ? [] : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true + }, + sourceMap: true + }) + ]) } }); @@ -105,13 +116,6 @@ module.exports = (env) => { {} ) ] : [ - new webpack.optimize.UglifyJsPlugin({ - mangle: false, - compress: false, - output: { - ascii_only: true, - } - }), // Plugins that apply in production builds only new AngularCompilerPlugin({ mainPath: path.join(__dirname, 'ClientApp/boot.server.PRODUCTION.ts'), @@ -126,7 +130,22 @@ module.exports = (env) => { }, target: 'node', // switch to "inline-source-map" if you want to debug the TS during SSR - devtool: isDevBuild ? 'cheap-eval-source-map' : false + devtool: isDevBuild ? 'cheap-eval-source-map' : false, + optimization: { + minimizer: [].concat(isDevBuild ? [] : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true + }, + sourceMap: true + }) + ]) + } }); return [clientBundleConfig, serverBundleConfig]; diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js index 6d35d3ba..9a63c583 100644 --- a/webpack.config.vendor.js +++ b/webpack.config.vendor.js @@ -27,10 +27,11 @@ const nonTreeShakableModules = [ const allModules = treeShakableModules.concat(nonTreeShakableModules); module.exports = (env) => { - console.log(`env = ${JSON.stringify(env)}`) + console.log(`env = ${JSON.stringify(env)}`) const extractCSS = new ExtractTextPlugin('vendor.css'); const isDevBuild = !(env && env.prod); const sharedConfig = { + mode: isDevBuild ? "development" : "production", stats: { modules: false }, resolve: { extensions: [ '.js' ] }, module: { @@ -70,8 +71,23 @@ module.exports = (env) => { name: '[name]_[hash]' }) ].concat(isDevBuild ? [] : [ - new webpack.optimize.UglifyJsPlugin() - ]) + + ]), + optimization: { + minimizer: [].concat(isDevBuild ? [] : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true + }, + sourceMap: true + }) + ]) + } }); const serverBundleConfig = merge(sharedConfig, { @@ -91,8 +107,22 @@ module.exports = (env) => { name: '[name]_[hash]' }) ].concat(isDevBuild ? [] : [ - new webpack.optimize.UglifyJsPlugin() - ]) + ]), + optimization: { + minimizer: [].concat(isDevBuild ? [] : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true + }, + sourceMap: true + }) + ]) + } }); return [clientBundleConfig, serverBundleConfig]; From eff67f28a986be7fb36b16d002649e6ea37622e2 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Thu, 31 May 2018 14:56:48 -0400 Subject: [PATCH 058/103] fix(uglify, dotnetcore): update to 2.1, fix uglify issue, prod build fixed closes #632 --- .angular-cli.json | 25 -------------- Asp2017.csproj | 8 ++--- ClientApp/tsconfig.spec.json | 1 + angular.json | 63 ++++++++++++++++++++++++++++++++++++ package.json | 4 ++- webpack.config.js | 1 + webpack.config.vendor.js | 2 ++ 7 files changed, 74 insertions(+), 30 deletions(-) delete mode 100644 .angular-cli.json create mode 100644 angular.json diff --git a/.angular-cli.json b/.angular-cli.json deleted file mode 100644 index 4e8d017d..00000000 --- a/.angular-cli.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "project": { - "name": "AspnetCore-Angular-Universal" - }, - "apps": [ - { - "root": "ClientApp" - } - ], - "defaults": { - "styleExt": "scss", - "component": { - "spec": false - } - }, - "lint":[ - { - "project": "ClientApp/tsconfig.app.json" - }, - { - "project": "ClientApp/tsconfig.spec.json" - } - ] -} diff --git a/Asp2017.csproj b/Asp2017.csproj index fe12d77e..c8975b88 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -7,15 +7,15 @@ </PropertyGroup> <ItemGroup> <!-- New Meta Package has SpaServices in It --> - <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-rc1-final" /> + <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" /> <PackageReference Include="NETStandard.Library" Version="2.0.3" /> - <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0-rc1-final" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0-rc1-final" /> + <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> </ItemGroup> <ItemGroup> <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" /> - </ItemGroup> + </ItemGroup> <ItemGroup> <!-- Files not to show in IDE --> <None Remove="yarn.lock" /> diff --git a/ClientApp/tsconfig.spec.json b/ClientApp/tsconfig.spec.json index 584cb0a4..de4e2a75 100644 --- a/ClientApp/tsconfig.spec.json +++ b/ClientApp/tsconfig.spec.json @@ -11,6 +11,7 @@ ] }, "files": [ + "polyfills.ts" ], "include": [ "**/*.spec.ts", diff --git a/angular.json b/angular.json new file mode 100644 index 00000000..42179045 --- /dev/null +++ b/angular.json @@ -0,0 +1,63 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "AspnetCore-Angular-Universal": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/", + "index": "ClientApp/index.html", + "main": "ClientApp/main.ts", + "tsConfig": "ClientApp/tsconfig.app.json", + "assets": [], + "styles": [], + "scripts": [] + }, + "configurations": {} + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "AspnetCore-Angular-Universal:build" + }, + "configurations": {} + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "AspnetCore-Angular-Universal:build" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "ClientApp/tsconfig.app.json", + "ClientApp/tsconfig.spec.json" + ], + "exclude": [] + } + } + } + }, + "AspnetCore-Angular-Universal-e2e": { + "root": "", + "sourceRoot": "", + "projectType": "application" + } + }, + "defaultProject": "AspnetCore-Angular-Universal", + "schematics": { + "@schematics/angular:component": { + "spec": false, + "styleext": "scss" + }, + "@schematics/angular:directive": {} + } +} \ No newline at end of file diff --git a/package.json b/package.json index 9765601e..61767b74 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "angular4-aspnetcore-universal", "version": "1.0.0-rc3", "scripts": { + "clean:install": "npm run clean && rimraf ./node_modules ./bin ./obj ./package-lock.json && dotnet restore && npm i", "lint": "tslint -p tsconfig.json", "test": "npm run build:vendor && karma start ClientApp/test/karma.conf.js", "test:watch": "npm run test -- --auto-watch --no-single-run", @@ -90,6 +91,7 @@ "tslint": "^5.10.0", "uglifyjs-webpack-plugin": "^1.2.5", "webpack-bundle-analyzer": "^2.13.1", - "webpack-cli": "^2.1.4" + "webpack-cli": "^2.1.4", + "@angular-devkit/build-angular": "~0.6.6" } } diff --git a/webpack.config.js b/webpack.config.js index d55cb8de..029207ac 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,6 +14,7 @@ const merge = require('webpack-merge'); const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin; const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; +const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); const { sharedModuleRules } = require('./webpack.additions'); diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js index 9a63c583..b335a1f9 100644 --- a/webpack.config.vendor.js +++ b/webpack.config.vendor.js @@ -2,6 +2,7 @@ const path = require('path'); const webpack = require('webpack'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const merge = require('webpack-merge'); +const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); const treeShakableModules = [ '@angular/animations', '@angular/common', @@ -24,6 +25,7 @@ const nonTreeShakableModules = [ 'event-source-polyfill', // 'jquery', ]; + const allModules = treeShakableModules.concat(nonTreeShakableModules); module.exports = (env) => { From 2e12109b0fe957154edaf2de6a15614b37597f24 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Thu, 31 May 2018 15:04:21 -0400 Subject: [PATCH 059/103] docs(readme): update verbiage --- README.md | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index d2b1db31..7006242d 100644 --- a/README.md +++ b/README.md @@ -4,24 +4,22 @@ > Updated to the latest Angular 6.x -> Note ServerTransferModule still in the works - fix coming soon - <p align="center"> - <img src="http://github.com/docs/architecture.png" alt="ASP.NET Core 2.0 Angular 5+ Starter" title="ASP.NET Core 2.0 Angular 5+ Starter"> + <img src="http://github.com/docs/architecture.png" alt="ASP.NET Core 2.0 Angular 6+ Starter" title="ASP.NET Core 2.0 Angular 6+ Starter"> </p> -### Harness the power of Angular 5+, ASP.NET Core 2.0, now with SEO ! +### Harness the power of Angular 6+, ASP.NET Core 2.0, now with SEO ! Angular SEO in action: <p align="center"> - <img src="http://github.com/docs/angular2-seo.png" alt="ASP.NET Core Angular5 SEO" title="ASP.NET Core Angular5 SEO"> + <img src="http://github.com/docs/angular2-seo.png" alt="ASP.NET Core Angular6 SEO" title="ASP.NET Core Angular6 SEO"> </p> ### What is this repo? Live Demo here: http://aspnetcore-angular2-universal.azurewebsites.net This repository is maintained by [Angular](https://github.com/angular/angular) and is meant to be an advanced starter -for both ASP.NET Core 2.0 using Angular 5.0+, not only for the client-side, but to be rendered on the server for instant +for both ASP.NET Core 2.0 using Angular 6.0+, not only for the client-side, but to be rendered on the server for instant application paints (Note: If you don't need SSR [read here](#faq) on how to disable it). This is meant to be a Feature-Rich Starter application containing all of the latest technologies, best build systems available, and include many real-world examples and libraries needed in todays Single Page Applications (SPAs). @@ -47,7 +45,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual > These are just some of the features found in this starter! -- ASP.NET 2.0 - VS2017 15.3 support now! +- ASP.NET 2.1 - VS2017 support now! - Azure delpoyment straight from VS2017 - Built in docker support through VS2017 - RestAPI (WebAPI) integration @@ -55,7 +53,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - Swagger WebAPI documentation when running in development mode - SignalR Chat demo! (Thanks to [@hakonamatata](https://github.com/hakonamatata)) -- **Angular 5.0.0** : +- **Angular 6.0.0** : - (Minimal) Angular-CLI integration - This is to be used mainly for Generating Components/Services/etc. - Usage examples: @@ -69,7 +67,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - Can be easily replaced with bootstrap4 (3 is provided for browser support) - Bootstrap using SCSS / SASS for easy theming / styling! -- **Webpack build system (Webpack 2)** +- **Webpack build system (Webpack 4)** - HMR : Hot Module Reloading/Replacement - Production builds w/ AoT Compilation @@ -87,7 +85,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - **Azure** - Microsoft Application Insights setup (for MVC & Web API routing) - - Client-side Angular2 Application Insights integration + - Client-side Angular Application Insights integration - If you're using Azure simply install `npm i -S @markpieszak/ng-application-insights` as a dependencies. - Note: Make sure only the Browser makes these calls ([usage info here](https://github.com/MarkPieszak/angular-application-insights/blob/master/README.md#usage)) - More information here: - https://github.com/MarkPieszak/angular-application-insights @@ -97,9 +95,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual instrumentationKey: 'Your-Application-Insights-instrumentationKey' }) ``` - - -> Looking for the older 2.x branch? Go [here](https://github.com/MarkPieszak/aspnetcore-angular2-universal/tree/old-2.x-universal-branch) + ---- @@ -107,8 +103,8 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual # Getting Started? -- **Make sure you have at least Node 6.x or higher (w/ npm 3+) installed!** -- **This repository uses ASP.Net Core 2.0, which has a hard requirement on .NET Core Runtime 2.0.0 and .NET Core SDK 2.0.0. Please install these items from [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.0-download.md)** +- **Make sure you have at least Node 8.11.1 or higher (w/ npm 5+) installed!** +- **This repository uses ASP.Net Core 2.1, which has a hard requirement on .NET Core Runtime 2.1 and .NET Core SDK 2.1. Please install these items from [here](https://blogs.msdn.microsoft.com/dotnet/2018/05/30/announcing-net-core-2-1/?WT.mc_id=blog-twitter-timheuer)** ### Visual Studio 2017 @@ -143,8 +139,9 @@ export ASPNETCORE_ENVIRONMENT=Development # Upcoming Features: -- Fix HttpTransferCacheModule & ServerTransferModule to work with aspnet-engine -- ~~Update to use npm [ngAspnetCoreEngine](https://github.com/angular/universal/pull/682) (still need to tweak a few things there)~~ +- Clean API / structure / simplify application +- Refactor to latest RxJs pipeable syntax +- Attempt to integrate with Angular-CLI fully ---- @@ -296,7 +293,7 @@ Take a look at the `_Layout.cshtml` file for example, notice how we let .NET han <head> <base href="http://github.com/" /> <!-- Title will be the one you set in your Angular application --> - <title>@ViewData["Title"] - AspNET.Core Angular 5.0.0 (+) starter + @ViewData["Title"] - AspNET.Core Angular 6.0.0 (+) starter @@ -335,9 +332,9 @@ Well now, your Client-side Angular will take over, and you'll have a fully funct # "Gotchas" -- This repository uses ASP.Net Core 2.0, which has a hard requirement on .NET Core Runtime 2.0.0 and .NET Core SDK 2.0.0. Please install these items from [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.0-download.md) +- This repository uses ASP.Net Core 2.1, which has a hard requirement on .NET Core Runtime 2.1 and .NET Core SDK 2.1. Please install these items from [here](https://blogs.msdn.microsoft.com/dotnet/2018/05/30/announcing-net-core-2-1/?WT.mc_id=blog-twitter-timheuer) -> When building components in Angular 5 there are a few things to keep in mind. +> When building components in Angular 6 there are a few things to keep in mind. - Make sure you provide Absolute URLs when calling any APIs. (The server can't understand relative paths, so `/api/whatever` will fail). From 8f6356ca35d1164b3c25ce112253e26da5511e39 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Thu, 31 May 2018 15:04:55 -0400 Subject: [PATCH 060/103] docs(readme): update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7006242d..bdf713cc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ASP.NET Core 2.0 & Angular 6(+) Advanced Starter - with Server-side prerendering (for Angular SEO)! +# ASP.NET Core 2.1 & Angular 6(+) Advanced Starter - with Server-side prerendering (for Angular SEO)! ## By [DevHelp.Online](http://www.DevHelp.Online) @@ -19,7 +19,7 @@ Angular SEO in action: ### What is this repo? Live Demo here: http://aspnetcore-angular2-universal.azurewebsites.net This repository is maintained by [Angular](https://github.com/angular/angular) and is meant to be an advanced starter -for both ASP.NET Core 2.0 using Angular 6.0+, not only for the client-side, but to be rendered on the server for instant +for both ASP.NET Core 2.1 using Angular 6.0+, not only for the client-side, but to be rendered on the server for instant application paints (Note: If you don't need SSR [read here](#faq) on how to disable it). This is meant to be a Feature-Rich Starter application containing all of the latest technologies, best build systems available, and include many real-world examples and libraries needed in todays Single Page Applications (SPAs). From e1b8178d2845e54c584528cd1ea4e235777cd68f Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Thu, 31 May 2018 15:39:02 -0400 Subject: [PATCH 061/103] chore(wording): update 5.0 references in text to 6.0 --- ClientApp/app/containers/home/home.component.html | 6 +++--- Startup.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ClientApp/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html index 3c08c588..7b6799b6 100644 --- a/ClientApp/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -1,8 +1,8 @@ 

    {{ title }}

    - Enjoy the latest features from .NET Core & Angular 5.0! -
    For more info check the repo here: AspNetCore-Angular2-Universal repo + Enjoy the latest features from .NET Core & Angular 6.x! +
    For more info check the repo here: AspNetCore-Angular-Universal repo

    @@ -10,7 +10,7 @@

    {{ 'HOME_FEATURE_LIST_TITLE' | translate }}

      -
    • ASP.NET Core 2.0 :: ( Visual Studio 2017 )
      • +
    • ASP.NET Core 2.1 :: ( Visual Studio 2017 )
    • Angular 6.* front-end UI framework
        diff --git a/Startup.cs b/Startup.cs index db1d5d8d..4b07eaed 100644 --- a/Startup.cs +++ b/Startup.cs @@ -56,7 +56,7 @@ public void ConfigureServices(IServiceCollection services) // Register the Swagger generator, defining one or more Swagger documents services.AddSwaggerGen(c => { - c.SwaggerDoc("v1", new Info { Title = "Angular 5.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); + c.SwaggerDoc("v1", new Info { Title = "Angular 6.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); }); } From 352fab824aa428079f31a6902c1e95444660f7f8 Mon Sep 17 00:00:00 2001 From: GRIMMR3AP3R Date: Thu, 31 May 2018 14:46:41 -0500 Subject: [PATCH 062/103] feat(bootstrap4): add bootstrap4, docker support, fix bootstrap-sass issues * Real Bootstrap 4 * Real Boostrap 4 * Add docker support --- .dockerignore | 335 ++++++++++++++++++ ClientApp/app/_styles.scss | 45 +++ ClientApp/app/_variables.scss | 6 + ClientApp/app/app.component.html | 8 +- ClientApp/app/app.component.scss | 88 ++--- ClientApp/app/app.module.ts | 5 +- .../components/navmenu/navmenu.component.css | 106 ------ .../components/navmenu/navmenu.component.html | 89 +++-- .../components/navmenu/navmenu.component.scss | 114 ++++++ .../components/navmenu/navmenu.component.ts | 2 +- .../user-detail/user-detail.component.html | 25 +- .../user-detail/user-detail.component.scss | 4 + .../user-detail/user-detail.component.ts | 29 +- .../app/containers/home/home.component.html | 4 +- .../ngx-bootstrap.component.html | 2 +- .../app/containers/users/users.component.css | 64 ---- .../app/containers/users/users.component.html | 55 +-- .../app/containers/users/users.component.scss | 101 ++++++ .../app/containers/users/users.component.ts | 8 +- Dockerfile | 24 ++ Server/Data/DbInitializer.cs | 3 +- Views/Shared/_Layout.cshtml | 3 +- package.json | 1 - 23 files changed, 809 insertions(+), 312 deletions(-) create mode 100644 .dockerignore create mode 100644 ClientApp/app/_styles.scss create mode 100644 ClientApp/app/_variables.scss delete mode 100644 ClientApp/app/components/navmenu/navmenu.component.css create mode 100644 ClientApp/app/components/navmenu/navmenu.component.scss create mode 100644 ClientApp/app/components/user-detail/user-detail.component.scss delete mode 100644 ClientApp/app/containers/users/users.component.css create mode 100644 ClientApp/app/containers/users/users.component.scss create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..230e749b --- /dev/null +++ b/.dockerignore @@ -0,0 +1,335 @@ +.dockerignore +.env +.git +.gitignore +.vs +.vscode +*/bin +*/obj +**/.toolstarget + + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ \ No newline at end of file diff --git a/ClientApp/app/_styles.scss b/ClientApp/app/_styles.scss new file mode 100644 index 00000000..42cf15fe --- /dev/null +++ b/ClientApp/app/_styles.scss @@ -0,0 +1,45 @@ +$body-bg: #f1f1f1; +$body-color: #111; +$theme-colors: ( "primary": #216DAD); +$theme-colors: ( "accent": #669ECD); + + +@import "http://github.com/~bootstrap/scss/bootstrap"; +.panel { + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12); + height: 100%; + flex: 1; + background-color: rgba(255, 255, 255, .30); + border-radius: .25rem; + .title { + background-color: #86afd0; + color: #FFFFFF; + text-align: center; + border-top-left-radius: .25rem; + border-top-right-radius: .25rem; + } + .body { + display: flex; + } +} + +@include media-breakpoint-down(md) { + .panel { + .body { + flex-direction: column; + padding: 0px; + } + .title { + font-size: 1.5rem; + } + } +} + +@include media-breakpoint-up(md) { + .panel { + .body { + flex-direction: row; + padding: 1.5rem; + } + } +} diff --git a/ClientApp/app/_variables.scss b/ClientApp/app/_variables.scss new file mode 100644 index 00000000..2d34745a --- /dev/null +++ b/ClientApp/app/_variables.scss @@ -0,0 +1,6 @@ +@import "http://github.com/styles"; +$header-height:50px; +$menu-max-width:25%; +$navbar-default-bg: #312312; +$light-orange: #ff8c00; +$navbar-default-color: $light-orange; diff --git a/ClientApp/app/app.component.html b/ClientApp/app/app.component.html index 0345c682..45ca7f89 100644 --- a/ClientApp/app/app.component.html +++ b/ClientApp/app/app.component.html @@ -1,6 +1,6 @@ -
        - -
        -
        +
        + +
        +
        diff --git a/ClientApp/app/app.component.scss b/ClientApp/app/app.component.scss index 481063dc..8705be92 100644 --- a/ClientApp/app/app.component.scss +++ b/ClientApp/app/app.component.scss @@ -1,63 +1,71 @@ -$navbar-default-bg: #312312; -$light-orange: #ff8c00; -$navbar-default-color: $light-orange; +@import "http://github.com/variables"; +/* *** Overall APP Styling can go here *** + -------------------------------------------- + Note: This Component has ViewEncapsulation.None so the styles will bleed out -/* Import Bootstrap & Fonts */ -$icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/'; -@import "http://github.com/~bootstrap-sass/assets/stylesheets/bootstrap"; +*/ +body { + line-height: 18px; + padding-top: $header-height; +} +.body-content { + margin: auto; +} +h1 { + border-bottom: 3px theme-color("accent") solid; + font-size: 24px; +} -/* *** Overall APP Styling can go here *** - -------------------------------------------- - Note: This Component has ViewEncapsulation.None so the styles will bleed out +h2 { + font-size: 20px; +} -*/ -@media (max-width: 767px) { - body { - background: #f1f1f1; - line-height: 18px; - padding-top: 30px; - } +h1, +h2, +h3 { + padding: 3px 0; +} - h1 { - border-bottom: 3px #4189C7 solid; - font-size: 24px; - } +ul { + padding: 10px 25px; +} - h2 { - font-size: 20px; - } +ul li { + padding: 5px 0; +} - h1, h2, h3 { - padding: 3px 0; - } +blockquote { + margin: 25px 10px; + padding: 10px 35px 10px 10px; + border-left: 10px color("green") solid; + background: $gray-100; +} + +blockquote a, +blockquote a:hover { + color: $green; } -@media (min-width: 768px) { +@include media-breakpoint-up(lg) { body { - background: #f1f1f1; - line-height: 18px; - padding-top: 0px; + padding-top: 30px; + } + .body-content { + margin-left: $menu-max-width; } - h1 { border-bottom: 5px #4189C7 solid; font-size: 36px; } - h2 { font-size: 30px; } - - h1, h2, h3 { + h1, + h2, + h3 { padding: 10px 0; } } - -ul { padding: 10px 25px; } -ul li { padding: 5px 0; } - -blockquote { margin: 25px 10px; padding: 10px 35px 10px 10px; border-left: 10px #158a15 solid; background: #edffed; } -blockquote a, blockquote a:hover { color: #068006; } diff --git a/ClientApp/app/app.module.ts b/ClientApp/app/app.module.ts index c0fa0985..7cc9c4c0 100644 --- a/ClientApp/app/app.module.ts +++ b/ClientApp/app/app.module.ts @@ -3,7 +3,7 @@ import { RouterModule, PreloadAllModules } from '@angular/router'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { HttpModule, Http } from '@angular/http'; import { HttpClientModule, HttpClient } from '@angular/common/http'; -import { FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BrowserModule, BrowserTransferStateModule } from '@angular/platform-browser'; import { TransferHttpCacheModule } from '@nguniversal/common'; @@ -54,9 +54,8 @@ export function createTranslateLoader(http: HttpClient, baseHref) { HttpClientModule, TransferHttpCacheModule, BrowserTransferStateModule, - - FormsModule, + ReactiveFormsModule, AccordionModule.forRoot(), // You could also split this up if you don't want the Entire Module imported // i18n support diff --git a/ClientApp/app/components/navmenu/navmenu.component.css b/ClientApp/app/components/navmenu/navmenu.component.css deleted file mode 100644 index 8d86aa03..00000000 --- a/ClientApp/app/components/navmenu/navmenu.component.css +++ /dev/null @@ -1,106 +0,0 @@ -li .glyphicon { - margin-right: 10px; -} - -/* Highlighting rules for nav menu items */ -li.link-active a, -li.link-active a:hover, -li.link-active a:focus { - background-color: #4189C7; - color: white; -} - -/* Keep the nav menu independent of scrolling and on top of other items */ -.main-nav { - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 1; -} - -.icon-bar { - background-color: #4189C7; -} - - -@media (max-width: 767px) { - /* Apply for small displays */ - .main-nav { - width: 100%; - } - - .navbar-brand { - font-size: 14px; - background-color: #f1f1f1; - } - .navbar-toggle { - padding: 0px 5px; - margin-top: 0px; - height: 26px; - } - - .navbar-link { - margin-top: 4px; - margin-left: 45px; - position: fixed; - } - - .navbar-collapse { - background-color: white; - } - - .navbar a { - /* If a menu item's text is too long, truncate it */ - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - padding-right: 5px; - } -} - -@media (min-width: 768px) { - /* On small screens, convert the nav menu to a vertical sidebar */ - .main-nav { - height: 100%; - max-width: 330px; - width: calc(25% - 20px); - } - .navbar { - border-radius: 0px; - border-width: 0px; - height: 100%; - } - .navbar-brand{ - width: 100%; - } - .navbar-link { - display: block; - width: 100% - } - .navbar-header { - float: none; - } - .navbar-collapse { - border-top: 1px solid #444; - padding: 0px; - } - .navbar ul { - float: none; - } - .navbar li { - float: none; - font-size: 15px; - margin: 6px; - } - .navbar li a { - padding: 10px 16px; - border-radius: 4px; - } - .navbar a { - /* If a menu item's text is too long, truncate it */ - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } -} diff --git a/ClientApp/app/components/navmenu/navmenu.component.html b/ClientApp/app/components/navmenu/navmenu.component.html index 08e1b0fc..36c187ed 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.html +++ b/ClientApp/app/components/navmenu/navmenu.component.html @@ -1,50 +1,41 @@ -
        -
        -
        -
        - - Angular 5 Universal & ASP.NET Core -
        -
        -
        -
        - -
        +
        + diff --git a/ClientApp/app/components/navmenu/navmenu.component.scss b/ClientApp/app/components/navmenu/navmenu.component.scss new file mode 100644 index 00000000..462e9461 --- /dev/null +++ b/ClientApp/app/components/navmenu/navmenu.component.scss @@ -0,0 +1,114 @@ +@import "http://github.com/variables"; +// Mobile first styling. +/* Apply for small displays */ + +.navbar { + position: fixed; + background-color: theme-color("primary"); + top: 0; + right: 0; + left: 0; + z-index: 1030; +} + +.navbar, +a, +button { + color: $body-bg; +} + +.nav { + padding: 0px; + background-color: white; +} + +.nav-item a { + /* If a menu item's text is too long, truncate it */ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + padding-right: 5px; +} + +.nav-link { + display: flex; + svg { + margin-right: 10px; + width: 20px; + height: 20px; + } +} + +.navbar-brand { + font-size: 1.15rem; +} + +li a { + border: 1px solid transparent; + &:hover { + border: 1px solid theme-color-level(primary, 2); + } +} + +li.link-active a, +li.link-active a:hover, +li.link-active a:focus { + background-color: theme-color("accent"); + color: $body-bg; +} + +@include media-breakpoint-up(lg) { + .navbar { + width: 275px; + min-height: 1px; + padding-right: 15px; + padding-left: 15px; + background-color: $body-bg; + flex: 0 0 $menu-max-width; + min-width: $menu-max-width; + position: fixed; + display: flex; + flex-direction: column; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 100; + padding: 0px; + align-items: flex-start; + box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1); + } + .navbar, + a, + button { + color: theme-color("primary"); + } + .navbar-brand { + padding: 15px 15px; + font-size: 100%; + line-height: 20px; + height: 50px; + } + .navbar-collapse { + width: 100%; + flex: 1; + align-items: flex-start; + } + .nav { + width: 100%; + border-top: 1px solid #444; + background-color: transparent; + } + .nav-item { + float: none; + font-size: 15px; + margin: 6px; + } + .nav-item a { + padding: 10px 16px; + border-radius: 4px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } +} diff --git a/ClientApp/app/components/navmenu/navmenu.component.ts b/ClientApp/app/components/navmenu/navmenu.component.ts index fb0cf22c..c5eb3e8c 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.ts +++ b/ClientApp/app/components/navmenu/navmenu.component.ts @@ -3,7 +3,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-nav-menu', templateUrl: './navmenu.component.html', - styleUrls: ['./navmenu.component.css'] + styleUrls: ['./navmenu.component.scss'] }) export class NavMenuComponent { diff --git a/ClientApp/app/components/user-detail/user-detail.component.html b/ClientApp/app/components/user-detail/user-detail.component.html index 585bbe40..0b9ed7b1 100644 --- a/ClientApp/app/components/user-detail/user-detail.component.html +++ b/ClientApp/app/components/user-detail/user-detail.component.html @@ -1,9 +1,24 @@ -
        -

        {{user.name}} details:

        -
        {{user.id}}
        +
        +

        {{user.name}} details:

        +
        +
        + + +
        +
        + + +
        +
        + +
        +
        +
        + diff --git a/ClientApp/app/components/user-detail/user-detail.component.scss b/ClientApp/app/components/user-detail/user-detail.component.scss new file mode 100644 index 00000000..15a7f257 --- /dev/null +++ b/ClientApp/app/components/user-detail/user-detail.component.scss @@ -0,0 +1,4 @@ +@import "http://github.com/variables"; +:host-context() { + flex: 1; +} diff --git a/ClientApp/app/components/user-detail/user-detail.component.ts b/ClientApp/app/components/user-detail/user-detail.component.ts index 75a8369e..2f2f5ffd 100644 --- a/ClientApp/app/components/user-detail/user-detail.component.ts +++ b/ClientApp/app/components/user-detail/user-detail.component.ts @@ -1,23 +1,40 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { IUser } from '../../models/User'; import { UserService } from '../../shared/user.service'; +import { FormControl, FormGroup } from '@angular/forms'; +import { debounce, debounceTime, distinctUntilChanged } from 'rxjs/operators'; @Component({ selector: 'app-user-detail', + styleUrls: ['./user-detail.component.scss'], templateUrl: './user-detail.component.html' }) -export class UserDetailComponent { +export class UserDetailComponent implements OnInit, OnChanges { + @Input() user: IUser; @Output() userUpdate: EventEmitter = new EventEmitter(); + userForm = new FormGroup({ + id: new FormControl(), + name: new FormControl() + }); constructor(private userService: UserService) { } + ngOnInit() { + this.userForm.valueChanges.pipe( + debounceTime(400), + distinctUntilChanged() + ).subscribe(user => this.user = user); + } + ngOnChanges(changes: SimpleChanges) { + this.userForm.patchValue(this.user); + } - updateUser(user) { - this.userService.updateUser(user).subscribe(result => { + updateUser() { + this.userService.updateUser(this.userForm.value).subscribe(result => { console.log('Put user result: ', result); }, error => { console.log(`There was an issue. ${error._body}.`); - }); - this.userUpdate.emit(null); + }); + this.userUpdate.emit(this.user); } } diff --git a/ClientApp/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html index 7b6799b6..8f12abfc 100644 --- a/ClientApp/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -53,11 +53,11 @@

        {{ 'HOME_ISSUES_TITLE' | translate }}

        {{ 'SWITCH_LANGUAGE' | translate }}

        - - diff --git a/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html b/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html index 5f7c3820..c57f2260 100644 --- a/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html +++ b/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html @@ -15,7 +15,7 @@

        Bootstrap Accordion demo:

        (click)="group.isOpen = !group.isOpen"> Toggle last panel - diff --git a/ClientApp/app/containers/users/users.component.css b/ClientApp/app/containers/users/users.component.css deleted file mode 100644 index 4e5440e1..00000000 --- a/ClientApp/app/containers/users/users.component.css +++ /dev/null @@ -1,64 +0,0 @@ -.selected { - background-color: #CFD8DC !important; - color: white; -} - -.users { - margin: 0 0 2em 0; - list-style-type: none; - padding: 0; - width: 15em; -} - - .users li { - cursor: pointer; - position: relative; - left: 0; - background-color: #EEE; - margin: .5em; - padding: .3em 0; - height: 2.4em; - border-radius: 4px; - } - - .users li:hover { - color: #607D8B; - background-color: #DDD; - left: .1em; - } - - .users li.selected:hover { - background-color: #BBD8DC !important; - color: white; - } - - .users .text { - position: relative; - top: -3px; - } - - .users .badge { - display: inline-block; - font-size: small; - color: white; - padding: 0.8em 0.7em 0 0.7em; - background-color: #607D8B; - line-height: 1em; - position: relative; - left: -1px; - top: -4px; - height: 2.5em; - margin-right: .8em; - border-radius: 4px 0 0 4px; - } -button.delete { - background-color: #eee; - border: none; - padding: 5px 10px; - border-radius: 4px; - float: right; - margin-top: 2px; - margin-right: .8em; - background-color: gray !important; - color: white; -} \ No newline at end of file diff --git a/ClientApp/app/containers/users/users.component.html b/ClientApp/app/containers/users/users.component.html index b90c06aa..4b8a7ecc 100644 --- a/ClientApp/app/containers/users/users.component.html +++ b/ClientApp/app/containers/users/users.component.html @@ -1,29 +1,38 @@

        This is a RestAPI Example (hitting WebAPI in our case)

        - Let's get some fake users from Rest:
        - You can find the Web API Routes in {{ "/Server/RestAPI/ ... "}} + Let's get some fake users from Rest: +
        You can find the Web API Routes in + {{ "/Server/RestAPI/ ... "}}
        +
        +

        Users

        +
        +
        +

        + Loading... +

        +
          +
        • + {{user.id}} +

          {{user.name}}

          + +
          • +
        +
        +
        +
        +
        + +
        + +
        +
        +
        + +
        +
        -
        - -
        - -

        Loading...

        -

        Users

        -
          -
        • - {{user.id}} {{user.name}} - -
          • -
        - diff --git a/ClientApp/app/containers/users/users.component.scss b/ClientApp/app/containers/users/users.component.scss new file mode 100644 index 00000000..85a47c26 --- /dev/null +++ b/ClientApp/app/containers/users/users.component.scss @@ -0,0 +1,101 @@ +@import "http://github.com/variables"; +.users-wrapper { + max-height: 65vh; + overflow-y: auto; + width: 100%; + margin-bottom: 15px; +} + +.card-wrapper { + display: flex; + flex-direction: column; + flex: 1; + padding-right: 15px; + padding-left: 15px; +} + +.users { + list-style-type: none; + display: flex; + flex-direction: column; + margin: 0px; + padding: 0px 2px; +} + +h1 { + font-size: 1.75rem; +} + +.user { + @extend .btn; + border: 0px; + background-color: #d9d9d9; + display: flex; + flex-direction: row; + align-items: center; + padding: 0px; + &:hover { + color: #607D8B; + background-color: #e6e6e6; + left: .1em; + } + &.selected { + background-color: #7eaacd !important; + color: white; + } +} + +.users li>* { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} + +.users li p { + flex: 1; + margin: 0px; +} + +.users li.selected:hover { + background-color: #BBD8DC !important; + color: white; +} + +.user-id { + @extend .input-group-text; + background-color: #607D8B; + color: white; + width: 2.5rem; + border: 0px; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; +} + +.delete-user { + @extend .btn, + .badge, + .badge-secondary; + height: 25px; + width: 25px; + margin-right: 10px; +} + +@include media-breakpoint-down(sm) { + .body { + flex-direction: column-reverse !important; + } +} + +@include media-breakpoint-up(md) { + .users-wrapper { + max-height: 65vh; + overflow-y: auto; + margin-right: 1.25rem; + margin-bottom: 0px; + width: 100%; + } + .body { + flex-direction: column; + } +} diff --git a/ClientApp/app/containers/users/users.component.ts b/ClientApp/app/containers/users/users.component.ts index f6a0aa2d..27a9bbff 100644 --- a/ClientApp/app/containers/users/users.component.ts +++ b/ClientApp/app/containers/users/users.component.ts @@ -14,7 +14,7 @@ import { UserService } from '../../shared/user.service'; @Component({ selector: 'app-users', templateUrl: './users.component.html', - styleUrls: ['./users.component.css'], + styleUrls: ['./users.component.scss'], animations: [ // Animation example // Triggered in the ngFor with [@flyInOut] @@ -64,15 +64,15 @@ export class UsersComponent implements OnInit { }); } - onUserUpdate(event) { - this.clearUser(); + onUserUpdate(user: IUser) { + this.users[this.users.findIndex((u => u.id == user.id))] = user; } addUser(newUserName) { - this.clearUser(); this.userService.addUser(newUserName).subscribe(result => { console.log('Post user result: ', result); this.users.push(result); + this.selectedUser = result; }, error => { console.log(`There was an issue. ${error._body}.`); }); diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..e7e95da8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +WORKDIR /app +RUN apt-get -qq update && apt-get install -my wget gnupg +RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - +RUN apt-get install -y nodejs +EXPOSE 80 + +FROM microsoft/dotnet:2.1-sdk AS build +WORKDIR /src +COPY Asp2017.csproj . +RUN apt-get -qq update && apt-get -qq -y install bzip2 +RUN dotnet restore ./Asp2017.csproj +COPY . . +WORKDIR /src/ +RUN dotnet build Asp2017.csproj -c Release -o /app + +FROM build AS publish +RUN dotnet publish Asp2017.csproj -c Release -o /app + +FROM base AS final +WORKDIR /app +COPY --from=publish /app . +ENV ASPNETCORE_ENVIRONMENT=Production +ENTRYPOINT ["dotnet", "Asp2017.dll"] diff --git a/Server/Data/DbInitializer.cs b/Server/Data/DbInitializer.cs index bca0eed3..45b7498e 100644 --- a/Server/Data/DbInitializer.cs +++ b/Server/Data/DbInitializer.cs @@ -29,7 +29,8 @@ public static void Initialize(SpaDbContext context) new User(){Name = "paonath"}, new User(){Name = "nalex095"}, new User(){Name = "ORuban"}, - new User(){Name = "Gaulomatic"} + new User(){Name = "Gaulomatic"}, + new User(){Name = "GRIMMR3AP3R"} }; foreach (User s in users) diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index bcf5be51..dba6da9f 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -8,9 +8,8 @@ @Html.Raw(ViewData["Meta"]) @Html.Raw(ViewData["Links"]) - - + @Html.Raw(ViewData["Styles"]) diff --git a/package.json b/package.json index 61767b74..02c48f5d 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "aspnet-webpack": "^2.0.3", "awesome-typescript-loader": "^5.0.0", "bootstrap": "^4.1.1", - "bootstrap-sass": "^3.3.7", "core-js": "^2.5.6", "css": "^2.2.3", "css-loader": "^0.28.11", From 2ac9bc268cdb28dc9337b183664fd59f6cd64a6a Mon Sep 17 00:00:00 2001 From: GRIMMR3AP3R Date: Tue, 5 Jun 2018 02:35:36 -0500 Subject: [PATCH 063/103] fix(webpack): StaticInjectorError potential fix for #637 ? --- webpack.config.js | 277 +++++++++++++++++++++------------------ webpack.config.vendor.js | 246 ++++++++++++++++++---------------- 2 files changed, 283 insertions(+), 240 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 029207ac..a7984c89 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -16,138 +16,161 @@ const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); -const { sharedModuleRules } = require('./webpack.additions'); +const { + sharedModuleRules +} = require('./webpack.additions'); module.exports = (env) => { - // Configuration in common to both client-side and server-side bundles - const isDevBuild = !(env && env.prod); - const sharedConfig = { - mode: isDevBuild ? "development" : "production", - stats: { modules: false }, - context: __dirname, - resolve: { extensions: [ '.js', '.ts' ] }, - output: { - filename: '[name].js', - publicPath: 'dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix - }, - module: { - rules: [ - { test: /\.ts$/, use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader', 'angular2-router-loader'] : '@ngtools/webpack' }, - { test: /\.html$/, use: 'html-loader?minimize=false' }, - { test: /\.css$/, use: [ 'to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] }, - { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' }, - ...sharedModuleRules - ] + // Configuration in common to both client-side and server-side bundles + const isDevBuild = !(env && env.prod); + const sharedConfig = { + mode: isDevBuild ? "development" : "production", + stats: { + modules: false + }, + context: __dirname, + resolve: { + extensions: ['.js', '.ts'] + }, + output: { + filename: '[name].js', + publicPath: 'dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix + }, + module: { + rules: [{ + test: /\.ts$/, + use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader', 'angular2-router-loader'] : '@ngtools/webpack' }, - plugins: [new CheckerPlugin()] - }; - - // Configuration for client-side bundle suitable for running in browsers - const clientBundleOutputDir = './wwwroot/dist'; - const clientBundleConfig = merge(sharedConfig, { - entry: { 'main-client': './ClientApp/boot.browser.ts' }, - output: { path: path.join(__dirname, clientBundleOutputDir) }, - plugins: [ - new webpack.DllReferencePlugin({ - context: __dirname, - manifest: require('./wwwroot/dist/vendor-manifest.json') - }) - ].concat(isDevBuild ? [ - // Plugins that apply in development builds only - new webpack.SourceMapDevToolPlugin({ - filename: '[file].map', // Remove this line if you prefer inline source maps - moduleFilenameTemplate: path.relative(clientBundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk - }) - ] : [ - // new BundleAnalyzerPlugin(), - // Plugins that apply in production builds only - new AngularCompilerPlugin({ - mainPath: path.join(__dirname, 'ClientApp/boot.browser.ts'), - tsConfigPath: './tsconfig.json', - entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), - exclude: ['./**/*.server.ts'] - }) - ]), - devtool: isDevBuild ? 'cheap-eval-source-map' : false, - node: { - fs: "empty" + { + test: /\.html$/, + use: 'html-loader?minimize=false' }, - optimization: { - minimizer: [].concat(isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ - cache: true, - parallel: true, - uglifyOptions: { - compress: false, - ecma: 6, - mangle: true - }, - sourceMap: true - }) - ]) - } - }); - - // Configuration for server-side (prerendering) bundle suitable for running in Node - const serverBundleConfig = merge(sharedConfig, { - // resolve: { mainFields: ['main'] }, - entry: { - 'main-server': - isDevBuild ? './ClientApp/boot.server.ts' : './ClientApp/boot.server.PRODUCTION.ts' + { + test: /\.css$/, + use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize'] }, - plugins: [ - new webpack.DllReferencePlugin({ - context: __dirname, - manifest: require('./ClientApp/dist/vendor-manifest.json'), - sourceType: 'commonjs2', - name: './vendor' - }) - ].concat(isDevBuild ? [ - new webpack.ContextReplacementPlugin( - // fixes WARNING Critical dependency: the request of a dependency is an expression - /(.+)?angular(\\|\/)core(.+)?/, - path.join(__dirname, 'src'), // location of your src - {} // a map of your routes - ), - new webpack.ContextReplacementPlugin( - // fixes WARNING Critical dependency: the request of a dependency is an expression - /(.+)?express(\\|\/)(.+)?/, - path.join(__dirname, 'src'), - {} - ) - ] : [ - // Plugins that apply in production builds only - new AngularCompilerPlugin({ - mainPath: path.join(__dirname, 'ClientApp/boot.server.PRODUCTION.ts'), - tsConfigPath: './tsconfig.json', - entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), - exclude: ['./**/*.browser.ts'] - }) - ]), - output: { - libraryTarget: 'commonjs', - path: path.join(__dirname, './ClientApp/dist') + { + test: /\.(png|jpg|jpeg|gif|svg)$/, + use: 'url-loader?limit=25000' }, - target: 'node', - // switch to "inline-source-map" if you want to debug the TS during SSR - devtool: isDevBuild ? 'cheap-eval-source-map' : false, - optimization: { - minimizer: [].concat(isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ - cache: true, - parallel: true, - uglifyOptions: { - compress: false, - ecma: 6, - mangle: true - }, - sourceMap: true - }) - ]) - } - }); + ...sharedModuleRules + ] + }, + plugins: [new CheckerPlugin()] + }; + + // Configuration for client-side bundle suitable for running in browsers + const clientBundleOutputDir = './wwwroot/dist'; + const clientBundleConfig = merge(sharedConfig, { + entry: { + 'main-client': './ClientApp/boot.browser.ts' + }, + output: { + path: path.join(__dirname, clientBundleOutputDir) + }, + plugins: [ + new webpack.DllReferencePlugin({ + context: __dirname, + manifest: require('./wwwroot/dist/vendor-manifest.json') + }) + ].concat(isDevBuild ? [ + // Plugins that apply in development builds only + new webpack.SourceMapDevToolPlugin({ + filename: '[file].map', // Remove this line if you prefer inline source maps + moduleFilenameTemplate: path.relative(clientBundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk + }) + ] : [ + // new BundleAnalyzerPlugin(), + // Plugins that apply in production builds only + new AngularCompilerPlugin({ + mainPath: path.join(__dirname, 'ClientApp/boot.browser.ts'), + tsConfigPath: './tsconfig.json', + entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), + exclude: ['./**/*.server.ts'] + }) + ]), + devtool: isDevBuild ? 'cheap-eval-source-map' : false, + node: { + fs: "empty" + }, + optimization: { + minimizer: [].concat(isDevBuild ? [] : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true, + keep_classnames: true, + keep_fnames: true + }, + sourceMap: true + }) + ]) + } + }); + + // Configuration for server-side (prerendering) bundle suitable for running in Node + const serverBundleConfig = merge(sharedConfig, { + // resolve: { mainFields: ['main'] }, + entry: { + 'main-server': isDevBuild ? './ClientApp/boot.server.ts' : './ClientApp/boot.server.PRODUCTION.ts' + }, + plugins: [ + new webpack.DllReferencePlugin({ + context: __dirname, + manifest: require('./ClientApp/dist/vendor-manifest.json'), + sourceType: 'commonjs2', + name: './vendor' + }) + ].concat(isDevBuild ? [ + new webpack.ContextReplacementPlugin( + // fixes WARNING Critical dependency: the request of a dependency is an expression + /(.+)?angular(\\|\/)core(.+)?/, + path.join(__dirname, 'src'), // location of your src + {} // a map of your routes + ), + new webpack.ContextReplacementPlugin( + // fixes WARNING Critical dependency: the request of a dependency is an expression + /(.+)?express(\\|\/)(.+)?/, + path.join(__dirname, 'src'), {} + ) + ] : [ + // Plugins that apply in production builds only + new AngularCompilerPlugin({ + mainPath: path.join(__dirname, 'ClientApp/boot.server.PRODUCTION.ts'), + tsConfigPath: './tsconfig.json', + entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), + exclude: ['./**/*.browser.ts'] + }) + ]), + output: { + libraryTarget: 'commonjs', + path: path.join(__dirname, './ClientApp/dist') + }, + target: 'node', + // switch to "inline-source-map" if you want to debug the TS during SSR + devtool: isDevBuild ? 'cheap-eval-source-map' : false, + optimization: { + minimizer: [].concat(isDevBuild ? [] : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true, + keep_classnames: true, + keep_fnames: true + }, + sourceMap: true + }) + ]) + } + }); - return [clientBundleConfig, serverBundleConfig]; + return [clientBundleConfig, serverBundleConfig]; }; diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js index b335a1f9..17d2fdb3 100644 --- a/webpack.config.vendor.js +++ b/webpack.config.vendor.js @@ -4,128 +4,148 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); const merge = require('webpack-merge'); const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); const treeShakableModules = [ - '@angular/animations', - '@angular/common', - '@angular/compiler', - '@angular/core', - '@angular/forms', - '@angular/http', - '@angular/platform-browser', - '@angular/platform-browser-dynamic', - '@angular/router', - 'ngx-bootstrap', - 'zone.js', + '@angular/animations', + '@angular/common', + '@angular/compiler', + '@angular/core', + '@angular/forms', + '@angular/http', + '@angular/platform-browser', + '@angular/platform-browser-dynamic', + '@angular/router', + 'ngx-bootstrap', + 'zone.js', ]; const nonTreeShakableModules = [ - // 'bootstrap', - // 'bootstrap/dist/css/bootstrap.css', - 'core-js', - // 'es6-promise', - // 'es6-shim', - 'event-source-polyfill', - // 'jquery', + // 'bootstrap', + // 'bootstrap/dist/css/bootstrap.css', + 'core-js', + // 'es6-promise', + // 'es6-shim', + 'event-source-polyfill', + // 'jquery', ]; const allModules = treeShakableModules.concat(nonTreeShakableModules); module.exports = (env) => { - console.log(`env = ${JSON.stringify(env)}`) - const extractCSS = new ExtractTextPlugin('vendor.css'); - const isDevBuild = !(env && env.prod); - const sharedConfig = { - mode: isDevBuild ? "development" : "production", - stats: { modules: false }, - resolve: { extensions: [ '.js' ] }, - module: { - rules: [ - { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' } - ] - }, - output: { - publicPath: 'dist/', - filename: '[name].js', - library: '[name]_[hash]' - }, - plugins: [ - // new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) - new webpack.ContextReplacementPlugin(/\@angular\b.*\b(bundles|linker)/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/11580 - new webpack.ContextReplacementPlugin(/(.+)?angular(\\|\/)core(.+)?/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/14898 - new webpack.IgnorePlugin(/^vertx$/) // Workaround for https://github.com/stefanpenner/es6-promise/issues/100 - ] - }; + console.log(`env = ${JSON.stringify(env)}`) + const extractCSS = new ExtractTextPlugin('vendor.css'); + const isDevBuild = !(env && env.prod); + const sharedConfig = { + mode: isDevBuild ? "development" : "production", + stats: { + modules: false + }, + resolve: { + extensions: ['.js'] + }, + module: { + rules: [{ + test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, + use: 'url-loader?limit=100000' + }] + }, + output: { + publicPath: 'dist/', + filename: '[name].js', + library: '[name]_[hash]' + }, + plugins: [ + // new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) + new webpack.ContextReplacementPlugin(/\@angular\b.*\b(bundles|linker)/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/11580 + new webpack.ContextReplacementPlugin(/(.+)?angular(\\|\/)core(.+)?/, path.join(__dirname, './ClientApp')), // Workaround for https://github.com/angular/angular/issues/14898 + new webpack.IgnorePlugin(/^vertx$/) // Workaround for https://github.com/stefanpenner/es6-promise/issues/100 + ] + }; - const clientBundleConfig = merge(sharedConfig, { - entry: { - // To keep development builds fast, include all vendor dependencies in the vendor bundle. - // But for production builds, leave the tree-shakable ones out so the AOT compiler can produce a smaller bundle. - vendor: isDevBuild ? allModules : nonTreeShakableModules - }, - output: { path: path.join(__dirname, 'wwwroot', 'dist') }, - module: { - rules: [ - { test: /\.css(\?|$)/, use: extractCSS.extract({ use: isDevBuild ? 'css-loader' : 'css-loader?minimize' }) } - ] - }, - plugins: [ - extractCSS, - new webpack.DllPlugin({ - path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), - name: '[name]_[hash]' - }) - ].concat(isDevBuild ? [] : [ + const clientBundleConfig = merge(sharedConfig, { + entry: { + // To keep development builds fast, include all vendor dependencies in the vendor bundle. + // But for production builds, leave the tree-shakable ones out so the AOT compiler can produce a smaller bundle. + vendor: isDevBuild ? allModules : nonTreeShakableModules + }, + output: { + path: path.join(__dirname, 'wwwroot', 'dist') + }, + module: { + rules: [{ + test: /\.css(\?|$)/, + use: extractCSS.extract({ + use: isDevBuild ? 'css-loader' : 'css-loader?minimize' + }) + }] + }, + plugins: [ + extractCSS, + new webpack.DllPlugin({ + path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), + name: '[name]_[hash]' + }) + ].concat(isDevBuild ? [] : [ - ]), - optimization: { - minimizer: [].concat(isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ - cache: true, - parallel: true, - uglifyOptions: { - compress: false, - ecma: 6, - mangle: true - }, - sourceMap: true - }) - ]) - } - }); + ]), + optimization: { + minimizer: [].concat(isDevBuild ? [] : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true, + keep_classnames: true, + keep_fnames: true + }, + sourceMap: true + }) + ]) + } + }); - const serverBundleConfig = merge(sharedConfig, { - target: 'node', - resolve: { mainFields: ['main'] }, - entry: { vendor: allModules.concat(['aspnet-prerendering']) }, - output: { - path: path.join(__dirname, 'ClientApp', 'dist'), - libraryTarget: 'commonjs2', - }, - module: { - rules: [ { test: /\.css(\?|$)/, use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] } ] - }, - plugins: [ - new webpack.DllPlugin({ - path: path.join(__dirname, 'ClientApp', 'dist', '[name]-manifest.json'), - name: '[name]_[hash]' - }) - ].concat(isDevBuild ? [] : [ - ]), - optimization: { - minimizer: [].concat(isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ - cache: true, - parallel: true, - uglifyOptions: { - compress: false, - ecma: 6, - mangle: true - }, - sourceMap: true - }) - ]) - } - }); + const serverBundleConfig = merge(sharedConfig, { + target: 'node', + resolve: { + mainFields: ['main'] + }, + entry: { + vendor: allModules.concat(['aspnet-prerendering']) + }, + output: { + path: path.join(__dirname, 'ClientApp', 'dist'), + libraryTarget: 'commonjs2', + }, + module: { + rules: [{ + test: /\.css(\?|$)/, + use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize'] + }] + }, + plugins: [ + new webpack.DllPlugin({ + path: path.join(__dirname, 'ClientApp', 'dist', '[name]-manifest.json'), + name: '[name]_[hash]' + }) + ].concat(isDevBuild ? [] : []), + optimization: { + minimizer: [].concat(isDevBuild ? [] : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true, + keep_classnames: true, + keep_fnames: true + }, + sourceMap: true + }) + ]) + } + }); - return [clientBundleConfig, serverBundleConfig]; + return [clientBundleConfig, serverBundleConfig]; } From 8fce62325a1777c8a786cf17278b8442e618e98a Mon Sep 17 00:00:00 2001 From: GRIMMR3AP3R Date: Tue, 5 Jun 2018 02:38:04 -0500 Subject: [PATCH 064/103] feat(docker): Visual Studio Docker support --- .dockerignore | 331 +----------------------------------- .env | 2 + Asp2017.csproj | 3 + Asp2017.sln | 6 + Dockerfile | 10 +- README.md | 9 +- docker-compose.dcproj | 18 ++ docker-compose.override.yml | 9 + docker-compose.yml | 8 + 9 files changed, 64 insertions(+), 332 deletions(-) create mode 100644 .env create mode 100644 docker-compose.dcproj create mode 100644 docker-compose.override.yml create mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore index 230e749b..04583682 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,332 +4,9 @@ .gitignore .vs .vscode +docker-compose.yml +docker-compose.*.yml */bin */obj -**/.toolstarget - - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ \ No newline at end of file +node_modules +docs \ No newline at end of file diff --git a/.env b/.env new file mode 100644 index 00000000..bb89c961 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +#Use this variable to set your Docker Repository to make it easier to push later. +#DOCKER_REGISTRY=your repo name \ No newline at end of file diff --git a/Asp2017.csproj b/Asp2017.csproj index c8975b88..00b2600f 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -4,10 +4,13 @@ true Latest false + Linux + docker-compose.dcproj + diff --git a/Asp2017.sln b/Asp2017.sln index 56a99822..9dcc66c0 100644 --- a/Asp2017.sln +++ b/Asp2017.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.27703.2018 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Asp2017", "Asp2017.csproj", "{BC28E9F7-E6EC-447D-AABD-17683BEAD625}" EndProject +Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{10B71BFC-C3ED-40B0-BB25-E38F04135E17}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {BC28E9F7-E6EC-447D-AABD-17683BEAD625}.Debug|Any CPU.Build.0 = Debug|Any CPU {BC28E9F7-E6EC-447D-AABD-17683BEAD625}.Release|Any CPU.ActiveCfg = Release|Any CPU {BC28E9F7-E6EC-447D-AABD-17683BEAD625}.Release|Any CPU.Build.0 = Release|Any CPU + {10B71BFC-C3ED-40B0-BB25-E38F04135E17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {10B71BFC-C3ED-40B0-BB25-E38F04135E17}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10B71BFC-C3ED-40B0-BB25-E38F04135E17}.Release|Any CPU.ActiveCfg = Release|Any CPU + {10B71BFC-C3ED-40B0-BB25-E38F04135E17}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Dockerfile b/Dockerfile index e7e95da8..1aaa4c6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,17 @@ FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base WORKDIR /app -RUN apt-get -qq update && apt-get install -my wget gnupg -RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - +RUN apt-get -qq update && apt-get install -y build-essential +RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN apt-get install -y nodejs +RUN npm i -g --unsafe-perm node-sass && npm rebuild --unsafe-perm node-sass -f EXPOSE 80 FROM microsoft/dotnet:2.1-sdk AS build WORKDIR /src COPY Asp2017.csproj . -RUN apt-get -qq update && apt-get -qq -y install bzip2 +RUN apt-get -qq update && apt-get install build-essential -y && apt-get install -my wget gnupg && apt-get -qq -y install bzip2 +RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - +RUN apt-get install -y nodejs RUN dotnet restore ./Asp2017.csproj COPY . . WORKDIR /src/ @@ -20,5 +23,4 @@ RUN dotnet publish Asp2017.csproj -c Release -o /app FROM base AS final WORKDIR /app COPY --from=publish /app . -ENV ASPNETCORE_ENVIRONMENT=Production ENTRYPOINT ["dotnet", "Asp2017.dll"] diff --git a/README.md b/README.md index bdf713cc..eb547404 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,11 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual instrumentationKey: 'Your-Application-Insights-instrumentationKey' }) ``` - +- **Docker** + - Built in Visual Studio F5 Debugging support + - Uses the very light weight microsoft/dotnet image + - Currently limited to Linux image as there is a bug with running nodejs in a container on Windows. + ---- @@ -114,6 +118,8 @@ VS2017 will automatically install all the neccessary npm & .NET dependencies whe Simply push F5 to start debugging ! +**Docker-Support**: Change the startup project to docker-compose and press F5 + **Note**: If you get any errors after this such as `module not found: boot.server` (or similar), open up command line and run `npm run build:dev` to make sure all the assets have been properly built by Webpack. ### Visual Studio Code @@ -373,6 +379,7 @@ constructor(element: ElementRef, renderer: Renderer2) { - Use a cache that's transferred from server to client (TODO: Point to the example) - Know the difference between attributes and properties in relation to the DOM. - Keep your directives stateless as much as possible. For stateful directives, you may need to provide an attribute that reflects the corresponding property with an initial string value such as url in img tag. For our native element the src attribute is reflected as the src property of the element type HTMLImageElement. + - Error: `sass-loader` requires `node-sass` >=4: Either in the docker container or localhost run npm rebuild node-sass -f ---- diff --git a/docker-compose.dcproj b/docker-compose.dcproj new file mode 100644 index 00000000..920d4a2a --- /dev/null +++ b/docker-compose.dcproj @@ -0,0 +1,18 @@ + + + + 2.1 + Linux + 10b71bfc-c3ed-40b0-bb25-e38f04135e17 + LaunchBrowser + {Scheme}://localhost:{ServicePort} + asp2017 + + + + docker-compose.yml + + + + + \ No newline at end of file diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 00000000..dabcc4da --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,9 @@ +version: '3.4' + +services: + asp2017: + environment: + - ASPNETCORE_ENVIRONMENT=Development + #- ASPNETCORE_ENVIRONMENT=Production + ports: + - "80" diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..d7d80bba --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3.4' + +services: + asp2017: + image: ${DOCKER_REGISTRY}asp2017 + build: + context: . + dockerfile: Dockerfile From 364d7100e1a16b9f0a46408801b35a889f8b277f Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Tue, 5 Jun 2018 19:33:18 -0400 Subject: [PATCH 065/103] docs(readme): add gitter link --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index eb547404..5fb06483 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,10 @@ This is meant to be a Feature-Rich Starter application containing all of the lat This utilizes all the latest standards, no gulp, no bower, no typings, no manually "building" anything. NPM, Webpack and .NET handle everything for you! +### Join us on Gitter + +[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/aspnetcore-angular2-universal/) + # Table of Contents * [Features](#features) From cc377108faacc8ed72a2a48ec9b462f45e4ff3c8 Mon Sep 17 00:00:00 2001 From: GRIMMR3AP3R Date: Thu, 7 Jun 2018 11:42:45 -0500 Subject: [PATCH 066/103] feat(PWA): add progressive web app manifest + PWA to app * PWA !! * Fixed the published PWA with workaround --- Asp2017.csproj | 7 +- Server/Controllers/HomeController.cs | 56 ++++----- Startup.cs | 166 ++++++++++++--------------- Views/Home/Index.cshtml | 1 + Views/Shared/_Layout.cshtml | 5 +- package.json | 1 + wwwroot/images/icon192x192.png | Bin 0 -> 9823 bytes wwwroot/images/icon512x512.png | Bin 0 -> 29105 bytes wwwroot/manifest.json | 18 +++ 9 files changed, 127 insertions(+), 127 deletions(-) create mode 100644 wwwroot/images/icon192x192.png create mode 100644 wwwroot/images/icon512x512.png create mode 100644 wwwroot/manifest.json diff --git a/Asp2017.csproj b/Asp2017.csproj index 00b2600f..7db490d3 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -8,17 +8,16 @@ docker-compose.dcproj - + + - - - + diff --git a/Server/Controllers/HomeController.cs b/Server/Controllers/HomeController.cs index bd9ad008..399174ef 100644 --- a/Server/Controllers/HomeController.cs +++ b/Server/Controllers/HomeController.cs @@ -1,25 +1,26 @@ -using Asp2017.Server.Helpers; +using System; +using System.Diagnostics; using System.Threading.Tasks; +using Asp2017.Server.Helpers; +using Asp2017.Server.Models; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; - -using Microsoft.AspNetCore.SpaServices.Prerendering; using Microsoft.AspNetCore.NodeServices; +using Microsoft.AspNetCore.SpaServices.Prerendering; using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Http; -using System.Diagnostics; -using System; -using Asp2017.Server.Models; -namespace AspCoreServer.Controllers -{ - public class HomeController : Controller - { +namespace AspCoreServer.Controllers { + public class HomeController : Controller { + protected readonly IHostingEnvironment HostingEnvironment; + public HomeController (IHostingEnvironment hostingEnv) { + this.HostingEnvironment = hostingEnv; + } + [HttpGet] - public async Task Index() - { - var prerenderResult = await Request.BuildPrerender(); + public async Task Index () { + var prerenderResult = await Request.BuildPrerender (); ViewData["SpaHtml"] = prerenderResult.Html; // our from Angular ViewData["Title"] = prerenderResult.Globals["title"]; // set our from Angular @@ -28,34 +29,35 @@ public async Task<IActionResult> Index() ViewData["Meta"] = prerenderResult.Globals["meta"]; // set our <meta> SEO tags ViewData["Links"] = prerenderResult.Globals["links"]; // set our <link rel="canonical"> etc SEO tags ViewData["TransferData"] = prerenderResult.Globals["transferData"]; // our transfer data set to window.TRANSFER_CACHE = {}; + if (!HostingEnvironment.IsDevelopment ()) { + ViewData["ServiceWorker"] = "<script>'serviceWorker'in navigator&&navigator.serviceWorker.register('/serviceworker')</script>"; + } - return View(); + return View (); } [HttpGet] - [Route("sitemap.xml")] - public async Task<IActionResult> SitemapXml() - { + [Route ("sitemap.xml")] + public IActionResult SitemapXml () { String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; xml += "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9/">"; xml += "<url>"; xml += "<loc>http://localhost:4251/home</loc>"; - xml += "<lastmod>" + DateTime.Now.ToString("yyyy-MM-dd") + "</lastmod>"; + xml += "<lastmod>" + DateTime.Now.ToString ("yyyy-MM-dd") + "</lastmod>"; xml += "</url>"; xml += "<url>"; xml += "<loc>http://localhost:4251/counter</loc>"; - xml += "<lastmod>" + DateTime.Now.ToString("yyyy-MM-dd") + "</lastmod>"; + xml += "<lastmod>" + DateTime.Now.ToString ("yyyy-MM-dd") + "</lastmod>"; xml += "</url>"; xml += "</urlset>"; - return Content(xml, "text/xml"); + return Content (xml, "text/xml"); } - public IActionResult Error() - { - return View(); + public IActionResult Error () { + return View (); } } -} +} \ No newline at end of file diff --git a/Startup.cs b/Startup.cs index 4b07eaed..bc77beb6 100644 --- a/Startup.cs +++ b/Startup.cs @@ -1,145 +1,125 @@ using System; using System.IO; +using AspCoreServer.Data; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SpaServices.Webpack; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.EntityFrameworkCore; -using AspCoreServer.Data; -using Swashbuckle.AspNetCore.Swagger; -using Microsoft.AspNetCore.Http; using Microsoft.Net.Http.Headers; +using Swashbuckle.AspNetCore.Swagger; +using WebEssentials.AspNetCore.Pwa; + +namespace AspCoreServer { + public class Startup { + + public static void Main (string[] args) { + var host = new WebHostBuilder () + .UseKestrel () + .UseContentRoot (Directory.GetCurrentDirectory ()) + .UseIISIntegration () + .UseStartup<Startup> () + .Build (); -namespace AspCoreServer -{ - public class Startup - { - - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup<Startup>() - .Build(); - - host.Run(); + host.Run (); } - public Startup(IHostingEnvironment env) - { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); + public Startup (IHostingEnvironment env) { + var builder = new ConfigurationBuilder () + .SetBasePath (env.ContentRootPath) + .AddJsonFile ("appsettings.json", optional : true, reloadOnChange : true) + .AddJsonFile ($"appsettings.{env.EnvironmentName}.json", optional : true) + .AddEnvironmentVariables (); + Configuration = builder.Build (); } public IConfigurationRoot Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { + public void ConfigureServices (IServiceCollection services) { // Add framework services. - services.AddMvc(); - services.AddNodeServices(); + services.AddMvc (); + services.AddNodeServices (); + services.AddHttpContextAccessor (); + services.AddProgressiveWebApp (new PwaOptions { Strategy = ServiceWorkerStrategy.CacheFirst, RegisterServiceWorker = true, RegisterWebmanifest = true }, "manifest.json"); var connectionStringBuilder = new Microsoft.Data.Sqlite.SqliteConnectionStringBuilder { DataSource = "spa.db" }; - var connectionString = connectionStringBuilder.ToString(); + var connectionString = connectionStringBuilder.ToString (); - services.AddDbContext<SpaDbContext>(options => - options.UseSqlite(connectionString)); + services.AddDbContext<SpaDbContext> (options => + options.UseSqlite (connectionString)); // Register the Swagger generator, defining one or more Swagger documents - services.AddSwaggerGen(c => - { - c.SwaggerDoc("v1", new Info { Title = "Angular 6.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); + services.AddSwaggerGen (c => { + c.SwaggerDoc ("v1", new Info { Title = "Angular 6.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); }); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, SpaDbContext context) - { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); + public void Configure (IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, SpaDbContext context) { + loggerFactory.AddConsole (Configuration.GetSection ("Logging")); + loggerFactory.AddDebug (); // app.UseStaticFiles(); - app.UseStaticFiles(new StaticFileOptions() - { - OnPrepareResponse = c => - { + app.UseStaticFiles (new StaticFileOptions () { + OnPrepareResponse = c => { //Do not add cache to json files. We need to have new versions when we add new translations. - if (!c.Context.Request.Path.Value.Contains(".json")) - { - c.Context.Response.GetTypedHeaders().CacheControl = new CacheControlHeaderValue() - { - MaxAge = TimeSpan.FromDays(30) // Cache everything except json for 30 days + if (!c.Context.Request.Path.Value.Contains (".json")) { + c.Context.Response.GetTypedHeaders ().CacheControl = new CacheControlHeaderValue () { + MaxAge = TimeSpan.FromDays (30) // Cache everything except json for 30 days }; - } - else - { - c.Context.Response.GetTypedHeaders().CacheControl = new CacheControlHeaderValue() - { - MaxAge = TimeSpan.FromMinutes(15) // Cache json for 15 minutes + } else { + c.Context.Response.GetTypedHeaders ().CacheControl = new CacheControlHeaderValue () { + MaxAge = TimeSpan.FromMinutes (15) // Cache json for 15 minutes }; } } }); - DbInitializer.Initialize(context); + DbInitializer.Initialize (context); - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions - { + if (env.IsDevelopment ()) { + app.UseDeveloperExceptionPage (); + app.UseWebpackDevMiddleware (new WebpackDevMiddlewareOptions { HotModuleReplacement = true, - HotModuleReplacementEndpoint = "/dist/" + HotModuleReplacementEndpoint = "/dist/" }); - app.UseSwagger(); - app.UseSwaggerUI(c => - { - c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1"); + app.UseSwagger (); + app.UseSwaggerUI (c => { + c.SwaggerEndpoint ("/swagger/v1/swagger.json", "My API V1"); }); // Enable middleware to serve swagger-ui (HTML, JS, CSS etc.), specifying the Swagger JSON endpoint. - - app.MapWhen(x => !x.Request.Path.Value.StartsWith("/swagger", StringComparison.OrdinalIgnoreCase), builder => - { - builder.UseMvc(routes => - { - routes.MapSpaFallbackRoute( - name: "spa-fallback", - defaults: new { controller = "Home", action = "Index" }); + app.MapWhen (x => !x.Request.Path.Value.StartsWith ("/swagger", StringComparison.OrdinalIgnoreCase), builder => { + builder.UseMvc (routes => { + routes.MapSpaFallbackRoute ( + name: "spa-fallback", + defaults : new { controller = "Home", action = "Index" }); }); }); - } - else - { - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - - routes.MapRoute( - "Sitemap", - "sitemap.xml", - new { controller = "Home", action = "SitemapXml" }); - - routes.MapSpaFallbackRoute( + } else { + app.UseMvc (routes => { + routes.MapRoute ( + name: "default", + template: "{controller=Home}/{action=Index}/{id?}"); + + routes.MapRoute ( + "Sitemap", + "sitemap.xml", + new { controller = "Home", action = "SitemapXml" }); + + routes.MapSpaFallbackRoute ( name: "spa-fallback", - defaults: new { controller = "Home", action = "Index" }); + defaults : new { controller = "Home", action = "Index" }); }); - app.UseExceptionHandler("/Home/Error"); + app.UseExceptionHandler ("/Home/Error"); } } } -} +} \ No newline at end of file diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml index 8c18039d..b8f7a97f 100644 --- a/Views/Home/Index.cshtml +++ b/Views/Home/Index.cshtml @@ -9,3 +9,4 @@ <!-- Our webpack bundle --> <script src="http://github.com/~/dist/main-client.js" asp-append-version="true"></script> } +@Html.Raw(ViewData["ServiceWorker"]) diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index dba6da9f..eeebe090 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -12,7 +12,7 @@ <script defer src="https://use.fontawesome.com/releases/v5.0.13/js/all.js" integrity="sha384-xymdQtn1n3lH2wcu0qhcdaOpQwyoarkgLVxC/wZ5q7h9gHtxICrpcaSUfygqZGOe" crossorigin="anonymous"></script> @Html.Raw(ViewData["Styles"]) - + <link rel="manifest" href="http://github.com/manifest.json"> </head> <body> @RenderBody() @@ -21,7 +21,6 @@ @Html.Raw(ViewData["TransferData"]) @Html.Raw(ViewData["Scripts"]) - @RenderSection("scripts", required: false) - + @RenderSection("scripts", required: false) </body> </html> diff --git a/package.json b/package.json index 02c48f5d..722be23e 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "moment": "2.22.1", "ngx-bootstrap": "^3.0.0", "node-sass": "^4.9.0", + "npm": "^6.1.0", "preboot": "^6.0.0-beta.4", "raw-loader": "^0.5.1", "rimraf": "^2.6.2", diff --git a/wwwroot/images/icon192x192.png b/wwwroot/images/icon192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..7f020c3fae22ba0892bf3d6f6bfb919fceed35c9 GIT binary patch literal 9823 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 E4;q)o-~a#s literal 0 HcmV?d00001 diff --git a/wwwroot/images/icon512x512.png b/wwwroot/images/icon512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..8f7e89c70247f811f8e21690dccb0227d2f2e953 GIT binary patch literal 29105 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 b_y05C*8dH#AM8#61E2@@v{Z_eErb6b+3S}{ literal 0 HcmV?d00001 diff --git a/wwwroot/manifest.json b/wwwroot/manifest.json new file mode 100644 index 00000000..fa6cd755 --- /dev/null +++ b/wwwroot/manifest.json @@ -0,0 +1,18 @@ +{ + "name": "ASP.NET Core 2.1 & Angular 6(+) Advanced Starter", + "short_name": "aspnetcore-angular2-universal", + "description": "ASP.NET Core 2.1 & Angular 6(+) Advanced Starter - with Server-side prerendering (for Angular SEO)!", + "icons": [{ + "src": "/images/icon192x192.png", + "sizes": "192x192" + }, + { + "src": "/images/icon512x512.png", + "sizes": "512x512" + } + ], + "background_color": "#3E4EB8", + "theme_color": "#2F3BA2", + "display": "standalone", + "start_url": "/" +} From 4bf7135662c44240273a6fc9d6a48719e5da21ad Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Thu, 7 Jun 2018 15:01:21 -0400 Subject: [PATCH 067/103] docs(readme): add PWA info --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5fb06483..8ed5a749 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ASP.NET Core 2.1 & Angular 6(+) Advanced Starter - with Server-side prerendering (for Angular SEO)! +# ASP.NET Core 2.1 & Angular 6(+) Advanced Starter - PWA & Server-side prerendering (for Angular SEO)! ## By [DevHelp.Online](http://www.DevHelp.Online) @@ -58,6 +58,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - SignalR Chat demo! (Thanks to [@hakonamatata](https://github.com/hakonamatata)) - **Angular 6.0.0** : + - PWA (Progressive Web App) - (Minimal) Angular-CLI integration - This is to be used mainly for Generating Components/Services/etc. - Usage examples: @@ -435,6 +436,7 @@ To support IE9 through IE11 open the `polyfills.ts` file in the `polyfills` fold Many thanks go out to Steve Sanderson ([@SteveSandersonMS](https://github.com/SteveSandersonMS)) from Microsoft and his amazing work on JavaScriptServices and integrating the world of Node with ASP.NET Core. Also thank you to the many Contributors ! +- [@GRIMMR3AP3R](https://github.com/GRIMMR3AP3R) - [@Isaac2004](https://github.com/Isaac2004) - [@AbrarJahin](https://github.com/AbrarJahin) - [@LiverpoolOwen](https://github.com/LiverpoolOwen) From df82e38f574a7abf6f52fe709859ed5840b51a76 Mon Sep 17 00:00:00 2001 From: smirtw <info@lvsys.com> Date: Mon, 11 Jun 2018 07:45:54 -0700 Subject: [PATCH 068/103] chore(type): fix version number --- ClientApp/app/containers/home/home.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ClientApp/app/containers/home/home.component.ts b/ClientApp/app/containers/home/home.component.ts index ff10f2d4..abc2db05 100644 --- a/ClientApp/app/containers/home/home.component.ts +++ b/ClientApp/app/containers/home/home.component.ts @@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core'; }) export class HomeComponent implements OnInit { - title: string = 'Angular 5.x Universal & ASP.NET Core 2.0 advanced starter-kit'; + title: string = 'Angular 6.x Universal & ASP.NET Core 2.1 advanced starter-kit'; // Use "constructor"s only for dependency injection constructor( From dc9adc50be56d8e5ed4ba9508cb79d089e617b4b Mon Sep 17 00:00:00 2001 From: smirtw <info@lvsys.com> Date: Mon, 11 Jun 2018 07:46:04 -0700 Subject: [PATCH 069/103] chore(type): fix version number --- ClientApp/app/components/navmenu/navmenu.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ClientApp/app/components/navmenu/navmenu.component.html b/ClientApp/app/components/navmenu/navmenu.component.html index 36c187ed..fdef2c65 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.html +++ b/ClientApp/app/components/navmenu/navmenu.component.html @@ -1,5 +1,5 @@ <nav class="navbar navbar-expand-lg"> - <a [routerLink]="['/home']" class='navbar-brand'>Angular 5 Universal & ASP.NET Core</a> + <a [routerLink]="['/home']" class='navbar-brand'>Angular 6 Universal & ASP.NET Core</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNav" aria-controls="mainNav" aria-expanded="false" aria-label="Toggle navigation" (click)="collapseNavbar()"> <i class="fas fa-bars"></i> From 1975d89630d3b73939ef67bff8df756792e2e793 Mon Sep 17 00:00:00 2001 From: smirtw <info@lvsys.com> Date: Wed, 13 Jun 2018 10:45:11 -0700 Subject: [PATCH 070/103] chore(webpack): use mini-css-extract-plugin (and remove rxjs compat) --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 722be23e..cf40a9b3 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "raw-loader": "^0.5.1", "rimraf": "^2.6.2", "rxjs": "^6.2.0", - "rxjs-compat": "^6.2.0", "sass-loader": "^7.0.1", "style-loader": "^0.21.0", "to-string-loader": "^1.1.5", @@ -75,7 +74,6 @@ "@types/jasmine": "^2.8.7", "chai": "^4.1.2", "codelyzer": "^3.1.2", - "extract-text-webpack-plugin": "^4.0.0-beta.0", "istanbul-instrumenter-loader": "^3.0.1", "jasmine-core": "^2.5.2", "karma": "^1.7.1", @@ -88,6 +86,7 @@ "karma-remap-coverage": "^0.1.5", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.4", + "mini-css-extract-plugin": "0.4.0", "tslint": "^5.10.0", "uglifyjs-webpack-plugin": "^1.2.5", "webpack-bundle-analyzer": "^2.13.1", From 73e880f785d1b83120e0935bcb3dac66ee93dde6 Mon Sep 17 00:00:00 2001 From: smirtw <info@lvsys.com> Date: Wed, 13 Jun 2018 10:46:22 -0700 Subject: [PATCH 071/103] feat(webpack): update to use mini-css-extract-plugin #645 --- webpack.config.vendor.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js index 17d2fdb3..dd198b09 100644 --- a/webpack.config.vendor.js +++ b/webpack.config.vendor.js @@ -1,6 +1,6 @@ const path = require('path'); const webpack = require('webpack'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const merge = require('webpack-merge'); const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); const treeShakableModules = [ @@ -30,7 +30,6 @@ const allModules = treeShakableModules.concat(nonTreeShakableModules); module.exports = (env) => { console.log(`env = ${JSON.stringify(env)}`) - const extractCSS = new ExtractTextPlugin('vendor.css'); const isDevBuild = !(env && env.prod); const sharedConfig = { mode: isDevBuild ? "development" : "production", @@ -71,13 +70,13 @@ module.exports = (env) => { module: { rules: [{ test: /\.css(\?|$)/, - use: extractCSS.extract({ - use: isDevBuild ? 'css-loader' : 'css-loader?minimize' - }) + use: ['style-loader', MiniCssExtractPlugin.loader, isDevBuild ? 'css-loader' : 'css-loader?minimize'] }] }, plugins: [ - extractCSS, + new MiniCssExtractPlugin({ + filename: 'vendor.css', + }), new webpack.DllPlugin({ path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), name: '[name]_[hash]' From 59239090d291f44d265fa3de36b72e61acb49046 Mon Sep 17 00:00:00 2001 From: GRIMMR3AP3R <robert.grimm.213@outlook.com> Date: Wed, 13 Jun 2018 12:48:43 -0500 Subject: [PATCH 072/103] feat(webpack): fix extract-text-webpack-plugin deprecation closes #645 --- package.json | 6 +++--- webpack.config.vendor.js | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index cf40a9b3..a7fcc1ca 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "zone.js": "^0.8.26" }, "devDependencies": { + "@angular-devkit/build-angular": "~0.6.6", "@angular/cli": "^6.0.5", "@angular/compiler-cli": "6.0.3", "@ngtools/webpack": "^6.0.5", @@ -86,11 +87,10 @@ "karma-remap-coverage": "^0.1.5", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.4", - "mini-css-extract-plugin": "0.4.0", + "mini-css-extract-plugin": "^0.4.0", "tslint": "^5.10.0", "uglifyjs-webpack-plugin": "^1.2.5", "webpack-bundle-analyzer": "^2.13.1", - "webpack-cli": "^2.1.4", - "@angular-devkit/build-angular": "~0.6.6" + "webpack-cli": "^2.1.4" } } diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js index dd198b09..6b67e525 100644 --- a/webpack.config.vendor.js +++ b/webpack.config.vendor.js @@ -30,6 +30,12 @@ const allModules = treeShakableModules.concat(nonTreeShakableModules); module.exports = (env) => { console.log(`env = ${JSON.stringify(env)}`) + const extractCSS = new MiniCssExtractPlugin({ + // Options similar to the same options in webpackOptions.output + // both options are optional + filename: "[name].css", + chunkFilename: "[id].css" + }); const isDevBuild = !(env && env.prod); const sharedConfig = { mode: isDevBuild ? "development" : "production", @@ -70,7 +76,10 @@ module.exports = (env) => { module: { rules: [{ test: /\.css(\?|$)/, - use: ['style-loader', MiniCssExtractPlugin.loader, isDevBuild ? 'css-loader' : 'css-loader?minimize'] + use: [ + MiniCssExtractPlugin.loader, + isDevBuild ? 'css-loader' : 'css-loader?minimize' + ] }] }, plugins: [ @@ -118,7 +127,10 @@ module.exports = (env) => { module: { rules: [{ test: /\.css(\?|$)/, - use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize'] + use: [ + MiniCssExtractPlugin.loader, + isDevBuild ? 'css-loader' : 'css-loader?minimize' + ] }] }, plugins: [ From e7b68f5ab8d472301191085b24f857ec653466d6 Mon Sep 17 00:00:00 2001 From: GRIMMR3AP3R <robert.grimm.213@outlook.com> Date: Wed, 15 Aug 2018 16:02:12 -0500 Subject: [PATCH 073/103] style(code): update code formatting, style and ng fix This has an updated editorconfig to ensure C# styling. Project files have been updated with better code styling. There are a bunch of other little tweaks but the best fix is bringing back the use of NG. With this fix ng g c blah\blah will no longer bark about "skip-import option to skip importing components in NgModule". The problem was Angluar.json didn't convert properly. --- .editorconfig | 193 ++++++++++- ClientApp/app/_styles.scss | 24 +- ClientApp/app/_variables.scss | 6 +- ClientApp/app/app.component.scss | 8 +- ClientApp/app/app.component.ts | 184 +++++----- ClientApp/app/app.module.browser.ts | 50 ++- ClientApp/app/app.module.server.ts | 16 +- ClientApp/app/app.module.ts | 324 ++++++++++-------- .../components/navmenu/navmenu.component.scss | 10 +- .../components/navmenu/navmenu.component.ts | 27 +- .../user-detail/user-detail.component.html | 2 +- .../user-detail/user-detail.component.scss | 2 +- .../user-detail/user-detail.component.ts | 74 ++-- .../containers/counter/counter.component.html | 4 +- .../counter/counter.component.spec.ts | 38 +- .../containers/counter/counter.component.ts | 12 +- .../app/containers/home/home.component.html | 21 +- .../app/containers/home/home.component.ts | 29 +- .../app/containers/lazy/lazy.component.ts | 2 +- ClientApp/app/containers/lazy/lazy.module.ts | 6 +- .../ngx-bootstrap.component.html | 24 +- .../ngx-bootstrap.component.ts | 52 ++- .../not-found/not-found.component.html | 4 +- .../not-found/not-found.component.ts | 8 +- .../app/containers/users/users.component.scss | 16 +- .../app/containers/users/users.component.ts | 51 +-- ClientApp/app/models/User.ts | 6 +- ClientApp/app/shared/link.service.ts | 156 ++++----- ClientApp/app/shared/user.service.ts | 18 +- ClientApp/boot.browser.ts | 12 +- ClientApp/boot.server.PRODUCTION.ts | 23 +- ClientApp/boot.server.ts | 10 +- ClientApp/polyfills/browser.polyfills.ts | 4 +- ClientApp/polyfills/polyfills.ts | 35 +- ClientApp/polyfills/server.polyfills.ts | 5 +- ClientApp/test/boot-tests.js | 8 +- ClientApp/test/karma.conf.js | 11 +- ClientApp/test/webpack.config.test.js | 23 +- ClientApp/tsconfig.app.json | 6 +- ClientApp/tsconfig.spec.json | 14 +- Program.cs | 33 ++ Server/Controllers/HomeController.cs | 102 +++--- Server/Data/DbInitializer.cs | 54 ++- Server/Data/SpaDbContext.cs | 12 +- Server/Helpers/HttpRequestExtensions.cs | 82 ++--- Server/Models/IRequest.cs | 14 +- Server/Models/TransferData.cs | 14 +- Server/Models/User.cs | 13 +- Server/RestAPI/UsersController.cs | 182 +++++----- Startup.cs | 188 +++++----- angular.json | 82 ++++- webpack.additions.js | 6 +- webpack.config.js | 198 ++++++----- wwwroot/manifest.json | 6 +- 54 files changed, 1370 insertions(+), 1134 deletions(-) create mode 100644 Program.cs diff --git a/.editorconfig b/.editorconfig index f1cc3ad3..90bafbc1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,15 +1,196 @@ -# http://editorconfig.org - +############################### +# Core EditorConfig Options # +############################### root = true +# All files [*] -charset = utf-8 indent_style = space -indent_size = 2 -end_of_line = lf + +# Code files +[*.{cs,csx,vb,vbx}] +indent_size = 4 insert_final_newline = true -trim_trailing_whitespace = true +charset = utf-8-bom [*.md] insert_final_newline = false trim_trailing_whitespace = false + +############################### +# .NET Coding Conventions # +############################### + +# Solution Files +[*.sln] +indent_style = tab + +# XML Project Files +[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] +indent_size = 2 + +# Configuration Files +[*.{json,xml,yml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}] +indent_size = 2 + +# Dotnet Code Style Settings +# See https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference +# See http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers +[*.{cs,csx,cake,vb}] +dotnet_sort_system_directives_first = true:warning +dotnet_style_coalesce_expression = true:warning +dotnet_style_collection_initializer = true:warning +dotnet_style_explicit_tuple_names = true:warning +dotnet_style_null_propagation = true:warning +dotnet_style_object_initializer = true:warning +dotnet_style_predefined_type_for_locals_parameters_members = true:warning +dotnet_style_predefined_type_for_member_access = true:warning +dotnet_style_qualification_for_event = true:warning +dotnet_style_qualification_for_field = true:warning +dotnet_style_qualification_for_method = true:warning +dotnet_style_qualification_for_property = true:warning + +# Naming Symbols +# constant_fields - Define constant fields +dotnet_naming_symbols.constant_fields.applicable_kinds = field +dotnet_naming_symbols.constant_fields.required_modifiers = const +# non_private_readonly_fields - Define public, internal and protected readonly fields +dotnet_naming_symbols.non_private_readonly_fields.applicable_accessibilities = public, internal, protected +dotnet_naming_symbols.non_private_readonly_fields.applicable_kinds = field +dotnet_naming_symbols.non_private_readonly_fields.required_modifiers = readonly +# static_readonly_fields - Define static and readonly fields +dotnet_naming_symbols.static_readonly_fields.applicable_kinds = field +dotnet_naming_symbols.static_readonly_fields.required_modifiers = static, readonly +# private_readonly_fields - Define private readonly fields +dotnet_naming_symbols.private_readonly_fields.applicable_accessibilities = private +dotnet_naming_symbols.private_readonly_fields.applicable_kinds = field +dotnet_naming_symbols.private_readonly_fields.required_modifiers = readonly +# public_internal_fields - Define public and internal fields +dotnet_naming_symbols.public_internal_fields.applicable_accessibilities = public, internal +dotnet_naming_symbols.public_internal_fields.applicable_kinds = field +# private_protected_fields - Define private and protected fields +dotnet_naming_symbols.private_protected_fields.applicable_accessibilities = private, protected +dotnet_naming_symbols.private_protected_fields.applicable_kinds = field +# public_symbols - Define any public symbol +dotnet_naming_symbols.public_symbols.applicable_accessibilities = public, internal, protected, protected_internal +dotnet_naming_symbols.public_symbols.applicable_kinds = method, property, event, delegate +# parameters - Defines any parameter +dotnet_naming_symbols.parameters.applicable_kinds = parameter +# non_interface_types - Defines class, struct, enum and delegate types +dotnet_naming_symbols.non_interface_types.applicable_kinds = class, struct, enum, delegate +# interface_types - Defines interfaces +dotnet_naming_symbols.interface_types.applicable_kinds = interface + +# Naming Styles +# camel_case - Define the camelCase style +dotnet_naming_style.camel_case.capitalization = camel_case +# pascal_case - Define the Pascal_case style +dotnet_naming_style.pascal_case.capitalization = pascal_case +# first_upper - The first character must start with an upper-case character +dotnet_naming_style.first_upper.capitalization = first_word_upper +# prefix_interface_interface_with_i - Interfaces must be PascalCase and the first character of an interface must be an 'I' +dotnet_naming_style.prefix_interface_interface_with_i.capitalization = pascal_case +dotnet_naming_style.prefix_interface_interface_with_i.required_prefix = I + +# Naming Rules +# Constant fields must be PascalCase +dotnet_naming_rule.constant_fields_must_be_pascal_case.severity = warning +dotnet_naming_rule.constant_fields_must_be_pascal_case.symbols = constant_fields +dotnet_naming_rule.constant_fields_must_be_pascal_case.style = pascal_case +# Public, internal and protected readonly fields must be PascalCase +dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity = warning +dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.symbols = non_private_readonly_fields +dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style = pascal_case +# Static readonly fields must be PascalCase +dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.severity = warning +dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.symbols = static_readonly_fields +dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.style = pascal_case +# Private readonly fields must be camelCase +dotnet_naming_rule.private_readonly_fields_must_be_camel_case.severity = warning +dotnet_naming_rule.private_readonly_fields_must_be_camel_case.symbols = private_readonly_fields +dotnet_naming_rule.private_readonly_fields_must_be_camel_case.style = camel_case +# Public and internal fields must be PascalCase +dotnet_naming_rule.public_internal_fields_must_be_pascal_case.severity = warning +dotnet_naming_rule.public_internal_fields_must_be_pascal_case.symbols = public_internal_fields +dotnet_naming_rule.public_internal_fields_must_be_pascal_case.style = pascal_case +# Private and protected fields must be camelCase +dotnet_naming_rule.private_protected_fields_must_be_camel_case.severity = warning +dotnet_naming_rule.private_protected_fields_must_be_camel_case.symbols = private_protected_fields +dotnet_naming_rule.private_protected_fields_must_be_camel_case.style = camel_case +# Public members must be capitalized +dotnet_naming_rule.public_members_must_be_capitalized.severity = warning +dotnet_naming_rule.public_members_must_be_capitalized.symbols = public_symbols +dotnet_naming_rule.public_members_must_be_capitalized.style = first_upper +# Parameters must be camelCase +dotnet_naming_rule.parameters_must_be_camel_case.severity = warning +dotnet_naming_rule.parameters_must_be_camel_case.symbols = parameters +dotnet_naming_rule.parameters_must_be_camel_case.style = camel_case +# Class, struct, enum and delegates must be PascalCase +dotnet_naming_rule.non_interface_types_must_be_pascal_case.severity = warning +dotnet_naming_rule.non_interface_types_must_be_pascal_case.symbols = non_interface_types +dotnet_naming_rule.non_interface_types_must_be_pascal_case.style = pascal_case +# Interfaces must be PascalCase and start with an 'I' +dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = warning +dotnet_naming_rule.interface_types_must_be_prefixed_with_i.symbols = interface_types +dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i + +# C# Code Style Settings +# See https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference +# See http://kent-boogaart.com/blog/editorconfig-reference-for-c-developers +[*.{cs,csx,cake}] +# Indentation Options +csharp_indent_block_contents = true:warning +csharp_indent_braces = false:warning +csharp_indent_case_contents = true:warning +csharp_indent_labels = no_change:warning +csharp_indent_switch_labels = true:warning +# Style Options +csharp_style_conditional_delegate_call = true:warning +csharp_style_expression_bodied_accessors = true:warning +csharp_style_expression_bodied_constructors = true:warning +csharp_style_expression_bodied_indexers = true:warning +csharp_style_expression_bodied_methods = true:warning +csharp_style_expression_bodied_operators = true:warning +csharp_style_expression_bodied_properties = true:warning +csharp_style_inlined_variable_declaration = true:warning +csharp_style_pattern_matching_over_as_with_null_check = true:warning +csharp_style_pattern_matching_over_is_with_cast_check = true:warning +csharp_style_throw_expression = true:warning +csharp_style_var_elsewhere = true:warning +csharp_style_var_for_built_in_types = true:warning +csharp_style_var_when_type_is_apparent = true:warning +# New Line Options +csharp_new_line_before_catch = true:warning +csharp_new_line_before_else = true:warning +csharp_new_line_before_finally = true:warning +csharp_new_line_before_members_in_anonymous_types = true:warning +csharp_new_line_before_members_in_object_initializers = true:warning +# BUG: Warning level cannot be set https://github.com/dotnet/roslyn/issues/18010 +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true:warning +# Spacing Options +csharp_space_after_cast = false:warning +csharp_space_after_colon_in_inheritance_clause = true:warning +csharp_space_after_comma = true:warning +csharp_space_after_dot = false:warning +csharp_space_after_keywords_in_control_flow_statements = true:warning +csharp_space_after_semicolon_in_for_statement = true:warning +csharp_space_around_binary_operators = before_and_after:warning +csharp_space_around_declaration_statements = do_not_ignore:warning +csharp_space_before_colon_in_inheritance_clause = true:warning +csharp_space_before_comma = false:warning +csharp_space_before_dot = false:warning +csharp_space_before_semicolon_in_for_statement = false:warning +csharp_space_before_open_square_brackets = false:warning +csharp_space_between_empty_square_brackets = false:warning +csharp_space_between_method_declaration_name_and_open_parenthesis = false:warning +csharp_space_between_method_declaration_parameter_list_parentheses = false:warning +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false:warning +csharp_space_between_method_call_name_and_opening_parenthesis = false:warning +csharp_space_between_method_call_parameter_list_parentheses = false:warning +csharp_space_between_method_call_empty_parameter_list_parentheses = false:warning +csharp_space_between_parentheses = expressions:warning +csharp_space_between_square_brackets = false:warning +# Wrapping Options +csharp_preserve_single_line_blocks = true:warning +csharp_preserve_single_line_statements = false:warning diff --git a/ClientApp/app/_styles.scss b/ClientApp/app/_styles.scss index 42cf15fe..87ea278f 100644 --- a/ClientApp/app/_styles.scss +++ b/ClientApp/app/_styles.scss @@ -1,22 +1,26 @@ $body-bg: #f1f1f1; $body-color: #111; -$theme-colors: ( "primary": #216DAD); -$theme-colors: ( "accent": #669ECD); +$theme-colors: ( + 'primary': #216dad +); +$theme-colors: ( + 'accent': #669ecd +); - -@import "http://github.com/~bootstrap/scss/bootstrap"; +@import 'http://github.com/~bootstrap/scss/bootstrap'; .panel { - box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12); + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 1px 5px 0 rgba(0, 0, 0, 0.12); height: 100%; flex: 1; - background-color: rgba(255, 255, 255, .30); - border-radius: .25rem; + background-color: rgba(255, 255, 255, 0.3); + border-radius: 0.25rem; .title { background-color: #86afd0; - color: #FFFFFF; + color: #ffffff; text-align: center; - border-top-left-radius: .25rem; - border-top-right-radius: .25rem; + border-top-left-radius: 0.25rem; + border-top-right-radius: 0.25rem; } .body { display: flex; diff --git a/ClientApp/app/_variables.scss b/ClientApp/app/_variables.scss index 2d34745a..313015eb 100644 --- a/ClientApp/app/_variables.scss +++ b/ClientApp/app/_variables.scss @@ -1,6 +1,6 @@ -@import "http://github.com/styles"; -$header-height:50px; -$menu-max-width:25%; +@import 'http://github.com/styles'; +$header-height: 50px; +$menu-max-width: 25%; $navbar-default-bg: #312312; $light-orange: #ff8c00; $navbar-default-color: $light-orange; diff --git a/ClientApp/app/app.component.scss b/ClientApp/app/app.component.scss index 8705be92..1e7eea64 100644 --- a/ClientApp/app/app.component.scss +++ b/ClientApp/app/app.component.scss @@ -1,4 +1,4 @@ -@import "http://github.com/variables"; +@import 'http://github.com/variables'; /* *** Overall APP Styling can go here *** -------------------------------------------- Note: This Component has ViewEncapsulation.None so the styles will bleed out @@ -15,7 +15,7 @@ body { } h1 { - border-bottom: 3px theme-color("accent") solid; + border-bottom: 3px theme-color('accent') solid; font-size: 24px; } @@ -40,7 +40,7 @@ ul li { blockquote { margin: 25px 10px; padding: 10px 35px 10px 10px; - border-left: 10px color("green") solid; + border-left: 10px color('green') solid; background: $gray-100; } @@ -57,7 +57,7 @@ blockquote a:hover { margin-left: $menu-max-width; } h1 { - border-bottom: 5px #4189C7 solid; + border-bottom: 5px #4189c7 solid; font-size: 36px; } h2 { diff --git a/ClientApp/app/app.component.ts b/ClientApp/app/app.component.ts index 614cba3e..415c196a 100644 --- a/ClientApp/app/app.component.ts +++ b/ClientApp/app/app.component.ts @@ -1,101 +1,103 @@ - -import {mergeMap, map, filter} from 'rxjs/operators'; -import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, Injector } from '@angular/core'; -import { Router, NavigationEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router'; -import { Meta, Title, DOCUMENT, MetaDefinition } from '@angular/platform-browser'; -import { Subscription } from 'rxjs'; -import { isPlatformServer } from '@angular/common'; -import { LinkService } from './shared/link.service'; - +import { + Component, + Injector, + OnDestroy, + OnInit, + ViewEncapsulation +} from '@angular/core'; +import { Meta, Title } from '@angular/platform-browser'; +import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; +import { REQUEST } from '@nguniversal/aspnetcore-engine/tokens'; // i18n support import { TranslateService } from '@ngx-translate/core'; -import { REQUEST } from '@nguniversal/aspnetcore-engine/tokens'; +import { Subscription } from 'rxjs'; +import { filter, map, mergeMap } from 'rxjs/operators'; +import { LinkService } from './shared/link.service'; @Component({ - selector: 'app-root', - templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'], - encapsulation: ViewEncapsulation.None + selector: 'app-root', + templateUrl: './app.component.html', + styleUrls: ['./app.component.scss'], + encapsulation: ViewEncapsulation.None }) export class AppComponent implements OnInit, OnDestroy { - - // This will go at the END of your title for example "Home - Angular Universal..." <-- after the dash (-) - private endPageTitle: string = 'Angular Universal and ASP.NET Core Starter'; - // If no Title is provided, we'll use a default one before the dash(-) - private defaultPageTitle: string = 'My App'; - - private routerSub$: Subscription; - private request; - - constructor( - private router: Router, - private activatedRoute: ActivatedRoute, - private title: Title, - private meta: Meta, - private linkService: LinkService, - public translate: TranslateService, - private injector: Injector - ) { - // this language will be used as a fallback when a translation isn't found in the current language - translate.setDefaultLang('en'); - - // the lang to use, if the lang isn't available, it will use the current loader to get them - translate.use('en'); - - this.request = this.injector.get(REQUEST); - - console.log(`What's our REQUEST Object look like?`); - console.log(`The Request object only really exists on the Server, but on the Browser we can at least see Cookies`); - console.log(this.request); + // This will go at the END of your title for example "Home - Angular Universal..." <-- after the dash (-) + private endPageTitle: string = 'Angular Universal and ASP.NET Core Starter'; + // If no Title is provided, we'll use a default one before the dash(-) + private defaultPageTitle: string = 'My App'; + + private routerSub$: Subscription; + private request; + + constructor( + private router: Router, + private activatedRoute: ActivatedRoute, + private title: Title, + private meta: Meta, + private linkService: LinkService, + public translate: TranslateService, + private injector: Injector + ) { + // this language will be used as a fallback when a translation isn't found in the current language + translate.setDefaultLang('en'); + + // the lang to use, if the lang isn't available, it will use the current loader to get them + translate.use('en'); + + this.request = this.injector.get(REQUEST); + + console.log(`What's our REQUEST Object look like?`); + console.log( + `The Request object only really exists on the Server, but on the Browser we can at least see Cookies` + ); + console.log(this.request); + } + + ngOnInit() { + // Change "Title" on every navigationEnd event + // Titles come from the data.title property on all Routes (see app.routes.ts) + this._changeTitleOnNavigation(); + } + + ngOnDestroy() { + // Subscription clean-up + this.routerSub$.unsubscribe(); + } + + private _changeTitleOnNavigation() { + this.routerSub$ = this.router.events + .pipe( + filter(event => event instanceof NavigationEnd), + map(() => this.activatedRoute), + map(route => { + while (route.firstChild) route = route.firstChild; + return route; + }), + filter(route => route.outlet === 'primary'), + mergeMap(route => route.data) + ) + .subscribe(event => { + this._setMetaAndLinks(event); + }); + } + + private _setMetaAndLinks(event) { + // Set Title if available, otherwise leave the default Title + const title = event['title'] + ? `${event['title']} - ${this.endPageTitle}` + : `${this.defaultPageTitle} - ${this.endPageTitle}`; + + this.title.setTitle(title); + + const metaData = event['meta'] || []; + const linksData = event['links'] || []; + + for (let i = 0; i < metaData.length; i++) { + this.meta.updateTag(metaData[i]); } - ngOnInit() { - // Change "Title" on every navigationEnd event - // Titles come from the data.title property on all Routes (see app.routes.ts) - this._changeTitleOnNavigation(); + for (let i = 0; i < linksData.length; i++) { + this.linkService.addTag(linksData[i]); } - - ngOnDestroy() { - // Subscription clean-up - this.routerSub$.unsubscribe(); - } - - private _changeTitleOnNavigation() { - - this.routerSub$ = this.router.events.pipe( - filter(event => event instanceof NavigationEnd), - map(() => this.activatedRoute), - map(route => { - while (route.firstChild) route = route.firstChild; - return route; - }), - filter(route => route.outlet === 'primary'), - mergeMap(route => route.data),) - .subscribe((event) => { - this._setMetaAndLinks(event); - }); - } - - private _setMetaAndLinks(event) { - - // Set Title if available, otherwise leave the default Title - const title = event['title'] - ? `${event['title']} - ${this.endPageTitle}` - : `${this.defaultPageTitle} - ${this.endPageTitle}`; - - this.title.setTitle(title); - - const metaData = event['meta'] || []; - const linksData = event['links'] || []; - - for (let i = 0; i < metaData.length; i++) { - this.meta.updateTag(metaData[i]); - } - - for (let i = 0; i < linksData.length; i++) { - this.linkService.addTag(linksData[i]); - } - } - + } } - diff --git a/ClientApp/app/app.module.browser.ts b/ClientApp/app/app.module.browser.ts index f7371e80..5162c3ca 100644 --- a/ClientApp/app/app.module.browser.ts +++ b/ClientApp/app/app.module.browser.ts @@ -1,13 +1,9 @@ import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { APP_BASE_HREF } from '@angular/common'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; - import { ORIGIN_URL, REQUEST } from '@nguniversal/aspnetcore-engine/tokens'; -import { AppModuleShared } from './app.module'; -import { AppComponent } from './app.component'; -import { BrowserTransferStateModule } from '@angular/platform-browser'; import { PrebootModule } from 'preboot'; +import { AppComponent } from './app.component'; +import { AppModuleShared } from './app.module'; export function getOriginUrl() { return window.location.origin; @@ -19,26 +15,26 @@ export function getRequest() { } @NgModule({ - bootstrap: [AppComponent], - imports: [ - PrebootModule.withConfig({ appRoot: 'app-root' }), - BrowserAnimationsModule, - - // Our Common AppModule - AppModuleShared + bootstrap: [AppComponent], + imports: [ + PrebootModule.withConfig({ appRoot: 'app-root' }), + BrowserAnimationsModule, - ], - providers: [ - { - // We need this for our Http calls since they'll be using an ORIGIN_URL provided in main.server - // (Also remember the Server requires Absolute URLs) - provide: ORIGIN_URL, - useFactory: (getOriginUrl) - }, { - // The server provides these in main.server - provide: REQUEST, - useFactory: (getRequest) - } - ] + // Our Common AppModule + AppModuleShared + ], + providers: [ + { + // We need this for our Http calls since they'll be using an ORIGIN_URL provided in main.server + // (Also remember the Server requires Absolute URLs) + provide: ORIGIN_URL, + useFactory: getOriginUrl + }, + { + // The server provides these in main.server + provide: REQUEST, + useFactory: getRequest + } + ] }) -export class AppModule { } +export class AppModule {} diff --git a/ClientApp/app/app.module.server.ts b/ClientApp/app/app.module.server.ts index 642a774c..e5fcb3de 100644 --- a/ClientApp/app/app.module.server.ts +++ b/ClientApp/app/app.module.server.ts @@ -1,13 +1,9 @@ import { NgModule } from '@angular/core'; -import { ServerModule } from '@angular/platform-server'; -import { BrowserModule } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -import { AppModuleShared } from './app.module'; -import { AppComponent } from './app.component'; -import { ServerTransferStateModule } from '@angular/platform-server'; - +import { ServerModule } from '@angular/platform-server'; import { PrebootModule } from 'preboot'; +import { AppComponent } from './app.component'; +import { AppModuleShared } from './app.module'; @NgModule({ bootstrap: [AppComponent], @@ -17,7 +13,7 @@ import { PrebootModule } from 'preboot'; ServerModule, PrebootModule.withConfig({ appRoot: 'app-root' }), - NoopAnimationsModule, + NoopAnimationsModule // HttpTransferCacheModule still needs fixes for 5.0 // Leave this commented out for now, as it breaks Server-renders @@ -26,7 +22,5 @@ import { PrebootModule } from 'preboot'; ] }) export class AppModule { - - constructor() { } - + constructor() {} } diff --git a/ClientApp/app/app.module.ts b/ClientApp/app/app.module.ts index 7cc9c4c0..a30f46d8 100644 --- a/ClientApp/app/app.module.ts +++ b/ClientApp/app/app.module.ts @@ -1,156 +1,212 @@ -import { NgModule, Inject } from '@angular/core'; -import { RouterModule, PreloadAllModules } from '@angular/router'; -import { CommonModule, APP_BASE_HREF } from '@angular/common'; -import { HttpModule, Http } from '@angular/http'; -import { HttpClientModule, HttpClient } from '@angular/common/http'; +import { CommonModule } from '@angular/common'; +import { HttpClient, HttpClientModule } from '@angular/common/http'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { BrowserModule, BrowserTransferStateModule } from '@angular/platform-browser'; +import { + BrowserModule, + BrowserTransferStateModule +} from '@angular/platform-browser'; +import { PreloadAllModules, RouterModule } from '@angular/router'; +import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine/tokens'; import { TransferHttpCacheModule } from '@nguniversal/common'; - -import { AccordionModule } from 'ngx-bootstrap'; - // i18n support -import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; - +import { AccordionModule } from 'ngx-bootstrap'; import { AppComponent } from './app.component'; import { NavMenuComponent } from './components/navmenu/navmenu.component'; -import { HomeComponent } from './containers/home/home.component'; -import { UsersComponent } from './containers/users/users.component'; import { UserDetailComponent } from './components/user-detail/user-detail.component'; import { CounterComponent } from './containers/counter/counter.component'; -import { NotFoundComponent } from './containers/not-found/not-found.component'; +import { HomeComponent } from './containers/home/home.component'; import { NgxBootstrapComponent } from './containers/ngx-bootstrap-demo/ngx-bootstrap.component'; - +import { NotFoundComponent } from './containers/not-found/not-found.component'; +import { UsersComponent } from './containers/users/users.component'; import { LinkService } from './shared/link.service'; import { UserService } from './shared/user.service'; -import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine/tokens'; export function createTranslateLoader(http: HttpClient, baseHref) { - // Temporary Azure hack - if (baseHref === null && typeof window !== 'undefined') { - baseHref = window.location.origin; - } - // i18n files are in `wwwroot/assets/` - return new TranslateHttpLoader(http, `${baseHref}/assets/i18n/`, '.json'); + // Temporary Azure hack + if (baseHref === null && typeof window !== 'undefined') { + baseHref = window.location.origin; + } + // i18n files are in `wwwroot/assets/` + return new TranslateHttpLoader(http, `${baseHref}/assets/i18n/`, '.json'); } @NgModule({ - declarations: [ - AppComponent, - NavMenuComponent, - CounterComponent, - UsersComponent, - UserDetailComponent, - HomeComponent, - NotFoundComponent, - NgxBootstrapComponent - ], - imports: [ - CommonModule, - BrowserModule.withServerTransition({ - appId: 'my-app-id' // make sure this matches with your Server NgModule - }), - HttpClientModule, - TransferHttpCacheModule, - BrowserTransferStateModule, - FormsModule, - ReactiveFormsModule, - AccordionModule.forRoot(), // You could also split this up if you don't want the Entire Module imported + declarations: [ + AppComponent, + NavMenuComponent, + CounterComponent, + UsersComponent, + UserDetailComponent, + HomeComponent, + NotFoundComponent, + NgxBootstrapComponent + ], + imports: [ + CommonModule, + BrowserModule.withServerTransition({ + appId: 'my-app-id' // make sure this matches with your Server NgModule + }), + HttpClientModule, + TransferHttpCacheModule, + BrowserTransferStateModule, + FormsModule, + ReactiveFormsModule, + AccordionModule.forRoot(), // You could also split this up if you don't want the Entire Module imported - // i18n support - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useFactory: (createTranslateLoader), - deps: [HttpClient, [ORIGIN_URL]] - } - }), + // i18n support + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useFactory: createTranslateLoader, + deps: [HttpClient, [ORIGIN_URL]] + } + }), - // App Routing - RouterModule.forRoot([ - { - path: '', - redirectTo: 'home', - pathMatch: 'full' - }, - { - path: 'home', component: HomeComponent, + // App Routing + RouterModule.forRoot( + [ + { + path: '', + redirectTo: 'home', + pathMatch: 'full' + }, + { + path: 'home', + component: HomeComponent, - // *** SEO Magic *** - // We're using "data" in our Routes to pass in our <title> <meta> <link> tag information - // Note: This is only happening for ROOT level Routes, you'd have to add some additional logic if you wanted this for Child level routing - // When you change Routes it will automatically append these to your document for you on the Server-side - // - check out app.component.ts to see how it's doing this - data: { - title: 'Homepage', - meta: [{ name: 'description', content: 'This is an example Description Meta tag!' }], - links: [ - { rel: 'canonical', href: 'http://blogs.example.com/blah/nice' }, - { rel: 'alternate', hreflang: 'es', href: 'http://es.example.com/' } - ] - } - }, - { - path: 'counter', component: CounterComponent, - data: { - title: 'Counter', - meta: [{ name: 'description', content: 'This is an Counter page Description!' }], - links: [ - { rel: 'canonical', href: 'http://blogs.example.com/counter/something' }, - { rel: 'alternate', hreflang: 'es', href: 'http://es.example.com/counter' } - ] - } - }, - { - path: 'users', component: UsersComponent, - data: { - title: 'Users REST example', - meta: [{ name: 'description', content: 'This is User REST API example page Description!' }], - links: [ - { rel: 'canonical', href: 'http://blogs.example.com/chat/something' }, - { rel: 'alternate', hreflang: 'es', href: 'http://es.example.com/users' } - ] - } - }, - { - path: 'ngx-bootstrap', component: NgxBootstrapComponent, - data: { - title: 'Ngx-bootstrap demo!!', - meta: [{ name: 'description', content: 'This is an Demo Bootstrap page Description!' }], - links: [ - { rel: 'canonical', href: 'http://blogs.example.com/bootstrap/something' }, - { rel: 'alternate', hreflang: 'es', href: 'http://es.example.com/bootstrap-demo' } - ] - } - }, + // *** SEO Magic *** + // We're using "data" in our Routes to pass in our <title> <meta> <link> tag information + // Note: This is only happening for ROOT level Routes, you'd have to add some additional logic if you wanted this for Child level routing + // When you change Routes it will automatically append these to your document for you on the Server-side + // - check out app.component.ts to see how it's doing this + data: { + title: 'Homepage', + meta: [ + { + name: 'description', + content: 'This is an example Description Meta tag!' + } + ], + links: [ + { rel: 'canonical', href: 'http://blogs.example.com/blah/nice' }, + { + rel: 'alternate', + hreflang: 'es', + href: 'http://es.example.com/' + } + ] + } + }, + { + path: 'counter', + component: CounterComponent, + data: { + title: 'Counter', + meta: [ + { + name: 'description', + content: 'This is an Counter page Description!' + } + ], + links: [ + { + rel: 'canonical', + href: 'http://blogs.example.com/counter/something' + }, + { + rel: 'alternate', + hreflang: 'es', + href: 'http://es.example.com/counter' + } + ] + } + }, + { + path: 'users', + component: UsersComponent, + data: { + title: 'Users REST example', + meta: [ + { + name: 'description', + content: 'This is User REST API example page Description!' + } + ], + links: [ + { + rel: 'canonical', + href: 'http://blogs.example.com/chat/something' + }, + { + rel: 'alternate', + hreflang: 'es', + href: 'http://es.example.com/users' + } + ] + } + }, + { + path: 'ngx-bootstrap', + component: NgxBootstrapComponent, + data: { + title: 'Ngx-bootstrap demo!!', + meta: [ + { + name: 'description', + content: 'This is an Demo Bootstrap page Description!' + } + ], + links: [ + { + rel: 'canonical', + href: 'http://blogs.example.com/bootstrap/something' + }, + { + rel: 'alternate', + hreflang: 'es', + href: 'http://es.example.com/bootstrap-demo' + } + ] + } + }, - { path: 'lazy', loadChildren: './containers/lazy/lazy.module#LazyModule'}, + { + path: 'lazy', + loadChildren: './containers/lazy/lazy.module#LazyModule' + }, - { - path: '**', component: NotFoundComponent, - data: { - title: '404 - Not found', - meta: [{ name: 'description', content: '404 - Error' }], - links: [ - { rel: 'canonical', href: 'http://blogs.example.com/bootstrap/something' }, - { rel: 'alternate', hreflang: 'es', href: 'http://es.example.com/bootstrap-demo' } - ] - } - } - ], { - // Router options - useHash: false, - preloadingStrategy: PreloadAllModules, - initialNavigation: 'enabled' - }) - ], - providers: [ - LinkService, - UserService, - TranslateModule - ], - bootstrap: [AppComponent] + { + path: '**', + component: NotFoundComponent, + data: { + title: '404 - Not found', + meta: [{ name: 'description', content: '404 - Error' }], + links: [ + { + rel: 'canonical', + href: 'http://blogs.example.com/bootstrap/something' + }, + { + rel: 'alternate', + hreflang: 'es', + href: 'http://es.example.com/bootstrap-demo' + } + ] + } + } + ], + { + // Router options + useHash: false, + preloadingStrategy: PreloadAllModules, + initialNavigation: 'enabled' + } + ) + ], + providers: [LinkService, UserService, TranslateModule], + bootstrap: [AppComponent] }) -export class AppModuleShared { -} +export class AppModuleShared {} diff --git a/ClientApp/app/components/navmenu/navmenu.component.scss b/ClientApp/app/components/navmenu/navmenu.component.scss index 462e9461..66115049 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.scss +++ b/ClientApp/app/components/navmenu/navmenu.component.scss @@ -1,10 +1,10 @@ -@import "http://github.com/variables"; -// Mobile first styling. +@import 'http://github.com/variables'; +// Mobile first styling. /* Apply for small displays */ .navbar { position: fixed; - background-color: theme-color("primary"); + background-color: theme-color('primary'); top: 0; right: 0; left: 0; @@ -53,7 +53,7 @@ li a { li.link-active a, li.link-active a:hover, li.link-active a:focus { - background-color: theme-color("accent"); + background-color: theme-color('accent'); color: $body-bg; } @@ -81,7 +81,7 @@ li.link-active a:focus { .navbar, a, button { - color: theme-color("primary"); + color: theme-color('primary'); } .navbar-brand { padding: 15px 15px; diff --git a/ClientApp/app/components/navmenu/navmenu.component.ts b/ClientApp/app/components/navmenu/navmenu.component.ts index c5eb3e8c..d3dadb4d 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.ts +++ b/ClientApp/app/components/navmenu/navmenu.component.ts @@ -1,23 +1,22 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-nav-menu', - templateUrl: './navmenu.component.html', - styleUrls: ['./navmenu.component.scss'] + selector: 'app-nav-menu', + templateUrl: './navmenu.component.html', + styleUrls: ['./navmenu.component.scss'] }) - export class NavMenuComponent { - collapse: string = 'collapse'; + collapse: string = 'collapse'; - collapseNavbar(): void { - if (this.collapse.length > 1) { - this.collapse = ''; - } else { - this.collapse = 'collapse'; - } + collapseNavbar(): void { + if (this.collapse.length > 1) { + this.collapse = ''; + } else { + this.collapse = 'collapse'; } + } - collapseMenu() { - this.collapse = 'collapse'; - } + collapseMenu() { + this.collapse = 'collapse'; + } } diff --git a/ClientApp/app/components/user-detail/user-detail.component.html b/ClientApp/app/components/user-detail/user-detail.component.html index 0b9ed7b1..f43b4bbb 100644 --- a/ClientApp/app/components/user-detail/user-detail.component.html +++ b/ClientApp/app/components/user-detail/user-detail.component.html @@ -1,6 +1,6 @@ <div class="panel"> <h2 class="title">{{user.name}} details:</h2> - <form class="body" [formGroup]="userForm"(ngSubmit)="updateUser()"> + <form class="body" [formGroup]="userForm" (ngSubmit)="updateUser()"> <div class="form-group"> <label for="userId">Id</label> <input type="input" formControlName="id" class="form-control" id="userId" placeholder="Id" readonly> diff --git a/ClientApp/app/components/user-detail/user-detail.component.scss b/ClientApp/app/components/user-detail/user-detail.component.scss index 15a7f257..a7809e89 100644 --- a/ClientApp/app/components/user-detail/user-detail.component.scss +++ b/ClientApp/app/components/user-detail/user-detail.component.scss @@ -1,4 +1,4 @@ -@import "http://github.com/variables"; +@import 'http://github.com/variables'; :host-context() { flex: 1; } diff --git a/ClientApp/app/components/user-detail/user-detail.component.ts b/ClientApp/app/components/user-detail/user-detail.component.ts index 2f2f5ffd..d14dbdc1 100644 --- a/ClientApp/app/components/user-detail/user-detail.component.ts +++ b/ClientApp/app/components/user-detail/user-detail.component.ts @@ -1,40 +1,52 @@ -import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; +import { + Component, + EventEmitter, + Input, + OnChanges, + OnInit, + Output, + SimpleChanges +} from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { IUser } from '../../models/User'; import { UserService } from '../../shared/user.service'; -import { FormControl, FormGroup } from '@angular/forms'; -import { debounce, debounceTime, distinctUntilChanged } from 'rxjs/operators'; @Component({ - selector: 'app-user-detail', - styleUrls: ['./user-detail.component.scss'], - templateUrl: './user-detail.component.html' + selector: 'app-user-detail', + styleUrls: ['./user-detail.component.scss'], + templateUrl: './user-detail.component.html' }) export class UserDetailComponent implements OnInit, OnChanges { + @Input() user: IUser; + @Output() userUpdate: EventEmitter<any> = new EventEmitter(); + userForm = new FormGroup({ + id: new FormControl(), + name: new FormControl() + }); + constructor(private userService: UserService) {} - @Input() user: IUser; - @Output() userUpdate: EventEmitter<any> = new EventEmitter(); - userForm = new FormGroup({ - id: new FormControl(), - name: new FormControl() - }); - constructor(private userService: UserService) { } - - ngOnInit() { - this.userForm.valueChanges.pipe( - debounceTime(400), - distinctUntilChanged() - ).subscribe(user => this.user = user); - } - ngOnChanges(changes: SimpleChanges) { - this.userForm.patchValue(this.user); - } + ngOnInit() { + this.userForm.valueChanges + .pipe( + debounceTime(400), + distinctUntilChanged() + ) + .subscribe(user => (this.user = user)); + } + ngOnChanges(changes: SimpleChanges) { + this.userForm.patchValue(this.user); + } - updateUser() { - this.userService.updateUser(this.userForm.value).subscribe(result => { - console.log('Put user result: ', result); - }, error => { - console.log(`There was an issue. ${error._body}.`); - }); - this.userUpdate.emit(this.user); - } + updateUser() { + this.userService.updateUser(this.userForm.value).subscribe( + result => { + console.log('Put user result: ', result); + }, + error => { + console.log(`There was an issue. ${error._body}.`); + } + ); + this.userUpdate.emit(this.user); + } } diff --git a/ClientApp/app/containers/counter/counter.component.html b/ClientApp/app/containers/counter/counter.component.html index cc2bbd59..d4dcafe4 100644 --- a/ClientApp/app/containers/counter/counter.component.html +++ b/ClientApp/app/containers/counter/counter.component.html @@ -2,6 +2,8 @@ <h1>Counter</h1> <p>This is a simple example of an Angular 2 component.</p> -<p>Current count: <strong>{{ currentCount }}</strong></p> +<p>Current count: + <strong>{{ currentCount }}</strong> +</p> <button (click)="incrementCounter()">Increment</button> diff --git a/ClientApp/app/containers/counter/counter.component.spec.ts b/ClientApp/app/containers/counter/counter.component.spec.ts index c1e54ed4..92202646 100644 --- a/ClientApp/app/containers/counter/counter.component.spec.ts +++ b/ClientApp/app/containers/counter/counter.component.spec.ts @@ -1,29 +1,27 @@ -/// <reference path="../../../../node_modules/@types/jasmine/index.d.ts" /> -import { assert } from 'chai'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CounterComponent } from './counter.component'; -import { TestBed, async, ComponentFixture } from '@angular/core/testing'; let fixture: ComponentFixture<CounterComponent>; describe('Counter component', () => { - beforeEach(() => { - TestBed.configureTestingModule({ declarations: [CounterComponent] }); - fixture = TestBed.createComponent(CounterComponent); - fixture.detectChanges(); - }); + beforeEach(() => { + TestBed.configureTestingModule({ declarations: [CounterComponent] }); + fixture = TestBed.createComponent(CounterComponent); + fixture.detectChanges(); + }); - it('should display a title', async(() => { - const titleText = fixture.nativeElement.querySelector('h1').textContent; - expect(titleText).toEqual('Counter'); - })); + it('should display a title', async(() => { + const titleText = fixture.nativeElement.querySelector('h1').textContent; + expect(titleText).toEqual('Counter'); + })); - it('should start with count 0, then increments by 1 when clicked', async(() => { - const countElement = fixture.nativeElement.querySelector('strong'); - expect(countElement.textContent).toEqual('0'); + it('should start with count 0, then increments by 1 when clicked', async(() => { + const countElement = fixture.nativeElement.querySelector('strong'); + expect(countElement.textContent).toEqual('0'); - const incrementButton = fixture.nativeElement.querySelector('button'); - incrementButton.click(); - fixture.detectChanges(); - expect(countElement.textContent).toEqual('1'); - })); + const incrementButton = fixture.nativeElement.querySelector('button'); + incrementButton.click(); + fixture.detectChanges(); + expect(countElement.textContent).toEqual('1'); + })); }); diff --git a/ClientApp/app/containers/counter/counter.component.ts b/ClientApp/app/containers/counter/counter.component.ts index 5adb5195..42123687 100644 --- a/ClientApp/app/containers/counter/counter.component.ts +++ b/ClientApp/app/containers/counter/counter.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-counter', - templateUrl: './counter.component.html' + selector: 'app-counter', + templateUrl: './counter.component.html' }) export class CounterComponent { - public currentCount = 0; + public currentCount = 0; - public incrementCounter() { - this.currentCount++; - } + public incrementCounter() { + this.currentCount++; + } } diff --git a/ClientApp/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html index 8f12abfc..f60e6d64 100644 --- a/ClientApp/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -2,8 +2,10 @@ <blockquote> <strong>Enjoy the latest features from .NET Core & Angular 6.x!</strong> - <br> For more info check the repo here: <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal">AspNetCore-Angular-Universal repo</a> - <br><br> + <br> For more info check the repo here: + <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal">AspNetCore-Angular-Universal repo</a> + <br> + <br> </blockquote> <div class="row"> @@ -14,8 +16,7 @@ <h2>{{ 'HOME_FEATURE_LIST_TITLE' | translate }} </h2> <li> Angular 6.* front-end UI framework <ul> - <li>Angular **platform-server** (aka: Universal) - server-side rendering for SEO, deep-linking, and - incredible performance.</li> + <li>Angular **platform-server** (aka: Universal) - server-side rendering for SEO, deep-linking, and incredible performance.</li> <!--<li>HMR State Management - Don't lose your applications state during HMR!</li>--> <li>AoT (Ahead-of-time) production compilation for even faster Prod builds.</li> </ul> @@ -41,7 +42,13 @@ <h2>{{ 'HOME_FEATURE_LIST_TITLE' | translate }} </h2> <h2>{{ 'HOME_ISSUES_TITLE' | translate }}</h2> <ul> - <li><strong>Issues with this Starter?</strong> <br>Please post an issue here: <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal">AspNetCore-Angular2-Universal repo</a><br><br></li> + <li> + <strong>Issues with this Starter?</strong> + <br>Please post an issue here: + <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal">AspNetCore-Angular2-Universal repo</a> + <br> + <br> + </li> <!--<li><strong>Issues with <u>Universal</u> itself?</strong> <br>Please post an issue here: <a href="https://github.com/angular/universal">Angular Universal repo</a></li>--> </ul> </div> @@ -54,11 +61,11 @@ <h2>{{ 'HOME_ISSUES_TITLE' | translate }}</h2> <h2> {{ 'SWITCH_LANGUAGE' | translate }}</h2> <button class="btn btn-outline-secondary mr-2" (click)="setLanguage('en')"> - <span class="flag-icon flag-icon-us"></span> {{ 'ENGLISH' | translate }} + <span class="flag-icon flag-icon-us"></span> {{ 'ENGLISH' | translate }} </button> <button class="btn btn-outline-secondary" (click)="setLanguage('no')"> - <span class="flag-icon flag-icon-no"></span> {{ 'NORWEGIAN' | translate }} + <span class="flag-icon flag-icon-no"></span> {{ 'NORWEGIAN' | translate }} </button> </div> diff --git a/ClientApp/app/containers/home/home.component.ts b/ClientApp/app/containers/home/home.component.ts index abc2db05..fc689f24 100644 --- a/ClientApp/app/containers/home/home.component.ts +++ b/ClientApp/app/containers/home/home.component.ts @@ -1,25 +1,22 @@ -import { Component, OnInit, Inject } from '@angular/core'; - +import { Component, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; @Component({ - selector: 'app-home', - templateUrl: './home.component.html' + selector: 'app-home', + templateUrl: './home.component.html' }) export class HomeComponent implements OnInit { + title: string = + 'Angular 6.x Universal & ASP.NET Core 2.1 advanced starter-kit'; - title: string = 'Angular 6.x Universal & ASP.NET Core 2.1 advanced starter-kit'; - - // Use "constructor"s only for dependency injection - constructor( - public translate: TranslateService - ) { } + // Use "constructor"s only for dependency injection + constructor(public translate: TranslateService) {} - // Here you want to handle anything with @Input()'s @Output()'s - // Data retrieval / etc - this is when the Component is "ready" and wired up - ngOnInit() { } + // Here you want to handle anything with @Input()'s @Output()'s + // Data retrieval / etc - this is when the Component is "ready" and wired up + ngOnInit() {} - public setLanguage(lang) { - this.translate.use(lang); - } + public setLanguage(lang) { + this.translate.use(lang); + } } diff --git a/ClientApp/app/containers/lazy/lazy.component.ts b/ClientApp/app/containers/lazy/lazy.component.ts index 97d260fd..53327733 100644 --- a/ClientApp/app/containers/lazy/lazy.component.ts +++ b/ClientApp/app/containers/lazy/lazy.component.ts @@ -10,4 +10,4 @@ import { Component } from '@angular/core'; </blockquote> ` }) -export class LazyComponent { } +export class LazyComponent {} diff --git a/ClientApp/app/containers/lazy/lazy.module.ts b/ClientApp/app/containers/lazy/lazy.module.ts index 8d468754..aa33a605 100644 --- a/ClientApp/app/containers/lazy/lazy.module.ts +++ b/ClientApp/app/containers/lazy/lazy.module.ts @@ -1,4 +1,4 @@ -import { NgModule, Component } from '@angular/core'; +import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { LazyComponent } from './lazy.component'; @@ -10,6 +10,4 @@ import { LazyComponent } from './lazy.component'; ]) ] }) -export class LazyModule { - -} +export class LazyModule {} diff --git a/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html b/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html index c57f2260..2b95c774 100644 --- a/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html +++ b/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.html @@ -1,38 +1,35 @@ <h1>Ngx-bootstrap Demo:</h1> <blockquote> - <strong>Here we're using Bootstrap via <a href="https://github.com/valor-software/ngx-bootstrap">ngx-bootstrap</a>, which can even be rendered on the server!</strong> + <strong>Here we're using Bootstrap via + <a href="https://github.com/valor-software/ngx-bootstrap">ngx-bootstrap</a>, which can even be rendered on the server!</strong> <br> </blockquote> <hr> -<br><br> +<br> +<br> <h3>Bootstrap Accordion demo:</h3> <p> - <button type="button" class="btn btn-primary btn-sm" - (click)="group.isOpen = !group.isOpen"> + <button type="button" class="btn btn-primary btn-sm" (click)="group.isOpen = !group.isOpen"> Toggle last panel </button> - <button type="button" class="btn btn-primary btn-sm ml-2" - (click)="status.isFirstDisabled = ! status.isFirstDisabled"> + <button type="button" class="btn btn-primary btn-sm ml-2" (click)="status.isFirstDisabled = ! status.isFirstDisabled"> Enable / Disable first panel </button> </p> <div class="checkbox"> <label> - <input type="checkbox" [(ngModel)]="oneAtATime"> - Open only one at a time + <input type="checkbox" [(ngModel)]="oneAtATime"> Open only one at a time </label> </div> <accordion [closeOthers]="oneAtATime"> - <accordion-group heading="Static Header, initially expanded" - [isOpen]="status.isFirstOpen" - [isDisabled]="status.isFirstDisabled"> + <accordion-group heading="Static Header, initially expanded" [isOpen]="status.isFirstOpen" [isDisabled]="status.isFirstDisabled"> This content is straight in the template. </accordion-group> <accordion-group *ngFor="let group of groups" [heading]="group.title"> @@ -46,9 +43,8 @@ <h3>Bootstrap Accordion demo:</h3> <accordion-group #group [isOpen]="status.open"> <div accordion-heading> I can have markup, too! - <i class="pull-right glyphicon" - [ngClass]="{'glyphicon-chevron-down': group?.isOpen, 'glyphicon-chevron-right': !group?.isOpen}"></i> + <i class="pull-right glyphicon" [ngClass]="{'glyphicon-chevron-down': group?.isOpen, 'glyphicon-chevron-right': !group?.isOpen}"></i> </div> This is just some content to illustrate fancy headings. </accordion-group> -</accordion> \ No newline at end of file +</accordion> diff --git a/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts b/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts index a8ba7dec..d1122dad 100644 --- a/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts +++ b/ClientApp/app/containers/ngx-bootstrap-demo/ngx-bootstrap.component.ts @@ -1,36 +1,34 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-bootstrap', - templateUrl: './ngx-bootstrap.component.html' + selector: 'app-bootstrap', + templateUrl: './ngx-bootstrap.component.html' }) export class NgxBootstrapComponent { + public oneAtATime: boolean = true; + public items = ['Item 1', 'Item 2', 'Item 3']; - public oneAtATime: boolean = true; - public items = ['Item 1', 'Item 2', 'Item 3']; + public status = { + isFirstOpen: true, + isFirstDisabled: false, + open: false + }; - public status = { - isFirstOpen: true, - isFirstDisabled: false, - open: false - }; - - public groups = [ - { - title: 'Angular is neato gang!', - content: 'ASP.NET Core is too :)' - }, - { - title: 'Another One!', - content: 'Some content going here' - } - ]; - - // Use "constructor"s only for dependency injection - constructor() { } - - addItem(): void { - this.items.push(`Items ${this.items.length + 1}`); + public groups = [ + { + title: 'Angular is neato gang!', + content: 'ASP.NET Core is too :)' + }, + { + title: 'Another One!', + content: 'Some content going here' } + ]; + + // Use "constructor"s only for dependency injection + constructor() {} -} \ No newline at end of file + addItem(): void { + this.items.push(`Items ${this.items.length + 1}`); + } +} diff --git a/ClientApp/app/containers/not-found/not-found.component.html b/ClientApp/app/containers/not-found/not-found.component.html index 347dcb93..b0b7072d 100644 --- a/ClientApp/app/containers/not-found/not-found.component.html +++ b/ClientApp/app/containers/not-found/not-found.component.html @@ -1,8 +1,8 @@ <div class="wrapper"> <header class="header header--large"> <h1 class="title">Ahhhhhhhhhhh! This page doesn't exist</h1> - <h2 class="strapline">Not to worry. You can either head back to <a href="http://github.com/">our homepage</a>, or sit there and listen to a goat scream like - a human.</h2> + <h2 class="strapline">Not to worry. You can either head back to + <a href="http://github.com/">our homepage</a>, or sit there and listen to a goat scream like a human.</h2> </header> <div class="content fit-vid vid"> <iframe src="http://www.youtube.com/embed/SIaFtAKnqBU?vq=hd720&rel=0&showinfo=0&controls=0&iv_load_policy=3&loop=1&playlist=SIaFtAKnqBU&modestbranding=1&autoplay=1" diff --git a/ClientApp/app/containers/not-found/not-found.component.ts b/ClientApp/app/containers/not-found/not-found.component.ts index c59a5f8f..6bd9147a 100644 --- a/ClientApp/app/containers/not-found/not-found.component.ts +++ b/ClientApp/app/containers/not-found/not-found.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-not-found', - templateUrl: './not-found.component.html' + selector: 'app-not-found', + templateUrl: './not-found.component.html' }) export class NotFoundComponent implements OnInit { - constructor() { } + constructor() {} - ngOnInit() { } + ngOnInit() {} } diff --git a/ClientApp/app/containers/users/users.component.scss b/ClientApp/app/containers/users/users.component.scss index 85a47c26..67acfed0 100644 --- a/ClientApp/app/containers/users/users.component.scss +++ b/ClientApp/app/containers/users/users.component.scss @@ -1,4 +1,4 @@ -@import "http://github.com/variables"; +@import 'http://github.com/variables'; .users-wrapper { max-height: 65vh; overflow-y: auto; @@ -35,9 +35,9 @@ h1 { align-items: center; padding: 0px; &:hover { - color: #607D8B; + color: #607d8b; background-color: #e6e6e6; - left: .1em; + left: 0.1em; } &.selected { background-color: #7eaacd !important; @@ -45,7 +45,7 @@ h1 { } } -.users li>* { +.users li > * { display: flex; flex-direction: column; align-items: center; @@ -58,13 +58,13 @@ h1 { } .users li.selected:hover { - background-color: #BBD8DC !important; + background-color: #bbd8dc !important; color: white; } .user-id { @extend .input-group-text; - background-color: #607D8B; + background-color: #607d8b; color: white; width: 2.5rem; border: 0px; @@ -73,9 +73,7 @@ h1 { } .delete-user { - @extend .btn, - .badge, - .badge-secondary; + @extend .btn, .badge, .badge-secondary; height: 25px; width: 25px; margin-right: 10px; diff --git a/ClientApp/app/containers/users/users.component.ts b/ClientApp/app/containers/users/users.component.ts index 27a9bbff..b64ea0ee 100644 --- a/ClientApp/app/containers/users/users.component.ts +++ b/ClientApp/app/containers/users/users.component.ts @@ -1,13 +1,11 @@ import { - Component, OnInit, Inject -} from '@angular/core'; -import { - trigger, + animate, state, style, - animate, - transition + transition, + trigger } from '@angular/animations'; +import { Component, OnInit } from '@angular/core'; import { IUser } from '../../models/User'; import { UserService } from '../../shared/user.service'; @@ -31,14 +29,11 @@ import { UserService } from '../../shared/user.service'; ] }) export class UsersComponent implements OnInit { - users: IUser[]; selectedUser: IUser; // Use "constructor"s only for dependency injection - constructor( - private userService: UserService - ) { } + constructor(private userService: UserService) {} // Here you want to handle anything with @Input()'s @Output()'s // Data retrieval / etc - this is when the Component is "ready" and wired up @@ -55,27 +50,33 @@ export class UsersComponent implements OnInit { deleteUser(user) { this.clearUser(); - this.userService.deleteUser(user).subscribe(result => { - console.log('Delete user result: ', result); - let position = this.users.indexOf(user); - this.users.splice(position, 1); - }, error => { - console.log(`There was an issue. ${error._body}.`); - }); + this.userService.deleteUser(user).subscribe( + result => { + console.log('Delete user result: ', result); + let position = this.users.indexOf(user); + this.users.splice(position, 1); + }, + error => { + console.log(`There was an issue. ${error._body}.`); + } + ); } onUserUpdate(user: IUser) { - this.users[this.users.findIndex((u => u.id == user.id))] = user; + this.users[this.users.findIndex(u => u.id == user.id)] = user; } addUser(newUserName) { - this.userService.addUser(newUserName).subscribe(result => { - console.log('Post user result: ', result); - this.users.push(result); - this.selectedUser = result; - }, error => { - console.log(`There was an issue. ${error._body}.`); - }); + this.userService.addUser(newUserName).subscribe( + result => { + console.log('Post user result: ', result); + this.users.push(result); + this.selectedUser = result; + }, + error => { + console.log(`There was an issue. ${error._body}.`); + } + ); } clearUser() { diff --git a/ClientApp/app/models/User.ts b/ClientApp/app/models/User.ts index 53f9df3a..f140ecb1 100644 --- a/ClientApp/app/models/User.ts +++ b/ClientApp/app/models/User.ts @@ -1,4 +1,4 @@ export interface IUser { - id: number; - name: string; -} \ No newline at end of file + id: number; + name: string; +} diff --git a/ClientApp/app/shared/link.service.ts b/ClientApp/app/shared/link.service.ts index c5a2f16d..2e6754a4 100644 --- a/ClientApp/app/shared/link.service.ts +++ b/ClientApp/app/shared/link.service.ts @@ -6,90 +6,90 @@ * Soon there will be an overall HeadService within Angular that handles Meta/Link everything */ -import { Injectable, PLATFORM_ID, Optional, RendererFactory2, ViewEncapsulation, Inject } from '@angular/core'; -import { DOCUMENT } from '@angular/platform-browser'; import { isPlatformServer } from '@angular/common'; +import { + Inject, + Injectable, + PLATFORM_ID, + RendererFactory2, + ViewEncapsulation +} from '@angular/core'; +import { DOCUMENT } from '@angular/platform-browser'; @Injectable() export class LinkService { - - private isServer: boolean = isPlatformServer(this.platform_id); - - constructor( - private rendererFactory: RendererFactory2, - @Inject(DOCUMENT) private document, - @Inject(PLATFORM_ID) private platform_id - ) { - } - - /** - * Inject the State into the bottom of the <head> - */ - addTag(tag: LinkDefinition, forceCreation?: boolean) { - - try { - const renderer = this.rendererFactory.createRenderer(this.document, { - id: '-1', - encapsulation: ViewEncapsulation.None, - styles: [], - data: {} - }); - - const link = renderer.createElement('link'); - const head = this.document.head; - const selector = this._parseSelector(tag); - - if (head === null) { - throw new Error('<head> not found within DOCUMENT.'); - } - - Object.keys(tag).forEach((prop: string) => { - return renderer.setAttribute(link, prop, tag[prop]); - }); - - // [TODO]: get them to update the existing one (if it exists) ? - renderer.appendChild(head, link); - - } catch (e) { - console.error('Error within linkService : ', e); - } + private isServer: boolean = isPlatformServer(this.platform_id); + + constructor( + private rendererFactory: RendererFactory2, + @Inject(DOCUMENT) private document, + @Inject(PLATFORM_ID) private platform_id + ) {} + + /** + * Inject the State into the bottom of the <head> + */ + addTag(tag: LinkDefinition, forceCreation?: boolean) { + try { + const renderer = this.rendererFactory.createRenderer(this.document, { + id: '-1', + encapsulation: ViewEncapsulation.None, + styles: [], + data: {} + }); + + const link = renderer.createElement('link'); + const head = this.document.head; + const selector = this._parseSelector(tag); + + if (head === null) { + throw new Error('<head> not found within DOCUMENT.'); + } + + Object.keys(tag).forEach((prop: string) => { + return renderer.setAttribute(link, prop, tag[prop]); + }); + + // [TODO]: get them to update the existing one (if it exists) ? + renderer.appendChild(head, link); + } catch (e) { + console.error('Error within linkService : ', e); } - - // updateTag(tag: LinkDefinition, selector?: string) { - // if (!tag) return null; - // selector = selector || this._parseSelector(tag); - // const meta = this.getTag(selector); - // if (meta) { - // return this._setMetaElementAttributes(tag, meta); - // } - // return this._getOrCreateElement(tag, true); - // } - - // getTag(attrSelector: string): HTMLMetaElement { - // if (!attrSelector) return null; - // return this._dom.querySelector(this._doc, `meta[${attrSelector}]`); - // } - - private _parseSelector(tag: LinkDefinition): string { - // Possibly re-work this - const attr: string = tag.rel ? 'rel' : 'hreflang'; - return `${attr}="${tag[attr]}"`; - } - + } + + // updateTag(tag: LinkDefinition, selector?: string) { + // if (!tag) return null; + // selector = selector || this._parseSelector(tag); + // const meta = this.getTag(selector); + // if (meta) { + // return this._setMetaElementAttributes(tag, meta); + // } + // return this._getOrCreateElement(tag, true); + // } + + // getTag(attrSelector: string): HTMLMetaElement { + // if (!attrSelector) return null; + // return this._dom.querySelector(this._doc, `meta[${attrSelector}]`); + // } + + private _parseSelector(tag: LinkDefinition): string { + // Possibly re-work this + const attr: string = tag.rel ? 'rel' : 'hreflang'; + return `${attr}="${tag[attr]}"`; + } } - export declare type LinkDefinition = { - charset?: string; - crossorigin?: string; - href?: string; - hreflang?: string; - media?: string; - rel?: string; - rev?: string; - sizes?: string; - target?: string; - type?: string; + charset?: string; + crossorigin?: string; + href?: string; + hreflang?: string; + media?: string; + rel?: string; + rev?: string; + sizes?: string; + target?: string; + type?: string; } & { - [prop: string]: string; - }; \ No newline at end of file + [prop: string]: string; +}; diff --git a/ClientApp/app/shared/user.service.ts b/ClientApp/app/shared/user.service.ts index 31110e7e..85249249 100644 --- a/ClientApp/app/shared/user.service.ts +++ b/ClientApp/app/shared/user.service.ts @@ -1,21 +1,13 @@ -import { Injectable, Inject, Injector } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Http, URLSearchParams } from '@angular/http'; -import { APP_BASE_HREF } from '@angular/common'; +import { Injectable, Injector } from '@angular/core'; import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine/tokens'; import { IUser } from '../models/User'; -import { Observable } from 'rxjs'; - @Injectable() export class UserService { - private baseUrl: string; - constructor( - private http: HttpClient, - private injector: Injector - ) { + constructor(private http: HttpClient, private injector: Injector) { this.baseUrl = this.injector.get(ORIGIN_URL); } @@ -31,11 +23,13 @@ export class UserService { return this.http.delete<IUser>(`${this.baseUrl}/api/users/` + user.id); } - updateUser(user: IUser){ + updateUser(user: IUser) { return this.http.put<IUser>(`${this.baseUrl}/api/users/` + user.id, user); } addUser(newUserName: string) { - return this.http.post<IUser>(`${this.baseUrl}/api/users`, { name: newUserName }); + return this.http.post<IUser>(`${this.baseUrl}/api/users`, { + name: newUserName + }); } } diff --git a/ClientApp/boot.browser.ts b/ClientApp/boot.browser.ts index 329344f7..c0ef55b6 100644 --- a/ClientApp/boot.browser.ts +++ b/ClientApp/boot.browser.ts @@ -1,16 +1,16 @@ -import './polyfills/browser.polyfills'; import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module.browser'; +import './polyfills/browser.polyfills'; // // Enable either Hot Module Reloading or production mode if (module['hot']) { - module['hot'].accept(); - module['hot'].dispose(() => { - modulePromise.then(appModule => appModule.destroy()); - }); + module['hot'].accept(); + module['hot'].dispose(() => { + modulePromise.then(appModule => appModule.destroy()); + }); } else { - enableProdMode(); + enableProdMode(); } const modulePromise = platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/ClientApp/boot.server.PRODUCTION.ts b/ClientApp/boot.server.PRODUCTION.ts index 30f8deb0..b7bcbb7a 100644 --- a/ClientApp/boot.server.PRODUCTION.ts +++ b/ClientApp/boot.server.PRODUCTION.ts @@ -1,16 +1,19 @@ -import 'zone.js/dist/zone-node'; -import './polyfills/server.polyfills'; -import { enableProdMode } from '@angular/core'; +import { enableProdMode } from '@angular/core'; +import { + createTransferScript, + IEngineOptions, + ngAspnetCoreEngine +} from '@nguniversal/aspnetcore-engine'; import { createServerRenderer } from 'aspnet-prerendering'; +import 'zone.js/dist/zone-node'; +import './polyfills/server.polyfills'; // Grab the (Node) server-specific NgModule const { AppModuleNgFactory } = require('./app/app.module.server.ngfactory'); // <-- ignore this - this is Production only -import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from '@nguniversal/aspnetcore-engine'; enableProdMode(); -export default createServerRenderer((params) => { - +export default createServerRenderer(params => { // Platform-server provider configuration const setupOptions: IEngineOptions = { appSelector: '<app-root></app-root>', @@ -23,16 +26,16 @@ export default createServerRenderer((params) => { }; return ngAspnetCoreEngine(setupOptions).then(response => { - // Apply your transferData to response.globals response.globals.transferData = createTransferScript({ - someData: 'Transfer this to the client on the window.TRANSFER_CACHE {} object', + someData: + 'Transfer this to the client on the window.TRANSFER_CACHE {} object', fromDotnet: params.data.thisCameFromDotNET // example of data coming from dotnet, in HomeController }); - return ({ + return { html: response.html, // our <app-root> serialized globals: response.globals // all of our styles/scripts/meta-tags/link-tags for aspnet to serve up - }); + }; }); }); diff --git a/ClientApp/boot.server.ts b/ClientApp/boot.server.ts index c2c0fb47..72457842 100644 --- a/ClientApp/boot.server.ts +++ b/ClientApp/boot.server.ts @@ -1,11 +1,11 @@ -import 'zone.js/dist/zone-node'; -import './polyfills/server.polyfills'; -import { enableProdMode } from '@angular/core'; +import { enableProdMode } from '@angular/core'; +import { createTransferScript, IEngineOptions, ngAspnetCoreEngine } from '@nguniversal/aspnetcore-engine'; import { createServerRenderer } from 'aspnet-prerendering'; - +import 'zone.js/dist/zone-node'; // Grab the (Node) server-specific NgModule import { AppModule } from './app/app.module.server'; -import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from '@nguniversal/aspnetcore-engine'; +import './polyfills/server.polyfills'; + enableProdMode(); diff --git a/ClientApp/polyfills/browser.polyfills.ts b/ClientApp/polyfills/browser.polyfills.ts index 1db98ac8..207f7e06 100644 --- a/ClientApp/polyfills/browser.polyfills.ts +++ b/ClientApp/polyfills/browser.polyfills.ts @@ -1,5 +1,5 @@ +import 'reflect-metadata'; +import 'zone.js/dist/zone'; import './polyfills.ts'; -import 'zone.js/dist/zone'; -import 'reflect-metadata'; // import 'web-animations-js'; // Run `npm install --save web-animations-js`. diff --git a/ClientApp/polyfills/polyfills.ts b/ClientApp/polyfills/polyfills.ts index fd43e294..b577f1c4 100644 --- a/ClientApp/polyfills/polyfills.ts +++ b/ClientApp/polyfills/polyfills.ts @@ -1,30 +1,25 @@ - /*************************************************************************************************** * BROWSER POLYFILLS */ /** IE9, IE10 and IE11 requires all of the following polyfills. **/ - import 'core-js/es6/symbol'; - import 'core-js/es6/object'; - import 'core-js/es6/function'; - import 'core-js/es6/parse-int'; - import 'core-js/es6/parse-float'; - import 'core-js/es6/number'; - import 'core-js/es6/math'; - import 'core-js/es6/string'; - import 'core-js/es6/date'; - import 'core-js/es6/array'; - import 'core-js/es6/regexp'; - import 'core-js/es6/map'; - import 'core-js/es6/set'; - - /** */ - import 'reflect-metadata'; - +import 'core-js/es6/array'; +import 'core-js/es6/date'; +import 'core-js/es6/function'; +import 'core-js/es6/map'; +import 'core-js/es6/math'; +import 'core-js/es6/number'; +import 'core-js/es6/object'; +import 'core-js/es6/parse-float'; +import 'core-js/es6/parse-int'; /** IE10 and IE11 requires the following for NgClass support on SVG elements */ // import 'classlist.js'; // Run `npm install --save classlist.js`. - /** Evergreen browsers require these. **/ import 'core-js/es6/reflect'; +import 'core-js/es6/regexp'; +import 'core-js/es6/set'; +import 'core-js/es6/string'; +import 'core-js/es6/symbol'; import 'core-js/es7/reflect'; - +/** */ +import 'reflect-metadata'; diff --git a/ClientApp/polyfills/server.polyfills.ts b/ClientApp/polyfills/server.polyfills.ts index 7044895f..96b07953 100644 --- a/ClientApp/polyfills/server.polyfills.ts +++ b/ClientApp/polyfills/server.polyfills.ts @@ -1,3 +1,2 @@ -import './polyfills.ts'; - -import 'zone.js'; +import 'zone.js'; +import './polyfills.ts'; diff --git a/ClientApp/test/boot-tests.js b/ClientApp/test/boot-tests.js index 647b8c02..51eeb6d3 100644 --- a/ClientApp/test/boot-tests.js +++ b/ClientApp/test/boot-tests.js @@ -12,13 +12,15 @@ const testing = require('@angular/core/testing'); const testingBrowser = require('@angular/platform-browser-dynamic/testing'); // Prevent Karma from running prematurely -__karma__.loaded = function () {}; +__karma__.loaded = function() {}; // First, initialize the Angular testing environment -testing.getTestBed().initTestEnvironment( +testing + .getTestBed() + .initTestEnvironment( testingBrowser.BrowserDynamicTestingModule, testingBrowser.platformBrowserDynamicTesting() -); + ); // Then we find all the tests const context = require.context('../', true, /\.spec\.ts$/); diff --git a/ClientApp/test/karma.conf.js b/ClientApp/test/karma.conf.js index b54ce8f9..6ab0db4b 100644 --- a/ClientApp/test/karma.conf.js +++ b/ClientApp/test/karma.conf.js @@ -1,15 +1,12 @@ // Karma configuration file, see link for more information // https://karma-runner.github.io/0.13/config/configuration-file.html -module.exports = function (config) { +module.exports = function(config) { config.set({ basePath: '.', frameworks: ['jasmine'], exclude: [], - files: [ - '../../wwwroot/dist/vendor.js', - './boot-tests.js' - ], + files: ['../../wwwroot/dist/vendor.js', './boot-tests.js'], preprocessors: { './boot-tests.js': ['coverage', 'webpack', 'sourcemap'] }, @@ -45,7 +42,7 @@ module.exports = function (config) { }, // you can define custom flags customLaunchers: { - 'PhantomJS_custom': { + PhantomJS_custom: { base: 'PhantomJS', options: { windowName: 'test-window', @@ -53,7 +50,7 @@ module.exports = function (config) { webSecurityEnabled: false } }, - flags: ['--load-images=true'], + flags: ['--load-images=true'] // debug: true } }, diff --git a/ClientApp/test/webpack.config.test.js b/ClientApp/test/webpack.config.test.js index 3a14d96d..5cbcecc5 100644 --- a/ClientApp/test/webpack.config.test.js +++ b/ClientApp/test/webpack.config.test.js @@ -5,7 +5,7 @@ const webpack = require('webpack'); var path = require('path'); var rootPath = path.join.bind(path, path.resolve(__dirname, '../../')); -module.exports = function (options) { +module.exports = function(options) { return { devtool: 'inline-source-map', resolve: { @@ -13,7 +13,8 @@ module.exports = function (options) { modules: [rootPath('ClientApp'), 'node_modules'] }, module: { - rules: [{ + rules: [ + { enforce: 'pre', test: /\.js$/, loader: 'source-map-loader', @@ -24,7 +25,8 @@ module.exports = function (options) { }, { test: /\.ts$/, - use: [{ + use: [ + { loader: 'awesome-typescript-loader', query: { sourceMap: false, @@ -32,7 +34,7 @@ module.exports = function (options) { compilerOptions: { removeComments: true } - }, + } }, 'angular2-template-loader' ], @@ -58,13 +60,8 @@ module.exports = function (options) { esModules: true }, include: rootPath('ClientApp'), - exclude: [ - /ClientApp\\test/, - /\.(e2e|spec)\.ts$/, - /node_modules/ - ] + exclude: [/ClientApp\\test/, /\.(e2e|spec)\.ts$/, /node_modules/] } - ] }, plugins: [ @@ -91,8 +88,7 @@ module.exports = function (options) { * legacy options go here */ } - }), - + }) ], performance: { hints: false @@ -112,6 +108,5 @@ module.exports = function (options) { clearImmediate: false, setImmediate: false } - }; -} +}; diff --git a/ClientApp/tsconfig.app.json b/ClientApp/tsconfig.app.json index 3f094c64..2cf4ae53 100644 --- a/ClientApp/tsconfig.app.json +++ b/ClientApp/tsconfig.app.json @@ -6,9 +6,5 @@ "baseUrl": "", "types": [] }, - "exclude": [ - "test.ts", - "**/*.spec.ts", - "boot.server.PRODUCTION.ts" - ] + "exclude": ["test.ts", "**/*.spec.ts", "boot.server.PRODUCTION.ts"] } diff --git a/ClientApp/tsconfig.spec.json b/ClientApp/tsconfig.spec.json index de4e2a75..c8fc1d84 100644 --- a/ClientApp/tsconfig.spec.json +++ b/ClientApp/tsconfig.spec.json @@ -5,16 +5,8 @@ "module": "commonjs", "target": "es5", "baseUrl": "", - "types": [ - "jasmine", - "node" - ] + "types": ["jasmine", "node"] }, - "files": [ - "polyfills.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] + "files": ["polyfills.ts"], + "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/Program.cs b/Program.cs new file mode 100644 index 00000000..69e56419 --- /dev/null +++ b/Program.cs @@ -0,0 +1,33 @@ +using AspCoreServer; +using AspCoreServer.Data; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using System; +using System.IO; + +public class Program { + public static void Main (string[] args) { + var host = BuildWebHost (args); + using (var scope = host.Services.CreateScope ()) { + var services = scope.ServiceProvider; + try { + var context = services.GetRequiredService<SpaDbContext>(); + DbInitializer.Initialize(context); + } catch (Exception ex) { + var logger = services.GetRequiredService<ILogger<Program>> (); + logger.LogError (ex, "An error occurred while seeding the database."); + } + } + + host.Run (); + } + public static IWebHost BuildWebHost (string[] args) => + WebHost.CreateDefaultBuilder (args) + .UseKestrel () + .UseContentRoot (Directory.GetCurrentDirectory ()) + .UseIISIntegration () + .UseStartup<Startup> () + .Build (); + } diff --git a/Server/Controllers/HomeController.cs b/Server/Controllers/HomeController.cs index 399174ef..18c423c6 100644 --- a/Server/Controllers/HomeController.cs +++ b/Server/Controllers/HomeController.cs @@ -1,63 +1,47 @@ -using System; -using System.Diagnostics; -using System.Threading.Tasks; -using Asp2017.Server.Helpers; -using Asp2017.Server.Models; +using Asp2017.Server.Helpers; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.NodeServices; -using Microsoft.AspNetCore.SpaServices.Prerendering; -using Microsoft.Extensions.DependencyInjection; - -namespace AspCoreServer.Controllers { - public class HomeController : Controller { - protected readonly IHostingEnvironment HostingEnvironment; - public HomeController (IHostingEnvironment hostingEnv) { - this.HostingEnvironment = hostingEnv; - } - - [HttpGet] - public async Task<IActionResult> Index () { - var prerenderResult = await Request.BuildPrerender (); - - ViewData["SpaHtml"] = prerenderResult.Html; // our <app-root /> from Angular - ViewData["Title"] = prerenderResult.Globals["title"]; // set our <title> from Angular - ViewData["Styles"] = prerenderResult.Globals["styles"]; // put styles in the correct place - ViewData["Scripts"] = prerenderResult.Globals["scripts"]; // scripts (that were in our header) - ViewData["Meta"] = prerenderResult.Globals["meta"]; // set our <meta> SEO tags - ViewData["Links"] = prerenderResult.Globals["links"]; // set our <link rel="canonical"> etc SEO tags - ViewData["TransferData"] = prerenderResult.Globals["transferData"]; // our transfer data set to window.TRANSFER_CACHE = {}; - if (!HostingEnvironment.IsDevelopment ()) { - ViewData["ServiceWorker"] = "<script>'serviceWorker'in navigator&&navigator.serviceWorker.register('/serviceworker')</script>"; - } - - return View (); - } - - [HttpGet] - [Route ("sitemap.xml")] - public IActionResult SitemapXml () { - String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; - - xml += "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9/">"; - xml += "<url>"; - xml += "<loc>http://localhost:4251/home</loc>"; - xml += "<lastmod>" + DateTime.Now.ToString ("yyyy-MM-dd") + "</lastmod>"; - xml += "</url>"; - xml += "<url>"; - xml += "<loc>http://localhost:4251/counter</loc>"; - xml += "<lastmod>" + DateTime.Now.ToString ("yyyy-MM-dd") + "</lastmod>"; - xml += "</url>"; - xml += "</urlset>"; - - return Content (xml, "text/xml"); - - } +using System; +using System.Threading.Tasks; - public IActionResult Error () { - return View (); +namespace AspCoreServer.Controllers +{ + public class HomeController : Controller { + protected readonly IHostingEnvironment HostingEnvironment; + public HomeController(IHostingEnvironment hostingEnv) => this.HostingEnvironment = hostingEnv; + + [HttpGet] + public async Task<IActionResult> Index () { + var prerenderResult = await this.Request.BuildPrerender (); + + this.ViewData["SpaHtml"] = prerenderResult.Html; // our <app-root /> from Angular + this.ViewData["Title"] = prerenderResult.Globals["title"]; // set our <title> from Angular + this.ViewData["Styles"] = prerenderResult.Globals["styles"]; // put styles in the correct place + this.ViewData["Scripts"] = prerenderResult.Globals["scripts"]; // scripts (that were in our header) + this.ViewData["Meta"] = prerenderResult.Globals["meta"]; // set our <meta> SEO tags + this.ViewData["Links"] = prerenderResult.Globals["links"]; // set our <link rel="canonical"> etc SEO tags + this.ViewData["TransferData"] = prerenderResult.Globals["transferData"]; // our transfer data set to window.TRANSFER_CACHE = {}; + if (!this.HostingEnvironment.IsDevelopment ()) { + this.ViewData["ServiceWorker"] = "<script>'serviceWorker'in navigator&&navigator.serviceWorker.register('/serviceworker')</script>"; + } + + return View (); + } + + [HttpGet] + [Route("sitemap.xml")] + public IActionResult SitemapXml() => Content($@"<?xml version=""1.0"" encoding=""utf-8""?> + <urlset xmlns=""http://www.sitemaps.org/schemas/sitemap/0.9""> + <url> + <loc>http://localhost:4251/home</loc> + <lastmod>{ DateTime.Now.ToString("yyyy-MM-dd")}</lastmod> + </url> + <url> + <loc>http://localhost:4251/counter</loc> + <lastmod>{DateTime.Now.ToString("yyyy-MM-dd")}</lastmod> + </url> + </urlset>", "text/xml"); + + public IActionResult Error() => View(); } - } -} \ No newline at end of file +} diff --git a/Server/Data/DbInitializer.cs b/Server/Data/DbInitializer.cs index 45b7498e..919c9282 100644 --- a/Server/Data/DbInitializer.cs +++ b/Server/Data/DbInitializer.cs @@ -1,43 +1,37 @@ using System; using System.Linq; +using AspCoreServer; +using AspCoreServer.Models; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -using AspCoreServer.Models; -using AspCoreServer; -namespace AspCoreServer.Data -{ - public static class DbInitializer - { - public static void Initialize(SpaDbContext context) - { - context.Database.EnsureCreated(); +namespace AspCoreServer.Data { + public static class DbInitializer { + public static void Initialize (SpaDbContext context) { + context.Database.EnsureCreated (); - if (context.User.Any()) - { - return; // DB has been seeded + if (context.User.Any ()) { + return; // DB has been seeded } - var users = new User[] - { - new User(){Name = "Mark Pieszak"}, - new User(){Name = "Abrar Jahin"}, - new User(){Name = "hakonamatata"}, - new User(){Name = "LiverpoolOwen"}, - new User(){Name = "Ketrex"}, - new User(){Name = "markwhitfeld"}, - new User(){Name = "daveo1001"}, - new User(){Name = "paonath"}, - new User(){Name = "nalex095"}, - new User(){Name = "ORuban"}, - new User(){Name = "Gaulomatic"}, - new User(){Name = "GRIMMR3AP3R"} + var users = new User[] { + new User () { Name = "Mark Pieszak" }, + new User () { Name = "Abrar Jahin" }, + new User () { Name = "hakonamatata" }, + new User () { Name = "LiverpoolOwen" }, + new User () { Name = "Ketrex" }, + new User () { Name = "markwhitfeld" }, + new User () { Name = "daveo1001" }, + new User () { Name = "paonath" }, + new User () { Name = "nalex095" }, + new User () { Name = "ORuban" }, + new User () { Name = "Gaulomatic" }, + new User () { Name = "GRIMMR3AP3R" } }; - foreach (User s in users) - { - context.User.Add(s); + foreach (var s in users) { + context.User.Add (s); } - context.SaveChanges(); + context.SaveChanges (); } } } diff --git a/Server/Data/SpaDbContext.cs b/Server/Data/SpaDbContext.cs index e6fee5f7..0f90c230 100644 --- a/Server/Data/SpaDbContext.cs +++ b/Server/Data/SpaDbContext.cs @@ -1,14 +1,10 @@ using AspCoreServer.Models; using Microsoft.EntityFrameworkCore; -namespace AspCoreServer.Data -{ - public class SpaDbContext : DbContext - { - public SpaDbContext(DbContextOptions<SpaDbContext> options) - : base(options) - { - Database.EnsureCreated(); +namespace AspCoreServer.Data { + public class SpaDbContext : DbContext { + public SpaDbContext (DbContextOptions<SpaDbContext> options) : base (options) { + Database.EnsureCreated (); } //List of DB Models - Add your DB models here diff --git a/Server/Helpers/HttpRequestExtensions.cs b/Server/Helpers/HttpRequestExtensions.cs index 12648b60..81c613b9 100644 --- a/Server/Helpers/HttpRequestExtensions.cs +++ b/Server/Helpers/HttpRequestExtensions.cs @@ -1,3 +1,7 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Asp2017.Server.Models; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; @@ -5,61 +9,35 @@ using Microsoft.AspNetCore.NodeServices; using Microsoft.AspNetCore.SpaServices.Prerendering; using Microsoft.Extensions.DependencyInjection; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Asp2017.Server.Helpers -{ - public static class HttpRequestExtensions - { - public static IRequest AbstractRequestInfo(this HttpRequest request) - { - - IRequest requestSimplified = new IRequest(); - requestSimplified.cookies = request.Cookies; - requestSimplified.headers = request.Headers; - requestSimplified.host = request.Host; - - return requestSimplified; - } - - public static async Task<RenderToStringResult> BuildPrerender(this HttpRequest Request) - { - var nodeServices = Request.HttpContext.RequestServices.GetRequiredService<INodeServices>(); - var hostEnv = Request.HttpContext.RequestServices.GetRequiredService<IHostingEnvironment>(); - - var applicationBasePath = hostEnv.ContentRootPath; - var requestFeature = Request.HttpContext.Features.Get<IHttpRequestFeature>(); - var unencodedPathAndQuery = requestFeature.RawTarget; - var unencodedAbsoluteUrl = $"{Request.Scheme}://{Request.Host}{unencodedPathAndQuery}"; - - // ** TransferData concept ** - // Here we can pass any Custom Data we want ! - - // By default we're passing down Cookies, Headers, Host from the Request object here - TransferData transferData = new TransferData(); - transferData.request = Request.AbstractRequestInfo(); - transferData.thisCameFromDotNET = "Hi Angular it's asp.net :)"; - // Add more customData here, add it to the TransferData class - - //Prerender now needs CancellationToken - System.Threading.CancellationTokenSource cancelSource = new System.Threading.CancellationTokenSource(); - System.Threading.CancellationToken cancelToken = cancelSource.Token; - // Prerender / Serialize application (with Universal) - return await Prerenderer.RenderToString( +namespace Asp2017.Server.Helpers { + public static class HttpRequestExtensions { + public static IRequest AbstractRequestInfo(this HttpRequest request) => new IRequest() + { + cookies = request.Cookies, + headers = request.Headers, + host = request.Host + }; + + public static async Task<RenderToStringResult> BuildPrerender(this HttpRequest request) => + // Prerender / Serialize application (with Universal) + await Prerenderer.RenderToString( "/", - nodeServices, - cancelToken, - new JavaScriptModuleExport(applicationBasePath + "/ClientApp/dist/main-server"), - unencodedAbsoluteUrl, - unencodedPathAndQuery, - transferData, // Our simplified Request object & any other CustommData you want to send! + request.HttpContext.RequestServices.GetRequiredService<INodeServices>(), + new System.Threading.CancellationTokenSource().Token, + new JavaScriptModuleExport(request.HttpContext.RequestServices.GetRequiredService<IHostingEnvironment>().ContentRootPath + "/ClientApp/dist/main-server"), + $"{request.Scheme}://{request.Host}{request.HttpContext.Features.Get<IHttpRequestFeature>().RawTarget}", + request.HttpContext.Features.Get<IHttpRequestFeature>().RawTarget, + // ** TransferData concept ** + // Here we can pass any Custom Data we want ! + // By default we're passing down Cookies, Headers, Host from the Request object here + new TransferData + { + request = request.AbstractRequestInfo(), + thisCameFromDotNET = "Hi Angular it's asp.net :)" + }, // Our simplified Request object & any other CustommData you want to send! 30000, - Request.PathBase.ToString() + request.PathBase.ToString() ); } - } } diff --git a/Server/Models/IRequest.cs b/Server/Models/IRequest.cs index 407cf571..295c88fb 100644 --- a/Server/Models/IRequest.cs +++ b/Server/Models/IRequest.cs @@ -3,12 +3,10 @@ using System.Linq; using System.Threading.Tasks; -namespace Asp2017.Server.Models -{ - public class IRequest - { - public object cookies { get; set; } - public object headers { get; set; } - public object host { get; set; } - } +namespace Asp2017.Server.Models { + public class IRequest { + public object cookies { get; set; } + public object headers { get; set; } + public object host { get; set; } + } } diff --git a/Server/Models/TransferData.cs b/Server/Models/TransferData.cs index a89ab38d..c144d2df 100644 --- a/Server/Models/TransferData.cs +++ b/Server/Models/TransferData.cs @@ -3,13 +3,11 @@ using System.Linq; using System.Threading.Tasks; -namespace Asp2017.Server.Models -{ - public class TransferData - { - public dynamic request { get; set; } +namespace Asp2017.Server.Models { + public class TransferData { + public dynamic request { get; set; } - // Your data here ? - public object thisCameFromDotNET { get; set; } - } + // Your data here ? + public object thisCameFromDotNET { get; set; } + } } diff --git a/Server/Models/User.cs b/Server/Models/User.cs index fb3d74da..56e388bf 100644 --- a/Server/Models/User.cs +++ b/Server/Models/User.cs @@ -1,20 +1,17 @@ using System; using System.ComponentModel.DataAnnotations; -namespace AspCoreServer.Models -{ - public class User - { +namespace AspCoreServer.Models { + public class User { public int ID { get; set; } public string Name { get; set; } - [DisplayFormat(DataFormatString = "{0:yyyy-MM-dd}", ApplyFormatInEditMode = true)] - [DataType(DataType.Date)] + [DisplayFormat (DataFormatString = "{0:yyyy-MM-dd}", ApplyFormatInEditMode = true)] + [DataType (DataType.Date)] public DateTime EntryTime { get; set; } //Setting Default value - public User() - { + public User () { EntryTime = DateTime.Now; } } diff --git a/Server/RestAPI/UsersController.cs b/Server/RestAPI/UsersController.cs index 3a7fe3d2..a23301e0 100644 --- a/Server/RestAPI/UsersController.cs +++ b/Server/RestAPI/UsersController.cs @@ -1,123 +1,95 @@ +using System; +using System.Linq; +using System.Threading.Tasks; using AspCoreServer.Data; using AspCoreServer.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using System; -using System.Linq; -using System.Threading.Tasks; -namespace AspCoreServer.Controllers -{ - [Route("api/[controller]")] - public class UsersController : Controller - { - private readonly SpaDbContext _context; +namespace AspCoreServer.Controllers { + [Route ("api/[controller]")] + public class UsersController : Controller { + private readonly SpaDbContext context; - public UsersController(SpaDbContext context) - { - _context = context; - } + public UsersController(SpaDbContext context) => this.context = context; - [HttpGet] - public async Task<IActionResult> Get(int currentPageNo = 1, int pageSize = 20) - { - var users = await _context.User - .OrderByDescending(u => u.EntryTime) - .Skip((currentPageNo - 1) * pageSize) - .Take(pageSize) - .ToArrayAsync(); + [HttpGet] + public async Task<IActionResult> Get (int currentPageNo = 1, int pageSize = 20) { + var users = await this.context.User + .OrderByDescending (u => u.EntryTime) + .Skip ((currentPageNo - 1) * pageSize) + .Take (pageSize) + .ToArrayAsync (); - if (!users.Any()) - { - return NotFound("Users not Found"); - } - else - { - return Ok(users); - } - } + if (!users.Any ()) { + return NotFound ("Users not Found"); + } else { + return Ok (users); + } + } - [HttpGet("{id}")] - public async Task<IActionResult> Get(int id) - { - var user = await _context.User - .Where(u => u.ID == id) - .AsNoTracking() - .SingleOrDefaultAsync(m => m.ID == id); + [HttpGet ("{id}")] + public async Task<IActionResult> Get (int id) { + var user = await this.context.User + .Where (u => u.ID == id) + .AsNoTracking () + .SingleOrDefaultAsync (m => m.ID == id); - if (user == null) - { - return NotFound("User not Found"); - } - else - { - return Ok(user); - } - } + if (user == null) { + return NotFound ("User not Found"); + } else { + return Ok (user); + } + } - [HttpPost] - public async Task<IActionResult> Post([FromBody]User user) - { - if (!string.IsNullOrEmpty(user.Name)) - { - _context.Add(user); - await _context.SaveChangesAsync(); - return CreatedAtAction("Post", user); - } - else - { - return BadRequest("User's name was not given"); - } - } + [HttpPost] + public async Task<IActionResult> Post ([FromBody] User user) { + if (!string.IsNullOrEmpty (user.Name)) { + this.context.Add (user); + await this.context.SaveChangesAsync (); + return CreatedAtAction ("Post", user); + } else { + return BadRequest ("User's name was not given"); + } + } - [HttpPut("{id}")] - public async Task<IActionResult> Put(int id, [FromBody]User userUpdateValue) - { - try - { - userUpdateValue.EntryTime = DateTime.Now; + [HttpPut ("{id}")] + public async Task<IActionResult> Put (int id, [FromBody] User userUpdateValue) { + try { + userUpdateValue.EntryTime = DateTime.Now; - var userToEdit = await _context.User - .AsNoTracking() - .SingleOrDefaultAsync(m => m.ID == id); + var userToEdit = await context.User + .AsNoTracking () + .SingleOrDefaultAsync (m => m.ID == id); - if (userToEdit == null) - { - return NotFound("Could not update user as it was not Found"); + if (userToEdit == null) { + return NotFound ("Could not update user as it was not Found"); + } else { + this.context.Update (userUpdateValue); + await this.context.SaveChangesAsync (); + return Json ("Updated user - " + userUpdateValue.Name); + } + } catch (DbUpdateException) { + //Log the error (uncomment ex variable name and write a log.) + this.ModelState.AddModelError ("", "Unable to save changes. " + + "Try again, and if the problem persists, " + + "see your system administrator."); + return NotFound ("User not Found"); + } } - else - { - _context.Update(userUpdateValue); - await _context.SaveChangesAsync(); - return Json("Updated user - " + userUpdateValue.Name); - } - } - catch (DbUpdateException) - { - //Log the error (uncomment ex variable name and write a log.) - ModelState.AddModelError("", "Unable to save changes. " + - "Try again, and if the problem persists, " + - "see your system administrator."); - return NotFound("User not Found"); - } - } - [HttpDelete("{id}")] - public async Task<IActionResult> Delete(int id) - { - var userToRemove = await _context.User - .AsNoTracking() - .SingleOrDefaultAsync(m => m.ID == id); - if (userToRemove == null) - { - return NotFound("Could not delete user as it was not Found"); - } - else - { - _context.User.Remove(userToRemove); - await _context.SaveChangesAsync(); - return Json("Deleted user - " + userToRemove.Name); - } + [HttpDelete ("{id}")] + public async Task<IActionResult> Delete (int id) { + var userToRemove = await this.context.User + .AsNoTracking () + .SingleOrDefaultAsync (m => m.ID == id); + if (userToRemove == null) { + return NotFound ("Could not delete user as it was not Found"); + } else { + this.context.User.Remove (userToRemove); + await this.context.SaveChangesAsync (); + return Json ("Deleted user - " + userToRemove.Name); + } + } } - } } diff --git a/Startup.cs b/Startup.cs index bc77beb6..a1b0f70d 100644 --- a/Startup.cs +++ b/Startup.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using AspCoreServer.Data; using Microsoft.AspNetCore.Builder; @@ -14,112 +14,96 @@ using WebEssentials.AspNetCore.Pwa; namespace AspCoreServer { - public class Startup { - - public static void Main (string[] args) { - var host = new WebHostBuilder () - .UseKestrel () - .UseContentRoot (Directory.GetCurrentDirectory ()) - .UseIISIntegration () - .UseStartup<Startup> () - .Build (); - - host.Run (); - } - public Startup (IHostingEnvironment env) { - var builder = new ConfigurationBuilder () - .SetBasePath (env.ContentRootPath) - .AddJsonFile ("appsettings.json", optional : true, reloadOnChange : true) - .AddJsonFile ($"appsettings.{env.EnvironmentName}.json", optional : true) - .AddEnvironmentVariables (); - Configuration = builder.Build (); - } - - public IConfigurationRoot Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices (IServiceCollection services) { - // Add framework services. - services.AddMvc (); - services.AddNodeServices (); - services.AddHttpContextAccessor (); - services.AddProgressiveWebApp (new PwaOptions { Strategy = ServiceWorkerStrategy.CacheFirst, RegisterServiceWorker = true, RegisterWebmanifest = true }, "manifest.json"); - - var connectionStringBuilder = new Microsoft.Data.Sqlite.SqliteConnectionStringBuilder { DataSource = "spa.db" }; - var connectionString = connectionStringBuilder.ToString (); - - services.AddDbContext<SpaDbContext> (options => - options.UseSqlite (connectionString)); - - // Register the Swagger generator, defining one or more Swagger documents - services.AddSwaggerGen (c => { - c.SwaggerDoc ("v1", new Info { Title = "Angular 6.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); - }); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure (IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, SpaDbContext context) { - loggerFactory.AddConsole (Configuration.GetSection ("Logging")); - loggerFactory.AddDebug (); - - // app.UseStaticFiles(); - - app.UseStaticFiles (new StaticFileOptions () { - OnPrepareResponse = c => { - //Do not add cache to json files. We need to have new versions when we add new translations. - - if (!c.Context.Request.Path.Value.Contains (".json")) { - c.Context.Response.GetTypedHeaders ().CacheControl = new CacheControlHeaderValue () { - MaxAge = TimeSpan.FromDays (30) // Cache everything except json for 30 days - }; - } else { - c.Context.Response.GetTypedHeaders ().CacheControl = new CacheControlHeaderValue () { - MaxAge = TimeSpan.FromMinutes (15) // Cache json for 15 minutes - }; - } + public class Startup { + public Startup (IHostingEnvironment env) { + var builder = new ConfigurationBuilder () + .SetBasePath (env.ContentRootPath) + .AddJsonFile ("appsettings.json", optional : true, reloadOnChange : true) + .AddJsonFile ($"appsettings.{env.EnvironmentName}.json", optional : true) + .AddEnvironmentVariables (); + this.Configuration = builder.Build (); } - }); - - DbInitializer.Initialize (context); - if (env.IsDevelopment ()) { - app.UseDeveloperExceptionPage (); - app.UseWebpackDevMiddleware (new WebpackDevMiddlewareOptions { - HotModuleReplacement = true, - HotModuleReplacementEndpoint = "/dist/" - }); - app.UseSwagger (); - app.UseSwaggerUI (c => { - c.SwaggerEndpoint ("/swagger/v1/swagger.json", "My API V1"); - }); + public IConfigurationRoot Configuration { get; } - // Enable middleware to serve swagger-ui (HTML, JS, CSS etc.), specifying the Swagger JSON endpoint. + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices (IServiceCollection services) { + // Add framework services. + services.AddMvc (); + services.AddNodeServices (); + services.AddHttpContextAccessor (); + services.AddProgressiveWebApp (new PwaOptions { Strategy = ServiceWorkerStrategy.CacheFirst, RegisterServiceWorker = true, RegisterWebmanifest = true }, "manifest.json"); - app.MapWhen (x => !x.Request.Path.Value.StartsWith ("/swagger", StringComparison.OrdinalIgnoreCase), builder => { - builder.UseMvc (routes => { - routes.MapSpaFallbackRoute ( - name: "spa-fallback", - defaults : new { controller = "Home", action = "Index" }); - }); - }); - } else { - app.UseMvc (routes => { - routes.MapRoute ( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); + var connectionStringBuilder = new Microsoft.Data.Sqlite.SqliteConnectionStringBuilder { DataSource = "spa.db" }; + var connectionString = connectionStringBuilder.ToString(); - routes.MapRoute ( - "Sitemap", - "sitemap.xml", - new { controller = "Home", action = "SitemapXml" }); + services.AddDbContext<SpaDbContext>(options => + options.UseSqlite(connectionString)); - routes.MapSpaFallbackRoute ( - name: "spa-fallback", - defaults : new { controller = "Home", action = "Index" }); + // Register the Swagger generator, defining one or more Swagger documents + services.AddSwaggerGen (c => { + c.SwaggerDoc ("v1", new Info { Title = "Angular 6.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); + }); + } - }); - app.UseExceptionHandler ("/Home/Error"); - } + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure (IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, SpaDbContext context) { + loggerFactory.AddConsole (this.Configuration.GetSection ("Logging")); + loggerFactory.AddDebug (); + + // app.UseStaticFiles(); + + app.UseStaticFiles (new StaticFileOptions () { + OnPrepareResponse = c => { + //Do not add cache to json files. We need to have new versions when we add new translations. + c.Context.Response.GetTypedHeaders ().CacheControl = !c.Context.Request.Path.Value.Contains (".json") + ? new CacheControlHeaderValue () { + MaxAge = TimeSpan.FromDays (30) // Cache everything except json for 30 days + } + : new CacheControlHeaderValue () { + MaxAge = TimeSpan.FromMinutes (15) // Cache json for 15 minutes + }; + } + }); + + if (env.IsDevelopment ()) { + app.UseDeveloperExceptionPage (); + app.UseWebpackDevMiddleware (new WebpackDevMiddlewareOptions { + HotModuleReplacement = true, + HotModuleReplacementEndpoint = "/dist/" + }); + app.UseSwagger (); + app.UseSwaggerUI (c => { + c.SwaggerEndpoint ("/swagger/v1/swagger.json", "My API V1"); + }); + + // Enable middleware to serve swagger-ui (HTML, JS, CSS etc.), specifying the Swagger JSON endpoint. + + app.MapWhen (x => !x.Request.Path.Value.StartsWith ("/swagger", StringComparison.OrdinalIgnoreCase), builder => { + builder.UseMvc (routes => { + routes.MapSpaFallbackRoute ( + name: "spa-fallback", + defaults : new { controller = "Home", action = "Index" }); + }); + }); + } else { + app.UseMvc (routes => { + routes.MapRoute ( + name: "default", + template: "{controller=Home}/{action=Index}/{id?}"); + + routes.MapRoute ( + "Sitemap", + "sitemap.xml", + new { controller = "Home", action = "SitemapXml" }); + + routes.MapSpaFallbackRoute ( + name: "spa-fallback", + defaults : new { controller = "Home", action = "Index" }); + + }); + app.UseExceptionHandler ("/Home/Error"); + } + } } - } -} \ No newline at end of file +} diff --git a/angular.json b/angular.json index 42179045..b6c5377c 100644 --- a/angular.json +++ b/angular.json @@ -5,28 +5,52 @@ "projects": { "AspnetCore-Angular-Universal": { "root": "", - "sourceRoot": "src", + "sourceRoot": "ClientApp", "projectType": "application", + "prefix": "app", + "schematics": {}, "architect": { "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist/", - "index": "ClientApp/index.html", - "main": "ClientApp/main.ts", + "outputPath": "wwwroot/dist", + "main": "ClientApp/boot-browser.ts", + "polyfills": "ClientApp/polyfills/polyfills.ts", "tsConfig": "ClientApp/tsconfig.app.json", "assets": [], "styles": [], "scripts": [] }, - "configurations": {} + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "ClientApp/environments/environment.ts", + "with": "ClientApp/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true + } + } }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { "browserTarget": "AspnetCore-Angular-Universal:build" }, - "configurations": {} + "configurations": { + "production": { + "browserTarget": "AspnetCore-Angular-Universal:build:production" + } + } }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", @@ -34,6 +58,18 @@ "browserTarget": "AspnetCore-Angular-Universal:build" } }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "ClientApp/test.ts", + "polyfills": "ClientApp/polyfills.ts", + "tsConfig": "ClientApp/tsconfig.spec.json", + "karmaConfig": "ClientApp/karma.conf.js", + "styles": ["ClientApp/styles.css"], + "scripts": [], + "assets": ["ClientApp/favicon.ico", "ClientApp/assets"] + } + }, "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { @@ -41,23 +77,31 @@ "ClientApp/tsconfig.app.json", "ClientApp/tsconfig.spec.json" ], - "exclude": [] + "exclude": ["**/node_modules/**"] } } } }, "AspnetCore-Angular-Universal-e2e": { - "root": "", - "sourceRoot": "", - "projectType": "application" + "root": "e2e/", + "projectType": "application", + "architect": { + "e2e": { + "builder": "@angular-devkit/build-angular:protractor", + "options": { + "protractorConfig": "e2e/protractor.conf.js", + "devServerTarget": "AspnetCore-Angular-Universal:serve" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": "e2e/tsconfig.e2e.json", + "exclude": ["**/node_modules/**"] + } + } + } } }, - "defaultProject": "AspnetCore-Angular-Universal", - "schematics": { - "@schematics/angular:component": { - "spec": false, - "styleext": "scss" - }, - "@schematics/angular:directive": {} - } -} \ No newline at end of file + "defaultProject": "AspnetCore-Angular-Universal" +} diff --git a/webpack.additions.js b/webpack.additions.js index 62bf4bb3..9c63a2f8 100644 --- a/webpack.additions.js +++ b/webpack.additions.js @@ -7,12 +7,14 @@ // Shared rules[] we need to add const sharedModuleRules = [ // sass - { test: /\.scss$/, loaders: ['to-string-loader', 'css-loader', 'sass-loader'] }, + { + test: /\.scss$/, + loaders: ['to-string-loader', 'css-loader', 'sass-loader'] + }, // font-awesome { test: /\.(woff2?|ttf|eot|svg)$/, loader: 'url-loader?limit=10000' } ]; - module.exports = { sharedModuleRules }; diff --git a/webpack.config.js b/webpack.config.js index a7984c89..d8689752 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -13,18 +13,17 @@ const webpack = require('webpack'); const merge = require('webpack-merge'); const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin; const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; +const BundleAnalyzerPlugin = require('webpack-bundle-analyzer') + .BundleAnalyzerPlugin; const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); -const { - sharedModuleRules -} = require('./webpack.additions'); +const { sharedModuleRules } = require('./webpack.additions'); -module.exports = (env) => { +module.exports = env => { // Configuration in common to both client-side and server-side bundles const isDevBuild = !(env && env.prod); const sharedConfig = { - mode: isDevBuild ? "development" : "production", + mode: isDevBuild ? 'development' : 'production', stats: { modules: false }, @@ -37,9 +36,16 @@ module.exports = (env) => { publicPath: 'dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix }, module: { - rules: [{ + rules: [ + { test: /\.ts$/, - use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader', 'angular2-router-loader'] : '@ngtools/webpack' + use: isDevBuild + ? [ + 'awesome-typescript-loader?silent=true', + 'angular2-template-loader', + 'angular2-router-loader' + ] + : '@ngtools/webpack' }, { test: /\.html$/, @@ -47,7 +53,10 @@ module.exports = (env) => { }, { test: /\.css$/, - use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize'] + use: [ + 'to-string-loader', + isDevBuild ? 'css-loader' : 'css-loader?minimize' + ] }, { test: /\.(png|jpg|jpeg|gif|svg)$/, @@ -73,42 +82,57 @@ module.exports = (env) => { context: __dirname, manifest: require('./wwwroot/dist/vendor-manifest.json') }) - ].concat(isDevBuild ? [ - // Plugins that apply in development builds only - new webpack.SourceMapDevToolPlugin({ - filename: '[file].map', // Remove this line if you prefer inline source maps - moduleFilenameTemplate: path.relative(clientBundleOutputDir, '[resourcePath]') // Point sourcemap entries to the original file locations on disk - }) - ] : [ - // new BundleAnalyzerPlugin(), - // Plugins that apply in production builds only - new AngularCompilerPlugin({ - mainPath: path.join(__dirname, 'ClientApp/boot.browser.ts'), - tsConfigPath: './tsconfig.json', - entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'), - exclude: ['./**/*.server.ts'] - }) - ]), + ].concat( + isDevBuild + ? [ + // Plugins that apply in development builds only + new webpack.SourceMapDevToolPlugin({ + filename: '[file].map', // Remove this line if you prefer inline source maps + moduleFilenameTemplate: path.relative( + clientBundleOutputDir, + '[resourcePath]' + ) // Point sourcemap entries to the original file locations on disk + }) + ] + : [ + // new BundleAnalyzerPlugin(), + // Plugins that apply in production builds only + new AngularCompilerPlugin({ + mainPath: path.join(__dirname, 'ClientApp/boot.browser.ts'), + tsConfigPath: './tsconfig.json', + entryModule: path.join( + __dirname, + 'ClientApp/app/app.module.browser#AppModule' + ), + exclude: ['./**/*.server.ts'], + sourceMap: isDevBuild + }) + ] + ), devtool: isDevBuild ? 'cheap-eval-source-map' : false, node: { - fs: "empty" + fs: 'empty' }, optimization: { - minimizer: [].concat(isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ - cache: true, - parallel: true, - uglifyOptions: { - compress: false, - ecma: 6, - mangle: true, - keep_classnames: true, - keep_fnames: true - }, - sourceMap: true - }) - ]) + minimizer: [].concat( + isDevBuild + ? [] + : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true, + keep_classnames: true, + keep_fnames: true + }, + sourceMap: true + }) + ] + ) } }); @@ -116,7 +140,9 @@ module.exports = (env) => { const serverBundleConfig = merge(sharedConfig, { // resolve: { mainFields: ['main'] }, entry: { - 'main-server': isDevBuild ? './ClientApp/boot.server.ts' : './ClientApp/boot.server.PRODUCTION.ts' + 'main-server': isDevBuild + ? './ClientApp/boot.server.ts' + : './ClientApp/boot.server.PRODUCTION.ts' }, plugins: [ new webpack.DllReferencePlugin({ @@ -125,27 +151,39 @@ module.exports = (env) => { sourceType: 'commonjs2', name: './vendor' }) - ].concat(isDevBuild ? [ - new webpack.ContextReplacementPlugin( - // fixes WARNING Critical dependency: the request of a dependency is an expression - /(.+)?angular(\\|\/)core(.+)?/, - path.join(__dirname, 'src'), // location of your src - {} // a map of your routes - ), - new webpack.ContextReplacementPlugin( - // fixes WARNING Critical dependency: the request of a dependency is an expression - /(.+)?express(\\|\/)(.+)?/, - path.join(__dirname, 'src'), {} - ) - ] : [ - // Plugins that apply in production builds only - new AngularCompilerPlugin({ - mainPath: path.join(__dirname, 'ClientApp/boot.server.PRODUCTION.ts'), - tsConfigPath: './tsconfig.json', - entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'), - exclude: ['./**/*.browser.ts'] - }) - ]), + ].concat( + isDevBuild + ? [ + new webpack.ContextReplacementPlugin( + // fixes WARNING Critical dependency: the request of a dependency is an expression + /(.+)?angular(\\|\/)core(.+)?/, + path.join(__dirname, 'src'), // location of your src + {} // a map of your routes + ), + new webpack.ContextReplacementPlugin( + // fixes WARNING Critical dependency: the request of a dependency is an expression + /(.+)?express(\\|\/)(.+)?/, + path.join(__dirname, 'src'), + {} + ) + ] + : [ + // Plugins that apply in production builds only + new AngularCompilerPlugin({ + mainPath: path.join( + __dirname, + 'ClientApp/boot.server.PRODUCTION.ts' + ), + tsConfigPath: './tsconfig.json', + entryModule: path.join( + __dirname, + 'ClientApp/app/app.module.server#AppModule' + ), + exclude: ['./**/*.browser.ts'], + sourceMap: isDevBuild + }) + ] + ), output: { libraryTarget: 'commonjs', path: path.join(__dirname, './ClientApp/dist') @@ -154,21 +192,25 @@ module.exports = (env) => { // switch to "inline-source-map" if you want to debug the TS during SSR devtool: isDevBuild ? 'cheap-eval-source-map' : false, optimization: { - minimizer: [].concat(isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ - cache: true, - parallel: true, - uglifyOptions: { - compress: false, - ecma: 6, - mangle: true, - keep_classnames: true, - keep_fnames: true - }, - sourceMap: true - }) - ]) + minimizer: [].concat( + isDevBuild + ? [] + : [ + // we specify a custom UglifyJsPlugin here to get source maps in production + new UglifyJsPlugin({ + cache: true, + parallel: true, + uglifyOptions: { + compress: false, + ecma: 6, + mangle: true, + keep_classnames: true, + keep_fnames: true + }, + sourceMap: true + }) + ] + ) } }); diff --git a/wwwroot/manifest.json b/wwwroot/manifest.json index fa6cd755..1f247be0 100644 --- a/wwwroot/manifest.json +++ b/wwwroot/manifest.json @@ -1,8 +1,10 @@ { "name": "ASP.NET Core 2.1 & Angular 6(+) Advanced Starter", "short_name": "aspnetcore-angular2-universal", - "description": "ASP.NET Core 2.1 & Angular 6(+) Advanced Starter - with Server-side prerendering (for Angular SEO)!", - "icons": [{ + "description": + "ASP.NET Core 2.1 & Angular 6(+) Advanced Starter - with Server-side prerendering (for Angular SEO)!", + "icons": [ + { "src": "/images/icon192x192.png", "sizes": "192x192" }, From 9071694afc5f3b9a2c4c7219d36a3ff65328e839 Mon Sep 17 00:00:00 2001 From: Martin Babacaev <martin.babacaev@gmail.com> Date: Wed, 15 Aug 2018 23:03:40 +0200 Subject: [PATCH 074/103] fix(build): add asp2017.sln to fix msbuild issues closes #658 --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 33256db7..da1cb069 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,7 +8,7 @@ "tasks": [ { "taskName": "build", - "args": [ ], + "args": ["Asp2017.sln"], "isBuildCommand": true, "showOutput": "silent", "problemMatcher": "$msCompile" From a939ad81c40a6d3c32e2874e67a310d197ab8f49 Mon Sep 17 00:00:00 2001 From: Tobias Punke <Gaulomatic@users.noreply.github.com> Date: Tue, 21 Aug 2018 15:58:08 +0200 Subject: [PATCH 075/103] chore(csproj): update .csproj to reflect changes in .NET Core 2.1 --- Asp2017.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asp2017.csproj b/Asp2017.csproj index 7db490d3..7a28f3b4 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -9,7 +9,7 @@ </PropertyGroup> <ItemGroup> <!-- New Meta Package has SpaServices in It --> - <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" /> + <PackageReference Include="Microsoft.AspNetCore.All" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="0.1.1646902" /> <PackageReference Include="NETStandard.Library" Version="2.0.3" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" /> From c212c17dc5ce7c0c53d84ce6241a3dd3bd18c1c9 Mon Sep 17 00:00:00 2001 From: Ivan <chasow@yandex.ru> Date: Sat, 1 Sep 2018 04:23:25 +0300 Subject: [PATCH 076/103] docs(readme): change Core 2.0 to Core 2.1 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8ed5a749..a37cdd2a 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ > Updated to the latest Angular 6.x <p align="center"> - <img src="http://github.com/docs/architecture.png" alt="ASP.NET Core 2.0 Angular 6+ Starter" title="ASP.NET Core 2.0 Angular 6+ Starter"> + <img src="http://github.com/docs/architecture.png" alt="ASP.NET Core 2.1 Angular 6+ Starter" title="ASP.NET Core 2.1 Angular 6+ Starter"> </p> -### Harness the power of Angular 6+, ASP.NET Core 2.0, now with SEO ! +### Harness the power of Angular 6+, ASP.NET Core 2.1, now with SEO ! Angular SEO in action: From 706809df76113e0037fab4c3da858e77e2f53039 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Thu, 20 Sep 2018 21:04:39 -0400 Subject: [PATCH 077/103] fix(build): fix major build and run-time errors closes #680 --- ClientApp/app/app.module.server.ts | 8 +++-- .../counter/counter.component.spec.ts | 2 ++ ClientApp/boot.browser.ts | 2 +- ClientApp/boot.server.PRODUCTION.ts | 12 +++---- ClientApp/boot.server.ts | 9 +++--- ClientApp/polyfills/browser.polyfills.ts | 5 ++- ClientApp/polyfills/polyfills.ts | 32 +++++++++++-------- ClientApp/polyfills/server.polyfills.ts | 4 ++- ClientApp/tsconfig.app.json | 6 +++- Views/Home/Index.cshtml | 1 + package.json | 19 ++++++++--- webpack.config.js | 6 ++-- 12 files changed, 66 insertions(+), 40 deletions(-) diff --git a/ClientApp/app/app.module.server.ts b/ClientApp/app/app.module.server.ts index e5fcb3de..06af629a 100644 --- a/ClientApp/app/app.module.server.ts +++ b/ClientApp/app/app.module.server.ts @@ -5,6 +5,8 @@ import { PrebootModule } from 'preboot'; import { AppComponent } from './app.component'; import { AppModuleShared } from './app.module'; +import { TransferHttpCacheModule, StateTransferInitializerModule } from '@nguniversal/common'; + @NgModule({ bootstrap: [AppComponent], imports: [ @@ -13,12 +15,12 @@ import { AppModuleShared } from './app.module'; ServerModule, PrebootModule.withConfig({ appRoot: 'app-root' }), - NoopAnimationsModule + NoopAnimationsModule, - // HttpTransferCacheModule still needs fixes for 5.0 + TransferHttpCacheModule, // still needs fixes for 5.0 // Leave this commented out for now, as it breaks Server-renders // Looking into fixes for this! - @MarkPieszak - // ServerTransferStateModule // <-- broken for the time-being with ASP.NET + // StateTransferInitializerModule // <-- broken for the time-being with ASP.NET ] }) export class AppModule { diff --git a/ClientApp/app/containers/counter/counter.component.spec.ts b/ClientApp/app/containers/counter/counter.component.spec.ts index 92202646..960f08d3 100644 --- a/ClientApp/app/containers/counter/counter.component.spec.ts +++ b/ClientApp/app/containers/counter/counter.component.spec.ts @@ -1,6 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CounterComponent } from './counter.component'; +import {} from 'jasmine'; + let fixture: ComponentFixture<CounterComponent>; describe('Counter component', () => { diff --git a/ClientApp/boot.browser.ts b/ClientApp/boot.browser.ts index c0ef55b6..68de6e5b 100644 --- a/ClientApp/boot.browser.ts +++ b/ClientApp/boot.browser.ts @@ -1,7 +1,7 @@ +import './polyfills/browser.polyfills'; import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module.browser'; -import './polyfills/browser.polyfills'; // // Enable either Hot Module Reloading or production mode if (module['hot']) { diff --git a/ClientApp/boot.server.PRODUCTION.ts b/ClientApp/boot.server.PRODUCTION.ts index b7bcbb7a..e3c33ff0 100644 --- a/ClientApp/boot.server.PRODUCTION.ts +++ b/ClientApp/boot.server.PRODUCTION.ts @@ -1,15 +1,11 @@ -import { enableProdMode } from '@angular/core'; -import { - createTransferScript, - IEngineOptions, - ngAspnetCoreEngine -} from '@nguniversal/aspnetcore-engine'; -import { createServerRenderer } from 'aspnet-prerendering'; -import 'zone.js/dist/zone-node'; +import 'zone.js/dist/zone-node'; import './polyfills/server.polyfills'; +import { enableProdMode } from '@angular/core'; +import { createServerRenderer } from 'aspnet-prerendering'; // Grab the (Node) server-specific NgModule const { AppModuleNgFactory } = require('./app/app.module.server.ngfactory'); // <-- ignore this - this is Production only +import { ngAspnetCoreEngine, IEngineOptions, createTransferScript } from '@nguniversal/aspnetcore-engine'; enableProdMode(); diff --git a/ClientApp/boot.server.ts b/ClientApp/boot.server.ts index 72457842..b6510018 100644 --- a/ClientApp/boot.server.ts +++ b/ClientApp/boot.server.ts @@ -1,11 +1,12 @@ -import { enableProdMode } from '@angular/core'; +import 'zone.js/dist/zone-node'; +import './polyfills/server.polyfills'; + +import { enableProdMode } from '@angular/core'; import { createTransferScript, IEngineOptions, ngAspnetCoreEngine } from '@nguniversal/aspnetcore-engine'; import { createServerRenderer } from 'aspnet-prerendering'; -import 'zone.js/dist/zone-node'; + // Grab the (Node) server-specific NgModule import { AppModule } from './app/app.module.server'; -import './polyfills/server.polyfills'; - enableProdMode(); diff --git a/ClientApp/polyfills/browser.polyfills.ts b/ClientApp/polyfills/browser.polyfills.ts index 207f7e06..9e6fe1d4 100644 --- a/ClientApp/polyfills/browser.polyfills.ts +++ b/ClientApp/polyfills/browser.polyfills.ts @@ -1,5 +1,8 @@ +// Note: * The order is IMPORTANT! * + +import './polyfills.ts'; + import 'reflect-metadata'; import 'zone.js/dist/zone'; -import './polyfills.ts'; // import 'web-animations-js'; // Run `npm install --save web-animations-js`. diff --git a/ClientApp/polyfills/polyfills.ts b/ClientApp/polyfills/polyfills.ts index b577f1c4..45b62d73 100644 --- a/ClientApp/polyfills/polyfills.ts +++ b/ClientApp/polyfills/polyfills.ts @@ -1,25 +1,29 @@ +// Note: * The order is IMPORTANT! * + /*************************************************************************************************** * BROWSER POLYFILLS */ /** IE9, IE10 and IE11 requires all of the following polyfills. **/ -import 'core-js/es6/array'; -import 'core-js/es6/date'; -import 'core-js/es6/function'; -import 'core-js/es6/map'; -import 'core-js/es6/math'; -import 'core-js/es6/number'; +import 'core-js/es6/symbol'; import 'core-js/es6/object'; -import 'core-js/es6/parse-float'; +import 'core-js/es6/function'; import 'core-js/es6/parse-int'; -/** IE10 and IE11 requires the following for NgClass support on SVG elements */ -// import 'classlist.js'; // Run `npm install --save classlist.js`. -/** Evergreen browsers require these. **/ -import 'core-js/es6/reflect'; +import 'core-js/es6/parse-float'; +import 'core-js/es6/number'; +import 'core-js/es6/math'; +import 'core-js/es6/string'; +import 'core-js/es6/date'; +import 'core-js/es6/array'; import 'core-js/es6/regexp'; +import 'core-js/es6/map'; import 'core-js/es6/set'; -import 'core-js/es6/string'; -import 'core-js/es6/symbol'; -import 'core-js/es7/reflect'; + /** */ import 'reflect-metadata'; + +/** IE10 and IE11 requires the following for NgClass support on SVG elements */ +// import 'classlist.js'; // Run `npm install --save classlist.js`. +/** Evergreen browsers require these. **/ +import 'core-js/es6/reflect'; +import 'core-js/es7/reflect'; \ No newline at end of file diff --git a/ClientApp/polyfills/server.polyfills.ts b/ClientApp/polyfills/server.polyfills.ts index 96b07953..68867b14 100644 --- a/ClientApp/polyfills/server.polyfills.ts +++ b/ClientApp/polyfills/server.polyfills.ts @@ -1,2 +1,4 @@ -import 'zone.js'; +// Note: * The order is IMPORTANT! * import './polyfills.ts'; + +import 'zone.js'; diff --git a/ClientApp/tsconfig.app.json b/ClientApp/tsconfig.app.json index 2cf4ae53..aec85d7d 100644 --- a/ClientApp/tsconfig.app.json +++ b/ClientApp/tsconfig.app.json @@ -6,5 +6,9 @@ "baseUrl": "", "types": [] }, - "exclude": ["test.ts", "**/*.spec.ts", "boot.server.PRODUCTION.ts"] + "exclude": [ + "test.ts", + "**/*.spec.ts", + "boot.server.PRODUCTION.ts" + ] } diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml index b8f7a97f..d8882a29 100644 --- a/Views/Home/Index.cshtml +++ b/Views/Home/Index.cshtml @@ -9,4 +9,5 @@ <!-- Our webpack bundle --> <script src="http://github.com/~/dist/main-client.js" asp-append-version="true"></script> } + @Html.Raw(ViewData["ServiceWorker"]) diff --git a/package.json b/package.json index a7fcc1ca..c75c5113 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,13 @@ { - "name": "angular4-aspnetcore-universal", - "version": "1.0.0-rc3", + "name": "angular6-aspnetcore-universal", + "author": { + "name": "Mark Pieszak", + "email": "hello@devhelp.online", + "url": "http://devhelp.online/" + }, + "version": "1.0.0-rc4", "scripts": { - "clean:install": "npm run clean && rimraf ./node_modules ./bin ./obj ./package-lock.json && dotnet restore && npm i", + "clean:install": "npm run clean && rimraf ./node_modules ./bin ./obj ./package-lock.json && dotnet restore Asp2017.csproj && npm i", "lint": "tslint -p tsconfig.json", "test": "npm run build:vendor && karma start ClientApp/test/karma.conf.js", "test:watch": "npm run test -- --auto-watch --no-single-run", @@ -92,5 +97,11 @@ "uglifyjs-webpack-plugin": "^1.2.5", "webpack-bundle-analyzer": "^2.13.1", "webpack-cli": "^2.1.4" - } + }, + "license": "MIT", + "repository": { + "type": "github", + "url": "https://github.com/MarkPieszak/aspnetcore-angular2-universal" + }, + "readme": "https://github.com/MarkPieszak/aspnetcore-angular2-universal/blob/master/README.md" } diff --git a/webpack.config.js b/webpack.config.js index d8689752..3ea5c207 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -38,7 +38,7 @@ module.exports = env => { module: { rules: [ { - test: /\.ts$/, + test: /^(?!.*\.spec\.ts$).*\.ts$/, use: isDevBuild ? [ 'awesome-typescript-loader?silent=true', @@ -99,7 +99,7 @@ module.exports = env => { // Plugins that apply in production builds only new AngularCompilerPlugin({ mainPath: path.join(__dirname, 'ClientApp/boot.browser.ts'), - tsConfigPath: './tsconfig.json', + tsConfigPath: './ClientApp/tsconfig.app.json', entryModule: path.join( __dirname, 'ClientApp/app/app.module.browser#AppModule' @@ -174,7 +174,7 @@ module.exports = env => { __dirname, 'ClientApp/boot.server.PRODUCTION.ts' ), - tsConfigPath: './tsconfig.json', + tsConfigPath: './ClientApp/tsconfig.app.json', entryModule: path.join( __dirname, 'ClientApp/app/app.module.server#AppModule' From 6c71405a0e3cc9839c0091d58b2548e858090d66 Mon Sep 17 00:00:00 2001 From: emkialton <43580460+emkialton@users.noreply.github.com> Date: Thu, 27 Sep 2018 18:05:16 +0200 Subject: [PATCH 078/103] fix(prod build): fix production build closes #685 --- ClientApp/tsconfig.app.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ClientApp/tsconfig.app.json b/ClientApp/tsconfig.app.json index aec85d7d..a082833e 100644 --- a/ClientApp/tsconfig.app.json +++ b/ClientApp/tsconfig.app.json @@ -4,11 +4,11 @@ "outDir": "../out-tsc/app", "module": "es2015", "baseUrl": "", - "types": [] + "sourceMap": true, + "types": ["node"] }, "exclude": [ "test.ts", - "**/*.spec.ts", - "boot.server.PRODUCTION.ts" + "**/*.spec.ts" ] } From a1eb39b1e1c09edfeea19e62df2de743f63eecbe Mon Sep 17 00:00:00 2001 From: Steven Smith <stevensmith89@gmail.com> Date: Tue, 16 Oct 2018 12:09:43 -0700 Subject: [PATCH 079/103] docs(readme): README.md table of content links fix --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a37cdd2a..8b15d92e 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,10 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual * [Upcoming Features](#upcoming-features) * [Application Structure](#application-structure) * [Gotchas](#gotchas) -* [FAQ](#faq---also-check-out-the-faq-issues-label) +* [FAQ](#faq---also-check-out-the-faq-issues-label-and-the-how-to-issues-label) * [Special Thanks](#special-thanks) * [License](#license) -* [Consulting & Training](#looking-for-angular--aspnet-consulting--training--support) +* [Consulting & Training](#devhelponline---angular--aspnet---consulting--training--development) --- From 1d93c776ab7856dced281434fd49c794d287373f Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Thu, 18 Oct 2018 10:47:20 -0400 Subject: [PATCH 080/103] fix(csproj): update entity framework to 2.1.1 closes #694 --- Asp2017.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asp2017.csproj b/Asp2017.csproj index 7a28f3b4..b307acba 100644 --- a/Asp2017.csproj +++ b/Asp2017.csproj @@ -12,8 +12,8 @@ <PackageReference Include="Microsoft.AspNetCore.All" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="0.1.1646902" /> <PackageReference Include="NETStandard.Library" Version="2.0.3" /> - <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" /> + <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.1" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> <PackageReference Include="WebEssentials.AspNetCore.PWA" Version="1.0.33" /> </ItemGroup> From b396d9b51b4ac28a6f26a6cf95ef7457fb1ee14a Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Mon, 26 Nov 2018 17:10:24 -0500 Subject: [PATCH 081/103] docs(readme): update --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8b15d92e..94ea42b6 100644 --- a/README.md +++ b/README.md @@ -460,6 +460,8 @@ Nothing's ever perfect, but please let me know by creating an issue (make sure t Copyright (c) 2016-2018 [Mark Pieszak](https://github.com/MarkPieszak) +[![Twitter Follow](https://img.shields.io/twitter/follow/MarkPieszak.svg?style=social)](https://twitter.com/MarkPieszak) + ---- # DevHelp.Online - Angular & ASP.NET - Consulting | Training | Development From 53eb5327171e0699d230a74d97bc90f4db353ca0 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Mon, 10 Dec 2018 19:05:25 -0500 Subject: [PATCH 082/103] fix(webpack-cli): update to fix webpack issue when bundling vendor closes #690 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c75c5113..a929eabe 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "tslint": "^5.10.0", "uglifyjs-webpack-plugin": "^1.2.5", "webpack-bundle-analyzer": "^2.13.1", - "webpack-cli": "^2.1.4" + "webpack-cli": "^3.1.2" }, "license": "MIT", "repository": { From 976505d800a8c7a9f0954a0e80d7ce4b67448bad Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Mon, 10 Dec 2018 19:25:10 -0500 Subject: [PATCH 083/103] fix(preboot): pin to preboot6-beta.4 until patched closes #704 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a929eabe..56510a52 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "@angular/platform-browser-dynamic": "^6.0.3", "@angular/platform-server": "^6.0.3", "@angular/router": "^6.0.3", - "@nguniversal/aspnetcore-engine": "^6.0.0", - "@nguniversal/common": "^6.0.0", + "@nguniversal/aspnetcore-engine": "^7.0.2", + "@nguniversal/common": "^7.0.2", "@ngx-translate/core": "^10.0.2", "@ngx-translate/http-loader": "^3.0.1", "@types/node": "^10.1.2", @@ -57,7 +57,7 @@ "ngx-bootstrap": "^3.0.0", "node-sass": "^4.9.0", "npm": "^6.1.0", - "preboot": "^6.0.0-beta.4", + "preboot": "6.0.0-beta.4", "raw-loader": "^0.5.1", "rimraf": "^2.6.2", "rxjs": "^6.2.0", From d0cae199ad386c5f35d8aede79ef2d48224d3661 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Mon, 10 Dec 2018 19:37:09 -0500 Subject: [PATCH 084/103] docs(home): add devhelp note --- .../app/containers/home/home.component.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/ClientApp/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html index f60e6d64..c2eed1af 100644 --- a/ClientApp/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -3,7 +3,7 @@ <blockquote> <strong>Enjoy the latest features from .NET Core & Angular 6.x!</strong> <br> For more info check the repo here: - <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal">AspNetCore-Angular-Universal repo</a> + <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal" target="_blank">AspNetCore-Angular-Universal repo</a> <br> <br> </blockquote> @@ -45,16 +45,30 @@ <h2>{{ 'HOME_ISSUES_TITLE' | translate }}</h2> <li> <strong>Issues with this Starter?</strong> <br>Please post an issue here: - <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal">AspNetCore-Angular2-Universal repo</a> + <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal" target="_blank">AspNetCore-Angular2-Universal repo</a> <br> <br> </li> <!--<li><strong>Issues with <u>Universal</u> itself?</strong> <br>Please post an issue here: <a href="https://github.com/angular/universal">Angular Universal repo</a></li>--> </ul> + + <h2><a href="http://www.devhelp.online/" target="_blank">DevHelp.Online</a></h2> + + <strong>Consulting | Development | Training | Workshops</strong> + <br><br> + Get your Team or Application up to speed by working with some of the leading industry experts in JavaScript & ASP.NET!<br> + <br> + <strong>Follow us on Twitter!</strong><br><br> + <a href="http://www.twitter.com/DevHelpOnline" target="_blank">@DevHelpOnline</a> | + <a href="http://www.twitter.com/MarkPieszak" target="_blank">@MarkPieszak</a> + <br> + <br> + </div> </div> + <div class="row"> <div class="col-lg-12"> From cc1e9b8ccb3001bcfe8a3ce44cd539096fde6363 Mon Sep 17 00:00:00 2001 From: Mark Pieszak <mpieszak84@gmail.com> Date: Wed, 19 Dec 2018 12:48:25 -0500 Subject: [PATCH 085/103] docs(readme): update ie11 webpack config info related to https://github.com/MarkPieszak/aspnetcore-angular-universal/issues/706 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94ea42b6..f7666391 100644 --- a/README.md +++ b/README.md @@ -427,7 +427,7 @@ import * as $ from 'jquery'; ### How can I support IE9 through IE11? -To support IE9 through IE11 open the `polyfills.ts` file in the `polyfills` folder and uncomment out the 'import polyfills' as needed. +To support IE9 through IE11 open the `polyfills.ts` file in the `polyfills` folder and uncomment out the 'import polyfills' as needed. ALSO - make sure that your `webpack.config` and `webpack.config.vendor` change option of `UglifyJsPlugin` from `ecma: 6` to **`ecma: 5`**. ---- From 57273e12bed52c3a970c6cd7ef7071c766abe028 Mon Sep 17 00:00:00 2001 From: Peter Blazejewicz <peterblazejewicz@users.noreply.github.com> Date: Sun, 10 Feb 2019 14:59:41 +0100 Subject: [PATCH 086/103] feat(update client): update client dependencies (#708) This commit: - updates Angular from 6.* to most recent 7.2 version - updates all related client and tooling dependencies - removes dependencies that are no longer user (like Chai related ones) Thanks! --- .../components/navmenu/navmenu.component.html | 2 +- .../app/containers/home/home.component.html | 4 +- .../app/containers/home/home.component.ts | 2 +- README.md | 18 +-- Startup.cs | 2 +- package.json | 105 +++++++++--------- wwwroot/manifest.json | 4 +- 7 files changed, 67 insertions(+), 70 deletions(-) diff --git a/ClientApp/app/components/navmenu/navmenu.component.html b/ClientApp/app/components/navmenu/navmenu.component.html index fdef2c65..ba9ff74e 100644 --- a/ClientApp/app/components/navmenu/navmenu.component.html +++ b/ClientApp/app/components/navmenu/navmenu.component.html @@ -1,5 +1,5 @@ <nav class="navbar navbar-expand-lg"> - <a [routerLink]="['/home']" class='navbar-brand'>Angular 6 Universal & ASP.NET Core</a> + <a [routerLink]="['/home']" class='navbar-brand'>Angular 7 Universal & ASP.NET Core</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNav" aria-controls="mainNav" aria-expanded="false" aria-label="Toggle navigation" (click)="collapseNavbar()"> <i class="fas fa-bars"></i> diff --git a/ClientApp/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html index c2eed1af..26160f60 100644 --- a/ClientApp/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -1,7 +1,7 @@ <h1>{{ title }}</h1> <blockquote> - <strong>Enjoy the latest features from .NET Core & Angular 6.x!</strong> + <strong>Enjoy the latest features from .NET Core & Angular 7.x!</strong> <br> For more info check the repo here: <a href="https://github.com/MarkPieszak/aspnetcore-angular2-universal" target="_blank">AspNetCore-Angular-Universal repo</a> <br> @@ -14,7 +14,7 @@ <h2>{{ 'HOME_FEATURE_LIST_TITLE' | translate }} </h2> <ul> <li>ASP.NET Core 2.1 :: ( Visual Studio 2017 )</li> <li> - Angular 6.* front-end UI framework + Angular 7.* front-end UI framework <ul> <li>Angular **platform-server** (aka: Universal) - server-side rendering for SEO, deep-linking, and incredible performance.</li> <!--<li>HMR State Management - Don't lose your applications state during HMR!</li>--> diff --git a/ClientApp/app/containers/home/home.component.ts b/ClientApp/app/containers/home/home.component.ts index fc689f24..850f7b8f 100644 --- a/ClientApp/app/containers/home/home.component.ts +++ b/ClientApp/app/containers/home/home.component.ts @@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core'; }) export class HomeComponent implements OnInit { title: string = - 'Angular 6.x Universal & ASP.NET Core 2.1 advanced starter-kit'; + 'Angular 7.x Universal & ASP.NET Core 2.1 advanced starter-kit'; // Use "constructor"s only for dependency injection constructor(public translate: TranslateService) {} diff --git a/README.md b/README.md index f7666391..0f61aadf 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ -# ASP.NET Core 2.1 & Angular 6(+) Advanced Starter - PWA & Server-side prerendering (for Angular SEO)! +# ASP.NET Core 2.1 & Angular 7(+) Advanced Starter - PWA & Server-side prerendering (for Angular SEO)! ## By [DevHelp.Online](http://www.DevHelp.Online) -> Updated to the latest Angular 6.x +> Updated to the latest Angular 7.x <p align="center"> - <img src="http://github.com/docs/architecture.png" alt="ASP.NET Core 2.1 Angular 6+ Starter" title="ASP.NET Core 2.1 Angular 6+ Starter"> + <img src="http://github.com/docs/architecture.png" alt="ASP.NET Core 2.1 Angular 7+ Starter" title="ASP.NET Core 2.1 Angular 7+ Starter"> </p> -### Harness the power of Angular 6+, ASP.NET Core 2.1, now with SEO ! +### Harness the power of Angular 7+, ASP.NET Core 2.1, now with SEO ! Angular SEO in action: <p align="center"> - <img src="http://github.com/docs/angular2-seo.png" alt="ASP.NET Core Angular6 SEO" title="ASP.NET Core Angular6 SEO"> + <img src="http://github.com/docs/angular2-seo.png" alt="ASP.NET Core Angular7 SEO" title="ASP.NET Core Angular7 SEO"> </p> ### What is this repo? Live Demo here: http://aspnetcore-angular2-universal.azurewebsites.net This repository is maintained by [Angular](https://github.com/angular/angular) and is meant to be an advanced starter -for both ASP.NET Core 2.1 using Angular 6.0+, not only for the client-side, but to be rendered on the server for instant +for both ASP.NET Core 2.1 using Angular 7.0+, not only for the client-side, but to be rendered on the server for instant application paints (Note: If you don't need SSR [read here](#faq) on how to disable it). This is meant to be a Feature-Rich Starter application containing all of the latest technologies, best build systems available, and include many real-world examples and libraries needed in todays Single Page Applications (SPAs). @@ -57,7 +57,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual - Swagger WebAPI documentation when running in development mode - SignalR Chat demo! (Thanks to [@hakonamatata](https://github.com/hakonamatata)) -- **Angular 6.0.0** : +- **Angular 7.0.0** : - PWA (Progressive Web App) - (Minimal) Angular-CLI integration - This is to be used mainly for Generating Components/Services/etc. @@ -304,7 +304,7 @@ Take a look at the `_Layout.cshtml` file for example, notice how we let .NET han <head> <base href="http://github.com/" /> <!-- Title will be the one you set in your Angular application --> - <title>@ViewData["Title"] - AspNET.Core Angular 6.0.0 (+) starter + @ViewData["Title"] - AspNET.Core Angular 7.0.0 (+) starter @@ -345,7 +345,7 @@ Well now, your Client-side Angular will take over, and you'll have a fully funct - This repository uses ASP.Net Core 2.1, which has a hard requirement on .NET Core Runtime 2.1 and .NET Core SDK 2.1. Please install these items from [here](https://blogs.msdn.microsoft.com/dotnet/2018/05/30/announcing-net-core-2-1/?WT.mc_id=blog-twitter-timheuer) -> When building components in Angular 6 there are a few things to keep in mind. +> When building components in Angular 7 there are a few things to keep in mind. - Make sure you provide Absolute URLs when calling any APIs. (The server can't understand relative paths, so `/api/whatever` will fail). diff --git a/Startup.cs b/Startup.cs index a1b0f70d..8d978fd4 100644 --- a/Startup.cs +++ b/Startup.cs @@ -42,7 +42,7 @@ public void ConfigureServices (IServiceCollection services) { // Register the Swagger generator, defining one or more Swagger documents services.AddSwaggerGen (c => { - c.SwaggerDoc ("v1", new Info { Title = "Angular 6.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); + c.SwaggerDoc ("v1", new Info { Title = "Angular 7.0 Universal & ASP.NET Core advanced starter-kit web API", Version = "v1" }); }); } diff --git a/package.json b/package.json index 56510a52..476524e2 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "angular6-aspnetcore-universal", + "name": "angular7-aspnetcore-universal", "author": { "name": "Mark Pieszak", "email": "hello@devhelp.online", @@ -22,81 +22,78 @@ "clean": "rimraf wwwroot/dist clientapp/dist" }, "dependencies": { - "@angular/animations": "^6.0.3", - "@angular/common": "^6.0.3", - "@angular/compiler": "^6.0.3", - "@angular/core": "^6.0.3", - "@angular/forms": "^6.0.3", - "@angular/http": "^6.0.3", - "@angular/platform-browser": "^6.0.3", - "@angular/platform-browser-dynamic": "^6.0.3", - "@angular/platform-server": "^6.0.3", - "@angular/router": "^6.0.3", + "@angular/animations": "^7.2.0", + "@angular/common": "^7.2.0", + "@angular/compiler": "^7.2.0", + "@angular/core": "^7.2.0", + "@angular/forms": "^7.2.0", + "@angular/http": "^7.2.0", + "@angular/platform-browser": "^7.2.0", + "@angular/platform-browser-dynamic": "^7.2.0", + "@angular/platform-server": "^7.2.0", + "@angular/router": "^7.2.0", "@nguniversal/aspnetcore-engine": "^7.0.2", "@nguniversal/common": "^7.0.2", - "@ngx-translate/core": "^10.0.2", - "@ngx-translate/http-loader": "^3.0.1", - "@types/node": "^10.1.2", + "@ngx-translate/core": "^11.0.1", + "@ngx-translate/http-loader": "^4.0.0", + "@types/node": "^10.12.18", "angular2-router-loader": "^0.3.5", "angular2-template-loader": "^0.6.2", "aspnet-prerendering": "^3.0.1", - "aspnet-webpack": "^2.0.3", - "awesome-typescript-loader": "^5.0.0", - "bootstrap": "^4.1.1", - "core-js": "^2.5.6", - "css": "^2.2.3", - "css-loader": "^0.28.11", - "event-source-polyfill": "^0.0.12", + "aspnet-webpack": "^3.0.0", + "awesome-typescript-loader": "^5.2.1", + "bootstrap": "^4.2.1", + "core-js": "^2.6.1", + "css": "^2.2.4", + "css-loader": "^2.1.0", + "event-source-polyfill": "^1.0.5", "expose-loader": "^0.7.5", - "file-loader": "^1.1.11", + "file-loader": "^3.0.1", "html-loader": "^0.5.5", "isomorphic-fetch": "^2.2.1", "jquery": "^3.3.1", "json-loader": "^0.5.7", - "moment": "2.22.1", - "ngx-bootstrap": "^3.0.0", + "moment": "^2.23.0", + "ngx-bootstrap": "^3.1.4", "node-sass": "^4.9.0", - "npm": "^6.1.0", - "preboot": "6.0.0-beta.4", - "raw-loader": "^0.5.1", - "rimraf": "^2.6.2", - "rxjs": "^6.2.0", - "sass-loader": "^7.0.1", - "style-loader": "^0.21.0", + "preboot": "^6.0.0-beta.6", + "raw-loader": "^1.0.0", + "rimraf": "^2.6.3", + "rxjs": "^6.3.3", + "sass-loader": "^7.1.0", + "style-loader": "^0.23.1", "to-string-loader": "^1.1.5", - "typescript": "~2.7.2", - "url-loader": "^1.0.1", - "webpack": "^4.9.1", - "webpack-hot-middleware": "^2.22.2", - "webpack-merge": "^4.1.2", + "url-loader": "^1.1.2", + "webpack": "^4.28.1", + "webpack-hot-middleware": "^2.24.3", + "webpack-merge": "^4.2.1", "zone.js": "^0.8.26" }, "devDependencies": { "@angular-devkit/build-angular": "~0.6.6", - "@angular/cli": "^6.0.5", - "@angular/compiler-cli": "6.0.3", - "@ngtools/webpack": "^6.0.5", - "@types/chai": "^4.1.3", - "@types/jasmine": "^2.8.7", - "chai": "^4.1.2", - "codelyzer": "^3.1.2", + "@angular/cli": "^7.2.0", + "@angular/compiler-cli": "^7.2.0", + "@ngtools/webpack": "^7.1.4", + "@types/jasmine": "^3.3.5", + "codelyzer": "^4.5.0", "istanbul-instrumenter-loader": "^3.0.1", - "jasmine-core": "^2.5.2", - "karma": "^1.7.1", - "karma-chai": "^0.1.0", + "jasmine-core": "^3.3.0", + "jasmine-spec-reporter": "^4.2.1", + "karma": "^3.1.4", "karma-chrome-launcher": "^2.2.0", - "karma-coverage": "^1.1.1", - "karma-jasmine": "^1.1.2", + "karma-coverage": "^1.1.2", + "karma-jasmine": "^2.0.1", "karma-mocha-reporter": "^2.2.5", "karma-phantomjs-launcher": "^1.0.4", "karma-remap-coverage": "^0.1.5", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^2.0.4", - "mini-css-extract-plugin": "^0.4.0", - "tslint": "^5.10.0", - "uglifyjs-webpack-plugin": "^1.2.5", - "webpack-bundle-analyzer": "^2.13.1", - "webpack-cli": "^3.1.2" + "karma-webpack": "^3.0.5", + "mini-css-extract-plugin": "^0.5.0", + "tslint": "^5.12.0", + "typescript": "^3.1.3", + "uglifyjs-webpack-plugin": "^2.1.1", + "webpack-bundle-analyzer": "^3.0.3", + "webpack-cli": "^3.2.1" }, "license": "MIT", "repository": { diff --git a/wwwroot/manifest.json b/wwwroot/manifest.json index 1f247be0..ca1c07d8 100644 --- a/wwwroot/manifest.json +++ b/wwwroot/manifest.json @@ -1,8 +1,8 @@ { - "name": "ASP.NET Core 2.1 & Angular 6(+) Advanced Starter", + "name": "ASP.NET Core 2.1 & Angular 7(+) Advanced Starter", "short_name": "aspnetcore-angular2-universal", "description": - "ASP.NET Core 2.1 & Angular 6(+) Advanced Starter - with Server-side prerendering (for Angular SEO)!", + "ASP.NET Core 2.1 & Angular 7(+) Advanced Starter - with Server-side prerendering (for Angular SEO)!", "icons": [ { "src": "/images/icon192x192.png", From 49cfeba5dbdddeed478b5ec29c24defb2408a98c Mon Sep 17 00:00:00 2001 From: Peter Blazejewicz Date: Sun, 10 Feb 2019 15:02:59 +0100 Subject: [PATCH 087/103] feat(webpack): migrate to terser from uglifiy This fixes webpack build in production mode See @webpack/webpack#7908 Thanks! --- README.md | 2 +- package.json | 1 + webpack.config.js | 28 +++++++++++++--------------- webpack.config.vendor.js | 22 +++++++++++----------- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 0f61aadf..42fa2e49 100644 --- a/README.md +++ b/README.md @@ -427,7 +427,7 @@ import * as $ from 'jquery'; ### How can I support IE9 through IE11? -To support IE9 through IE11 open the `polyfills.ts` file in the `polyfills` folder and uncomment out the 'import polyfills' as needed. ALSO - make sure that your `webpack.config` and `webpack.config.vendor` change option of `UglifyJsPlugin` from `ecma: 6` to **`ecma: 5`**. +To support IE9 through IE11 open the `polyfills.ts` file in the `polyfills` folder and uncomment out the 'import polyfills' as needed. ALSO - make sure that your `webpack.config` and `webpack.config.vendor` change option of `TerserPlugin` from `ecma: 6` to **`ecma: 5`**. ---- diff --git a/package.json b/package.json index 476524e2..4978e1f8 100644 --- a/package.json +++ b/package.json @@ -89,6 +89,7 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^3.0.5", "mini-css-extract-plugin": "^0.5.0", + "terser-webpack-plugin": "^1.2.1", "tslint": "^5.12.0", "typescript": "^3.1.3", "uglifyjs-webpack-plugin": "^2.1.1", diff --git a/webpack.config.js b/webpack.config.js index 3ea5c207..249c4f59 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -15,7 +15,7 @@ const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin; const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; const BundleAnalyzerPlugin = require('webpack-bundle-analyzer') .BundleAnalyzerPlugin; -const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); +const TerserPlugin = require('terser-webpack-plugin'); const { sharedModuleRules } = require('./webpack.additions'); @@ -118,19 +118,17 @@ module.exports = env => { isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ - cache: true, - parallel: true, - uglifyOptions: { - compress: false, + // we specify a custom TerserPlugin here to get source maps in production + new TerserPlugin({ + sourceMap: true, + terserOptions: { + compress: true, ecma: 6, mangle: true, keep_classnames: true, - keep_fnames: true + keep_fnames: true, }, - sourceMap: true - }) + }), ] ) } @@ -196,18 +194,18 @@ module.exports = env => { isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ + // we specify a custom TerserPlugin here to get source maps in production + new TerserPlugin({ cache: true, parallel: true, - uglifyOptions: { + sourceMap: true, + terserOptions: { compress: false, ecma: 6, mangle: true, keep_classnames: true, - keep_fnames: true + keep_fnames: true, }, - sourceMap: true }) ] ) diff --git a/webpack.config.vendor.js b/webpack.config.vendor.js index 6b67e525..775910fb 100644 --- a/webpack.config.vendor.js +++ b/webpack.config.vendor.js @@ -2,7 +2,7 @@ const path = require('path'); const webpack = require('webpack'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const merge = require('webpack-merge'); -const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); +const TerserPlugin = require('terser-webpack-plugin'); const treeShakableModules = [ '@angular/animations', '@angular/common', @@ -95,18 +95,18 @@ module.exports = (env) => { ]), optimization: { minimizer: [].concat(isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ + // we specify a custom TerserPlugin here to get source maps in production + new TerserPlugin({ cache: true, parallel: true, - uglifyOptions: { + sourceMap: true, + terserOptions: { compress: false, ecma: 6, mangle: true, keep_classnames: true, - keep_fnames: true + keep_fnames: true, }, - sourceMap: true }) ]) } @@ -141,18 +141,18 @@ module.exports = (env) => { ].concat(isDevBuild ? [] : []), optimization: { minimizer: [].concat(isDevBuild ? [] : [ - // we specify a custom UglifyJsPlugin here to get source maps in production - new UglifyJsPlugin({ + // we specify a custom TerserPlugin here to get source maps in production + new TerserPlugin({ cache: true, parallel: true, - uglifyOptions: { + sourceMap: true, + terserOptions: { compress: false, ecma: 6, mangle: true, keep_classnames: true, - keep_fnames: true + keep_fnames: true, }, - sourceMap: true }) ]) } From 5e43331328e5b430538b00d092d733bbaed4f99a Mon Sep 17 00:00:00 2001 From: Peter Blazejewicz Date: Sun, 10 Feb 2019 15:03:25 +0100 Subject: [PATCH 088/103] feat(pwa): update icons, favicons and manifest (#710) - most common sizes added - manifest entries updated - favicon ships the same content as manifest icons Thanks! --- wwwroot/favicon.ico | Bin 85432 -> 10990 bytes wwwroot/images/icon144x144.png | Bin 0 -> 6192 bytes wwwroot/images/icon192x192.png | Bin 9823 -> 8346 bytes wwwroot/images/icon256x256.png | Bin 0 -> 11350 bytes wwwroot/images/icon36x36.png | Bin 0 -> 1739 bytes wwwroot/images/icon384x384.png | Bin 0 -> 20299 bytes wwwroot/images/icon48x48.png | Bin 0 -> 2228 bytes wwwroot/images/icon512x512.png | Bin 29105 -> 29204 bytes wwwroot/images/icon72x72.png | Bin 0 -> 3087 bytes wwwroot/images/icon96x96.png | Bin 0 -> 4050 bytes wwwroot/manifest.json | 37 +++++++++++++++++++++++++++++---- 11 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 wwwroot/images/icon144x144.png create mode 100644 wwwroot/images/icon256x256.png create mode 100644 wwwroot/images/icon36x36.png create mode 100644 wwwroot/images/icon384x384.png create mode 100644 wwwroot/images/icon48x48.png create mode 100644 wwwroot/images/icon72x72.png create mode 100644 wwwroot/images/icon96x96.png diff --git a/wwwroot/favicon.ico b/wwwroot/favicon.ico index 6884543f9617d81e56ccd478989bec1ece300e3a..23015bba41706f1a8354ffc675cf328d6b9167dd 100644 GIT binary patch literal 10990 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 HVFdmUW_yrt diff --git a/wwwroot/images/icon144x144.png b/wwwroot/images/icon144x144.png new file mode 100644 index 0000000000000000000000000000000000000000..b53f37918280fa8c175bbe6096eb1c59324cd6af GIT binary patch literal 6192 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 literal 0 HcmV?d00001 diff --git a/wwwroot/images/icon192x192.png b/wwwroot/images/icon192x192.png index 7f020c3fae22ba0892bf3d6f6bfb919fceed35c9..6f4b36a1cf3a1656a11fdc0504b11ce72c338b48 100644 GIT binary patch delta 8279 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 E4;q)o-~a#s diff --git a/wwwroot/images/icon256x256.png b/wwwroot/images/icon256x256.png new file mode 100644 index 0000000000000000000000000000000000000000..66c420db1a6b17b9817f324ad935517d23954ae2 GIT binary patch literal 11350 zcmZ`2+}d6bP5R4DbgiMgHqCpfPjF~ z-CghUf1lom_v6FB;qE#6ti8@U`|h*DG}IKxi0Oy{03cIRl+ywL2>2@mAcTS+Kgp%| zzz>*}w5l`!RK}2;KgS3EMw%&VsRDo}8vx*f0N@lH!Yu>9Ycv3?VgW$>9RS>ROsm(F z0RI6uRZ)-wuC9NwnhF!Z5ds$_Re6Fr2oW^{S&7pdbpYTvQj(L_cAwZtcXOd1^H^?q z;N$w~DBuQpFicZVI{ax8mtoaMC6#D%l_UzWEmlc(-!4gCrHq8+c~Pf$%B2$)4-c_V zTs?X9CDUACWb1i~&^(k5c@&Fh7j)8c^UN%ZS}x}Wo~zZ-MOUuoRX0MhA zbSDNm&!Jt`O?Gd*XWy1j10AR)#--qNRUXnsFI6i=Sv(F%^R!u@gW z+1~_$)1$i#qV5*UP_O&5R7Q!L6CpXOoV%lm6C6>EDeo%YA^G8Y)=Z*5?yWx*+VAnd zY$7;2sypS4k?#bkgab&qiHQRO{Bsb+)0&G0pUSNFRs*6I4s8>#jBH#`Ib5(z=PSR8 za*tylzn-jd(J%< zrwKe}7gSVzj6)H_BmJL?77iOO6dCKftgQx+$uIJU36N8oz9B?Q@h6=HHuZmHKRVbD zA8*;(6J5N$llDzf>)H+ayk0T6{z0l7&apa-BqbGO%}vgwgx>o@z1I z2uTVKxm%q7(=#Vsq#x^){|Lg{OoY}Y59U1nPsb|Nmj34yHnj3beRSCE{?`BbRyCo#J1C73)k$@m!Z*`%<$K|**R*vgv zzHceWc66?77$`a-uK8SXRq?3%HKbknv&guQ?eaH}nF{b5&vs096*}jlmRLIf5t7Td z0hpb%w+`GzJEgX$38N+BIllRb$d_?tNah|*$cXnwPxc%*Ej|7C%%THrOe8D)pi-nf z4Kh3cV)m`FvCBv!q0ZL+Z_=-mJKmk`Q-X|ju-M9}JK&Cz92TV>v;j?Ie_Ugn3}}vQ z-|DSU%Ps7z^R(X?74mq$+uuP^tUf8kEiT50ks~^Sdw~#dto`wE&)NyU`r)oTCl(gx z3IddZ5zq;API3E{+8$-MD?+WGj1YS=I{3BM5+a#d=xA#)laU+v#-Nk;lsOj=T>$6n zribLr7QKbqCA~=8tbdBXrhEH^k!d;qo^Z(bfqZ6t6h@Kg0ABw-M4e%I#>;$mi2924 zYGhCHBFa~s7KNcA&BA8g${kDTrTSB3D`6#|0i&TUQ!wBzZ zPh;JFZufLHHz^QY(NX<=PPF5B}OcR`*K=Tk^B5dtV(XXIA2@ zg5)n}OkRMnRQxyPE0CgQfp2nm(t-`$;w$G%fS;OAh$V{m-t89q6pvBcm+h2spc8ov z;v(cJkaGTq1~5^xr6n#lIUH@+fMV^PG!>&?Wb%eO3l4gwhPD)3B+uIe z2+7;xrZGo7*=A>_uHX?jBs?t6M?Ki{#dm<79J0t(Uo*q>TRC0jmu(w$^nztustl#p zeQ=w)5j3QRsIRa6c`avbg*tO)1bHlnLxjP#RK=f!<=S4KG3}+)1GWtViQY&dd}z>H ztXo#G&9S)|NDVxKNj8J?IKCR-wOkb`6Q)s4b%>;Z=`5c5q^^W>LTllplhSn1k|jG2 zMuX@OR%NWPE9-hW z1^uu?Uz^ch*~a|8HpU+He(ZFCgs~JOwrwEZsU*oBx+T2R21~{XRvbSnwYb>6akOen zSZ(W>&1`}yGI6fURI@vV zz?9?evMrtD@Oa(YcI&0EUvJR**r;c5-y6b;p~p{23ho!17d!qczdtde@j3sS!E>6D z;f&s7*k`c}fm^hA6odMRP#~gn$+`M|uC?($gXSu%kL=&1S7%zq1JUTtTl8Nfe|vy} z-`xDLtFW_{C8K(l971!C6i1DrV%=G!P*@mCwl@Q2*SlBl30=)jEvG2`z6nsth=~eC z#gZTaIS7vb7QMtT-wz|t%F6nsOD}sN9qKYEK~w(OZ7&_Q0PI4^qtV#IL_S!%X*++K z>Q)YbQBb)towB*cNKSJzQrbM9!VVuFU}CO!zX{)kBj?G*bvXDFH36hXPM}-DqI&mT zG!CTgg3{#C4P4Vo9)o|F4tCU~+0qm*R~! zrFu+I8W7mM8qu#ZO9HV@PjI7z5Q+t~lE9~7nh=Moinh_(%od=l3h3T$`i;M;OwwHSJ<5&=Yf`cinT zPGMN_q&q8K{_um$vjP-)xj^T;A0sZ6_+4yQ)k+c{R>1BcESQLQP9=@8TOU{oG!rdsE51A-fpDcg9b69iy3$<#HV13bnN zgxoKZ1R_MiaQXaaLKi`d^~>7WoYwjrL%;LHOaa07-4Q_caO-x=wEMs6vN;!;(x?uA z$qZGg{ZY!75hthOIz22lT=4t$WnXB`0OzTkLGt(*>!W|DXSop5xWuVW?<6(HD{B8+ z`r$w4(+45&3`%TYD48CR@m)9Ku8=uoKBu4_Co(p-cX<8Kp|3d5~H0h}RA5g?NkNdAt+xn}WK zGHjbrGD*2&K-@oz2$A|p`EWVLgrc=0!GbS{O97k5q~fvP#Y=?!%cYg`R|d+s*M@-U zd>5gSmpX|DD450EA9&!AS0SWl@pU3E-2(wnf~}r`abAA_2U(9doNr!U^i~4mM&q;r z#)viqvFgI30s4!16(~B?Y5R~X^++1&O+<Y*>RQ7KlbmCAi||{ zC3A`eH#E=roUflVUENMA^(&(aIqGSCD>#m5pU5zfMy_v9faJ~pHDHTyIO?DJxv;Ilfm_I%*CQm+N#WeoB7Ty4fz!-+pQe(bggh86)Q{g{SN_ASxO~J>K zug#X47lMmz{UOs_WZoG?VMPNfjqd(XC$wt7WR?#ao@@Q?8M&KyH8FOvk3v=p0_zXtb0=e^85W+K8Q{Rh@fnD5 zg3GOmhRzC8J#y=4@c)gEjk*TZ`d$#GoHDoJ-=EeJ=rW?G^TAJ_9hgiNnregJbB+cl zU6RgR1OzPpwf0GQz4F5EK{0S0=No!Dj*6SVFI{yYJ| zyr)&8`i8|4MeDcJ5^$O!ek$nu>3~JT!@eDhyUf2u*@3WNiW*{-wQ%mlYE}sLB?R$p z!h@tJUS)`ftF%`nsn4m^2s(uE!soqSF3I39lawxtGY^DZ=2;vVTWjjbHm2XC0XETQ zi$%C)DhW9t;E^WUoyiz&MqWc0 z+=^ORB!ozlIsny)&T%4ubi|NgvI9@bgK&WuK>U%z0{yk$OkAvqsl|(umJFbS;~xKE zPuR=v*(Q1fPJ&^c;PkYXD?EEf7yy8cpnVtAqCOn1tX zekPtjBJ#*@#BlU7DVNZdY3Dl_y4o^su^WlYqDB#yzy+vfTOP83Cqzek98?LOKHAxmk6jlZ85ApQ2gL$GsHkV&{6nGl(YFQm&-pY$ zjR8(OA?GCeJ{S^H8I&ME8De_t`$GuII4nOrywtvn0~cIvpr^1|>xT(76*OdcmyHmd z2|8X6d~WmAy91f??Q}8@(G*_8htfw`?HZ98>dMBEl_lLP%`wLq!Y`^X*+LQl4ktqF z;$ynU_*qI~MIr#8CtAGN*@nR7e-RT7jSjA$4@YIY%qV*gz16cUjehv*?i)a7z|yim zRRtfmpb_r?)Xgr~NSiI1&C(7R9kDq_V_C>G+b4*bJM=(z(x8qLD)@4aEIqS{3i~@F z=Lh)w#H3ksEbj%ca>m67<=B|33Z?-BEMt_Ye!S(@8-OBLq*|#->-Ieu`hE;pc}frq zOK?+)%=eE0$ZtlGPoafB4;e0LdA*Ijn|Lyf#F^gagB(#o)wFM8N7tAg|I0 z(HU3PQ>+9JNP54zAF0XdkBn?X>3ygF)sx18AbNK9Tm zguF=W@3Y~d#u;=PhRERcq_qz`SnDgUF_jF?5_YhU-$RNM7}hIH-rtDCL2zdGotjnK zULw^X?hRqJcDdAYTjbKZS-BSHTKw$K@4M#uL@2UTKQ*F9<1{NuxTn(QJq+MHHy)E( zbHdE2qAZQQ<4%uZvDQstmDVZ%%$h~Q)#KbWeo5bIQtzWl{Jfs&tyV;mhYpW(x#A+r zb1|3ZLa`j!PahGdEUcq4K7-FQqnU7ZAjEVd0H0N))^aD#X&Ee2^vs7qp7A*p@7j>0)Nf>d z7WNQINze$bA8hF7T(sI%#I$MH8hYBD{87qSGTkcVzR0w(190RB*861$)HiORaN7Ef{6x+BWZYfr77xgI#q$VgtaG4PG>%MBTAO?f{qR>F5_!A ze|eWb*ZZX7LdMOJ$G{E>U^G(3f1WwTw`nAq-sABu(f+8-U*(X6{jei6Wqg5+??t|0 zJG)uCsaesf1J!t|VOtdL_Rn()YRyLt0EDyOhALgJ5?KbT`?U8ie%uRn>FkgCiYO6Z zIvTqgx8qRU)y{k^V!V3s_WOR@K-3VaJ^8=r^G=^+;enTys}UBHf^K~XQ^uj+Yi+^XLHW@6Q z_GEr+*ErZ)xUx$3QStP~#^sFdX6&Gl@plx1H1HamQ?enzzi**t1=6)|!3`Oj++py^l>66v2E;O!SBx`dlB`3zN2UFC&LYDV$d}KchF&sYr=S&7OVoRDqaRu1Qr>p?{X8{MQX>o3 zdimjeDb>WcaQh~!LCd>p7AjJmo`VZR-`#}C%QhQD+Xb(;i*{Ylq?+)|xJz+iGK??7 zENJifk+sN~8oLh2+f~Snj*v0$uPFYE{!}P?KXp02kn^}<)$jcGt{?YL-5$L*k`n&_ z2;S2r!=od&tJ4;T^9UA_OgUOI(yPO9KbNRaHk>Ea!8v;GsTBA^d7Iz0x^boHo9p%G zLvyg9jjs;A2dMy(+EM;`uWK!z88Q0#$oo3v*D^o(Rfkq)bRPoizu69}^EA}`S zW)vkCDHlL6H=Fh|XdXxbIKFNATuO?R;`fT`odXXZmw0eVis^R)Dd{!y!>=gbm8L#m&HR+iLbDZATXM^9P7F^XK*i0uH7qtHCEu- z8$i-zl_7cB8@ByH2OmI3d>SYDr^e0*5q%R^2}bf&_KF7K#@fZP6z|pUVDY6v-khNf z9|4s6rPFlt_X$Va<%Afo>6xE(#TMtUFo$LuA4J_!HPKj7svOp7z0D8PRrAqN`6k?M zJnFB~&-zJK_piL>W=xiCeps&&0FiBFdtdV9GAzOfv#iJ-jYdMOc55m;;uvdkFN&1s zemLCr7O55bb`beI*UT=^{wt;b)u^EN>d4T};@?HiOA@@czvvrsjvAfBfCh0lvD_Qd zRfmKE>r@K&R5wIg$ES~UTj92Y-z_r4iwBgtjJAbb+h19C?OaX0{!12AGm#x!WJ(U_ z$-eQN30e_ayQh=)n-50}6{KT0?Fi0HR^PW9GRrwg(Mt z4PcFKg5972uZc1agQCw$Bx0p{Zj)gKi>BFcTo&^1S)?eOo)h*=hnIJE*8et?nT;7} z`7(Fx7nFz#$utKD{hvBSJ3Xnmqo@dk?}at@nb7g`QpuEFs`xn{^7?8X`4va@(kz=i zCpR4s3>|3%=sDiDDHL2uzCz5F17#y9O4ywOl^Q@UX z(ags2RO;-yFr|N$qvKO>lB~ou6ybRPNClY55?uc4%gpBxAphE;$Vb(y*@%gtutIOM z-DTg2?EXQo$`>(u`o4_e;`f%{h_Ji#TIoH2ykp^x3We8GwqvTgJvEN(It924WMZb} ztX%R!b15j~&4H6sS;NYf^evtx2>!xROKF+k$Os3t^Uh^7sh7+H`<;@ghZrxpNy1WE;dQo-)nq(_hBZAu$A18FBC;Y+^Ur( zdsc*_%_e_svwnW_ee>0ofv*?^gWAzT9&U5E_^Rs6?_#b?YGu#ON*`o<5OT)o8*3_3 zedtc~Kkppg=YIV3#F`KN%QDl?Z1%Q$t~4)~5=oMn^sLQUca^%@{2b0F%{I=cxU5XB ztv_q2P%E&C@}iv}jiwMNT=26eiUuVY{I+$gtjW=Led=bf->%S+h?b~@wG$$R-m~=N zcVW!s?y2IPV5HrnCK1ff$58N~VWIC;aGh3S6gLD5TebaZcWq8J_cH01Cy$!`u@^`F zBI2qy^bUw?4I2o25OZZUw{R2~7gplEU5q7V>Y{zU7&I8`&foi8-$igKIWQur@i7UN z4D;VMtBK3vN{6wp!82z%mtUXpZT`TEfOmdhxOC=CKmPT=%4GB2R?deKpKbL&yf}H6 zlgO}S8D%5zHA1kWU?((5SW|@*M#u=3*N<;5U9Nu3aJ$EQIcJ#erYB}tU%sY-(pzEJ z@V=_nHIY2fR=L85g)ed#vbv06Y0`y<HW*cs;EZJ+$Ca)TDyXu4$(a1wfNQ9VZC{O zp!Tnh&_KciaK`}tlgrU|*Sp&YNHV?K$j$i#;v5JJhbB24_jUJF=UQdhdwra4w5@ht zv$d10)aKwj#TSxp+ttI)Yt2}7O&r~`nRIJj8X1z4!Ueo4UBLqYsAZUaN^2-lCZiKX zG<@)%HikpQgfNnv{=RabcYWf59CaizC3O;thV{tB{3`P)6ZwL4oc zS6UpwbOEFj?|vF>>Ux3`OT^s!N{nWt>XPzeSVAOV%Yhp;y4y1n01Ok}7ab8B9_1T8 zeL432QRgg0WB%z6x+gxMPI1nEk&p4`BdS4aFbOQ>`9&sH(BF__3ykae+tZd&X=luw z&V8{Ywf3@Jd}>-``XOybtDer}!}PDJCc$PlN{=0BVwL|vkr>x$>1?ChNaA2}02-^n zEc?|g@OI}w0H>cfCBZqKMlr7U^>MUUAiGbWP9iZ|d){u(TZNEkFO z>~9!2VR6&kLohAv8G0u*f3x>Fpz%PA>U&()*K-tNzp=++o7Fi!kET{nlth6KA||)6 zYj?~x;udha6iYz}XD7&R!P{PmdopZ>1}LQ$X}$%;Lc>dReqS{9;Z7}TBVjU_rI#Yk zI#i^%cN|CIGEcN7|FW>QzIyT}J>yJr-NTJbBF!6;Rsw^_R7>1N0j*U55Jk!u0(`uj zaV@Kbhe9*WUMqn*j5{m zc*uewO<%VI*%`h1rtT`1la%{C#990Zy79@g9p}4)40lDr_cXuhJ8XUUw~(%AIOgr3 z!C}C3Bz@LBj2Uv zXmuca^i&Fb=SrEViY=nTMdEB_d8LAa$t>_aBeW0RnFWlKZBBmN{Qd0gn175| zIA8r@g)0`cKsYYRoxLCPJ^KD@X)q=u(dnI>N}(+5Gc75OuS#*CpW5wZxmV3Vbx0v) z<{~)>2?`e;x!~%zc4y4w;?J+!JW=V%PNEw>*#%%stz;+!?dwr83%3{LUN7<;nxa+n zru`bZJ_8*5Nro56CQYaR>~u|R4@|Tw9t$F&AF#Eb6Rp4G?;mcwjw$^% zjS>Lf?in$#DV$7G$Bo>hwKv>6TCPqXcVLj>c`453P*m?ew%E+UE3P zBA$mG(KF4jFMio2q~pjF6NZ1#-^S=*W;>n+-(fJ?neY5JNoMqqWHNz~4EiA`aXTgM z$)KCW*|V|tfBbofrOQ~!Ug-e(kPK=&l2PB{%bn7Ex0K+K^}S?-4JC#ZNuWk{*ROf* z_f4u zuPPAt=hL21^=d%0Lu3N)9W>TeU)a3%v`MmwO@v}e5va`C<+WdvTjjoaeL9JMs~H6h z0H76j27P$XrDad1E4tvXy3BWTc=IDl=3bb_`{rJw?OKbQQzjRV!Dc7z{a6*o6doKg zd`ie;qp7UUWOd5Pa$Z}H$kHFK&kS_pAYzdobx;4CVfvX>(qDU1Bz~l!wI|F9kp3d< zaj>yg-ZD}-S3N9Xkg1!D5Bfuld_R4X_}!~n|7`r#QTR9EHC1K<3JktkzH`;Zfn9my z)R(z`;~uoVba(Gq8vv2gZP-!6I&JT{wt9BkhjxNv`%i1wuiaU6@W|gg(Jhzs>+qvB zlXrH&iz3b%zzVE#-AS6d#9rJh-Tf2)*rL5A_bEs*E)%*3SN}2cQ29*@bzn}mkca^l zrV~k25E5T{b5yFi3|q`I+(autU{8`oq0_$9HPAd&xmQ{?R<7y_plI*B&WQd5(?Ewd zI=vq5w0|A*M{A#&(n0BnIzQwEIfgY41~&YFYu#(w6lq{9XABZB!Yd`r!p@3agtwDT zt}*=4K7X2k?b$YYVPqZya7eQbNqDaYN6+{UUFbMukyva8<@DXgbhcK@s6PAp>2%AU z`@)m|PNg~5Z#JB=22ln=qP}{rD5ieq4&i~-Vo=Uw8jKFkV%)-mvu;ev$?*3>*K~nD zx-}YLnVtjUvAf;se|Mv08hm$$tMT?fhES1G_3OANITU-XuTf8?#j}IYR+v`<9CLA% zco$x7pQM_=o&i0U!0=uPr=(}|T*_SF z8#W6+PiLzXB+vqFVl^2T8T^Jj7W)Zm)aPt@VTMNIrbUUlK&)H{n?i(})Mc`U4w-0m8BnMnxclZ@b*F~UT26P1bxj)owS2&OWDDuhLq>jaJW98pi+}Lx*TecBb!uJKz92A+ zQ138MBpF(cZI>d-O}xJNm_E1C=dA${m^Lgqcimf`*Is|jiuYc|jdyU07gL7<0^sd9 zNp5D-)X5a6-Cx9q;ZNST7rqOo#2A+{5uMiN*FDs`l9L5h)#kJs^IwORxA3dQ;ApGq zP0x+fc_A38Ha#bp{QB|T`llUt?tS#zP0E=hjd_>Lb-Ju6mOmi5>0K>Y=GlYm{pIxk8N_l~eT0Zi&2j_veyJ-kN>^LnDyBp3{8 zp5CK63BO+=YYa`L>vwd9<4AtGYeB&tv-7weuvsH>%iYy&OW~{1?H$!HkYXXXJ~kfQ z9PvFmWOZxUfA(X44(y>20r~h9kHGcQRRNg!TDyz>6%tV*2D^uBK1~^W`TcR*M70c> zb@zVAsW$K@j78@Djl1}dzOO6%98BfCDQPfm7)_V3;?>Iug{_ZMn*xi>KlUku31g|i zNB=b4+qAwq81@g`q1jQz0JYPv{F~ONCloe~4+-!KD1Q7^0*`cJ1Sy&K_{G4$p_ST= zdl5~c4o25Xs_8NMui<0M>zQ2zWp3&(0w7Nqp?Pr9&muz?zDJY1HCxsUVzfHYJvK5^ zDh#*y+9xVs``;HwyjN<$_OuCm0^?eQw~&e0)-m?-=E;LamAen5?%GH9>3?&31{txD zP7P>fE)YR`N>c=1r70jBittbI0CRd`MQczB%u>)%_oq(U0FxY{lJnY6pdzL#{H zj;Xah2fF|^gmI=1UTm&LlwNWICf1IDz^W~Ep!ILP%U=#-SHsFPo*AQ#!}_Hdm>wyp zpNI!Xua=@k%9?(N4MTAEg9=EHoXD`nkRPQpAFrlQ&tIVaBWi?#9#Q(;hZm+@18xn| zjSS0qU&r0`{gI&oPOo76Xp*h%cp{hY7405j0Y-#JkOndSp9gmm4b*{z> z{!OZS>rkivB9_DLlWRa#@wx~?yha!8t0MFbJp}d`q2#YpuWsHX=v8qVu@eUOHLHuf zo{RZ&7YlK-R~Fz0z>nq=<3{swqs6rO`NRd#;(P*}Xg+Z?TGAo0^ZyvwJDA&8di?(e z>ipcEpn7Y>G)qDGt7PJ67 zW)dDV5=v%Dl>{n0N~9c4@T)le9KgS*tZvX%Q literal 0 HcmV?d00001 diff --git a/wwwroot/images/icon36x36.png b/wwwroot/images/icon36x36.png new file mode 100644 index 0000000000000000000000000000000000000000..974921f1348df031b32d58461c6ceb67f6c836b2 GIT binary patch literal 1739 zcmV;+1~mDJP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 delta 111 zcmbR8gmL3z#t9W%kJ#9`#5AuJmBwytx=|2rp=)5KYhWH?XkcYzWMyKkYhYq!V9+O! x#K*wEpjzS@QIe8al4_NkpOTqY$zWt)h^E01q9Nnb>DfRH44$rjF6*2UngEPYAbbD- diff --git a/wwwroot/images/icon72x72.png b/wwwroot/images/icon72x72.png new file mode 100644 index 0000000000000000000000000000000000000000..77fde9ebd279e4af01ff2030881cf9c4f8ae1c91 GIT binary patch literal 3087 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 literal 0 HcmV?d00001 diff --git a/wwwroot/manifest.json b/wwwroot/manifest.json index ca1c07d8..b386fa18 100644 --- a/wwwroot/manifest.json +++ b/wwwroot/manifest.json @@ -5,12 +5,41 @@ "ASP.NET Core 2.1 & Angular 7(+) Advanced Starter - with Server-side prerendering (for Angular SEO)!", "icons": [ { + "src": "/images/icon36x36.png", + "sizes": "36x36", + "type": "image/png" + }, { + "src": "/images/icon48x48.png", + "sizes": "48x48", + "type": "image/png" + }, { + "src": "/images/icon72x72.png", + "sizes": "72x72", + "type": "image/png" + }, { + "src": "/images/icon96x96.png", + "sizes": "96x96", + "type": "image/png" + }, { + "src": "/images/icon144x144.png", + "sizes": "144x144", + "type": "image/png" + }, { "src": "/images/icon192x192.png", - "sizes": "192x192" - }, - { + "sizes": "192x192", + "type": "image/png" + }, { + "src": "/images/icon256x256.png", + "sizes": "256x256", + "type": "image/png" + }, { + "src": "/images/icon384x384.png", + "sizes": "384x384", + "type": "image/png" + }, { "src": "/images/icon512x512.png", - "sizes": "512x512" + "sizes": "512x512", + "type": "image/png" } ], "background_color": "#3E4EB8", From e184ce9af8688dba3440a4d81cb5431640a52906 Mon Sep 17 00:00:00 2001 From: Peter Blazejewicz Date: Sun, 10 Feb 2019 15:03:43 +0100 Subject: [PATCH 089/103] feat(charset): move declaration to top (#711) Just to follow established routes: https://blogs.msdn.microsoft.com/ieinternals/2011/07/18/best-practice-get-your-head-in-order/ Thanks! --- Views/Shared/_Layout.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index eeebe090..e749bc3b 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -1,10 +1,10 @@ + @ViewData["Title"] - - + @Html.Raw(ViewData["Meta"]) @Html.Raw(ViewData["Links"]) From 8b0ec8ee3147e77f84f1e12509e8e5c0e9acc47f Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Sun, 10 Feb 2019 10:34:00 -0500 Subject: [PATCH 090/103] chore(preboot): pin to beta4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4978e1f8..81f03d1c 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "moment": "^2.23.0", "ngx-bootstrap": "^3.1.4", "node-sass": "^4.9.0", - "preboot": "^6.0.0-beta.6", + "preboot": "^6.0.0-beta.4", "raw-loader": "^1.0.0", "rimraf": "^2.6.3", "rxjs": "^6.3.3", From b46107696e340511743e8a72f9ba694cc41fa8d4 Mon Sep 17 00:00:00 2001 From: Peter Blazejewicz Date: Thu, 28 Feb 2019 16:02:54 +0100 Subject: [PATCH 091/103] Update dependencies to be aligned with NG 7.2.0. Fixes #716 (#718) closes #716 This commit make changes in dependencies entries in package.json to be more aligned to package.json version generated by @angular/cli 7.2.0. This fixes the issue with outcome of script like build:prod Thanks! ```bash npm run clean:install > angular7-aspnetcore-universal@1.0.0-rc4 clean:install /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > npm run clean && rimraf ./node_modules ./bin ./obj ./package-lock.json && dotnet restore Asp2017.csproj && npm i > angular7-aspnetcore-universal@1.0.0-rc4 clean /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > rimraf wwwroot/dist clientapp/dist Restoring packages for /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/Asp2017.csproj... Generating MSBuild file /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/obj/Asp2017.csproj.nuget.g.props. Generating MSBuild file /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/obj/Asp2017.csproj.nuget.g.targets. Restore completed in 1.95 sec for /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/Asp2017.csproj. npm WARN deprecated circular-json@0.5.9: CircularJSON is in maintenance only, flatted is its successor. > fsevents@1.2.7 install /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/node_modules/fsevents > node install node-pre-gyp WARN Using request for node-pre-gyp https download [fsevents] Success: "/Users/piotrblazejewicz/git/aspnetcore-angular2-universal/node_modules/fsevents/lib/binding/Release/node-v59-darwin-x64/fse.node" is installed via remote > node-sass@4.11.0 install /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/node_modules/node-sass > node scripts/install.js Cached binary found at /Users/piotrblazejewicz/.npm/node-sass/4.11.0/darwin-x64-59_binding.node > phantomjs-prebuilt@2.1.16 install /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/node_modules/phantomjs-prebuilt > node install.js Considering PhantomJS found at /usr/local/bin/phantomjs Found PhantomJS at /usr/local/bin/phantomjs ...verifying Writing location.js file PhantomJS is already installed on PATH at /usr/local/bin/phantomjs > node-sass@4.11.0 postinstall /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/node_modules/node-sass > node scripts/build.js Binary found at /Users/piotrblazejewicz/git/aspnetcore-angular2-universal/node_modules/node-sass/vendor/darwin-x64-59/binding.node Testing binary Binary is fine npm notice created a lockfile as package-lock.json. You should commit this file. npm WARN bootstrap@4.3.1 requires a peer of popper.js@^1.14.7 but none is installed. You must install peer dependencies yourself. npm WARN karma-webpack@3.0.5 requires a peer of webpack@^2.0.0 || ^3.0.0 but none is installed. You must install peer dependencies yourself. added 1328 packages from 1266 contributors and audited 52380 packages in 40.119s found 1 low severity vulnerability run `npm audit fix` to fix them, or `npm audit` for details ``` ```bash npm run build:prod > angular7-aspnetcore-universal@1.0.0-rc4 build:prod /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > npm run clean && npm run build:vendor -- --env.prod && npm run build:webpack -- --env.prod > angular7-aspnetcore-universal@1.0.0-rc4 clean /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > rimraf wwwroot/dist clientapp/dist > angular7-aspnetcore-universal@1.0.0-rc4 build:vendor /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > webpack --config webpack.config.vendor.js --progress --color "--env.prod" env = {"prod":true} [1] Hash: 0cd0fe463be445b08132ce687d8bdad25e6a9daf Version: webpack 4.29.5 Child Hash: 0cd0fe463be445b08132 Time: 6789ms Built at: 2019-02-26 18:32:15 Asset Size Chunks Chunk Names vendor.js 112 KiB 0 [emitted] vendor Entrypoint vendor = vendor.js Child Hash: ce687d8bdad25e6a9daf Time: 23102ms Built at: 2019-02-26 18:32:31 Asset Size Chunks Chunk Names vendor.js 2 MiB 0 [emitted] vendor Entrypoint vendor = vendor.js WARNING in ./node_modules/@angular/core/bundles/core.umd.js 18394:19-40 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ dll vendor vendor[3] WARNING in ./node_modules/@angular/core/bundles/core.umd.js 18406:19-106 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ dll vendor vendor[3] > angular7-aspnetcore-universal@1.0.0-rc4 build:webpack /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > webpack --progress --color "--env.prod" [1] Hash: 283e428aa756b4bf9dc86d7e8bceb2c03b314740 Version: webpack 4.29.5 Child Hash: 283e428aa756b4bf9dc8 Time: 48150ms Built at: 2019-02-26 18:33:22 Asset Size Chunks Chunk Names 1.js 1.08 KiB 1 [emitted] main-client.js 1.78 MiB 0 [emitted] [big] main-client Entrypoint main-client [big] = main-client.js WARNING in ./node_modules/@angular/core/fesm5/core.js 18349:15-36 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ ./ClientApp/boot.browser.ts 2:0-47 13:4-18 WARNING in ./node_modules/@angular/core/fesm5/core.js 18361:15-102 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ ./ClientApp/boot.browser.ts 2:0-47 13:4-18 WARNING in asset size limit: The following asset(s) exceed the recommended size limit (244 KiB). This can impact web performance. Assets: main-client.js (1.78 MiB) WARNING in entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (244 KiB). This can impact web performance. Entrypoints: main-client (1.78 MiB) main-client.js Child Hash: 6d7e8bceb2c03b314740 Time: 49251ms Built at: 2019-02-26 18:33:24 Asset Size Chunks Chunk Names 1.js 1.21 KiB 1 [emitted] main-server.js 2.96 MiB 0 [emitted] main-server Entrypoint main-server = main-server.js WARNING in ./node_modules/@angular/core/fesm5/core.js 18349:15-36 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ ./ClientApp/boot.server.PRODUCTION.ts 3:0-47 8:0-14 WARNING in ./node_modules/@angular/core/fesm5/core.js 18361:15-102 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ ./ClientApp/boot.server.PRODUCTION.ts 3:0-47 8:0-14 ``` ```bash npm run build:dev > angular7-aspnetcore-universal@1.0.0-rc4 build:dev /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > npm run build:vendor && npm run build:webpack > angular7-aspnetcore-universal@1.0.0-rc4 build:vendor /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > webpack --config webpack.config.vendor.js --progress --color env = undefined [1] Hash: 3a685f0209a95b535a9f17a6a40f1c8908affc70 Version: webpack 4.29.5 Child Hash: 3a685f0209a95b535a9f Time: 6393ms Built at: 2019-02-26 18:31:26 Asset Size Chunks Chunk Names vendor.js 6.94 MiB vendor [emitted] vendor Entrypoint vendor = vendor.js WARNING in ./node_modules/@angular/core/fesm5/core.js 18349:15-36 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ dll vendor vendor[3] WARNING in ./node_modules/@angular/core/fesm5/core.js 18361:15-102 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ dll vendor vendor[3] Child Hash: 17a6a40f1c8908affc70 Time: 6359ms Built at: 2019-02-26 18:31:26 Asset Size Chunks Chunk Names vendor.js 7.05 MiB vendor [emitted] vendor Entrypoint vendor = vendor.js WARNING in ./node_modules/@angular/core/bundles/core.umd.js 18394:19-40 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ dll vendor vendor[3] WARNING in ./node_modules/@angular/core/bundles/core.umd.js 18406:19-106 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ dll vendor vendor[3] > angular7-aspnetcore-universal@1.0.0-rc4 build:webpack /Users/piotrblazejewicz/git/aspnetcore-angular2-universal > webpack --progress --color [1] Hash: b4d33732336411f4f0263367da7fc158b6733f0d Version: webpack 4.29.5 Child Hash: b4d33732336411f4f026 Time: 21055ms Built at: 2019-02-26 18:31:50 Asset Size Chunks Chunk Names 0.js 8.26 KiB 0 [emitted] 0.js.map 81 bytes 0 [emitted] main-client.js 4.07 MiB main-client [emitted] main-client main-client.js.map 7.96 KiB main-client [emitted] main-client Entrypoint main-client = main-client.js main-client.js.map Child Hash: 3367da7fc158b6733f0d Time: 22992ms Built at: 2019-02-26 18:31:52 Asset Size Chunks Chunk Names 0.js 8.2 KiB 0 [emitted] main-server.js 20.7 MiB main-server [emitted] main-server Entrypoint main-server = main-server.js WARNING in ./node_modules/@angular/core/fesm5/core.js 18349:15-36 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ ./ClientApp/boot.server.ts 3:0-47 8:0-14 WARNING in ./node_modules/@angular/core/fesm5/core.js 18361:15-102 System.import() is deprecated and will be removed soon. Use import() instead. For more info visit https://webpack.js.org/guides/code-splitting/ @ ./ClientApp/boot.server.ts 3:0-47 8:0-14 ``` --- package.json | 76 ++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 81f03d1c..995977bb 100644 --- a/package.json +++ b/package.json @@ -22,28 +22,28 @@ "clean": "rimraf wwwroot/dist clientapp/dist" }, "dependencies": { - "@angular/animations": "^7.2.0", - "@angular/common": "^7.2.0", - "@angular/compiler": "^7.2.0", - "@angular/core": "^7.2.0", - "@angular/forms": "^7.2.0", - "@angular/http": "^7.2.0", - "@angular/platform-browser": "^7.2.0", - "@angular/platform-browser-dynamic": "^7.2.0", - "@angular/platform-server": "^7.2.0", - "@angular/router": "^7.2.0", - "@nguniversal/aspnetcore-engine": "^7.0.2", - "@nguniversal/common": "^7.0.2", + "@angular/animations": "~7.2.0", + "@angular/common": "~7.2.0", + "@angular/compiler": "~7.2.0", + "@angular/core": "~7.2.0", + "@angular/forms": "~7.2.0", + "@angular/http": "~7.2.0", + "@angular/platform-browser": "~7.2.0", + "@angular/platform-browser-dynamic": "~7.2.0", + "@angular/platform-server": "~7.2.0", + "@angular/router": "~7.2.0", + "@nguniversal/aspnetcore-engine": "^7.1.0", + "@nguniversal/common": "^7.1.0", "@ngx-translate/core": "^11.0.1", "@ngx-translate/http-loader": "^4.0.0", - "@types/node": "^10.12.18", + "@types/node": "^11.9.5", "angular2-router-loader": "^0.3.5", "angular2-template-loader": "^0.6.2", "aspnet-prerendering": "^3.0.1", "aspnet-webpack": "^3.0.0", "awesome-typescript-loader": "^5.2.1", - "bootstrap": "^4.2.1", - "core-js": "^2.6.1", + "bootstrap": "^4.3.1", + "core-js": "^2.6.5", "css": "^2.2.4", "css-loader": "^2.1.0", "event-source-polyfill": "^1.0.5", @@ -53,48 +53,48 @@ "isomorphic-fetch": "^2.2.1", "jquery": "^3.3.1", "json-loader": "^0.5.7", - "moment": "^2.23.0", - "ngx-bootstrap": "^3.1.4", - "node-sass": "^4.9.0", - "preboot": "^6.0.0-beta.4", + "moment": "^2.24.0", + "ngx-bootstrap": "^3.2.0", + "node-sass": "^4.11.0", + "preboot": "^7.0.0", "raw-loader": "^1.0.0", "rimraf": "^2.6.3", - "rxjs": "^6.3.3", + "rxjs": "~6.4.0", "sass-loader": "^7.1.0", "style-loader": "^0.23.1", "to-string-loader": "^1.1.5", "url-loader": "^1.1.2", - "webpack": "^4.28.1", + "webpack": "^4.29.5", "webpack-hot-middleware": "^2.24.3", "webpack-merge": "^4.2.1", - "zone.js": "^0.8.26" + "zone.js": "^0.8.29" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.6.6", - "@angular/cli": "^7.2.0", - "@angular/compiler-cli": "^7.2.0", - "@ngtools/webpack": "^7.1.4", - "@types/jasmine": "^3.3.5", - "codelyzer": "^4.5.0", + "@angular-devkit/build-angular": "~0.13.3", + "@angular/cli": "~7.3.3", + "@angular/compiler-cli": "~7.2.0", + "@ngtools/webpack": "~7.3.3", + "@types/jasmine": "~2.8.8", + "codelyzer": "~4.5.0", "istanbul-instrumenter-loader": "^3.0.1", "jasmine-core": "^3.3.0", "jasmine-spec-reporter": "^4.2.1", - "karma": "^3.1.4", - "karma-chrome-launcher": "^2.2.0", - "karma-coverage": "^1.1.2", - "karma-jasmine": "^2.0.1", + "karma": "~4.0.0", + "karma-chrome-launcher": "~2.2.0", + "karma-coverage": "~1.1.2", + "karma-jasmine": "~2.0.1", "karma-mocha-reporter": "^2.2.5", "karma-phantomjs-launcher": "^1.0.4", "karma-remap-coverage": "^0.1.5", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^3.0.5", "mini-css-extract-plugin": "^0.5.0", - "terser-webpack-plugin": "^1.2.1", - "tslint": "^5.12.0", - "typescript": "^3.1.3", - "uglifyjs-webpack-plugin": "^2.1.1", - "webpack-bundle-analyzer": "^3.0.3", - "webpack-cli": "^3.2.1" + "terser-webpack-plugin": "^1.2.3", + "tslint": "~5.11.0", + "typescript": "~3.2.2", + "uglifyjs-webpack-plugin": "^2.1.2", + "webpack-bundle-analyzer": "^3.0.4", + "webpack-cli": "^3.2.3" }, "license": "MIT", "repository": { From ec6b2f32bbaedb78eeaba9e4685a073aaa232ae2 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Mon, 11 Mar 2019 08:56:48 -0400 Subject: [PATCH 092/103] docs(readme): update --- README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 42fa2e49..77d58eee 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ASP.NET Core 2.1 & Angular 7(+) Advanced Starter - PWA & Server-side prerendering (for Angular SEO)! -## By [DevHelp.Online](http://www.DevHelp.Online) +## By [Trilon.io](https://Trilon.io) > Updated to the latest Angular 7.x @@ -18,7 +18,7 @@ Angular SEO in action: ### What is this repo? Live Demo here: http://aspnetcore-angular2-universal.azurewebsites.net -This repository is maintained by [Angular](https://github.com/angular/angular) and is meant to be an advanced starter +This repository is maintained by [Trilon.io](https://Trilon.io) and the [Angular](https://github.com/angular/angular) Universal team and is meant to be an advanced starter for both ASP.NET Core 2.1 using Angular 7.0+, not only for the client-side, but to be rendered on the server for instant application paints (Note: If you don't need SSR [read here](#faq) on how to disable it). @@ -458,7 +458,7 @@ Nothing's ever perfect, but please let me know by creating an issue (make sure t [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](/LICENSE) -Copyright (c) 2016-2018 [Mark Pieszak](https://github.com/MarkPieszak) +Copyright (c) 2016-2019 [Mark Pieszak](https://github.com/MarkPieszak) [![Twitter Follow](https://img.shields.io/twitter/follow/MarkPieszak.svg?style=social)](https://twitter.com/MarkPieszak) @@ -466,16 +466,14 @@ Copyright (c) 2016-2018 [Mark Pieszak](https://github.com/MarkPieszak) # DevHelp.Online - Angular & ASP.NET - Consulting | Training | Development -Check out **[www.DevHelp.Online](http://DevHelp.Online)** for more info! Twitter [@DevHelpOnline](http://www.twitter.com/DevHelpOnline) +Check out **[Trilon.io](https://Trilon.io)** for more info! Twitter [@Trilon_io](http://www.twitter.com/Trilon_io) -Contact us at , and let's talk about your projects needs. +Contact us at , and let's talk about your projects needs.

        - DevHelp.Online - Angular ASPNET JavaScript Consulting Development and Training + Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training

        ----- - -## Follow me online: +## Follow Trilon online: -Twitter: [@MarkPieszak](http://twitter.com/MarkPieszak) | Medium: [@MarkPieszak](https://medium.com/@MarkPieszak) +Twitter: [@Trilon_io](http://twitter.com/Trilon_io) From 1de9303af83ccd6aa8d7066fc886d3925e0858bb Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Mon, 11 Mar 2019 09:24:32 -0400 Subject: [PATCH 093/103] docs: update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 77d58eee..e6ed1417 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ This utilizes all the latest standards, no gulp, no bower, no typings, no manual * [FAQ](#faq---also-check-out-the-faq-issues-label-and-the-how-to-issues-label) * [Special Thanks](#special-thanks) * [License](#license) -* [Consulting & Training](#devhelponline---angular--aspnet---consulting--training--development) +* [Trilon - Consulting & Training](#trilon---angular--aspnet---consulting--training--development) --- @@ -464,7 +464,7 @@ Copyright (c) 2016-2019 [Mark Pieszak](https://github.com/MarkPieszak) ---- -# DevHelp.Online - Angular & ASP.NET - Consulting | Training | Development +# Trilon - Angular & ASP.NET - Consulting | Training | Development Check out **[Trilon.io](https://Trilon.io)** for more info! Twitter [@Trilon_io](http://www.twitter.com/Trilon_io) From c8dac96c2cad48e574810b3d4f8c8a7100e458cb Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Tue, 12 Mar 2019 15:45:06 -0400 Subject: [PATCH 094/103] docs: update trilon info --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 995977bb..99ba5443 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "angular7-aspnetcore-universal", "author": { - "name": "Mark Pieszak", - "email": "hello@devhelp.online", - "url": "http://devhelp.online/" + "name": "Mark Pieszak | Trilon Consulting", + "email": "hello@trilon.io", + "url": "https://trilon.io/" }, "version": "1.0.0-rc4", "scripts": { From 2b9154407a8d19491640484926456356b7229676 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Tue, 12 Mar 2019 15:47:21 -0400 Subject: [PATCH 095/103] chore: trilon info --- ClientApp/app/containers/home/home.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ClientApp/app/containers/home/home.component.html b/ClientApp/app/containers/home/home.component.html index 26160f60..c3a92f5c 100644 --- a/ClientApp/app/containers/home/home.component.html +++ b/ClientApp/app/containers/home/home.component.html @@ -3,7 +3,7 @@
        Enjoy the latest features from .NET Core & Angular 7.x!
        For more info check the repo here: - AspNetCore-Angular-Universal repo + AspNetCore-Angular-Universal repo

        @@ -52,14 +52,14 @@

        {{ 'HOME_ISSUES_TITLE' | translate }}

      -

      DevHelp.Online

      +

      Trilon Consulting - Trilon.io

      Consulting | Development | Training | Workshops

      - Get your Team or Application up to speed by working with some of the leading industry experts in JavaScript & ASP.NET!
      + Get your Team or Application up to speed by working with some of the leading industry experts in JavaScript, Node / NestJS, & ASP.NET!

      Follow us on Twitter!

      - @DevHelpOnline | + @trilon_io | @MarkPieszak

      From 83b0301b1db1ed34e1d16d8ef9fa4750c8b970d8 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Sun, 17 Mar 2019 11:55:39 -0400 Subject: [PATCH 096/103] docs: update --- README.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e6ed1417..b0b14e9f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,15 @@ # ASP.NET Core 2.1 & Angular 7(+) Advanced Starter - PWA & Server-side prerendering (for Angular SEO)! -## By [Trilon.io](https://Trilon.io) +## Made with :heart: by [Trilon.io](https://Trilon.io) +

      + + Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training + +

      + +--- -> Updated to the latest Angular 7.x +## High-level architectural diagram

      ASP.NET Core 2.1 Angular 7+ Starter @@ -471,7 +478,9 @@ Check out **[Trilon.io](https://Trilon.io)** for more info! Twitter [@Trilon_io] Contact us at , and let's talk about your projects needs.

      - Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training + + Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training +

      ## Follow Trilon online: From 7e2468a7d01472acf15f430b50ca596a64a62d6b Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Sun, 17 Mar 2019 11:57:52 -0400 Subject: [PATCH 097/103] docs: update --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index b0b14e9f..b6402f4b 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,12 @@ # ASP.NET Core 2.1 & Angular 7(+) Advanced Starter - PWA & Server-side prerendering (for Angular SEO)! -## Made with :heart: by [Trilon.io](https://Trilon.io) +### Made with :heart: by [Trilon.io](https://Trilon.io)

      Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training

      ---- - -## High-level architectural diagram

      ASP.NET Core 2.1 Angular 7+ Starter From 4aa16404f1b1a0dd1b4e70b7dd891b0006eabd9b Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Mon, 18 Mar 2019 12:32:39 -0400 Subject: [PATCH 098/103] fix: rxjs pin to 6.2.2 closes #714 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 99ba5443..01bc52bc 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "preboot": "^7.0.0", "raw-loader": "^1.0.0", "rimraf": "^2.6.3", - "rxjs": "~6.4.0", + "rxjs": "6.2.2", "sass-loader": "^7.1.0", "style-loader": "^0.23.1", "to-string-loader": "^1.1.5", From 9cf8b7ba6ee15c01e2ec02a77421e7ee77eb6254 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Fri, 5 Apr 2019 12:17:42 -0400 Subject: [PATCH 099/103] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6402f4b..8e933ca5 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ### Made with :heart: by [Trilon.io](https://Trilon.io)

      - Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training + Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training

      @@ -476,7 +476,7 @@ Contact us at , and let's talk about your projects needs.

      - Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training + Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training

      From 82dc1897c03f9546b613b72e4a72040b85ab54f1 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Fri, 5 Apr 2019 12:45:04 -0400 Subject: [PATCH 100/103] Update README.md --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8e933ca5..ecac2050 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,6 @@

      - -

      - ASP.NET Core 2.1 Angular 7+ Starter -

      - ### Harness the power of Angular 7+, ASP.NET Core 2.1, now with SEO ! Angular SEO in action: @@ -20,6 +15,12 @@ Angular SEO in action: ASP.NET Core Angular7 SEO

      +### Angular Universal Application Architecture + +

      + ASP.NET Core 2.1 Angular 7+ Starter +

      + ### What is this repo? Live Demo here: http://aspnetcore-angular2-universal.azurewebsites.net This repository is maintained by [Trilon.io](https://Trilon.io) and the [Angular](https://github.com/angular/angular) Universal team and is meant to be an advanced starter From b8ec2b0ff276a187e3821797fbd03201842d5311 Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Fri, 5 Apr 2019 12:45:28 -0400 Subject: [PATCH 101/103] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ecac2050..482cc672 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@

      +--- + ### Harness the power of Angular 7+, ASP.NET Core 2.1, now with SEO ! Angular SEO in action: From 55f0105f807946cff515aaa0ef535de1329c2b9f Mon Sep 17 00:00:00 2001 From: Mark Pieszak Date: Sun, 7 Apr 2019 17:56:32 -0400 Subject: [PATCH 102/103] Update README.md --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 482cc672..f52bdf4d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,17 @@ # ASP.NET Core 2.1 & Angular 7(+) Advanced Starter - PWA & Server-side prerendering (for Angular SEO)! -### Made with :heart: by [Trilon.io](https://Trilon.io) -

      +--- + +
      +

      - Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training + Trilon.io - Angular Universal, NestJS, JavaScript Application Consulting Development and Training

      + +

      Made with :heart: by Trilon.io

      + --- ### Harness the power of Angular 7+, ASP.NET Core 2.1, now with SEO ! From 837b134516631afb3034d40278e2bc9f170acdba Mon Sep 17 00:00:00 2001 From: Detys Date: Mon, 27 May 2019 02:49:07 +0300 Subject: [PATCH 103/103] fix(seeding): seeding now follows .NET Core 2.0 best practices --- Program.cs | 60 ++++++++++++------- Server/Data/CoreEFStartup.cs | 17 ++++++ Server/Data/LoggingEFStartup.cs | 13 ++++ ...itializer.cs => SimpleContentEFStartup.cs} | 24 ++++---- 4 files changed, 80 insertions(+), 34 deletions(-) create mode 100644 Server/Data/CoreEFStartup.cs create mode 100644 Server/Data/LoggingEFStartup.cs rename Server/Data/{DbInitializer.cs => SimpleContentEFStartup.cs} (67%) diff --git a/Program.cs b/Program.cs index 69e56419..fdf46454 100644 --- a/Program.cs +++ b/Program.cs @@ -6,28 +6,42 @@ using Microsoft.Extensions.Logging; using System; using System.IO; +using System.Threading.Tasks; -public class Program { - public static void Main (string[] args) { - var host = BuildWebHost (args); - using (var scope = host.Services.CreateScope ()) { - var services = scope.ServiceProvider; - try { - var context = services.GetRequiredService(); - DbInitializer.Initialize(context); - } catch (Exception ex) { - var logger = services.GetRequiredService> (); - logger.LogError (ex, "An error occurred while seeding the database."); - } - } +public class Program +{ + public static async Task Main(string[] args) + { + var host = BuildWebHost(args); + using (var scope = host.Services.CreateScope()) + { + var services = scope.ServiceProvider; - host.Run (); - } - public static IWebHost BuildWebHost (string[] args) => - WebHost.CreateDefaultBuilder (args) - .UseKestrel () - .UseContentRoot (Directory.GetCurrentDirectory ()) - .UseIISIntegration () - .UseStartup () - .Build (); - } + try + { + await EnsureDataStorageIsReady(services); + + } catch (Exception ex) + { + var logger = services.GetRequiredService>(); + logger.LogError(ex, "An error occurred while seeding the database."); + } + } + + host.Run(); + } + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .Build(); + + private static async Task EnsureDataStorageIsReady(IServiceProvider services) + { + await CoreEFStartup.InitializeDatabaseAsync(services); + await SimpleContentEFStartup.InitializeDatabaseAsync(services); + await LoggingEFStartup.InitializeDatabaseAsync(services); + } +} diff --git a/Server/Data/CoreEFStartup.cs b/Server/Data/CoreEFStartup.cs new file mode 100644 index 00000000..d3947ef1 --- /dev/null +++ b/Server/Data/CoreEFStartup.cs @@ -0,0 +1,17 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; + +namespace AspCoreServer.Data +{ + public static class CoreEFStartup + { + public static async Task InitializeDatabaseAsync(IServiceProvider services) + { + var context = services.GetRequiredService(); + + await context.Database.EnsureCreatedAsync(); + } + + } +} diff --git a/Server/Data/LoggingEFStartup.cs b/Server/Data/LoggingEFStartup.cs new file mode 100644 index 00000000..edf33498 --- /dev/null +++ b/Server/Data/LoggingEFStartup.cs @@ -0,0 +1,13 @@ +using System; +using System.Threading.Tasks; + +namespace AspCoreServer.Data +{ + public static class LoggingEFStartup + { + public static async Task InitializeDatabaseAsync(IServiceProvider services) + { + //Implent to your hearts' content + } + } +} diff --git a/Server/Data/DbInitializer.cs b/Server/Data/SimpleContentEFStartup.cs similarity index 67% rename from Server/Data/DbInitializer.cs rename to Server/Data/SimpleContentEFStartup.cs index 919c9282..db160dee 100644 --- a/Server/Data/DbInitializer.cs +++ b/Server/Data/SimpleContentEFStartup.cs @@ -1,16 +1,20 @@ using System; -using System.Linq; -using AspCoreServer; +using System.Threading.Tasks; using AspCoreServer.Models; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -namespace AspCoreServer.Data { - public static class DbInitializer { - public static void Initialize (SpaDbContext context) { - context.Database.EnsureCreated (); +namespace AspCoreServer.Data +{ + public static class SimpleContentEFStartup + { + public static async Task InitializeDatabaseAsync(IServiceProvider services) + { + var context = services.GetRequiredService(); - if (context.User.Any ()) { + + if (await context.User.AnyAsync()) + { return; // DB has been seeded } var users = new User[] { @@ -27,11 +31,9 @@ public static void Initialize (SpaDbContext context) { new User () { Name = "Gaulomatic" }, new User () { Name = "GRIMMR3AP3R" } }; + await context.User.AddRangeAsync(users); - foreach (var s in users) { - context.User.Add (s); - } - context.SaveChanges (); + await context.SaveChangesAsync(); } } }