Merge pull request #157 from derivita/bazel-4.2.2

Upgrade bazel and rules_nodejs.

Author: davidedc

.bazelrc

@@ -61,11 +61,6 @@ build:debug --compilation_mode=dbg
 # This prevents accidentally depending on this feature, which Bazel will remove.
 build --nolegacy_external_runfiles
 
-# Turn on the "Managed Directories" feature.
-# This allows Bazel to share the same node_modules directory with other tools
-# NB: this option was introduced in Bazel 0.26
-# See https://docs.bazel.build/versions/master/command-line-reference.html#flag--experimental_allow_incremental_repository_updates
-common --experimental_allow_incremental_repository_updates
 
 # Turn on --incompatible_strict_action_env which was on by default
 # in Bazel 0.21.0 but turned off again in 0.22.0. Follow

.bazelversion

@@ -1,2 +1 @@
-3.0.0
-
+4.2.2

BUILD.bazel

@@ -1,7 +1,6 @@
 load("@npm//@bazel/typescript:index.bzl", "ts_project")
 load("@npm//@bazel/esbuild:index.bzl", "esbuild")
-load("gen_tests.bzl", "gen_tests")
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test", "pkg_npm", "copy_to_bin")
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin", "nodejs_test", "pkg_npm")
 
 # Allow any ts_library rules in this workspace to reference the config
 # Note: if you move the tsconfig.json file to a subdirectory, you can add an alias() here instead
