From 932f24645406f9c4c2f46dfae991bb4772a9fbbe Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 18 Jun 2021 00:01:34 +0300
Subject: [PATCH] build(docs-infra): allow a trailing `/` in more
 `navigationUrls` globs in `ngsw-config.json` (#42452)

Previously, we were not consistent in allowing a trailing `/` in
`navigationUrls` globs in `ngsw-config.json`. And when we did, we used
two globs: one with and one without the trailing `/`.

This commit updates all appropriate `navigationUrls` globs to allow a
trailing `/`. It also merges the two glob patterns (the one with and the
one without the `/`) into one.

This is in preparation of automatically generating the ServiceWorker
`navigationUrls` based on `firebase.json`.

PR Close #42452
---
 aio/ngsw-config.json | 73 +++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 45 deletions(-)

diff --git a/aio/ngsw-config.json b/aio/ngsw-config.json
index 7387a9ef59..eec5de2210 100644
--- a/aio/ngsw-config.json
+++ b/aio/ngsw-config.json
@@ -74,7 +74,7 @@
     "!/**/*.*",
     "!/**/*__*",
     "!/**/*__*/**",
-    "!/**/stackblitz",
+    "!/**/stackblitz/{0,1}",
     "!/api/*/**/*-(class|directive|var|interface|function|pipe|let|type-alias|decorator)",
     "!/api/**/AnimationStateDeclarationMetadata*",
     "!/api/**/CORE_DIRECTIVES*",
@@ -88,57 +88,40 @@
     "!/api/common/MaxLengthValidator*",
     "!/api/common/NgModel*",
     "!/api/http/**",
-    "!/api/http",
+    "!/api/http/{0,1}",
     "!/api/platform-browser/AnimationDriver*",
     "!/api/testing/**",
     "!/docs/?*",
     "!/docs/*/**",
-    "!/guide/bazel",
-    "!/guide/change-log",
-    "!/getting-started",
+    "!/guide/bazel/{0,1}",
+    "!/guide/change-log/{0,1}",
+    "!/getting-started/{0,1}",
     "!/getting-started/**",
-    "!/guide/cli-quickstart",
-    "!/guide/cli-quickstart/",
-    "!/guide/displaying-data",
-    "!/guide/displaying-data/",
-    "!/guide/learning-angular",
-    "!/guide/learning-angular/",
-    "!/guide/metadata",
-    "!/guide/metadata/",
-    "!/guide/ngmodule",
-    "!/guide/ngmodule/",
-    "!/guide/service-worker-getstart",
-    "!/guide/service-worker-getstart/",
-    "!/guide/service-worker-comm",
-    "!/guide/service-worker-comm/",
-    "!/guide/service-worker-configref",
-    "!/guide/service-worker-configref/",
-    "!/guide/updating-to-version-10",
-    "!/guide/updating-to-version-10/",
-    "!/guide/updating-to-version-11",
-    "!/guide/updating-to-version-11/",
-    "!/guide/webpack",
-    "!/guide/webpack/",
-    "!/guide/setup",
-    "!/guide/setup-systemjs-anatomy",
-    "!/guide/quickstart",
-    "!/news",
-    "!/news/",
-    "!/start/data",
-    "!/start/data/",
-    "!/start/deployment",
-    "!/start/deployment/",
-    "!/start/forms",
-    "!/start/forms/",
-    "!/start/routing",
-    "!/start/routing/",
-    "!/styleguide",
+    "!/guide/cli-quickstart/{0,1}",
+    "!/guide/displaying-data/{0,1}",
+    "!/guide/learning-angular/{0,1}",
+    "!/guide/metadata/{0,1}",
+    "!/guide/ngmodule/{0,1}",
+    "!/guide/service-worker-getstart/{0,1}",
+    "!/guide/service-worker-comm/{0,1}",
+    "!/guide/service-worker-configref/{0,1}",
+    "!/guide/updating-to-version-10/{0,1}",
+    "!/guide/updating-to-version-11/{0,1}",
+    "!/guide/webpack/{0,1}",
+    "!/guide/setup/{0,1}",
+    "!/guide/setup-systemjs-anatomy/{0,1}",
+    "!/guide/quickstart/{0,1}",
+    "!/news/{0,1}",
+    "!/start/data/{0,1}",
+    "!/start/deployment/{0,1}",
+    "!/start/forms/{0,1}",
+    "!/start/routing/{0,1}",
+    "!/styleguide/{0,1}",
     "!/styleguide/**",
-    "!/testing",
+    "!/testing/{0,1}",
     "!/testing/**",
     "!/config/**",
-    "!/strict",
-    "!/devtools",
-    "!/devtools/**"
+    "!/strict/{0,1}",
+    "!/devtools/{0,1}"
   ]
 }