Skip to content

Commit

Permalink
build: run Bazel format/lint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeagle committed Apr 15, 2019
1 parent 7204714 commit 33645eb
Show file tree
Hide file tree
Showing 19 changed files with 139 additions and 157 deletions.
23 changes: 13 additions & 10 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "build_bazel_rules_nodejs",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.7/rules_nodejs-0.27.7.tar.gz"],
sha256 = "fb87ed5965cef93188af9a7287511639403f4b0da418961ce6defb9dcf658f51",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.7/rules_nodejs-0.27.7.tar.gz"],
)

# TS API Guardian resides in Angular
Expand All @@ -20,56 +20,59 @@ http_archive(
# We use protocol buffers for the Build Event Protocol
git_repository(
name = "com_google_protobuf",
remote = "https://github.com/protocolbuffers/protobuf",
commit = "b6375e03aa80274dae89410efdf46346413b2247",
remote = "https://github.com/protocolbuffers/protobuf",
)

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()

load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")

# 0.18.0 is needed for .bazelignore
check_bazel_version("0.18.0")

node_repositories(
node_version = "10.9.0",
yarn_version = "1.9.2",
node_repositories = {
"10.9.0-darwin_amd64": (
"node-v10.9.0-darwin-x64.tar.gz",
"node-v10.9.0-darwin-x64",
"3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc"
"3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc",
),
"10.9.0-linux_amd64": (
"node-v10.9.0-linux-x64.tar.xz",
"node-v10.9.0-linux-x64",
"c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff"
"c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff",
),
"10.9.0-windows_amd64": (
"node-v10.9.0-win-x64.zip",
"node-v10.9.0-win-x64",
"6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e"
"6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e",
),
},
node_version = "10.9.0",
yarn_repositories = {
"1.9.2": (
"yarn-v1.9.2.tar.gz",
"yarn-v1.9.2",
"3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204"
"3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204",
),
},
yarn_version = "1.9.2",
)

yarn_install(
name = "npm",
package_json = "//:package.json",
yarn_lock = "//:yarn.lock",
data = [
"//:tools/yarn/check-yarn.js",
],
package_json = "//:package.json",
yarn_lock = "//:yarn.lock",
)

load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")

install_bazel_dependencies()

load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
Expand Down
14 changes: 7 additions & 7 deletions etc/api/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ load("@angular//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test")
bundle[1],
bundle[2],
),
allow_module_identifiers = [
"fs",
"ts",
"ajv",
"Symbol",
"webpack",
],
data = glob([
"%s/%s/**/*.d.ts" % (
bundle[0],
Expand All @@ -36,13 +43,6 @@ load("@angular//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test")
# @angular-devkit/build-optimizer
"^buildOptimizerLoader$",
],
allow_module_identifiers = [
"fs",
"ts",
"ajv",
"Symbol",
"webpack",
],
# At the moment using this will ignore a big change
use_angular_tag_rules = False,
) for bundle in [b[:-len(".d.ts")].split("/", 2) for b in glob(
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"scripts": {
"admin": "node ./bin/devkit-admin",
"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:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=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",
"bazel:test": "bazel test //...",
Expand Down
5 changes: 4 additions & 1 deletion packages/angular/cli/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ ts_library(
"**/*_spec_large.ts",
],
),
data = glob(["**/*.json", "**/*.md"]),
data = glob([
"**/*.json",
"**/*.md",
]),
module_name = "@angular/cli",
# strict_checks = False,
deps = [
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/pwa/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ ts_library(
":pwa_schema",
"//packages/angular_devkit/core",
"//packages/angular_devkit/schematics",
"@npm//rxjs",
"@npm//@types/node",
"@npm//rxjs",
],
)

Expand Down
31 changes: 15 additions & 16 deletions packages/angular_devkit/architect/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@ ts_json_schema(
name = "builder_input_schema",
src = "src/input-schema.json",
)

ts_json_schema(
name = "builder_output_schema",
src = "src/output-schema.json",
)

ts_json_schema(
name = "builder_builders_schema",
src = "src/builders-schema.json",
)

ts_json_schema(
name = "progress_schema",
src = "src/progress-schema.json",
Expand All @@ -41,15 +44,14 @@ ts_library(
module_root = "node/index.d.ts",
# strict_checks = False,
deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node",
"@npm//rxjs",

"@npm//@types/node",
":architect",
":builder_builders_schema",
":builder_input_schema",
":builder_output_schema",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node",
"@npm//@types/node",
"@npm//rxjs",
],
)

Expand All @@ -62,19 +64,18 @@ ts_library(
"**/*_spec_large.ts",
],
),
module_name = "@angular-devkit/architect",
module_root = "src/index.d.ts",
# strict_checks = False,
data = glob(["**/*.json"]),
module_name = "@angular-devkit/architect",
module_root = "src/index.d.ts",
deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node",
"@npm//rxjs",

"@npm//@types/node",
":builder_input_schema",
":builder_output_schema",
":progress_schema",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node",
"@npm//@types/node",
"@npm//rxjs",
],
)

