diff --git a/BUILD.bazel b/BUILD.bazel index 049d72fe261..bdd447f8dcd 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,7 +1,5 @@ package(default_visibility = ["//visibility:public"]) -load("@build_bazel_rules_nodejs//:defs.bzl", "node_modules_filegroup") - exports_files([ "tsconfig.json", "LICENSE", diff --git a/WORKSPACE b/WORKSPACE index 6396b707f93..7a29bc3fe99 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -35,13 +35,16 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi # Bazel version must be at least v0.21.0 because: # - 0.21.0 Using --incompatible_strict_action_env flag fixes cache when running `yarn bazel` # (see https://github.com/angular/angular/issues/27514#issuecomment-451438271) -check_bazel_version("0.21.0", """ +check_bazel_version( + message = """ You no longer need to install Bazel on your machine. Angular has a dependency on the @bazel/bazel package which supplies it. Try running `yarn bazel` instead. (If you did run that, check that you've got a fresh `yarn install`) -""") +""", + minimum_bazel_version = "0.21.0", +) # Setup the Node.js toolchain node_repositories( diff --git a/bazel-out b/bazel-out new file mode 120000 index 00000000000..0f59fe12b3e --- /dev/null +++ b/bazel-out @@ -0,0 +1 @@ +/private/var/tmp/_bazel_wassim/b60489123ecff60262797b9b261f5599/execroot/angular/bazel-out \ No newline at end of file diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 131cba42610..962093c4fa4 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -23,13 +23,16 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi # Bazel version must be at least v0.21.0 because: # - 0.21.0 Using --incompatible_strict_action_env flag fixes cache when running `yarn bazel` # (see https://github.com/angular/angular/issues/27514#issuecomment-451438271) -check_bazel_version("0.21.0", """ +check_bazel_version( + message = """ You no longer need to install Bazel on your machine. Angular has a dependency on the @bazel/bazel package which supplies it. Try running `yarn bazel` instead. (If you did run that, check that you've got a fresh `yarn install`) -""") +""", + minimum_bazel_version = "0.21.0", +) # Setup the Node.js toolchain node_repositories( diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel index 1014cdd936f..e04abde8c5d 100644 --- a/integration/bazel/src/BUILD.bazel +++ b/integration/bazel/src/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@npm_angular_bazel//:index.bzl", "ng_module") -load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "nodejs_binary", "rollup_bundle") +load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "rollup_bundle") load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel index d7b68d723d9..2c87ddba915 100644 --- a/modules/benchmarks/src/largetable/iv/BUILD.bazel +++ b/modules/benchmarks/src/largetable/iv/BUILD.bazel @@ -1,4 +1,3 @@ -load("//tools:defaults.bzl", "ts_library") load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel index 22cc107de6a..c4779d184d1 100644 --- a/modules/playground/src/zippy_component/BUILD.bazel +++ b/modules/playground/src/zippy_component/BUILD.bazel @@ -6,7 +6,7 @@ package(default_visibility = ["//modules/playground:__subpackages__"]) ng_module( name = "zippy_component", srcs = glob(["**/*.ts"]), - assets = glob(["app/zippy.html"]), + assets = ["app/zippy.html"], tsconfig = "//modules/playground:tsconfig-build.json", # TODO: FW-1004 Type checking is currently not complete. type_check = False, diff --git a/package.json b/package.json index 9fe50b6039e..50817e20451 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "url": "https://github.com/angular/angular.git" }, "scripts": { - "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name BUILD -or -name BUILD.bazel -or -name WORKSPACE \\) ! -path \"*/node_modules/*\" | xargs buildifier -v", + "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=args-order,attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unused-variable", "bazel:lint": "yarn bazel:format --lint=warn", "bazel:lint-fix": "yarn bazel:format --lint=fix", "preinstall": "node tools/yarn/check-yarn.js", diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl index 9a4e651d403..3230cb16c70 100644 --- a/packages/bazel/src/ng_module.bzl +++ b/packages/bazel/src/ng_module.bzl @@ -545,7 +545,7 @@ NG_MODULE_ATTRIBUTES = { } NG_MODULE_RULE_ATTRS = dict(dict(COMMON_ATTRIBUTES, **NG_MODULE_ATTRIBUTES), **{ - "tsconfig": attr.label(allow_files = True, single_file = True), + "tsconfig": attr.label(allow_single_file = True), "node_modules": attr.label( doc = """The npm packages which should be available during the compile. diff --git a/packages/bazel/src/protractor/protractor_web_test.bzl b/packages/bazel/src/protractor/protractor_web_test.bzl index eb2fc069147..2da41aea2b0 100644 --- a/packages/bazel/src/protractor/protractor_web_test.bzl +++ b/packages/bazel/src/protractor/protractor_web_test.bzl @@ -149,14 +149,12 @@ _protractor_web_test = rule( doc = "Optional server executable target", executable = True, cfg = "target", - single_file = False, allow_files = True, ), "protractor": attr.label( doc = "Protractor executable target (set by protractor_web_test macro)", executable = True, cfg = "target", - single_file = False, allow_files = True, ), "_conf_tmpl": attr.label( diff --git a/packages/bazel/src/schematics/BUILD.bazel b/packages/bazel/src/schematics/BUILD.bazel index 5770199cc3b..d069a018df5 100644 --- a/packages/bazel/src/schematics/BUILD.bazel +++ b/packages/bazel/src/schematics/BUILD.bazel @@ -8,7 +8,7 @@ filegroup( visibility = ["//packages/bazel:__subpackages__"], ) -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test") jasmine_node_test( name = "test", diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel index 489eeba8c2a..0d9ce2b0cda 100644 --- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ng_module", "ts_library") +load("//tools:defaults.bzl", "ng_module") ng_module( name = "app", diff --git a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel index a603a75afbb..99e2f11d1f6 100644 --- a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) load("//tools:defaults.bzl", "ng_module") -load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle") ng_module( name = "app", diff --git a/packages/compiler-cli/src/ngcc/BUILD.bazel b/packages/compiler-cli/src/ngcc/BUILD.bazel index 9578fc4fbb7..cc4f7facb80 100644 --- a/packages/compiler-cli/src/ngcc/BUILD.bazel +++ b/packages/compiler-cli/src/ngcc/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +load("//tools:defaults.bzl", "ts_library") ts_library( name = "ngcc", diff --git a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel index 3099efe5669..622809dfec1 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel @@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library") ts_library( name = "annotations", - srcs = glob([ - "index.ts", + srcs = ["index.ts"] + glob([ "src/**/*.ts", ]), deps = [ diff --git a/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel b/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel index 2b0efabac87..774d74285bd 100644 --- a/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel @@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library") ts_library( name = "diagnostics", - srcs = glob([ - "index.ts", + srcs = ["index.ts"] + glob([ "src/**/*.ts", ]), deps = [ diff --git a/packages/compiler-cli/src/ngtsc/host/BUILD.bazel b/packages/compiler-cli/src/ngtsc/host/BUILD.bazel index 5f6a6cb8119..f88965ad126 100644 --- a/packages/compiler-cli/src/ngtsc/host/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/host/BUILD.bazel @@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library") ts_library( name = "host", - srcs = glob([ - "index.ts", + srcs = ["index.ts"] + glob([ "src/**/*.ts", ]), deps = ["@ngdeps//typescript"], diff --git a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel index 1595c439704..a2af33791e9 100644 --- a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel @@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library") ts_library( name = "metadata", - srcs = glob([ - "index.ts", + srcs = ["index.ts"] + glob([ "src/*.ts", ]), deps = [ diff --git a/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel b/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel index 70f871c3af3..23b5a6f8f98 100644 --- a/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel @@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library") ts_library( name = "shims", - srcs = glob([ - "index.ts", + srcs = ["index.ts"] + glob([ "src/**/*.ts", ]), deps = [ diff --git a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel index 213a53dc9e2..3b502798892 100644 --- a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel @@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library") ts_library( name = "switch", - srcs = glob([ - "index.ts", + srcs = ["index.ts"] + glob([ "src/**/*.ts", ]), deps = [ diff --git a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel index 32eae2e67a3..9e854413df3 100644 --- a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel @@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library") ts_library( name = "transform", - srcs = glob([ - "index.ts", + srcs = ["index.ts"] + glob([ "src/**/*.ts", ]), deps = [ diff --git a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel index 1f63dd3f2e6..e880c86fb06 100644 --- a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel @@ -5,7 +5,6 @@ load("//tools:defaults.bzl", "ts_library") ts_library( name = "util", srcs = glob([ - "index.ts", "src/**/*.ts", ]), deps = [ diff --git a/packages/core/test/bundling/animation_world/BUILD.bazel b/packages/core/test/bundling/animation_world/BUILD.bazel index 563c5c53e06..878e670120b 100644 --- a/packages/core/test/bundling/animation_world/BUILD.bazel +++ b/packages/core/test/bundling/animation_world/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle") load("//tools/http-server:http_server.bzl", "http_server") ng_module( diff --git a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel index c4501ccbedd..33d467a5bb5 100644 --- a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel +++ b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle") load("//tools/http-server:http_server.bzl", "http_server") ng_module( diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel index 9f89287a010..b337f88d322 100644 --- a/packages/core/test/render3/ivy/BUILD.bazel +++ b/packages/core/test/render3/ivy/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite") +load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") ts_library( name = "ivy_lib", diff --git a/packages/elements/schematics/BUILD.bazel b/packages/elements/schematics/BUILD.bazel index 3a3c20fa786..2b554aee66a 100644 --- a/packages/elements/schematics/BUILD.bazel +++ b/packages/elements/schematics/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "npm_package", "ts_library") +load("//tools:defaults.bzl", "npm_package") exports_files([ "package.json", diff --git a/packages/elements/schematics/ng-add/BUILD.bazel b/packages/elements/schematics/ng-add/BUILD.bazel index 5c1703fe3b1..7fae43766ab 100644 --- a/packages/elements/schematics/ng-add/BUILD.bazel +++ b/packages/elements/schematics/ng-add/BUILD.bazel @@ -1,15 +1,13 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "jasmine_node_test", "npm_package", "ts_library") +load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") ts_library( name = "ng-add", - srcs = glob( - [ - "index.ts", - "schema.ts", - ], - ), + srcs = [ + "index.ts", + "schema.ts", + ], deps = [ "//packages/common", "//packages/core", @@ -21,11 +19,9 @@ ts_library( ts_library( name = "test_lib", testonly = True, - srcs = glob( - [ - "index_spec.ts", - ], - ), + srcs = [ + "index_spec.ts", + ], deps = [ ":ng-add", "//packages/common", diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel index 06549ecf4a7..71bea73873d 100644 --- a/packages/elements/test/BUILD.bazel +++ b/packages/elements/test/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite") +load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite") ts_library( name = "test_lib", diff --git a/packages/router/test/aot_ngsummary_test/BUILD.bazel b/packages/router/test/aot_ngsummary_test/BUILD.bazel index 65d4c197ccd..5a4b60bf49c 100644 --- a/packages/router/test/aot_ngsummary_test/BUILD.bazel +++ b/packages/router/test/aot_ngsummary_test/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ts_library", "ts_web_test_suite") +load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ts_library") ng_module( name = "aot_routing_module", diff --git a/packages/upgrade/test/BUILD.bazel b/packages/upgrade/test/BUILD.bazel index 480ea045203..901457b9523 100644 --- a/packages/upgrade/test/BUILD.bazel +++ b/packages/upgrade/test/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite") +load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite") ts_library( name = "test_lib", diff --git a/tools/public_api_guard/BUILD.bazel b/tools/public_api_guard/BUILD.bazel index 517993efa5a..b037b901177 100644 --- a/tools/public_api_guard/BUILD.bazel +++ b/tools/public_api_guard/BUILD.bazel @@ -1,7 +1,7 @@ load("//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test") load(":public_api_guard.bzl", "generate_targets") -generate_targets(glob(["*/**/*.d.ts"])) +generate_targets(golden_files = glob(["*/**/*.d.ts"])) ts_api_guardian_test( name = "ng_global_utils_api", diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel index 191aa162e0b..eb6c2f2f075 100644 --- a/tools/ts-api-guardian/BUILD.bazel +++ b/tools/ts-api-guardian/BUILD.bazel @@ -1,8 +1,6 @@ load( "@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", - "node_modules_filegroup", - "nodejs_binary", "npm_package", ) load("@npm_bazel_typescript//:defs.bzl", "ts_library")