From bd71f1023467af575d3686c87ffc5b6dd074c346 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Wed, 15 Jul 2020 13:58:03 -0700
Subject: [PATCH] build(language-service): Remove ls_rollup_bundle (#38086)

`ls_rollup_bundle` is no longer needed since we could invoke `ng_rollup_bundle`
directly.

Background: language service runs rollup to produce a single file to reduce
startup time in the editor. However, due to the need to load dynamic versions
of typescript at runtime (think the case where users can change typescript
version in their editor), we hack the "banner" to export a CommonJS default function,
so that we could dynamically load the typescript module provided at runtime via AMD
and use it throughout the implementation.

PR Close #38086
---
 packages/language-service/BUILD.bazel         |  4 +--
 packages/language-service/bundles/BUILD.bazel | 10 +++++---
 packages/language-service/bundles/index.bzl   | 25 -------------------
 packages/language-service/package.json        |  2 +-
 4 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 packages/language-service/bundles/index.bzl

diff --git a/packages/language-service/BUILD.bazel b/packages/language-service/BUILD.bazel
index 4e1ef571e9..320cc23995 100644
--- a/packages/language-service/BUILD.bazel
+++ b/packages/language-service/BUILD.bazel
@@ -46,7 +46,7 @@ pkg_npm(
     deps = [
         ":language-service",
         # min bundle is not used at the moment; omit from package to speed up build
-        "//packages/language-service/bundles:language-service.umd.js",
-        "//packages/language-service/bundles:ivy.umd.js",
+        "//packages/language-service/bundles:language-service.js",
+        "//packages/language-service/bundles:ivy.js",
     ],
 )
diff --git a/packages/language-service/bundles/BUILD.bazel b/packages/language-service/bundles/BUILD.bazel
index 698e333666..3f323a5893 100644
--- a/packages/language-service/bundles/BUILD.bazel
+++ b/packages/language-service/bundles/BUILD.bazel
@@ -1,8 +1,10 @@
-load("//packages/language-service/bundles:index.bzl", "ls_rollup_bundle")
+load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 
-ls_rollup_bundle(
+ng_rollup_bundle(
     name = "language-service",
+    build_optimizer = False,
     entry_point = "//packages/language-service:index.ts",
+    format = "amd",
     globals = {
         "fs": "fs",
         "path": "path",
@@ -18,9 +20,11 @@ ls_rollup_bundle(
     ],
 )
 
-ls_rollup_bundle(
+ng_rollup_bundle(
     name = "ivy",
+    build_optimizer = False,
     entry_point = "//packages/language-service/ivy:ts_plugin.ts",
+    format = "amd",
     globals = {
         "fs": "fs",
         "path": "path",
diff --git a/packages/language-service/bundles/index.bzl b/packages/language-service/bundles/index.bzl
deleted file mode 100644
index ca2498d940..0000000000
--- a/packages/language-service/bundles/index.bzl
+++ /dev/null
@@ -1,25 +0,0 @@
-load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", "ng_rollup_bundle")
-
-def ls_rollup_bundle(name, **kwargs):
-    """
-        A variant of ng_rollup_bundle for the language-service bundle that
-        outputs in AMD format.
-    """
-    visibility = kwargs.pop("visibility", None)
-
-    # Note: the output file is called "umd.js" because of historical reasons.
-    # The format is actually AMD and not UMD, but we are afraid to rename
-    # the file because that would likely break the IDE and other integrations that
-    # have the path hardcoded in them.
-    ng_rollup_bundle(
-        name = name + ".umd",
-        build_optimizer = False,
-        format = "amd",
-        visibility = visibility,
-        **kwargs
-    )
-    native.alias(
-        name = name,
-        actual = name + ".umd",
-        visibility = visibility,
-    )
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
index e8a25ad500..e3e5b2a1b5 100644
--- a/packages/language-service/package.json
+++ b/packages/language-service/package.json
@@ -2,7 +2,7 @@
   "name": "@angular/language-service",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - language services",
-  "main": "./bundles/language-service.umd.js",
+  "main": "./bundles/language-service.js",
   "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",