From 5ff4590b050ffa11faab52fe6d0cc2927987b535 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Mon, 17 Dec 2018 13:17:13 -0800
Subject: [PATCH] fix(bazel): Set module_name and enable ng test (#27715)

Relative imports in Typescript files only work when module_name is
defined in ts_library (when run in Node.js).
See issue https://github.com/bazelbuild/rules_typescript/issues/360

With that fixed, `ng test` now works.

`ng build` requires `node_modules` to be available in the project
directory, so it's not usable yet. Running `yarn` in project directory
does not work because of postinstall version check.

PR Close #27715
---
 integration/bazel-schematics/test.sh                   | 10 ++++------
 packages/bazel/src/builders/BUILD.bazel                |  1 +
 .../bazel-workspace/files/e2e/BUILD.bazel.template     |  5 ++++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/integration/bazel-schematics/test.sh b/integration/bazel-schematics/test.sh
index f60993ff71e632..35e326f52b5250 100755
--- a/integration/bazel-schematics/test.sh
+++ b/integration/bazel-schematics/test.sh
@@ -9,15 +9,13 @@ function test() {
   # Create project
   ng new demo --collection=@angular/bazel --defaults --skip-git
   cd demo
-  # TODO(kyliau): Use bazel commands directly for now. Once 7.1.4 is out we can
-  # switch to use builders (ng build and ng test)
   # Run build
+  # TODO(kyliau): Use `bazel build` for now. Running `ng build` requires
+  # node_modules to be available in project directory.
   bazel build //src:bundle
   # Run test
-  bazel test \
-    //src:test \
-    //e2e:devserver_test \
-    //e2e:prodserver_test
+  ng test
+  ng e2e
 }
 
 test
diff --git a/packages/bazel/src/builders/BUILD.bazel b/packages/bazel/src/builders/BUILD.bazel
index 0a4c2299d03138..c745a5816be099 100644
--- a/packages/bazel/src/builders/BUILD.bazel
+++ b/packages/bazel/src/builders/BUILD.bazel
@@ -20,6 +20,7 @@ ts_library(
     data = [
         "schema.json",
     ],
+    module_name = "@angular/bazel/src/builders",
     deps = [
         "@ngdeps//@angular-devkit/architect",
         "@ngdeps//@angular-devkit/core",
diff --git a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template
index 3006b04ae59404..25995db21ebefa 100644
--- a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template
@@ -12,7 +12,10 @@ ts_library(
       "@npm//@types/node",
       "@npm//jasmine",
       "@npm//protractor",
-    ]
+    ],
+    data = [
+      "//:tsconfig.json",
+    ],
 )
 
 protractor_web_test_suite(