style: enforce buildifier lint on CI (#28186)

PR Close #28186

BUILD.bazel

@@ -1,3 +1,5 @@
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
 package(default_visibility = ["//visibility:public"])
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_modules_filegroup")
@@ -44,8 +46,6 @@ filegroup(
     ],
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-
 # A nodejs_binary for @angular/bazel/ngc-wrapped to use by default in
 # ng_module that depends on @npm//@angular/bazel instead of the
 # output of the //packages/bazel/src/ngc-wrapped ts_library rule. This

WORKSPACE

@@ -41,7 +41,9 @@ 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(

integration/bazel/src/BUILD.bazel

@@ -5,6 +5,8 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "nodejs_binary", "ro
 load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
+package(default_visibility = ["//visibility:public"])
+
 # Allow targets under sub-packages to reference the tsconfig.json file
 exports_files(["tsconfig.json"])
 

integration/bazel/src/hello-world/BUILD.bazel

@@ -5,6 +5,8 @@ load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
 load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
 
+package(default_visibility = ["//visibility:public"])
+
 sass_binary(
     name = "hello-world-styles",
     src = "hello-world.component.scss",

modules/benchmarks/src/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "util_lib",
     srcs = ["util.ts"],

modules/benchmarks/src/largetable/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "util_lib",
     srcs = ["util.ts"],

modules/benchmarks/src/largetable/render3/BUILD.bazel

@@ -4,6 +4,8 @@ load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "largetable_lib",
     srcs = glob(["**/*.ts"]),

modules/benchmarks/src/tree/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "util_lib",
     srcs = ["util.ts"],

modules/benchmarks/src/tree/render3/BUILD.bazel

@@ -4,6 +4,8 @@ load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "tree_lib",
     srcs = glob(["**/*.ts"]),

modules/e2e_util/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "e2e_util",
     testonly = 1,

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,out-of-order-load,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unsorted-dict-items,unused-variable",
     "bazel:lint": "yarn bazel:format --lint=warn",
     "bazel:lint-fix": "yarn bazel:format --lint=fix",
     "preinstall": "node tools/yarn/check-yarn.js",

packages/BUILD.bazel

@@ -1,3 +1,5 @@
+load("//tools:defaults.bzl", "ts_library")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files([

packages/animations/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_package")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "animations",
     srcs = glob(

packages/animations/browser/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "browser",
     srcs = glob(

packages/animations/browser/testing/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),

packages/bazel/index.bzl

@@ -7,14 +7,14 @@
 Users should not load files under "/src"
 """
 
-load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module")
-load("//packages/bazel/src:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace")
 load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package")
 load(
     "//packages/bazel/src/protractor:protractor_web_test.bzl",
     _protractor_web_test = "protractor_web_test",
     _protractor_web_test_suite = "protractor_web_test_suite",
 )
+load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module")
+load("//packages/bazel/src:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace")
 
 ng_module = _ng_module
 ng_package = _ng_package

packages/bazel/src/BUILD.bazel

@@ -8,8 +8,6 @@ filegroup(
 # For generating skydoc
 exports_files(glob(["*.bzl"]))
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-
 nodejs_binary(
     name = "rollup_with_build_optimizer",
     data = [

packages/bazel/src/builders/BUILD.bazel

@@ -1,3 +1,5 @@
+load("//tools:defaults.bzl", "ts_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
@@ -8,8 +10,6 @@ filegroup(
     visibility = ["//packages/bazel:__subpackages__"],
 )
 
-load("//tools:defaults.bzl", "ts_library")
-
 ts_library(
     name = "builders",
     srcs = [

packages/bazel/src/esm5.bzl

@@ -170,6 +170,11 @@ esm5_outputs_aspect = aspect(
             executable = True,
             cfg = "host",
         ),
+        "_tsc_wrapped": attr.label(
+            default = Label("@build_bazel_rules_typescript//:@bazel/typescript/tsc_wrapped"),
+            executable = True,
+            cfg = "host",
+        ),
     },
 )
 

packages/bazel/src/ng_module.bzl

@@ -244,6 +244,8 @@ def _expected_outs(ctx):
     # TODO(alxhub): i18n is only produced by the legacy compiler currently. This should be re-enabled
     # when ngtsc can extract messages
     if is_legacy_ngc:
+        # TODO(manekinekko): due to bazelbuild/bazel#4858 we cannot fix the call to ctx.new_file(genfiles_dir)
+        # so the rule is turned off for now.
         i18n_messages_files = [ctx.new_file(ctx.genfiles_dir, ctx.label.name + "_ngc_messages.xmb")]
     else:
         i18n_messages_files = []
@@ -268,9 +270,9 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
         expected_outs = outs.closure_js
 
     angular_compiler_options = {
-        "enableResourceInlining": ctx.attr.inline_resources,
-        "generateCodeForLibraries": False,
         "allowEmptyCodegenFiles": True,
+        "enableIvy": _enable_ivy_value(ctx),
+        "enableResourceInlining": ctx.attr.inline_resources,
         # Summaries are only enabled if Angular outputs are to be produced.
         "enableSummariesForJit": is_legacy_ngc,
         "enableIvy": _enable_ivy_value(ctx),
@@ -537,8 +539,8 @@ def ng_module_impl(ctx, ts_compile_actions):
 
     if is_legacy_ngc:
         providers["angular"] = {
-            "summaries": outs.summaries,
             "metadata": outs.metadata,
+            "summaries": outs.summaries,
         }
         providers["ngc_messages"] = outs.i18n_messages
 
@@ -568,13 +570,6 @@ local_deps_aspects = [collect_node_modules_aspect, _collect_summaries_aspect]
 
 NG_MODULE_ATTRIBUTES = {
     "srcs": attr.label_list(allow_files = [".ts"]),
-
-    # Note: DEPS_ASPECTS is already a list, we add the cast to workaround
-    # https://github.com/bazelbuild/skydoc/issues/21
-    "deps": attr.label_list(
-        doc = "Targets that are imported by this target",
-        aspects = local_deps_aspects,
-    ),
     "assets": attr.label_list(
         doc = ".html and .css files needed by the Angular compiler",
         allow_files = [
@@ -583,14 +578,6 @@ NG_MODULE_ATTRIBUTES = {
             ".html",
         ],
     ),
-    "factories": attr.label_list(
-        allow_files = [".ts", ".html"],
-        mandatory = False,
-    ),
-    "filter_summaries": attr.bool(default = False),
-    "type_check": attr.bool(default = True),
-    "inline_resources": attr.bool(default = True),
-    "no_i18n": attr.bool(default = False),
     "compiler": attr.label(
         doc = """Sets a different ngc compiler binary to use for this library.
 
@@ -605,16 +592,40 @@ NG_MODULE_ATTRIBUTES = {
         executable = True,
         cfg = "host",
     ),
+    "factories": attr.label_list(
+        allow_files = [".ts", ".html"],
+        mandatory = False,
+    ),
+    "filter_summaries": attr.bool(default = False),
+    "inline_resources": attr.bool(default = True),
     "ng_xi18n": attr.label(
         default = Label(DEFAULT_NG_XI18N),
         executable = True,
         cfg = "host",
     ),
+    "no_i18n": attr.bool(default = False),
+    "type_check": attr.bool(default = True),
+
+    # Note: DEPS_ASPECTS is already a list, we add the cast to workaround
+    # https://github.com/bazelbuild/skydoc/issues/21
+    "deps": attr.label_list(
+        doc = "Targets that are imported by this target",
+        aspects = local_deps_aspects,
+    ),
     "_supports_workers": attr.bool(default = True),
 }
 
 NG_MODULE_RULE_ATTRS = dict(dict(COMMON_ATTRIBUTES, **NG_MODULE_ATTRIBUTES), **{
-    "tsconfig": attr.label(allow_files = True, single_file = True),
+    "entry_point": attr.string(),
+
+    # Default is %{name}_public_index
+    # The suffix points to the generated "bundle index" files that users import from
+    # The default is intended to avoid collisions with the users input files.
+    # Later packaging rules will point to these generated files as the entry point
+    # into the package.
+    # See the flatModuleOutFile documentation in
+    # https://github.com/angular/angular/blob/master/packages/compiler-cli/src/transformers/api.ts
+    "flat_module_out_file": attr.string(),
     "node_modules": attr.label(
         doc = """The npm packages which should be available during the compile.
 

packages/bazel/src/ng_package/BUILD.bazel

@@ -1,5 +1,3 @@
-package(default_visibility = ["//visibility:public"])
-
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
 # BEGIN-DEV-ONLY

packages/bazel/src/ng_package/ng_package.bzl

@@ -16,6 +16,12 @@ specification of this format at https://goo.gl/jB3GVv
 load("@build_bazel_rules_nodejs//internal/common:collect_es6_sources.bzl", "collect_es6_sources")
 load("@build_bazel_rules_nodejs//internal/common:node_module_info.bzl", "NodeModuleInfo")
 load("@build_bazel_rules_nodejs//internal/common:sources_aspect.bzl", "sources_aspect")
+load(
+    "@build_bazel_rules_nodejs//:internal/npm_package/npm_package.bzl",
+    "NPM_PACKAGE_ATTRS",
+    "NPM_PACKAGE_OUTPUTS",
+    "create_package",
+)
 load(
     "@build_bazel_rules_nodejs//:internal/rollup/rollup_bundle.bzl",
     "ROLLUP_ATTRS",
@@ -32,6 +38,7 @@ load(
 load("//packages/bazel/src:external.bzl", "FLAT_DTS_FILE_SUFFIX")
 load("//packages/bazel/src:esm5.bzl", "esm5_outputs_aspect", "esm5_root_dir", "flatten_esm5")
 load("//packages/bazel/src/ng_package:collect-type-definitions.bzl", "collect_type_definitions")
+load("//packages/bazel/src:esm5.bzl", "esm5_outputs_aspect", "esm5_root_dir", "flatten_esm5")
 
 _DEFAULT_NG_PACKAGER = "@npm//@angular/bazel/bin:packager"
 
@@ -336,8 +343,8 @@ def _ng_package_impl(ctx):
         packager_inputs.extend([m.metadata_file])
         metadata_arg[m.module_name] = {
             "index": m.typings_file.path.replace(".d.ts", ".js"),
-            "typings": m.typings_file.path,
             "metadata": m.metadata_file.path,
+            "typings": m.typings_file.path,
         }
     packager_args.add(str(metadata_arg))
 
@@ -401,7 +408,6 @@ DEPS_ASPECTS = [esm5_outputs_aspect, sources_aspect]
 
 NG_PACKAGE_ATTRS = dict(NPM_PACKAGE_ATTRS, **dict(ROLLUP_ATTRS, **{
     "srcs": attr.label_list(allow_files = True),
-    "deps": attr.label_list(aspects = DEPS_ASPECTS),
     "data": attr.label_list(
         doc = "Additional, non-Angular files to be added to the package, e.g. global CSS assets.",
         allow_files = True,
@@ -412,11 +418,15 @@ NG_PACKAGE_ATTRS = dict(NPM_PACKAGE_ATTRS, **dict(ROLLUP_ATTRS, **{
     "entry_point_name": attr.string(
         doc = "Name to use when generating bundle files for the primary entry-point.",
     ),
+    "globals": attr.string_dict(default = {}),
+    "include_devmode_srcs": attr.bool(default = False),
     "ng_packager": attr.label(
         default = Label(_DEFAULT_NG_PACKAGER),
         executable = True,
         cfg = "host",
     ),
+    "readme_md": attr.label(allow_single_file = [".md"]),
+    "deps": attr.label_list(aspects = DEPS_ASPECTS),
     "_rollup": attr.label(
         default = Label("@build_bazel_rules_nodejs//internal/rollup"),
         executable = True,
@@ -479,8 +489,8 @@ def ng_package_outputs(name, entry_point, entry_point_name):
 
     basename = primary_entry_point_name(name, entry_point, entry_point_name)
     outputs = {
-        "fesm5": "fesm5/%s.js" % basename,
         "fesm2015": "fesm2015/%s.js" % basename,
+        "fesm5": "fesm5/%s.js" % basename,
         "umd": "%s.umd.js" % basename,
         "umd_min": "%s.umd.min.js" % basename,
     }

packages/bazel/src/ng_rollup_bundle.bzl

@@ -91,7 +91,7 @@ def _run_tsc(ctx, input, output):
     args.add(input)
     args.add("--outFile", output)
 
-    ctx.action(
+    ctx.actions.run(
         executable = ctx.executable._tsc,
         inputs = [input],
         outputs = [output],
@@ -170,16 +170,16 @@ ng_rollup_bundle = rule(
             Typically this will be `ts_library` or `ng_module` targets.""",
             aspects = DEPS_ASPECTS,
         ),
-        "_rollup": attr.label(
-            executable = True,
-            cfg = "host",
-            default = Label("@angular//packages/bazel/src:rollup_with_build_optimizer"),
-        ),
         "_brotli": attr.label(
             executable = True,
             cfg = "host",
             default = Label("@org_brotli//:brotli"),
         ),
+        "_rollup": attr.label(
+            executable = True,
+            cfg = "host",
+            default = Label("@angular//packages/bazel/src:rollup_with_build_optimizer"),
+        ),
     }),
     outputs = dict(ROLLUP_OUTPUTS, **{
         "build_es5_min_compressed": "%{name}.min.js.br",

packages/bazel/src/protractor/protractor_web_test.bzl

@@ -62,9 +62,9 @@ def _protractor_web_test_impl(ctx):
         substitutions = {
             "TMPL_config": expand_path_into_runfiles(ctx, configuration_file.short_path) if configuration_file else "",
             "TMPL_on_prepare": expand_path_into_runfiles(ctx, on_prepare_file.short_path) if on_prepare_file else "",
-            "TMPL_workspace": ctx.workspace_name,
             "TMPL_server": ctx.executable.server.short_path if ctx.executable.server else "",
             "TMPL_specs": "\n".join(["      '%s'," % e for e in specs]),
+            "TMPL_workspace": ctx.workspace_name,
         },
     )
 
@@ -121,14 +121,17 @@ _protractor_web_test = rule(
     test = True,
     executable = True,
     attrs = {
+        "srcs": attr.label_list(
+            doc = "A list of JavaScript test files",
+            allow_files = [".js"],
+        ),
         "configuration": attr.label(
             doc = "Protractor configuration file",
             allow_single_file = True,
             aspects = [sources_aspect],
         ),
-        "srcs": attr.label_list(
+        "data": attr.label_list(
-            doc = "A list of JavaScript test files",
+            doc = "Runtime dependencies",
-            allow_files = [".js"],
         ),
         "on_prepare": attr.label(
             doc = """A file with a node.js script to run once before all tests run.
@@ -137,27 +140,22 @@ _protractor_web_test = rule(
             allow_single_file = True,
             aspects = [sources_aspect],
         ),
-        "deps": attr.label_list(
+        "protractor": attr.label(
-            doc = "Other targets which produce JavaScript such as `ts_library`",
+            doc = "Protractor executable target (set by protractor_web_test macro)",
+            executable = True,
+            cfg = "target",
             allow_files = True,
-            aspects = [sources_aspect],
-        ),
-        "data": attr.label_list(
-            doc = "Runtime dependencies",
         ),
         "server": attr.label(
             doc = "Optional server executable target",
             executable = True,
             cfg = "target",
-            single_file = False,
             allow_files = True,
         ),
-        "protractor": attr.label(
+        "deps": attr.label_list(
-            doc = "Protractor executable target (set by protractor_web_test macro)",
+            doc = "Other targets which produce JavaScript such as `ts_library`",
-            executable = True,
-            cfg = "target",
-            single_file = False,
             allow_files = True,
+            aspects = [sources_aspect],
         ),
         "_conf_tmpl": attr.label(
             default = Label(_CONF_TMPL),

packages/bazel/src/protractor/utils/BUILD.bazel

@@ -2,6 +2,8 @@ package(default_visibility = ["//visibility:public"])
 
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "utils",
     srcs = ["index.ts"],

packages/bazel/src/schematics/BUILD.bazel

@@ -1,3 +1,5 @@
+load("//tools:defaults.bzl", "jasmine_node_test")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
@@ -8,8 +10,6 @@ filegroup(
     visibility = ["//packages/bazel:__subpackages__"],
 )
 
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
-
 jasmine_node_test(
     name = "test",
     bootstrap = ["angular/tools/testing/init_node_spec.js"],

packages/bazel/src/schematics/bazel-workspace/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "bazel-workspace",
     srcs = [

packages/bazel/src/schematics/ng-new/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "ng-new",
     srcs = [

packages/bazel/test/ng_package/example/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//packages/bazel/test:__subpackages__"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_package", "npm_package")
 
+package(default_visibility = ["//packages/bazel/test:__subpackages__"])
+
 ng_module(
     name = "example",
     srcs = glob(["*.ts"]),

packages/bazel/test/ng_package/example/secondary/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//packages/bazel/test:__subpackages__"])
-
 load("//tools:defaults.bzl", "ng_module")
 
+package(default_visibility = ["//packages/bazel/test:__subpackages__"])
+
 ng_module(
     name = "secondary",
     srcs = glob(["*.ts"]),

packages/benchpress/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "npm_package", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "benchpress",
     srcs = glob(

packages/common/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_package")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "common",
     srcs = glob(

packages/common/http/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "http",
     srcs = glob(

packages/common/http/testing/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "testing",
     srcs = glob(

packages/common/locales/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "npm_package", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "locales",
     srcs = glob(
@@ -14,6 +14,10 @@ npm_package(
     name = "package",
     srcs = ["package.json"],
     replacements = {
+
+        # Workaround for `.d.ts`` containing `/// <amd-module .../>`
+        # which are generated in TypeScript v2.9, but not before.
+        "/// <amd-module name=.*/>": "",
         # Workaround for https://github.com/angular/angular/issues/23217
         # Webpack will detect that the UMD outputs from TypeScript pass the
         # `require` function into the module, and cannot accurately track
@@ -21,10 +25,6 @@ npm_package(
         # We don't actually import anything in the locale code so we can
         # null out the require reference passed into the module.
         "factory\(require, exports\)": "factory(null, exports)",
-
-        # Workaround for `.d.ts`` containing `/// <amd-module .../>`
-        # which are generated in TypeScript v2.9, but not before.
-        "/// <amd-module name=.*/>": "",
     },
     deps = [":locales"],
 )

packages/common/testing/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),

packages/compiler-cli/BUILD.bazel

@@ -3,6 +3,8 @@ package(default_visibility = ["//visibility:public"])
 load("//tools:defaults.bzl", "npm_package", "ts_library")
 load("@npm_bazel_typescript//:defs.bzl", "ts_config")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_config(
     name = "tsconfig",
     src = "tsconfig-build.json",

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")
 
-load("//tools:defaults.bzl", "ng_module", "ts_library")
+package(default_visibility = ["//visibility:public"])
 
 ng_module(
     name = "app",

packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "lib1",
     srcs = glob(

packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "lib2",
     srcs = glob(

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")
+
+package(default_visibility = ["//visibility:public"])
 
 ng_module(
     name = "app",

packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel

@@ -1,4 +1,6 @@
 load("//packages/bazel:index.bzl", "ng_module")
+load("//tools:defaults.bzl", "jasmine_node_test")
+load(":extract_flat_module_index.bzl", "extract_flat_module_index")
 
 ng_module(
     name = "test_module",
@@ -21,16 +23,12 @@ ng_module(
     ],
 )
 
-load(":extract_flat_module_index.bzl", "extract_flat_module_index")
-
 extract_flat_module_index(
     name = "flat_module_index",
     testonly = True,
     deps = [":test_module"],
 )
 
-load("//tools:defaults.bzl", "jasmine_node_test")
-
 jasmine_node_test(
     name = "test",
     srcs = ["spec.js"],

packages/compiler-cli/src/ngcc/BUILD.bazel

@@ -1,6 +1,6 @@
-package(default_visibility = ["//visibility:public"])
+load("//tools:defaults.bzl", "ts_library")
 
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+package(default_visibility = ["//visibility:public"])
 
 ts_library(
     name = "ngcc",

packages/compiler-cli/src/ngcc/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "annotations",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/**/*.ts",
     ]),
     deps = [

packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "diagnostics",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/**/*.ts",
     ]),
     deps = [

packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "entry_point",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/**/*.ts",
     ]),
     module_name = "@angular/compiler-cli/src/ngtsc/entry_point",

packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/src/ngtsc/imports/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "imports",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/*.ts",
     ]),
     deps = [

packages/compiler-cli/src/ngtsc/partial_evaluator/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "partial_evaluator",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/*.ts",
     ]),
     module_name = "@angular/compiler-cli/src/ngtsc/partial_evaluator",

packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "reflection",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/**/*.ts",
     ]),
     deps = ["@ngdeps//typescript"],

packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/src/ngtsc/shims/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "shims",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/**/*.ts",
     ]),
     deps = [

packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/src/ngtsc/switch/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "switch",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/**/*.ts",
     ]),
     deps = [

packages/compiler-cli/src/ngtsc/testing/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "testing",
     testonly = True,

packages/compiler-cli/src/ngtsc/transform/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "transform",
-    srcs = glob([
+    srcs = ["index.ts"] + glob([
-        "index.ts",
         "src/**/*.ts",
     ]),
     deps = [

packages/compiler-cli/src/ngtsc/translator/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "translator",
     srcs = glob(["**/*.ts"]),

packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "typecheck",
     srcs = glob(["**/*.ts"]),

packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/src/ngtsc/util/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "util",
     srcs = glob([
-        "index.ts",
         "src/**/*.ts",
     ]),
     deps = [

packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_package", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "fake_core",
     srcs = [

packages/compiler/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_package", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "compiler",
     srcs = glob(

packages/compiler/testing/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "testing",
     srcs = glob(

packages/core/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_package")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "core",
     srcs = glob(

packages/core/src/compiler/BUILD.bazel

@@ -1,11 +1,11 @@
+load("//tools:defaults.bzl", "ts_library")
+
 package(default_visibility = [
     "//packages/compiler/test:__pkg__",
     "//packages/core:__subpackages__",
     "//tools/public_api_guard:__pkg__",
 ])
 
-load("//tools:defaults.bzl", "ts_library")
-
 ts_library(
     name = "compiler",
     srcs = glob(

packages/core/src/di/interface/BUILD.bazel

@@ -1,10 +1,10 @@
+load("//tools:defaults.bzl", "ts_library")
+
 package(default_visibility = [
     "//packages/core:__subpackages__",
     "//tools/public_api_guard:__pkg__",
 ])
 
-load("//tools:defaults.bzl", "ts_library")
-
 ts_library(
     name = "interface",
     srcs = glob(

packages/core/src/interface/BUILD.bazel

@@ -1,10 +1,10 @@
+load("//tools:defaults.bzl", "ts_library")
+
 package(default_visibility = [
     "//packages/core:__subpackages__",
     "//tools/public_api_guard:__pkg__",
 ])
 
-load("//tools:defaults.bzl", "ts_library")
-
 ts_library(
     name = "interface",
     srcs = glob(

packages/core/src/reflection/BUILD.bazel

@@ -1,10 +1,10 @@
+load("//tools:defaults.bzl", "ts_library")
+
 package(default_visibility = [
     "//packages/core:__subpackages__",
     "//tools/public_api_guard:__pkg__",
 ])
 
-load("//tools:defaults.bzl", "ts_library")
-
 ts_library(
     name = "reflection",
     srcs = glob(

packages/core/src/util/BUILD.bazel

@@ -1,10 +1,10 @@
+load("//tools:defaults.bzl", "ts_library")
+
 package(default_visibility = [
     "//packages/core:__subpackages__",
     "//tools/public_api_guard:__pkg__",
 ])
 
-load("//tools:defaults.bzl", "ts_library")
-
 ts_library(
     name = "util",
     srcs = glob(

packages/core/test/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,

packages/core/test/bundling/animation_world/BUILD.bazel

@@ -3,6 +3,8 @@ package(default_visibility = ["//visibility:public"])
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "animation_world",
     srcs = ["index.ts"],

packages/core/test/bundling/hello_world/BUILD.bazel

@@ -4,6 +4,8 @@ load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "hello_world",
     srcs = ["index.ts"],

packages/core/test/bundling/hello_world_i18n/BUILD.bazel

@@ -3,6 +3,8 @@ package(default_visibility = ["//visibility:public"])
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "hello_world_i18n",
     srcs = ["index.ts"],

packages/core/test/bundling/hello_world_r2/BUILD.bazel

@@ -3,6 +3,8 @@ package(default_visibility = ["//visibility:public"])
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "hello_world",
     srcs = ["index.ts"],

packages/core/test/bundling/injection/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
-load("//tools:defaults.bzl", "jasmine_node_test", "ng_rollup_bundle", "ts_library")
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
+load("//tools:defaults.bzl", "jasmine_node_test", "ng_rollup_bundle", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
 
 ts_library(
     name = "injection",

packages/core/test/bundling/todo/BUILD.bazel

@@ -5,6 +5,8 @@ load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "todo",
     srcs = ["index.ts"],

packages/core/test/bundling/todo_i18n/BUILD.bazel

@@ -4,6 +4,8 @@ load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "todo_i18n",
     srcs = [

packages/core/test/bundling/todo_r2/BUILD.bazel

@@ -4,6 +4,8 @@ load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "todo",
     srcs = ["index.ts"],

packages/core/test/bundling/util/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 # Either loads reflect-metadata or is a no-op, depending on whether compilation is in JIT mode.
 ts_library(
     name = "reflect_metadata",

packages/core/test/render3/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "render3_lib",
     testonly = True,

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")
 
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+package(default_visibility = ["//visibility:public"])
 
 ts_library(
     name = "ivy_lib",

packages/core/test/view/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "view_lib",
     testonly = True,

packages/core/testing/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "testing",
     srcs = glob(

packages/elements/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_package")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "elements",
     srcs = glob(

packages/elements/schematics/BUILD.bazel

@@ -1,6 +1,6 @@
-package(default_visibility = ["//visibility:public"])
+load("//tools:defaults.bzl", "npm_package")
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+package(default_visibility = ["//visibility:public"])
 
 exports_files([
     "package.json",

packages/elements/schematics/ng-add/BUILD.bazel

@@ -1,15 +1,14 @@
-package(default_visibility = ["//visibility:public"])
+load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
-load("//tools:defaults.bzl", "jasmine_node_test", "npm_package", "ts_library")
+package(default_visibility = ["//visibility:public"])
 
 ts_library(
     name = "ng-add",
-    srcs = glob(
+    srcs =
         [
             "index.ts",
             "schema.ts",
         ],
-    ),
     deps = [
         "//packages/common",
         "//packages/core",
@@ -21,11 +20,9 @@ ts_library(
 ts_library(
     name = "test_lib",
     testonly = True,
-    srcs = glob(
+    srcs = [
-        [
+        "index_spec.ts",
-            "index_spec.ts",
+    ],
-        ],
-    ),
     deps = [
         ":ng-add",
         "//packages/common",

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",

packages/forms/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_package")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "forms",
     srcs = glob(

packages/http/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_package")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "http",
     srcs = glob(

packages/http/testing/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),

packages/language-service/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "npm_package", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "language-service",
     srcs = glob(

packages/language-service/bundles/BUILD.bazel

@@ -4,9 +4,9 @@ ls_rollup_bundle(
     name = "language-service",
     entry_point = "packages/language-service/index.js",
     globals = {
-        "typescript": "ts",
-        "path": "path",
         "fs": "fs",
+        "path": "path",
+        "typescript": "ts",
     },
     license_banner = "banner.js.txt",
     visibility = ["//packages/language-service:__pkg__"],

packages/platform-browser-dynamic/BUILD.bazel

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ng_module", "ng_package")
 
+package(default_visibility = ["//visibility:public"])
+
 ng_module(
     name = "platform-browser-dynamic",
     srcs = glob(

packages/platform-browser-dynamic/testing/BUILD.bazel

@@ -1,9 +1,9 @@
+load("//tools:defaults.bzl", "ng_module")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-load("//tools:defaults.bzl", "ng_module")
-
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),