From df5924abd0c4efe87e2fd189739e565346276b91 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Fri, 6 Sep 2019 16:01:18 -0700
Subject: [PATCH] test: fix ivy ts_devserver tests under
 /packages/core/test/bunding/ (#32520)

PR Close #32520
---
 packages/core/test/bundling/todo/BUILD.bazel      |  9 +++++++--
 packages/core/test/bundling/todo/index.html       | 14 --------------
 packages/core/test/bundling/todo_i18n/BUILD.bazel |  9 +++++++--
 packages/core/test/bundling/todo_i18n/index.html  | 14 --------------
 packages/core/test/bundling/todo_r2/BUILD.bazel   |  9 +++++++--
 packages/core/test/bundling/todo_r2/index.html    | 14 --------------
 packages/core/test/bundling/util/BUILD.bazel      |  1 +
 7 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index 5a0877908a..ab662a78eb 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -89,8 +89,13 @@ genrule(
 
 ts_devserver(
     name = "devserver",
-    entry_module = "angular/packages/core/test/bundling/todo/index",
-    serving_path = "/bundle.min.js",
+    entry_module = "@angular/core/test/bundling/todo",
+    scripts = [
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
+    # Use a serving_path that matches the common static index.html used
+    # in both devserver & prodserver
+    serving_path = "/bundle.min.js.br",
     static_files = [
         "index.html",
         ":tslib",
diff --git a/packages/core/test/bundling/todo/index.html b/packages/core/test/bundling/todo/index.html
index 5d25aabdeb..098e4b3b27 100644
--- a/packages/core/test/bundling/todo/index.html
+++ b/packages/core/test/bundling/todo/index.html
@@ -38,20 +38,6 @@
       (document.location.search.endsWith('debug') ? '/bundle.min_debug.js' : '/bundle.min.js.br') +
       '"></' + 'script>');
   </script>
-  <script>
-    if (typeof define === "function" && define.amd) {
-      // If `define` is defined that we are in devserver mode. Dev server concatenates all of the 
-      // source files and than loads them using `require`. There is an issue with the way 
-      // `@angular/core` imports are generated which results in both `@angular/core` as well as `@angular/core/index`
-      // This hack makes both of the exports available to the application.
-      define("@angular/core", ["require", "exports", "tslib", "@angular/core/index"], function (require, exports) {
-        "use strict";
-        Object.defineProperty(exports, "__esModule", { value: true });
-        var tslib = require("tslib");
-        tslib.__exportStar(require("@angular/core/index"), exports);
-      });
-    }
-  </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/packages/core/test/bundling/todo_i18n/BUILD.bazel b/packages/core/test/bundling/todo_i18n/BUILD.bazel
index 21d5ac8664..93dc3994b2 100644
--- a/packages/core/test/bundling/todo_i18n/BUILD.bazel
+++ b/packages/core/test/bundling/todo_i18n/BUILD.bazel
@@ -83,8 +83,13 @@ genrule(
 
 ts_devserver(
     name = "devserver",
-    entry_module = "angular/packages/core/test/bundling/todo_i18n/index",
-    serving_path = "/bundle.min.js",
+    entry_module = "@angular/core/test/bundling/todo_i18n",
+    scripts = [
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
+    # Use a serving_path that matches the common static index.html used
+    # in both devserver & prodserver
+    serving_path = "/bundle.min.js.br",
     static_files = [
         "index.html",
         ":tslib",
diff --git a/packages/core/test/bundling/todo_i18n/index.html b/packages/core/test/bundling/todo_i18n/index.html
index f902b92519..3abd4ef1ed 100644
--- a/packages/core/test/bundling/todo_i18n/index.html
+++ b/packages/core/test/bundling/todo_i18n/index.html
@@ -38,20 +38,6 @@
       (document.location.search.endsWith('debug') ? '/bundle.min_debug.js' : '/bundle.min.js.br') +
       '"></' + 'script>');
   </script>
-  <script>
-    if (typeof define === "function" && define.amd) {
-      // If `define` is defined that we are in devserver mode. Dev server concatenates all of the
-      // source files and than loads them using `require`. There is an issue with the way
-      // `@angular/core` imports are generated which results in both `@angular/core` as well as `@angular/core/index`
-      // This hack makes both of the exports available to the application.
-      define("@angular/core", ["require", "exports", "tslib", "@angular/core/index"], function (require, exports) {
-        "use strict";
-        Object.defineProperty(exports, "__esModule", { value: true });
-        var tslib = require("tslib");
-        tslib.__exportStar(require("@angular/core/index"), exports);
-      });
-    }
-  </script>
 </body>
 
 </html>
diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo_r2/BUILD.bazel
index 34aaaea086..38aff5d73c 100644
--- a/packages/core/test/bundling/todo_r2/BUILD.bazel
+++ b/packages/core/test/bundling/todo_r2/BUILD.bazel
@@ -84,8 +84,13 @@ genrule(
 
 ts_devserver(
     name = "devserver",
-    entry_module = "angular/packages/core/test/bundling/todo_r2/index",
-    serving_path = "/bundle.min.js",
+    entry_module = "@angular/core/test/bundling/todo_r2",
+    scripts = [
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
+    # Use a serving_path that matches the common static index.html used
+    # in both devserver & prodserver
+    serving_path = "/bundle.min.js.br",
     static_files = [
         "index.html",
         ":tslib",
diff --git a/packages/core/test/bundling/todo_r2/index.html b/packages/core/test/bundling/todo_r2/index.html
index 5d25aabdeb..098e4b3b27 100644
--- a/packages/core/test/bundling/todo_r2/index.html
+++ b/packages/core/test/bundling/todo_r2/index.html
@@ -38,20 +38,6 @@
       (document.location.search.endsWith('debug') ? '/bundle.min_debug.js' : '/bundle.min.js.br') +
       '"></' + 'script>');
   </script>
-  <script>
-    if (typeof define === "function" && define.amd) {
-      // If `define` is defined that we are in devserver mode. Dev server concatenates all of the 
-      // source files and than loads them using `require`. There is an issue with the way 
-      // `@angular/core` imports are generated which results in both `@angular/core` as well as `@angular/core/index`
-      // This hack makes both of the exports available to the application.
-      define("@angular/core", ["require", "exports", "tslib", "@angular/core/index"], function (require, exports) {
-        "use strict";
-        Object.defineProperty(exports, "__esModule", { value: true });
-        var tslib = require("tslib");
-        tslib.__exportStar(require("@angular/core/index"), exports);
-      });
-    }
-  </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/packages/core/test/bundling/util/BUILD.bazel b/packages/core/test/bundling/util/BUILD.bazel
index 33e77aff59..8ca5d4470c 100644
--- a/packages/core/test/bundling/util/BUILD.bazel
+++ b/packages/core/test/bundling/util/BUILD.bazel
@@ -12,6 +12,7 @@ ts_library(
         ":metadata_switch",
     ],
     module_name = "@angular/core/test/bundling/util/src/reflect_metadata",
+    module_root = "src/reflect_metadata",
     deps = ["@npm//reflect-metadata"],
 )