From 17bfedd224fda87afe155a0857bdb3503b66f861 Mon Sep 17 00:00:00 2001 From: Keen Yee Liau Date: Wed, 5 Jun 2019 10:19:28 -0700 Subject: [PATCH] fix(bazel): Load global stylesheet in dev and prod (#30879) Global stylesheet should be injected as a tag in index.html for both dev and prod app. PR Close #30879 --- .../src/builders/files/src/BUILD.bazel.template | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/bazel/src/builders/files/src/BUILD.bazel.template b/packages/bazel/src/builders/files/src/BUILD.bazel.template index 3059878485..dd553a2948 100644 --- a/packages/bazel/src/builders/files/src/BUILD.bazel.template +++ b/packages/bazel/src/builders/files/src/BUILD.bazel.template @@ -5,11 +5,20 @@ load("@npm_bazel_karma//:index.bzl", "ts_web_test_suite") load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle", "history_server") load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") load("@npm_bazel_typescript//:index.bzl", "ts_devserver", "ts_library") -load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary") +load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary", "sass_binary") + +sass_binary( + name = "global_stylesheet", + src = glob(["styles.css", "styles.scss"])[0], + output_name = "global_stylesheet.css", +) multi_sass_binary( name = "styles", - srcs = glob(["**/*.scss"]), + srcs = glob( + include = ["**/*.scss"], + exclude = ["styles.scss"], + ), ) ng_module( @@ -52,6 +61,7 @@ web_package( # do not sort "@npm//node_modules/zone.js:dist/zone.min.js", ":bundle.min.js", + ":global_stylesheet", ], data = [ "favicon.ico", @@ -85,6 +95,7 @@ ts_devserver( ], static_files = [ "@npm//node_modules/zone.js:dist/zone.min.js", + ":global_stylesheet", ], data = [ "favicon.ico",