Skip to content

Commit

Permalink
- Updates bazel to 2.0.0 (#17)
Browse files Browse the repository at this point in the history
- Updates dependencies to latest versions
- Fixes build issues with upgrades
  • Loading branch information
Dig-Doug authored Dec 28, 2019
1 parent a871327 commit eff2a99
Show file tree
Hide file tree
Showing 5 changed files with 181 additions and 1,279 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
2.0.0
14 changes: 7 additions & 7 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "rules_proto",
sha256 = "57001a3b33ec690a175cdf0698243431ef27233017b9bed23f96d44b9c98242f",
strip_prefix = "rules_proto-9cd4f8f1ede19d81c6d48910429fe96776e567b1",
sha256 = "73ebe9d15ba42401c785f9d0aeebccd73bd80bf6b8ac78f74996d31f2c0ad7a6",
strip_prefix = "rules_proto-2c0468366367d7ed97a1f702f9cd7155ab3f73c5",
urls = [
"https://github.com/bazelbuild/rules_proto/archive/9cd4f8f1ede19d81c6d48910429fe96776e567b1.tar.gz",
"https://github.com/bazelbuild/rules_proto/archive/2c0468366367d7ed97a1f702f9cd7155ab3f73c5.tar.gz",
],
)

http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0",
sha256 = "3887b948779431ac443e6a64f31b9e1e17b8d386a31eebc50ec1d9b0a6cabd2b",
urls = [
"https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.3/rules_nodejs-0.38.3.tar.gz",
"https://github.com/bazelbuild/rules_nodejs/releases/download/1.0.0/rules_nodejs-1.0.0.tar.gz",
],
)

Expand Down Expand Up @@ -51,9 +51,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")

browser_repositories()
browser_repositories(chromium = True)

load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")

Expand Down
17 changes: 12 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,23 @@
"google-protobuf": "^3.10.0"
},
"devDependencies": {
"@bazel/hide-bazel-files": "^0.38.3",
"@bazel/jasmine": "^0.38.3",
"@bazel/karma": "^0.38.3",
"@bazel/rollup": "^0.38.3",
"@bazel/typescript": "^0.38.3",
"@bazel/hide-bazel-files": "^1.0.0",
"@bazel/jasmine": "^1.0.0",
"@bazel/karma": "^1.0.0",
"@bazel/rollup": "^1.0.0",
"@bazel/typescript": "^1.0.0",
"@improbable-eng/grpc-web": "^0.11.0",
"@types/google-protobuf": "^3.7.2",
"@types/jasmine": "^3.4.4",
"clang-format": "^1.2.4",
"husky": "^3.0.9",
"karma": "^4.4.1",
"karma-chrome-launcher": "2.2.0",
"karma-firefox-launcher": "1.1.0",
"karma-jasmine": "2.0.1",
"karma-requirejs": "1.1.0",
"karma-sourcemap-loader": "0.3.7",
"requirejs": "^2.3.6",
"rollup": "^1.25.1",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
Expand Down
8 changes: 5 additions & 3 deletions test/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
load("@npm_bazel_typescript//:index.bzl", "ts_library")
load("@npm_bazel_karma//:index.bzl", "ts_web_test_suite")
load("@npm_bazel_karma//:index.bzl", "karma_web_test_suite")

# This test checks that the protos can be resolved in a nodejs environment
jasmine_node_test(
Expand Down Expand Up @@ -55,7 +55,7 @@ ts_library(
],
)

ts_web_test_suite(
karma_web_test_suite(
name = "proto_with_deps_test_suite",
browsers = [
"@io_bazel_rules_webtesting//browsers:chromium-local",
Expand All @@ -80,7 +80,7 @@ ts_library(
],
)

ts_web_test_suite(
karma_web_test_suite(
name = "pizza_service_proto_test_suite",
srcs = [
"require.config.js",
Expand Down Expand Up @@ -109,6 +109,8 @@ rollup_bundle(
output_dir = True,
deps = [
":test_bundling_lib",
"@npm//rollup-plugin-commonjs",
"@npm//rollup-plugin-node-resolve",
],
format = "cjs",
)
Expand Down
Loading

0 comments on commit eff2a99

Please sign in to comment.