Expand All @@ -93,17 +94,15 @@ ts_library(
":architect",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node",
"@npm//rxjs",

"@npm//@types/node",
"@npm//rxjs",
],
)


npm_package(
name = "npm_package",
deps = [
":architect",
":testing"
":testing",
],
)
5 changes: 2 additions & 3 deletions packages/angular_devkit/architect_cli/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ ts_library(
"//packages/angular_devkit/architect:node",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node",
"@npm//rxjs",

"@npm//@types/node",
"@npm//@types/minimist",
"@npm//@types/node",
"@npm//@types/progress",
"@npm//rxjs",
],
)
22 changes: 10 additions & 12 deletions packages/angular_devkit/benchmark/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ ts_library(
deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node",
"@npm//rxjs",

"@npm//@types/node",
"@npm//@types/minimist",
"@npm//@types/node",
"@npm//rxjs",
],
)

ts_library(
name = "benchmark_test_lib",
testonly = True,
srcs = glob(
include = [
"src/**/*_spec.ts",
Expand All @@ -45,18 +45,16 @@ ts_library(
"src/test/fibonacci.js",
"src/test/test-script.js",
],
# @external_begin
tsconfig = "//:tsconfig-test.json",
deps = [
":benchmark",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node",
"@npm//rxjs",

"@npm//@types/node",
"@npm//@types/jasmine",
"@npm//@types/node",
"@npm//rxjs",
],
testonly = True,
# @external_begin
tsconfig = "//:tsconfig-test.json",
# @external_end
)

Expand All @@ -65,12 +63,12 @@ jasmine_node_test(
srcs = [":benchmark_test_lib"],
deps = [
"@npm//jasmine",
"@npm//source-map",
"@npm//minimist",
"@npm//pidusage",
"@npm//pidtree",
"@npm//tree-kill",
"@npm//pidusage",
"@npm//source-map",
"@npm//temp",
"@npm//tree-kill",
],
)

Expand Down
12 changes: 6 additions & 6 deletions packages/angular_devkit/build_optimizer/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,29 @@ ts_library(
deps = [
"@npm//@types/node",
"@npm//@types/source-map",
"@npm//typescript",
"@npm//@types/webpack",
"@npm//typescript",
],
)

ts_library(
name = "build_optimizer_test_lib",
testonly = True,
srcs = glob(
include = [
"src/**/*_spec.ts",
"src/**/*_spec_large.ts",
],
),
# @external_begin
tsconfig = "//:tsconfig-test.json",
deps = [
":build_optimizer",
"//packages/angular_devkit/core",
"@npm//@types/node",
"@npm//@types/jasmine",
"@npm//@types/node",
"@npm//@types/source-map",
],
testonly = True,
# @external_begin
tsconfig = "//:tsconfig-test.json",
# @external_end
)

Expand All @@ -58,7 +58,7 @@ jasmine_node_test(
deps = [
"@npm//jasmine",
"@npm//source-map",
]
],
)

npm_package(
Expand Down
Loading

0 comments on commit 33645eb

Please sign in to comment.