From 242379f3eb496194e586adab3da4090954e5eab4 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Tue, 26 Nov 2019 09:51:17 -0800
Subject: [PATCH] fix(builtin): locations arg of npm_package_bin should result
 in separate argv

---
 examples/app/BUILD.bazel          | 14 ++++++--------
 internal/node/npm_package_bin.bzl |  5 ++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/examples/app/BUILD.bazel b/examples/app/BUILD.bazel
index b249f89558..2a63c81194 100644
--- a/examples/app/BUILD.bazel
+++ b/examples/app/BUILD.bazel
@@ -9,12 +9,6 @@ load("@npm_bazel_typescript//:index.bzl", "ts_devserver", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
-_ASSETS = [
-    ":bundle.min",
-    "//styles:base.css",
-    "//styles:test.css",
-]
-
 ts_library(
     name = "app",
     srcs = ["app.ts"],
@@ -22,7 +16,6 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
-    static_files = [":inject_tags"] + _ASSETS,
     # We'll collect all the devmode JS sources from these TypeScript libraries
     deps = [":app"],
 )
@@ -38,6 +31,12 @@ terser_minified(
     src = ":bundle",
 )
 
+_ASSETS = [
+    ":bundle.min",
+    "//styles:base.css",
+    "//styles:test.css",
+]
+
 # Copy index.html to the output folder, adding <script> and <link> tags
 html_insert_assets(
     name = "inject_tags",
@@ -49,7 +48,6 @@ html_insert_assets(
         "$(location :index.tmpl.html)",
         "--roots",
         "$@",
-    ] + [
         "--assets",
     ] + ["$(locations %s)" % a for a in _ASSETS],
     data = [":index.tmpl.html"] + _ASSETS,
diff --git a/internal/node/npm_package_bin.bzl b/internal/node/npm_package_bin.bzl
index db017a8ed1..573b6cbbe2 100644
--- a/internal/node/npm_package_bin.bzl
+++ b/internal/node/npm_package_bin.bzl
@@ -54,7 +54,10 @@ def _impl(ctx):
         outputs = ctx.outputs.outs
 
     for a in ctx.attr.args:
-        args.add(_expand_location(ctx, a))
+        # Workaround bazelbuild/bazel#10309
+        # If one of the files has a space in the name, we will
+        # incorrectly split it into multiple argv
+        args.add_all(_expand_location(ctx, a).split(" "))
     run_node(
         ctx,
         executable = "tool",