diff --git a/WORKSPACE b/WORKSPACE index abc0a58541..52384881ab 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Fetch rules_nodejs so we can install our npm dependencies http_archive( name = "build_bazel_rules_nodejs", - sha256 = "9d93d4e1340c43dbf6b2fd66b683d89630a6310bf8be3bf40ec96685dcacc26c", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.3.3/rules_nodejs-2.3.3.tar.gz"], + sha256 = "dd4dc46066e2ce034cba0c81aa3e862b27e8e8d95871f567359f7a534cccb666", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.1.0/rules_nodejs-3.1.0.tar.gz"], ) # Check the rules_nodejs version and download npm dependencies @@ -31,6 +31,9 @@ yarn_install( name = "npm", manual_build_file_contents = npm_package_archives(), package_json = "//:package.json", + # TODO(josephperrott): Correct usage of transitive dependencies to reenable strict_visibility + # See: https://github.com/bazelbuild/rules_nodejs/wiki#strict_visibility-on-yarn_install-and-npm_install-now-defaults-true-2199 + strict_visibility = False, yarn_lock = "//:yarn.lock", ) @@ -44,11 +47,6 @@ load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies") npm_bazel_protractor_dependencies() -# Load karma dependencies -load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies") - -npm_bazel_karma_dependencies() - # Setup the rules_webtesting toolchain load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories") @@ -59,7 +57,7 @@ load("//dev-infra/browsers:browser_repositories.bzl", "browser_repositories") browser_repositories() # Setup the rules_sass toolchain -load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories") +load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") sass_repositories() diff --git a/package.json b/package.json index a932982a70..633b420cf6 100644 --- a/package.json +++ b/package.json @@ -52,12 +52,12 @@ "@babel/template": "^7.8.6", "@babel/traverse": "^7.8.6", "@babel/types": "^7.8.6", - "@bazel/jasmine": "2.3.3", - "@bazel/karma": "2.3.3", - "@bazel/protractor": "2.3.3", - "@bazel/rollup": "2.3.3", - "@bazel/terser": "2.3.3", - "@bazel/typescript": "2.3.3", + "@bazel/concatjs": "3.0.0", + "@bazel/jasmine": "3.1.0", + "@bazel/protractor": "3.1.0", + "@bazel/rollup": "3.1.0", + "@bazel/terser": "3.1.0", + "@bazel/typescript": "3.1.0", "@microsoft/api-extractor": "7.7.11", "@octokit/rest": "16.28.7", "@octokit/types": "^5.0.1", diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl index 22838f6b19..a2d475788d 100644 --- a/packages/bazel/package.bzl +++ b/packages/bazel/package.bzl @@ -43,11 +43,11 @@ def rules_angular_dev_dependencies(): _maybe( http_archive, name = "io_bazel_rules_sass", - sha256 = "77e241148f26d5dbb98f96fe0029d8f221c6cb75edbb83e781e08ac7f5322c5f", - strip_prefix = "rules_sass-1.24.0", + sha256 = "596ab3616d370135e0ecc710e103422e0aa3719f1c970303a0886b70c81ee819", + strip_prefix = "rules_sass-1.32.2", urls = [ - "https://github.com/bazelbuild/rules_sass/archive/1.24.0.zip", - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.24.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.32.2.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.32.2.zip", ], ) diff --git a/yarn.lock b/yarn.lock index 351df8af91..60f3622ef9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1967,43 +1967,47 @@ "@bazel/buildifier-linux_x64" "0.29.0" "@bazel/buildifier-win32_x64" "0.29.0" +"@bazel/concatjs@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@bazel/concatjs/-/concatjs-3.0.0.tgz#8a8b0c90ffcea4ed74a7c8db8fd37af861df394e" + integrity sha512-JQTKFxWY6KQwfwqQRJCJtg8sQBN0ydTvV/5umTIC9wUz+1RdVRzGVtypYuY+V8wbTWB7Pt3cr+6eq9tPjPSFWQ== + dependencies: + protobufjs "6.8.8" + source-map-support "0.5.9" + tsutils "2.27.2" + "@bazel/ibazel@^0.12.3": version "0.12.4" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.4.tgz#ddda7c8ead6e29dc8d637af446086a750f395218" integrity sha512-FzOy+esB/fXVDbAmL6Ce2yCEy+PESZih8GypKhi0B8XzoZHAAn3QNnQcMNwo9PrIfp3G1989nM/JQ1b8jwEinQ== -"@bazel/jasmine@2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-2.3.3.tgz#7221c3704e63a4b8b19a9c7c9dec4b0337f302e0" - integrity sha512-YAXSCSBQ51/Ep+PAIro9WnO1c47on4KJ3ISMLbBoowIsWVhXIRGVLUoRivIRE89yKX2vHE1+4OuwYpywgRQOZw== +"@bazel/jasmine@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-3.1.0.tgz#f71b60194f083cd171bf18089e90df1c16cb0ade" + integrity sha512-EPKbBtkqpolVhF9l9QCm8+wbdsRqtFvHgOruk/mkLXpvTmSV+cO//okunEMyeA03BIj1+Ek8Hqk4b4l4lAT4bw== dependencies: c8 "~7.1.0" jasmine-reporters "~2.3.2" -"@bazel/karma@2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.3.3.tgz#063192e597ec4bd7bf2b80bf6bc5d7e2013e2002" - integrity sha512-qetKRmK0abViVDZH6okAXlDsFgr5btdwrWngjStlGDHHaTR23ORNilPIUTLrbwyIgy6qHlMdGrTp9KVXGGK6sQ== +"@bazel/protractor@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-3.1.0.tgz#9d4e2514fa6949c58996b38824409811408924a8" + integrity sha512-39ilFP+grfdetXJOfeImNgNksB42vvlMmM/PU4cO5hUpGvDWSVpx9jIJUdr+NySf3M4A+Kizk3NtcO3xMNmwyQ== -"@bazel/protractor@2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.3.3.tgz#44eca70d159d3e5a67654683f81266cc3594ce5a" - integrity sha512-06EFGstTshvofjiUd1ZJJepGeTgkLZNZB9Bfb7IhMC/ca1ZaeKB8SRWHhiPw7wN1QojHf4JJ+uhbqDt60m+Xrg== +"@bazel/rollup@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-3.1.0.tgz#36346f052b2ce3c1e31e5ebb05ed80464548eb00" + integrity sha512-lmgPhlR1VsJRsSE83Jlv+WT26Lso0/0FqXknlVuOmvCWFwSUKlriws729fqJZsvV5O2muAgJKuQl/zk+gqGCug== -"@bazel/rollup@2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-2.3.3.tgz#ecefb4e23b3fd63c6f36f925a98bcfc5436f7fa6" - integrity sha512-8KsW+0GpYPMV1jKiEuAZhBm2wMcU3gKjCxasXqdXTSYDyuwE4n/aihuPxSBSWpJ82Gv4MBBkSmieFZ+s9nVoBw== +"@bazel/terser@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-3.1.0.tgz#5801e83d4ac648fb1a8824a77a1a1f32c3af0c1e" + integrity sha512-8oXZwy5G5dbr4zltBzLjfPw4ZARDEysB2E25dCqAo64XJ26ptS+D3/UnE3uZU9KuM/3ka1U+YIpit+f9SqCgTA== -"@bazel/terser@2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-2.3.3.tgz#680cedce0569291534ee832f76cae078948c4a7d" - integrity sha512-0PytwAoKO4Yqbfgm3HKzkLF7mycj1O10jndg7Sz8Z20yWmU35087ssULFzFy3sXehKSypFeV+PVJ3eO824/0OQ== - -"@bazel/typescript@2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-2.3.3.tgz#8f238a6d395140cdc6ed6900f0861efb744ca91b" - integrity sha512-tkkrV1wrpMKj7gDlgloo/24lGmW5btHxzg9xqBZsXVvEfhr3HP9dU296bBxtdS1zZuORCxdIhh7D3iPonQDibg== +"@bazel/typescript@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.1.0.tgz#a07999ad7956b8c624604a521e653570bba32025" + integrity sha512-sEWuvkUGIDeRhjLENHtJyop7wu4UqKN8h/nSgUwc5gkpWXQiT2wGH5jKVxBqODOBHB+IInEMtAjyRmCT+HbSHA== dependencies: protobufjs "6.8.8" semver "5.6.0"