From ef7f63c6cbc4f4e548721e9775d7f781bcdafcb1 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 5 Feb 2020 08:56:38 -0800
Subject: [PATCH] build: fix in-flight conflict with angular_bazel_architect
 example (#1607)

---
 examples/BUILD.bazel                          | 4 +++-
 examples/angular_bazel_architect/package.json | 1 +
 examples/angular_bazel_architect/yarn.lock    | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index d922fbdc9b..0ceb2df615 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -208,7 +208,9 @@ example_integration_test(
     bazel_commands = [
         "test ...",
     ],
-    npm_packages = {},
+    npm_packages = {
+        "//packages/hide-bazel-files:npm_package": "@bazel/hide-bazel-files",
+    },
     # windows fails CI with an error to do with a process fork not being able ot find node
     tags = ["fix-windows"],
 )
diff --git a/examples/angular_bazel_architect/package.json b/examples/angular_bazel_architect/package.json
index a84c464784..a091a9abbd 100644
--- a/examples/angular_bazel_architect/package.json
+++ b/examples/angular_bazel_architect/package.json
@@ -34,6 +34,7 @@
     "@angular/language-service": "9.0.0-rc.11",
     "@bazel/bazelisk": "^1.3.0",
     "@bazel/buildifier": "^0.29.0",
+    "@bazel/hide-bazel-files": "^1.2.4",
     "@bazel/ibazel": "^0.11.1",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
diff --git a/examples/angular_bazel_architect/yarn.lock b/examples/angular_bazel_architect/yarn.lock
index f46de21eb8..a262f3387f 100644
--- a/examples/angular_bazel_architect/yarn.lock
+++ b/examples/angular_bazel_architect/yarn.lock
@@ -1049,6 +1049,11 @@
     "@bazel/buildifier-linux_x64" "0.29.0"
     "@bazel/buildifier-win32_x64" "0.29.0"
 
+"@bazel/hide-bazel-files@^1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-1.2.4.tgz#fe00f2bbceb8e1a17bedde7616bef4810849c7f5"
+  integrity sha512-KZX4MkJOMtZT1DwFmjCWJNCUKcwbYBrv3Q++peoWkzJPcHGbt5nLFjt8Gzagi2GY7GRqp8WAut0E+eOGdhvkEg==
+
 "@bazel/ibazel@^0.11.1":
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.11.1.tgz#c07ceaded388f1e39d6aa732953e0dd04f3dbdf0"