Skip to content

Commit 01fdeec

Browse files
authored
refactor: remove http_server and history_server rules (#1158)
BREAKING CHANGE: history_server and http_server rules are no longer built-in. To use them, first install the http-server and/or history-server packages Then load("@npm//http-server:index.bzl", "http_server") (or replace with history-server, noting that the rule has underscore where the package has hyphen)
1 parent d846f45 commit 01fdeec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1056
-1659
lines changed

BUILD.bazel

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ bzl_library(
3434
visibility = ["//visibility:public"],
3535
deps = [
3636
"//internal/common:bzl",
37-
"//internal/history-server:bzl",
38-
"//internal/http-server:bzl",
3937
"//internal/jasmine_node_test:bzl",
4038
"//internal/linker:bzl",
4139
"//internal/npm_package:bzl",
@@ -86,8 +84,6 @@ npm_package(
8684
"//internal/golden_file_test:package_contents",
8785
"//internal/common:package_contents",
8886
"//internal/copy_repository:package_contents",
89-
"//internal/history-server:package_contents",
90-
"//internal/http-server:package_contents",
9187
"//internal/jasmine_node_test:package_contents",
9288
"//internal/js_library:package_contents",
9389
"//internal/linker:package_contents",

defs.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ Users should not load files under "/internal"
1919

2020
load("//internal/common:check_bazel_version.bzl", _check_bazel_version = "check_bazel_version")
2121
load("//internal/common:check_version.bzl", "check_version")
22-
load("//internal/history-server:history_server.bzl", _history_server = "history_server")
23-
load("//internal/http-server:http_server.bzl", _http_server = "http_server")
2422
load("//internal/jasmine_node_test:jasmine_node_test.bzl", _jasmine_node_test = "jasmine_node_test")
2523
load(
2624
"//internal/node:node.bzl",
@@ -40,8 +38,6 @@ node_repositories = _node_repositories
4038
jasmine_node_test = _jasmine_node_test
4139
rollup_bundle = _rollup_bundle
4240
npm_package = _npm_package
43-
history_server = _history_server
44-
http_server = _http_server
4541
npm_package_bin = _npm_bin
4642
# ANY RULES ADDED HERE SHOULD BE DOCUMENTED, see index.for_docs.bzl
4743

docs/BUILD.bazel

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ stardoc(
1818
name = "builtins",
1919
out = "builtins.api",
2020
input = "//:index.for_docs.bzl",
21-
deps = ["//:bzl"],
21+
deps = [
22+
"//:bzl",
23+
"//internal/node:bzl",
24+
],
2225
)
2326

2427
_BUILTINS_README = "# Built-in rules\n\nThese rules are available without any npm installation, via the `WORKSPACE` install of the `build_bazel_rules_nodejs` workspace. This is necessary to bootstrap Bazel to run the package manager to download other rules from NPM.\n\n"

examples/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ load(":test.bzl", "example_integration_test")
1616

1717
example_integration_test(
1818
name = "examples_angular",
19+
timeout = "long",
1920
npm_packages = {
2021
"//packages/karma:npm_package": "@bazel/karma",
2122
"//packages/protractor:npm_package": "@bazel/protractor",

examples/angular/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"@types/node": "6.14.6",
4141
"core-js": "2.6.9",
4242
"firebase-tools": "7.1.0",
43+
"history-server": "^1.3.1",
4344
"ts-morph": "3.1.0",
4445
"typescript": "3.4.5"
4546
},

examples/angular/src/BUILD.bazel

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
load("@build_bazel_rules_nodejs//:defs.bzl", "history_server", "rollup_bundle")
1+
load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
22
load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
33
load("@io_bazel_rules_docker//container:container.bzl", "container_image")
44
load("@io_bazel_rules_docker//nodejs:image.bzl", "nodejs_image")
55
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
6+
load("@npm//history-server:index.bzl", "history_server")
67
load("@npm_angular_bazel//:index.bzl", "ng_module")
78
load("@npm_bazel_typescript//:defs.bzl", "ts_config", "ts_devserver", "ts_library")
89

@@ -176,8 +177,8 @@ history_server(
176177
nodejs_image(
177178
name = "nodejs_image",
178179
data = [":prodapp"],
179-
entry_point = "@history-server_runtime_deps//:node_modules/history-server/modules/cli.js",
180-
node_modules = "@history-server_runtime_deps//:node_modules",
180+
entry_point = "@npm//:node_modules/history-server/modules/cli.js",
181+
node_modules = "@npm//:node_modules",
181182
# Actions created by this rule are I/O-bound,
182183
# so there is no benefit to running them remotely
183184
tags = ["local"],

examples/angular/yarn.lock

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,6 +2112,11 @@ eventemitter3@^3.0.0:
21122112
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
21132113
integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
21142114

2115+
eventemitter3@^4.0.0:
2116+
version "4.0.0"
2117+
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
2118+
integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
2119+
21152120
execa@^0.7.0:
21162121
version "0.7.0"
21172122
resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -2166,6 +2171,42 @@ expand-brackets@^2.1.4:
21662171
snapdragon "^0.8.1"
21672172
to-regex "^3.0.1"
21682173

2174+
express@^4.14.0:
2175+
version "4.17.1"
2176+
resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
2177+
integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
2178+
dependencies:
2179+
accepts "~1.3.7"
2180+
array-flatten "1.1.1"
2181+
body-parser "1.19.0"
2182+
content-disposition "0.5.3"
2183+
content-type "~1.0.4"
2184+
cookie "0.4.0"
2185+
cookie-signature "1.0.6"
2186+
debug "2.6.9"
2187+
depd "~1.1.2"
2188+
encodeurl "~1.0.2"
2189+
escape-html "~1.0.3"
2190+
etag "~1.8.1"
2191+
finalhandler "~1.1.2"
2192+
fresh "0.5.2"
2193+
merge-descriptors "1.0.1"
2194+
methods "~1.1.2"
2195+
on-finished "~2.3.0"
2196+
parseurl "~1.3.3"
2197+
path-to-regexp "0.1.7"
2198+
proxy-addr "~2.0.5"
2199+
qs "6.7.0"
2200+
range-parser "~1.2.1"
2201+
safe-buffer "5.1.2"
2202+
send "0.17.1"
2203+
serve-static "1.14.1"
2204+
setprototypeof "1.1.1"
2205+
statuses "~1.5.0"
2206+
type-is "~1.6.18"
2207+
utils-merge "1.0.1"
2208+
vary "~1.1.2"
2209+
21692210
express@^4.16.4:
21702211
version "4.17.0"
21712212
resolved "https://registry.yarnpkg.com/express/-/express-4.17.0.tgz#288af62228a73f4c8ea2990ba3b791bb87cd4438"
@@ -2860,6 +2901,15 @@ has@^1.0.1, has@^1.0.3:
28602901
dependencies:
28612902
function-bind "^1.1.1"
28622903

2904+
history-server@^1.3.1:
2905+
version "1.3.1"
2906+
resolved "https://registry.yarnpkg.com/history-server/-/history-server-1.3.1.tgz#4d79f1592293f88fd55e5000b4d2a71d713337c0"
2907+
integrity sha512-P8sDAn5gj54hLTvhV0iagtgKTNIcf8ynn+BC/AjfTGwYXsuhQsinMbCphPJfxCzN10FG7N0c0kX1tdtVkRU3Vw==
2908+
dependencies:
2909+
express "^4.14.0"
2910+
glob "^7.1.1"
2911+
http-proxy "^1.16.2"
2912+
28632913
home-dir@^1.0.0:
28642914
version "1.0.0"
28652915
resolved "https://registry.yarnpkg.com/home-dir/-/home-dir-1.0.0.tgz#2917eb44bdc9072ceda942579543847e3017fe4e"
@@ -2913,6 +2963,15 @@ http-proxy@^1.13.0:
29132963
follow-redirects "^1.0.0"
29142964
requires-port "^1.0.0"
29152965

2966+
http-proxy@^1.16.2:
2967+
version "1.18.0"
2968+
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
2969+
integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
2970+
dependencies:
2971+
eventemitter3 "^4.0.0"
2972+
follow-redirects "^1.0.0"
2973+
requires-port "^1.0.0"
2974+
29162975
http-signature@~1.2.0:
29172976
version "1.2.0"
29182977
resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"

examples/app/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "rollup_bundle")
1+
load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
22
load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
3+
load("@npm//http-server:index.bzl", "http_server")
34
load("@npm_bazel_protractor//:index.bzl", "protractor_web_test_suite")
45
load("@npm_bazel_typescript//:index.bzl", "ts_config", "ts_devserver", "ts_library")
56

examples/app/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"@bazel/protractor": "latest",
55
"@bazel/typescript": "latest",
66
"@types/jasmine": "3.3.15",
7+
"http-server": "^0.11.1",
78
"less": "^3.10.3",
89
"stylus": "^0.54.7",
910
"typescript": "2.7.x"

examples/app/styles/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ package(default_visibility = ["//:__pkg__"])
55

66
lessc(
77
name = "base",
8-
srcs = [
9-
"base.less",
10-
"variables.less",
11-
],
128
outs = [
139
"base.css",
1410
"base.css.map",
@@ -20,11 +16,14 @@ lessc(
2016
"--silent",
2117
"--source-map",
2218
],
19+
data = [
20+
"base.less",
21+
"variables.less",
22+
],
2323
)
2424

2525
stylus(
2626
name = "styles",
27-
srcs = ["test.styl"],
2827
outs = [
2928
"test.css",
3029
"test.css.map",
@@ -37,6 +36,7 @@ stylus(
3736
"--compress",
3837
"--sourcemap",
3938
],
39+
data = ["test.styl"],
4040
)
4141

4242
# For testing from the root workspace of this repository with bazel_integration_test.

0 commit comments

Comments
 (0)