- Updates to rules_nodejs v2 (#130)

Author: Dig-Doug

.bazelrc

@@ -0,0 +1 @@
+test --test_output=errors

.bazelversion

@@ -1 +1 @@
-3.3.1
+3.5.0

BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//packages/typescript:index.bzl", "ts_config")
 
 package(default_visibility = ["//:__subpackages__"])
 

WORKSPACE

@@ -4,19 +4,40 @@ workspace(
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_archive(
+    name = "build_bazel_rules_nodejs",
+    sha256 = "9cf91081afb192338a827dce92d4fdd5eabb809e3b20439611d6f440ac9b7c4e",
+    strip_prefix = "rules_nodejs-9ff4508deb9aece23890feb1404abb9a6c3d1b94",
+    urls = [
+        "https://github.com/bazelbuild/rules_nodejs/archive/9ff4508deb9aece23890feb1404abb9a6c3d1b94.tar.gz",
+    ],
+    patches = ["//:patches/rules_nodejs.patch"],
+)
+
+http_archive(
+    name = "io_bazel_rules_go",
+    sha256 = "a8d6b1b354d371a646d2f7927319974e0f9e52f73a2452d2b3877118169eb6bb",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz",
+    ],
+)
+
 http_archive(
     name = "rules_proto",
-    sha256 = "4d421d51f9ecfe9bf96ab23b55c6f2b809cbaf0eea24952683e397decfbd0dd0",
-    strip_prefix = "rules_proto-f6b8d89b90a7956f6782a4a3609b2f0eee3ce965",
+    sha256 = "aa1ee19226f707d44bee44c720915199c20c84a23318bb0597ed4e5c873ccbd5",
+    strip_prefix = "rules_proto-40298556293ae502c66579620a7ce867d5f57311",
     urls = [
-        "https://github.com/bazelbuild/rules_proto/archive/f6b8d89b90a7956f6782a4a3609b2f0eee3ce965.tar.gz",
+        "https://github.com/bazelbuild/rules_proto/archive/40298556293ae502c66579620a7ce867d5f57311.tar.gz",
     ],
 )
 
 http_archive(
-    name = "build_bazel_rules_nodejs",
-    sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
+    name = "io_bazel_rules_webtesting",
+    sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",
+    urls = [
+        "https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.3/rules_webtesting.tar.gz",
+    ],
 )
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
@@ -29,6 +50,24 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
 
+load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dev_dependencies")
+
+rules_nodejs_dev_dependencies()
+
+load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dev_dependencies")
+
+rules_typescript_dev_dependencies()
+
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
+
+go_rules_dependencies()
+
+go_register_toolchains()
+
+load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
+
+stardoc_repositories()
+
 load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
 
 yarn_install(
@@ -37,14 +76,6 @@ yarn_install(
     yarn_lock = "//:yarn.lock",
 )
 
-load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
-
-install_bazel_dependencies()
-
-load("@npm_bazel_karma//:package.bzl", "npm_bazel_karma_dependencies")
-
-npm_bazel_karma_dependencies()
-
 load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
 
 web_test_repositories()
@@ -53,10 +84,6 @@ load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_re
 
 browser_repositories(chromium = True)
 
-load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 load("@rules_typescript_proto//:index.bzl", "rules_typescript_proto_dependencies")
 
 rules_typescript_proto_dependencies()

package.json

@@ -7,28 +7,34 @@
     "google-protobuf": "3.12.2"
   },
   "devDependencies": {
-    "@bazel/jasmine": "1.7.0",
-    "@bazel/karma": "1.7.0",
-    "@bazel/rollup": "1.7.0",
-    "@bazel/typescript": "1.7.0",
-    "@improbable-eng/grpc-web": "0.12.0",
+    "@improbable-eng/grpc-web": "0.13.0",
     "@types/google-protobuf": "3.7.2",
     "@types/jasmine": "3.5.11",
+    "@types/node": "12.12.50",
+    "c8": "^7.3.0",
     "clang-format": "1.4.0",
     "husky": "4.2.5",
+    "jasmine": "^3.6.1",
+    "jasmine-core": "^3.6.0",
+    "jasmine-reporters": "^2.3.2",
     "karma": "5.0.1",
     "karma-chrome-launcher": "3.1.0",
     "karma-firefox-launcher": "1.3.0",
     "karma-jasmine": "3.3.1",
     "karma-requirejs": "1.1.0",
     "karma-sourcemap-loader": "0.3.7",
     "minimist": "1.2.5",
+    "protobufjs": "6.10.1",
     "requirejs": "2.3.6",
-    "rollup": "2.18.1",
+    "rollup": "2.22.1",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-resolve": "5.2.0",
+    "source-map-support": "0.5.19",
     "ts-protoc-gen": "0.12.0",
-    "typescript": "3.9.5"
+    "tsickle": "0.39.1",
+    "tsutils": "3.17.1",
+    "typescript": "3.9.7",
+    "unidiff": "1.0.2"
   },
   "scripts": {
     "format": "git-clang-format"

patches/rules_nodejs.patch

@@ -0,0 +1,11 @@
+diff --git packages/rollup/bin/BUILD.bazel packages/rollup/bin/BUILD.bazel
+index 883b0665..2401e645 100644
+--- packages/rollup/bin/BUILD.bazel
++++ packages/rollup/bin/BUILD.bazel
+@@ -17,5 +17,5 @@ nodejs_binary(
+         "@npm//rollup",
+     ],
+     entry_point = "//packages/rollup:index.js",
+-    visibility = ["//:__subpackages__"],
++    visibility = ["//visibility:public"],
+ )

src/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//packages/typescript:index.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 
 nodejs_binary(

test/BUILD.bazel

@@ -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", "karma_web_test_suite")
+load("@build_bazel_rules_nodejs//packages/jasmine:index.bzl", "jasmine_node_test")
+load("@build_bazel_rules_nodejs//packages/rollup:index.bzl", "rollup_bundle")
+load("@build_bazel_rules_nodejs//packages/typescript:index.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//packages/karma:index.bzl", "karma_web_test_suite")
 
 # This test checks that the protos can be resolved in a nodejs environment
 jasmine_node_test(
@@ -106,13 +106,14 @@ rollup_bundle(
     entry_points = {
         ":test_bundling.ts": "index",
     },
+    format = "cjs",
+    link_workspace_root = True,
     output_dir = True,
     deps = [
         ":test_bundling_lib",
         "@npm//rollup-plugin-commonjs",
         "@npm//rollup-plugin-node-resolve",
     ],
-    format = "cjs",
 )
 
 ts_library(
@@ -121,20 +122,20 @@ ts_library(
     tsconfig = ":test_bundling_tsconfig.json",
     deps = [
         "//test/proto:naming_styles_ts_proto",
-        "//test/proto/common:pizza_ts_proto",
         "//test/proto:pizza_service_ts_proto",
         "//test/proto/common:delivery_person_ts_proto",
-        "@npm//google-protobuf",
+        "//test/proto/common:pizza_ts_proto",
         "@npm//@improbable-eng/grpc-web",
+        "@npm//google-protobuf",
     ],
 )
 
 jasmine_node_test(
     name = "rollup_test",
     srcs = [
-        ":rollup_test.spec.js"
+        ":rollup_test.spec.js",
     ],
     data = [
-        ":test_es6_bundling"
-    ]
+        ":test_es6_bundling",
+    ],
 )