diff --git a/.circleci/config.yml b/.circleci/config.yml
index 84d31cbfbb..42e8e1331a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,11 +96,11 @@ jobs:
path: dist/bin/packages/core/test/bundling/todo/bundle.min.js
destination: packages/core/test/bundling/todo/bundle.min.js
- store_artifacts:
- path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js.brotli
- destination: packages/core/test/bundling/hello_world/bundle.min.js.brotli
+ path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js.br
+ destination: packages/core/test/bundling/hello_world/bundle.min.js.br
- store_artifacts:
- path: dist/bin/packages/core/test/bundling/todo/bundle.min.js.brotli
- destination: packages/core/test/bundling/todo/bundle.min.js.brotli
+ path: dist/bin/packages/core/test/bundling/todo/bundle.min.js.br
+ destination: packages/core/test/bundling/todo/bundle.min.js.br
- save_cache:
key: *cache_key
diff --git a/WORKSPACE b/WORKSPACE
index e3d40cd19b..9328952214 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -18,6 +18,12 @@ yarn_install(
yarn_lock = "//tools/ts-api-guardian:yarn.lock",
)
+yarn_install(
+ name = "http-server_runtime_deps",
+ package_json = "//tools/http-server:package.json",
+ yarn_lock = "//tools/http-server:yarn.lock",
+)
+
http_archive(
name = "build_bazel_rules_typescript",
url = "https://github.com/bazelbuild/rules_typescript/archive/0.12.1.zip",
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index 5a1de5ea26..8a4b375d53 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -83,6 +83,6 @@ ng_rollup_bundle = rule(
default = Label("@org_brotli//:brotli")),
}),
outputs = dict(ROLLUP_OUTPUTS, **{
- "build_es5_min_compressed": "%{name}.min.js.brotli",
+ "build_es5_min_compressed": "%{name}.min.js.br",
}),
)
diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
index f6da85e8b9..afe5cbd8a9 100644
--- a/packages/core/test/bundling/hello_world/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -4,7 +4,7 @@ load("//tools:defaults.bzl", "ts_library", "ivy_ng_module")
load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("//tools/http-server:http_server.bzl", "http_server")
ivy_ng_module(
name = "hello_world",
@@ -44,7 +44,7 @@ jasmine_node_test(
data = [
":bundle",
":bundle.js",
- ":bundle.min.js.brotli",
+ ":bundle.min.js.br",
":bundle.min_debug.js",
],
deps = [":test_lib"],
@@ -56,12 +56,11 @@ js_expected_symbol_test(
golden = ":bundle.golden_symbols.json",
)
-ts_devserver(
+http_server(
name = "devserver",
- static_files = [
- ":bundle.min_debug.js",
- ":bundle.min.js",
+ data = [
"index.html",
+ ":bundle.min.js",
+ ":bundle.min_debug.js",
],
- deps = [],
)
diff --git a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
index 0e57b04e2e..60b4084d98 100644
--- a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "ts_library", "ivy_ng_module")
load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("//tools/http-server:http_server.bzl", "http_server")
ivy_ng_module(
name = "hello_world_i18n",
@@ -27,12 +27,11 @@ ng_rollup_bundle(
],
)
-ts_devserver(
- name = "devserver",
- static_files = [
- ":bundle.min_debug.js",
- ":bundle.min.js",
+http_server(
+ name = "prodserver",
+ data = [
"index.html",
+ ":bundle.min.js",
+ ":bundle.min_debug.js",
],
- deps = [],
)
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index 32186f674b..c979e1c49e 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -1,6 +1,7 @@
package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "ts_library", "ivy_ng_module")
+load("//tools/http-server:http_server.bzl", "http_server")
load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
@@ -46,7 +47,7 @@ jasmine_node_test(
data = [
":bundle",
":bundle.js",
- ":bundle.min.js.brotli",
+ ":bundle.min.js.br",
":bundle.min_debug.js",
],
deps = [":test_lib"],
@@ -82,15 +83,13 @@ ts_devserver(
deps = [":todo"],
)
-# Even though this is `ts_devserver` rule, we are using it as simple static server
-# This is mostly broken for `ibazel`, use `:devserver` instead.
-ts_devserver(
+http_server(
name = "prodserver",
- static_files = [
- ":bundle.min_debug.js",
- ":bundle.min.js",
+ data = [
+ "base.css",
"index.html",
"todo.css",
- "base.css",
+ ":bundle.min.js.br",
+ ":bundle.min_debug.js",
],
)
diff --git a/packages/core/test/bundling/todo/index.html b/packages/core/test/bundling/todo/index.html
index 304af5a248..5d25aabdeb 100644
--- a/packages/core/test/bundling/todo/index.html
+++ b/packages/core/test/bundling/todo/index.html
@@ -35,7 +35,7 @@
-->