From 967734f17412de45165dcc41e5145605fa0e4809 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 5 Dec 2019 13:20:11 -0800
Subject: [PATCH] fix(builtin): handle scoped packages in generated
 npm_umd_bundle targets

Fixes #1095
---
 internal/npm_install/generate_build_file.js                     | 2 +-
 internal/npm_install/generate_build_file.ts                     | 2 +-
 .../npm_install/test/golden/@angular/core/BUILD.bazel.golden    | 2 +-
 .../test/golden/@gregmagolan/test-a/BUILD.bazel.golden          | 2 +-
 .../test/golden/@gregmagolan/test-b/BUILD.bazel.golden          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/npm_install/generate_build_file.js b/internal/npm_install/generate_build_file.js
index 9f87887ece..97154ab32e 100644
--- a/internal/npm_install/generate_build_file.js
+++ b/internal/npm_install/generate_build_file.js
@@ -873,7 +873,7 @@ node_module_library(
 
 npm_umd_bundle(
     name = "${pkg._name}__umd",
-    package_name = "${pkg._name}",
+    package_name = "${pkg._moduleName}",
     entry_point = "//:node_modules/${pkg._dir}/${mainEntryPoint}",
     package = ":${pkg._name}",
 )
diff --git a/internal/npm_install/generate_build_file.ts b/internal/npm_install/generate_build_file.ts
index 2b6aa69a21..c2a8dec9bf 100644
--- a/internal/npm_install/generate_build_file.ts
+++ b/internal/npm_install/generate_build_file.ts
@@ -967,7 +967,7 @@ node_module_library(
 
 npm_umd_bundle(
     name = "${pkg._name}__umd",
-    package_name = "${pkg._name}",
+    package_name = "${pkg._moduleName}",
     entry_point = "//:node_modules/${pkg._dir}/${mainEntryPoint}",
     package = ":${pkg._name}",
 )
diff --git a/internal/npm_install/test/golden/@angular/core/BUILD.bazel.golden b/internal/npm_install/test/golden/@angular/core/BUILD.bazel.golden
index 8c92b8e636..f113b2d469 100644
--- a/internal/npm_install/test/golden/@angular/core/BUILD.bazel.golden
+++ b/internal/npm_install/test/golden/@angular/core/BUILD.bazel.golden
@@ -760,7 +760,7 @@ node_module_library(
 load("@build_bazel_rules_nodejs//internal/npm_install:npm_umd_bundle.bzl", "npm_umd_bundle")
 npm_umd_bundle(
     name = "core__umd",
-    package_name = "core",
+    package_name = "@angular/core",
     entry_point = "//:node_modules/@angular/core/fesm5/core.js",
     package = ":core",
 )
diff --git a/internal/npm_install/test/golden/@gregmagolan/test-a/BUILD.bazel.golden b/internal/npm_install/test/golden/@gregmagolan/test-a/BUILD.bazel.golden
index af7f998df3..60e22cc90a 100644
--- a/internal/npm_install/test/golden/@gregmagolan/test-a/BUILD.bazel.golden
+++ b/internal/npm_install/test/golden/@gregmagolan/test-a/BUILD.bazel.golden
@@ -36,7 +36,7 @@ node_module_library(
 load("@build_bazel_rules_nodejs//internal/npm_install:npm_umd_bundle.bzl", "npm_umd_bundle")
 npm_umd_bundle(
     name = "test-a__umd",
-    package_name = "test-a",
+    package_name = "@gregmagolan/test-a",
     entry_point = "//:node_modules/@gregmagolan/test-a/main.js",
     package = ":test-a",
 )
diff --git a/internal/npm_install/test/golden/@gregmagolan/test-b/BUILD.bazel.golden b/internal/npm_install/test/golden/@gregmagolan/test-b/BUILD.bazel.golden
index 9894f6d3c6..34c64b684f 100644
--- a/internal/npm_install/test/golden/@gregmagolan/test-b/BUILD.bazel.golden
+++ b/internal/npm_install/test/golden/@gregmagolan/test-b/BUILD.bazel.golden
@@ -39,7 +39,7 @@ node_module_library(
 load("@build_bazel_rules_nodejs//internal/npm_install:npm_umd_bundle.bzl", "npm_umd_bundle")
 npm_umd_bundle(
     name = "test-b__umd",
-    package_name = "test-b",
+    package_name = "@gregmagolan/test-b",
     entry_point = "//:node_modules/@gregmagolan/test-b/main.js",
     package = ":test-b",
 )