Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update to bazel 0.27.0rc5 #861

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

## IMPORTANT
# If you change the `default_docker_image` version, also change the `cache_key` version
var_1: &default_docker_image circleci/node:10.12
var_2: &browsers_docker_image circleci/node:10.12-browsers
var_3: &cache_key node-0.12-{{ checksum "yarn.lock" }}-{{ checksum "examples/program/yarn.lock" }}
var_1: &default_docker_image circleci/node:10.14
var_2: &browsers_docker_image circleci/node:10.14-browsers
var_3: &cache_key node-0.14-{{ checksum "yarn.lock" }}-{{ checksum "examples/program/yarn.lock" }}

var_4: &init_environment
run:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"homepage": "https://github.com/bazelbuild/rules_nodejs",
"license": "Apache-2.0",
"devDependencies": {
"@bazel/bazel": "0.26.0",
"@bazel/bazel": "0.27.0rc5",
"@bazel/buildifier": "^0.25.1",
"@bazel/ibazel": "0.10.1",
"@commitlint/cli": "^8.0.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/typescript/.bazelrc
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
import %workspace%/../../common.bazelrc

# TODO(gregmagolan): remove this flag once @io_bazel_rules_go is compatible with Bazel 0.27.0
common --noincompatible_require_ctx_in_configure_features
18 changes: 3 additions & 15 deletions packages/typescript/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
# limitations under the License.

load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@build_bazel_rules_nodejs//:defs.bzl", "COMMON_REPLACEMENTS", "npm_package")
load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "TYPESCRIPT_REPLACEMENTS")

bzl_library(
name = "bzl",
Expand Down Expand Up @@ -68,20 +69,7 @@ npm_package(
packages = [
"@build_bazel_rules_typescript//:npm_bazel_typescript_package",
],
replacements = dict(
COMMON_REPLACEMENTS,
**{
# This BEGIN-DEV fencing is required as files pulled in from
# @build_bazel_rules_typescript//:npm_bazel_typescript_package
# use this alternate fencing
"(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
# Do a simple replacement needed to make the local development differ
# from how our release is used.
"//devserver:devserver_bin": "//devserver",
# This file gets vendored into our repo
"@build_bazel_rules_typescript//internal:common": "//internal:common",
}
),
replacements = TYPESCRIPT_REPLACEMENTS,
vendor_external = ["build_bazel_rules_typescript"],
deps = [
":copy_LICENSE",
Expand Down
16 changes: 16 additions & 0 deletions packages/typescript/index.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
Users should not load files under "/internal"
"""

load("@build_bazel_rules_nodejs//:defs.bzl", "COMMON_REPLACEMENTS")
load("//:version.bzl", _check_rules_typescript_version = "check_rules_typescript_version")
load("//internal:build_defs.bzl", _ts_library = "ts_library_macro")
load("//internal:ts_config.bzl", _ts_config = "ts_config")
Expand All @@ -33,3 +34,18 @@ ts_devserver = _ts_devserver
ts_proto_library = _ts_proto_library
# DO NOT ADD MORE rules here unless they appear in the generated docsite.
# Run bazel build :generate_README to re-generate the docsite.

TYPESCRIPT_REPLACEMENTS = dict(
COMMON_REPLACEMENTS,
**{
# This BEGIN-DEV fencing is required as files pulled in from
# @build_bazel_rules_typescript//:npm_bazel_typescript_package
# use this alternate fencing
"(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
# Do a simple replacement needed to make the local development differ
# from how our release is used.
"//devserver:devserver_bin": "//devserver",
# This file gets vendored into our repo
"@build_bazel_rules_typescript//internal:common": "//internal:common",
}
)
Loading