From b8d2ceb2d0e5083dd98cccde4c62abefc0f47f4a Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 3 Nov 2016 12:05:54 +0100 Subject: [PATCH 1/4] Update Startup.cs --- src/Squidex/Startup.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Squidex/Startup.cs b/src/Squidex/Startup.cs index ffb910f47..cc96ea758 100644 --- a/src/Squidex/Startup.cs +++ b/src/Squidex/Startup.cs @@ -152,15 +152,20 @@ namespace Squidex app.UseWebpackProxy(); app.Use((context, next) => { - context.Request.Path = new PathString("/index.html"); - + if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value)) + { + context.Request.Path = new PathString("/index.html"); + } return next(); }); } else { app.Use((context, next) => { - context.Request.Path = new PathString("/build/index.html"); + if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value)) + { + context.Request.Path = new PathString("/build/index.html"); + } return next(); }); From 31a45a670b8ca37866b9d393f61e75c3936cb2a4 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 3 Nov 2016 12:07:34 +0100 Subject: [PATCH 2/4] Update Startup.cs --- src/Squidex/Startup.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Squidex/Startup.cs b/src/Squidex/Startup.cs index cc96ea758..8a5d091c9 100644 --- a/src/Squidex/Startup.cs +++ b/src/Squidex/Startup.cs @@ -7,6 +7,7 @@ // ========================================================================== using System; +using System.IO; using Autofac; using Autofac.Extensions.DependencyInjection; using Microsoft.AspNetCore.Builder; From 64f47ce609039f14eb22224fe50e582ccd423ff6 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 3 Nov 2016 12:26:05 +0100 Subject: [PATCH 3/4] Update Startup.cs --- src/Squidex/Startup.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Squidex/Startup.cs b/src/Squidex/Startup.cs index 8a5d091c9..0ab3d8143 100644 --- a/src/Squidex/Startup.cs +++ b/src/Squidex/Startup.cs @@ -153,7 +153,7 @@ namespace Squidex app.UseWebpackProxy(); app.Use((context, next) => { - if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value)) + if (!Path.HasExtension(context.Request.Path.Value)) { context.Request.Path = new PathString("/index.html"); } @@ -163,7 +163,7 @@ namespace Squidex else { app.Use((context, next) => { - if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value)) + if (!Path.HasExtension(context.Request.Path.Value)) { context.Request.Path = new PathString("/build/index.html"); } From fd9b60be1e03773202755afb6495b7c295607a69 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 3 Nov 2016 13:06:23 +0100 Subject: [PATCH 4/4] Fix --- src/Squidex/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Squidex/package.json b/src/Squidex/package.json index 245a9c165..d55688428 100644 --- a/src/Squidex/package.json +++ b/src/Squidex/package.json @@ -10,7 +10,7 @@ "test:clean": "rimraf _test-output", "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ & webpack-dev-server --inline --hot --port 3000", "build": "webpack --config app-config/webpack.prod.js --bail", - "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js", + "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/", "build:clean": "rimraf wwwroot/build" }, "dependencies": {