Ng update (#1097)

* Temp * Temp * Update * Temp * Fix track-by * Build fixes * Migration to new flow. * More manual fixes. * Reformat templates. * Fix tests * Improve tests * Revert change.
Squidex · Jun 1, 2024 · bee3381 · bee3381
1 parent 75686ef
commit bee3381
Show file tree

Hide file tree

Showing 527 changed files with 26,559 additions and 26,910 deletions.
diff --git a/backend/src/Squidex.Web/BuilderExtensions.cs b/backend/src/Squidex.Web/BuilderExtensions.cs
diff --git a/backend/src/Squidex.Web/Constants.cs b/backend/src/Squidex.Web/Constants.cs
@@ -20,6 +20,8 @@ public static class Constants
 
     public const string PrefixIdentityServer = "/identity-server";
 
+    public const string PrefixSignin = "/signin";
+
     public const string ScopePermissions = "permissions";
 
     public const string ScopeProfile = "squidex-profile";

diff --git a/backend/src/Squidex/Startup.cs b/backend/src/Squidex/Startup.cs
@@ -94,15 +94,15 @@ public void Configure(IApplicationBuilder app)
             options.Path = "/api/swagger/v1/swagger.json";
         });
 
-        if (app.ApplicationServices.GetRequiredService<IWebHostEnvironment>().IsDevelopment())
-        {
-            app.UseWhenPath(Constants.PrefixIdentityServer, builder =>
+        app.UseWhen(c =>
+            c.Request.Path.Value?.StartsWith(Constants.PrefixIdentityServer, StringComparison.OrdinalIgnoreCase) == true ||
+            c.Request.Path.Value?.StartsWith(Constants.PrefixSignin, StringComparison.OrdinalIgnoreCase) == true,
+            builder =>
             {
                 builder.UseExceptionHandler("/identity-server/error");
             });
-        }
 
-        app.UseWhenPath(Constants.PrefixApi, builder =>
+        app.UseWhen(c => c.Request.Path.StartsWithSegments(Constants.PrefixApi, StringComparison.OrdinalIgnoreCase), builder =>
         {
             builder.UseSquidexCacheKeys();
             builder.UseSquidexExceptionHandling();

diff --git a/frontend/.prettierrc b/frontend/.prettierrc
@@ -0,0 +1,20 @@
+{
+    "plugins": ["squidex-prettier-plugin-organize-attributes"],
+    "overrides": [
+        {
+            "files": "*.html",
+            "options": {
+                "attributeGroups": ["$ANGULAR"],
+                "attributeIgnoreChars": "[]()*",
+                "attributeSort": "ASC",
+                "parser": "angular",
+                "printWidth": 140,
+                "bracketSameLine": true,
+                "bracketSpacing": true,
+                "singleAttributePerLine": false,                                                                                       
+                "tabWidth": 4
+            }
+        }
+    ],
+    "tabWidth": 4
+}
diff --git a/frontend/angular.json b/frontend/angular.json
@@ -119,7 +119,15 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
-              "outputHashing": "all"
+              "outputHashing": "all",
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
             },
             "development": {
               "extractLicenses": false,