fix(builtin): handle scoped packages in generated npm_umd_bundle targets

Fixes bazel-contrib#1095
alexeagle · Dec 5, 2019 · 758458b · 758458b
1 parent 7c03816
commit 758458b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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",
 )