From f1780e6e24c66335ca9cb2ceb0d730d383d1a3a3 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 29 Mar 2021 17:59:06 +1000 Subject: [PATCH] move loader arg into esbuild() invocation upstream.bzl should be kept as close to upstream as possible, so that it's easier to send changes upstream and pull in future changes --- ts/editor/BUILD.bazel | 5 ++++- ts/esbuild/upstream.bzl | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ts/editor/BUILD.bazel b/ts/editor/BUILD.bazel index 2db1cccf8..fb86760af 100644 --- a/ts/editor/BUILD.bazel +++ b/ts/editor/BUILD.bazel @@ -34,11 +34,14 @@ copy_bootstrap_icons( esbuild( name = "editor", + args = [ + "--loader:.svg=text", + ], entry_point = "index_wrapper.ts", visibility = ["//visibility:public"], deps = [ - "editor_ts", "bootstrap-icons", + "editor_ts", ], ) diff --git a/ts/esbuild/upstream.bzl b/ts/esbuild/upstream.bzl index 74c292089..53afb7e43 100644 --- a/ts/esbuild/upstream.bzl +++ b/ts/esbuild/upstream.bzl @@ -66,7 +66,6 @@ def _esbuild_impl(ctx): args.add_joined(["--platform", ctx.attr.platform], join_with = "=") args.add_joined(["--target", ctx.attr.target], join_with = "=") args.add_joined(["--log-level", "info"], join_with = "=") - args.add_joined(["--loader", ".svg=text"], join_with = ":") args.add_joined(["--metafile", metafile.path], join_with = "=") args.add_all(ctx.attr.define, format_each = "--define:%s") args.add_all(ctx.attr.external, format_each = "--external:%s")