From bf7d0462699b6bdea0f5765239ea0b6b6d386577 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Thu, 20 Jun 2019 11:53:45 -0700 Subject: [PATCH] style: fix bazel lint in zone.js (#31172) Update to latest buildifier to fix a false positive error PR Close #31172 --- package.json | 2 +- packages/zone.js/BUILD.bazel | 4 +- packages/zone.js/test/BUILD.bazel | 64 +++++++++++++------------------ yarn.lock | 38 +++++++++--------- 4 files changed, 48 insertions(+), 60 deletions(-) diff --git a/package.json b/package.json index e197d602ee..56762964f7 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "devDependencies": { "@angular/cli": "^8.0.0-beta.15", "@bazel/bazel": "0.26.1", - "@bazel/buildifier": "^0.25.1", + "@bazel/buildifier": "^0.26.0", "@bazel/ibazel": "~0.9.0", "@types/minimist": "^1.2.0", "browserstacktunnel-wrapper": "2.0.1", diff --git a/packages/zone.js/BUILD.bazel b/packages/zone.js/BUILD.bazel index ba916f90c6..7cbb572215 100644 --- a/packages/zone.js/BUILD.bazel +++ b/packages/zone.js/BUILD.bazel @@ -1,6 +1,4 @@ -load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package", "rollup_bundle") -load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") -load("@npm_bazel_typescript//:defs.bzl", "ts_library") +load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package") load("//packages/zone.js:bundles.bzl", "ES2015_BUNDLES", "ES5_BUNDLES", "ES5_GLOBAL_BUNDLES") exports_files([ diff --git a/packages/zone.js/test/BUILD.bazel b/packages/zone.js/test/BUILD.bazel index f8f4b93cd5..14d10efcd2 100644 --- a/packages/zone.js/test/BUILD.bazel +++ b/packages/zone.js/test/BUILD.bazel @@ -1,7 +1,6 @@ load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle") -load("@npm_bazel_karma//:index.bzl", "karma_web_test", "karma_web_test_suite") -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@npm_bazel_karma//:index.bzl", "karma_web_test_suite") exports_files([ "assets/sample.json", @@ -12,11 +11,11 @@ exports_files([ ts_library( name = "common_spec_env", testonly = True, - srcs = glob([ + srcs = [ + "test-env-setup-jasmine.ts", "test_fake_polyfill.ts", "wtf_mock.ts", - "test-env-setup-jasmine.ts", - ]), + ], deps = [ "//packages/zone.js/lib", ], @@ -45,9 +44,7 @@ ts_library( ts_library( name = "common_spec_util", testonly = True, - srcs = glob([ - "test-util.ts", - ]), + srcs = ["test-util.ts"], deps = [ "//packages/zone.js/lib", ], @@ -56,9 +53,9 @@ ts_library( ts_library( name = "error_spec_srcs", testonly = True, - srcs = glob([ + srcs = [ "common/Error.spec.ts", - ]), + ], deps = [ ":common_spec_util", "//packages/zone.js/lib", @@ -68,16 +65,12 @@ ts_library( ts_library( name = "test_node_lib", testonly = True, - srcs = glob( - [ - "node/*.ts", - "node-env-setup.ts", - "node_entry_point_common.ts", - "node_entry_point.ts", - "node_entry_point_no_patch_clock.ts", - "test-env-setup-jasmine-no-patch-clock.ts", - ], - ), + srcs = glob(["node/*.ts"]) + [ + "node-env-setup.ts", + "node_entry_point.ts", + "node_entry_point_no_patch_clock.ts", + "test-env-setup-jasmine-no-patch-clock.ts", + ], deps = [ ":common_spec_env", ":common_spec_srcs", @@ -94,10 +87,10 @@ ts_library( ts_library( name = "bluebird_spec", testonly = True, - srcs = glob([ + srcs = [ "extra/bluebird.spec.ts", "node_bluebird_entry_point.ts", - ]), + ], deps = [ ":common_spec_env", "//packages/zone.js/lib", @@ -108,11 +101,11 @@ ts_library( ts_library( name = "error_spec", testonly = True, - srcs = glob([ - "node_error_entry_point.ts", + srcs = [ "node_error_disable_policy_entry_point.ts", + "node_error_entry_point.ts", "node_error_lazy_policy_entry_point.ts", - ]), + ], deps = [ ":common_spec_env", ":common_spec_util", @@ -192,16 +185,13 @@ jasmine_node_test( ts_library( name = "test_browser_lib", testonly = True, - srcs = glob( - [ - "browser/*.ts", - "extra/cordova.spec.ts", - "mocha-patch.spec.ts", - "jasmine-patch.spec.ts", - "common_tests.ts", - "browser_entry_point.ts", - ], - ), + srcs = glob(["browser/*.ts"]) + [ + "extra/cordova.spec.ts", + "mocha-patch.spec.ts", + "jasmine-patch.spec.ts", + "common_tests.ts", + "browser_entry_point.ts", + ], deps = [ ":common_spec_env", ":common_spec_srcs", @@ -219,10 +209,10 @@ ts_library( ts_library( name = "browser_env_setup", testonly = True, - srcs = glob([ + srcs = [ "browser-env-setup.ts", "browser_symbol_setup.ts", - ]), + ], deps = [ ":common_spec_env", ], diff --git a/yarn.lock b/yarn.lock index 3c7173bfb8..fc41ceec39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -114,29 +114,29 @@ "@bazel/bazel-linux_x64" "0.26.1" "@bazel/bazel-win32_x64" "0.26.1" -"@bazel/buildifier-darwin_x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@bazel/buildifier-darwin_x64/-/buildifier-darwin_x64-0.25.1.tgz#bcb8643ae46c6aa4f4981f59648ecd9087b30a11" - integrity sha512-9fD3tXYgSjpZCEUGFBadfwDw89b3z3acYLd8+a0F6Sb/9LB0jzXOCMzqFMA7m1b3wOh1ecgWOyT0TyPUDSLRkg== +"@bazel/buildifier-darwin_x64@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@bazel/buildifier-darwin_x64/-/buildifier-darwin_x64-0.26.0.tgz#0e4f5066750f7984689857e332f93368e0d782dd" + integrity sha512-yvlHuaP2FIMJ4Z4Ucs/R1wgwkDjhDkwvGD1eyhy9Qblqu7Ypgxtv2wz8dygrxDJVxhk3Kiwzlrp3otq6OYjv5A== -"@bazel/buildifier-linux_x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@bazel/buildifier-linux_x64/-/buildifier-linux_x64-0.25.1.tgz#50cc7c3b8f9dfa818ea6cc9f2ec761cbd39471ea" - integrity sha512-Wt2yA+yeimi6i0USHoE1T2EhRJwtKDBmDLQx2E8Q+QXysULLm4usMEIGPdQYbHqKyjL75jbwlwZTlm9EzdXgCg== +"@bazel/buildifier-linux_x64@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@bazel/buildifier-linux_x64/-/buildifier-linux_x64-0.26.0.tgz#05020641f17441145056821ec33a2c667e253a3f" + integrity sha512-4+ZGEVMQdJr39My2eH6GmQrBIQfuw/DWO3Vwpy5vS1p61EvV0a5+jaukRelA3p//FD0j2cAKaBvwZdsijtDsZw== -"@bazel/buildifier-win32_x64@0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@bazel/buildifier-win32_x64/-/buildifier-win32_x64-0.25.1.tgz#d990afed296f65675c1406ae36580473cab65f4c" - integrity sha512-ak91iv940z04NJfEhWHMSudjlZK5PrpDNL8k/cmYowi1JSfYvCchfABiXWxfWURmvqgSGE+KV72xxZ0HLU60bw== +"@bazel/buildifier-win32_x64@0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@bazel/buildifier-win32_x64/-/buildifier-win32_x64-0.26.0.tgz#51d983d36fd41f59063347e027487a447e4ea83e" + integrity sha512-S3QvjopF6cQ0rMv8zxi/SWfRBtA+oBGiTPcfpn1wJZa8Q21PdOcjH9ZgPJKpIV53x6sJ8XBVs7HSW44dPrwxQA== -"@bazel/buildifier@^0.25.1": - version "0.25.1" - resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-0.25.1.tgz#e29ab77802d99d70a891b9a471f62e80030fc326" - integrity sha512-d3+DgsGmQ3cSLCm99321cl+vKD/c3pNSQINCBnipmNeNd7UA3/UQ2Ibp6MXZslF8fMQDpuLxhhCFUOnFAoNWsw== +"@bazel/buildifier@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-0.26.0.tgz#65af3851f9ebe8b9ac651185d051b1a155012dbb" + integrity sha512-PVzkCOYhjlgcRCXUO31dy/GmtjDWzeTyVmPCFc4pxTFBvlrG7qkVlUW3DCIbBI5neTes0pY8mju837UBdK0OFQ== optionalDependencies: - "@bazel/buildifier-darwin_x64" "0.25.1" - "@bazel/buildifier-linux_x64" "0.25.1" - "@bazel/buildifier-win32_x64" "0.25.1" + "@bazel/buildifier-darwin_x64" "0.26.0" + "@bazel/buildifier-linux_x64" "0.26.0" + "@bazel/buildifier-win32_x64" "0.26.0" "@bazel/ibazel@~0.9.0": version "0.9.0"