@@ -15,92 +14,78 @@ exports_files(
 ts_project(
     name = "tsc",
     tsconfig = "tsconfig.json",
-    deps = ["@npm//big-integer", "@npm//@types/node"],
+    deps = [
+        "@npm//@types/node",
+        "@npm//big-integer",
+    ],
 )
 
 copy_to_bin(
-    name="copy_browser_main",
-    srcs=["sources/browser_main.js"],
+    name = "copy_browser_main",
+    srcs = ["sources/browser_main.js"],
 )
 
 # recommendation online seems to be to NOT minify NPM packages, because they are
 # loaded "locally" and they are part of larger pipelines that usually
 # minify things "down the line"
 esbuild(
-    name="algebrite",
-    deps=[":tsc"],
+    name = "algebrite",
     entry_point = "index.ts",
-    platform = "node",
     external = ["big-integer"],
-    tool = select({
-        "@bazel_tools//src/conditions:darwin": "@esbuild_darwin//:bin/esbuild",
-        "@bazel_tools//src/conditions:windows": "@esbuild_windows//:esbuild.exe",
-        "@bazel_tools//src/conditions:linux_x86_64": "@esbuild_linux//:bin/esbuild",
-    }),
-    visibility=["//visibility:public"],
+    platform = "node",
+    visibility = ["//visibility:public"],
+    deps = [":tsc"],
 )
 
 # let's also copy the sourcemaps. They are only loaded when opening the dev tools
 # and they actually show the original code file-by-file, which could be useful
 genrule(
-    name="copy-to-dist-bundle-for-browser-min",
+    name = "copy-to-dist-bundle-for-browser-min",
     srcs = ["algebrite.bundle-for-browser-min.js"],
     outs = ["copy-to-dist-bundle-for-browser-min.txt"],
     cmd = "echo 'done' > $(OUTS) ; cd dist ; rm -f algebrite.bundle-for-browser-min.js ; rm -f algebrite.bundle-for-browser-min.js.map ; cp bin/algebrite.bundle-for-browser-min.js . ; cp bin/algebrite.bundle-for-browser-min.js.map .",
     local = 1,  # required
 )
 
 genrule(
-    name="copy-to-dist-bundle-for-browser",
+    name = "copy-to-dist-bundle-for-browser",
     srcs = ["algebrite.bundle-for-browser.js"],
     outs = ["copy-to-dist-bundle-for-browser.txt"],
     cmd = "echo 'done' > $(OUTS) ; cd dist ; rm -f algebrite.bundle-for-browser.js ; cp bin/algebrite.bundle-for-browser.js .",
     local = 1,  # required
 )
 
 genrule(
-    name="copy-to-dist-index-runtime-sources",
+    name = "copy-to-dist-index-runtime-sources",
     srcs = ["index.js"],
     outs = ["copy-to-dist-index-runtime-sources.txt"],
     cmd = "echo 'done' > $(OUTS) ; cd dist ; rm -rf index.js ; rm -rf runtime ; rm -rf sources ; cp bin/index.js index.js ; cp -r bin/runtime . ; cp -r bin/sources .",
     local = 1,  # required
 )
 
-
-
 esbuild(
-    name="algebrite.bundle-for-browser-min",
-    deps=[":tsc"],
+    name = "algebrite.bundle-for-browser-min",
     entry_point = ":copy_browser_main",
     minify = True,
-    target = "safari13,chrome87,firefox85",
-    tool = select({
-        "@bazel_tools//src/conditions:darwin": "@esbuild_darwin//:bin/esbuild",
-        "@bazel_tools//src/conditions:windows": "@esbuild_windows//:esbuild.exe",
-        "@bazel_tools//src/conditions:linux_x86_64": "@esbuild_linux//:bin/esbuild",
-    }),
-    visibility=["//visibility:public"],
+    target = "safari13",
+    visibility = ["//visibility:public"],
+    deps = [":tsc"],
 )
 
 esbuild(
-    name="algebrite.bundle-for-browser",
-    deps=[":tsc"],
+    name = "algebrite.bundle-for-browser",
     entry_point = ":copy_browser_main",
     minify = False,
-    target = "safari13,chrome87,firefox85",
-    tool = select({
-        "@bazel_tools//src/conditions:darwin": "@esbuild_darwin//:bin/esbuild",
-        "@bazel_tools//src/conditions:windows": "@esbuild_windows//:esbuild.exe",
-        "@bazel_tools//src/conditions:linux_x86_64": "@esbuild_linux//:bin/esbuild",
-    }),
-    visibility=["//visibility:public"],
+    target = "safari13",
+    visibility = ["//visibility:public"],
+    deps = [":tsc"],
 )
 
 pkg_npm(
-    name="npm",
+    name = "npm",
+    package_name = "algebrite",
     srcs = ["package.json"],
     deps = [
-        ":tsc",
         ":algebrite",
         ":algebrite.bundle-for-browser-min",
         ":algebrite.bundle-for-browser",
@@ -115,7 +100,7 @@ pkg_npm(
         # this is for the so called "module" npm deliverable
         # see https://stackoverflow.com/questions/42708484/what-is-the-module-package-json-field-for
         ":copy-to-dist-index-runtime-sources",
-    ]
+    ],
 )
 
 nodejs_test(
@@ -277,8 +262,8 @@ nodejs_test(
         ":tsc",
         "@npm//big-integer",
     ],
-    shard_count = 16,
     entry_point = ":tests/roots.ts",
+    shard_count = 16,
 )
 
 nodejs_test(

WORKSPACE.bazel

@@ -13,50 +13,24 @@ workspace(
 # Install the nodejs "bootstrap" package
 # This provides the basic tools for running and packaging nodejs programs in Bazel
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "f533eeefc8fe1ddfe93652ec50f82373d0c431f7faabd5e6323f6903195ef227",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.3.0/rules_nodejs-3.3.0.tar.gz"],
+    sha256 = "cfc289523cf1594598215901154a6c2515e8bf3671fd708264a6f6aefe02bf39",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.6/rules_nodejs-4.4.6.tar.gz"],
 )
 
 # The npm_install rule runs yarn anytime the package.json or package-lock.json file changes.
 # It also extracts any Bazel rules distributed in an npm package.
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
+
 npm_install(
     # Name this npm so that Bazel Label references look like @npm//package
     name = "npm",
     package_json = "//:package.json",
     package_lock_json = "//:package-lock.json",
 )
 
+load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
 
-_ESBUILD_VERSION = "0.11.5"  # reminder: update SHAs below when changing this value
-http_archive(
-    name = "esbuild_darwin",
-    urls = [
-        "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-%s.tgz" % _ESBUILD_VERSION,
-    ],
-    strip_prefix = "package",
-    build_file_content = """exports_files(["bin/esbuild"])""",
-    sha256 = "98436890727bdb0d4beddd9c9e07d0aeff0e8dfe0169f85e568eca0dd43f665e",
-)
-
-http_archive(
-    name = "esbuild_windows",
-    urls = [
-        "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-%s.tgz" % _ESBUILD_VERSION,
-    ],
-    strip_prefix = "package",
-    build_file_content = """exports_files(["esbuild.exe"])""",
-    sha256 = "589c8ff97210bd41de106e6317ce88f9e88d2cacfd8178ae1217f2b857ff6c3a",
-)
-
-http_archive(
-    name = "esbuild_linux",
-    urls = [
-        "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-%s.tgz" % _ESBUILD_VERSION,
-    ],
-    strip_prefix = "package",
-    build_file_content = """exports_files(["bin/esbuild"])""",
-    sha256 = "113c2e84895f4422a3676db4e15d9f01b2b4fac041edab25284fdb9574ba58a0",
-)
+esbuild_repositories(npm_repository = "npm")