From f554146711f38dbbbfcd67998fd46c11151d5c0f Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Fri, 28 Mar 2025 13:11:30 +0000 Subject: [PATCH 1/3] build: adjust `sass` compiler to work with `rules_js` Migrates our custom Sass compiler to `rules_js`. --- tools/sass/BUILD.bazel | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/sass/BUILD.bazel b/tools/sass/BUILD.bazel index 8da3b2d199f1..603ab7583188 100644 --- a/tools/sass/BUILD.bazel +++ b/tools/sass/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") +load("@aspect_rules_js//js:defs.bzl", "js_binary") load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -19,9 +19,13 @@ ts_project( ], ) -nodejs_binary( +js_binary( name = "compiler", - data = [":sass_lib"], - entry_point = "compiler-main.ts", - templated_args = ["--bazel_patch_module_resolver"], + data = [":sass_lib_rjs"], + entry_point = "compiler-main.js", + env = { + # TODO(devversion): Replace `rules_sass` with modernized standalone ruleset. + # e.g. https://github.com/devversion/rules_sass. + "BAZEL_BINDIR": ".", + }, ) From a6e7c59674728ba7aa9e76818d85694edde1d4d3 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Fri, 28 Mar 2025 13:11:41 +0000 Subject: [PATCH 2/3] build: update `ts_project` interop to default to `rules_js` Instead of exposing the real `rules_js` flavor via the `_rjs` suffix, we now make this the default. This means we still temporarily have a way of accessing the interop layer. That layer is exposed via `_legacy` suffix targets. --- tools/bazel/legacy_target.bzl | 4 ++++ tools/bazel/ts_project_interop.bzl | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 tools/bazel/legacy_target.bzl diff --git a/tools/bazel/legacy_target.bzl b/tools/bazel/legacy_target.bzl new file mode 100644 index 000000000000..1fa941fc3a89 --- /dev/null +++ b/tools/bazel/legacy_target.bzl @@ -0,0 +1,4 @@ +def get_legacy_label(label): + if not ":" in label: + label = "%s:%s" % (label, Label(label).name) + return "%s_legacy" % label diff --git a/tools/bazel/ts_project_interop.bzl b/tools/bazel/ts_project_interop.bzl index 58779a266cb0..66db7e5f8f35 100644 --- a/tools/bazel/ts_project_interop.bzl +++ b/tools/bazel/ts_project_interop.bzl @@ -2,6 +2,7 @@ load("@aspect_rules_js//js:providers.bzl", "JsInfo", "js_info") load("@rules_angular//src/ts_project:index.bzl", _ts_project = "ts_project") load("@build_bazel_rules_nodejs//:providers.bzl", "DeclarationInfo", "JSEcmaScriptModuleInfo", "JSModuleInfo", "LinkablePackageInfo") load("@devinfra//bazel/ts_project:index.bzl", "strict_deps_test") +load("//tools/bazel:legacy_target.bzl", "get_legacy_label") def _ts_deps_interop_impl(ctx): types = [] @@ -102,7 +103,6 @@ def ts_project( name, module_name = None, deps = [], - interop_deps = [], tsconfig = None, testonly = False, visibility = None, @@ -121,23 +121,23 @@ def ts_project( for d in deps: if d.startswith("//:node_modules/"): rjs_modules_to_rnjs.append(d.replace("//:node_modules/", "@npm//")) - if d.endswith("_rjs"): - rjs_modules_to_rnjs.append(d.replace("_rjs", "")) + elif not ":node_modules" in d: + rjs_modules_to_rnjs.append(get_legacy_label(d)) ts_deps_interop( name = "%s_interop_deps" % name, - deps = [] + interop_deps + rjs_modules_to_rnjs, + deps = [] + rjs_modules_to_rnjs, visibility = visibility, testonly = testonly, ) rule_impl( - name = "%s_rjs" % name, + name = name, testonly = testonly, declaration = True, tsconfig = tsconfig, visibility = visibility, - deps = [":%s_interop_deps" % name] + deps, + deps = deps, **kwargs ) @@ -149,13 +149,13 @@ def ts_project( ) ts_project_module( - name = name, + name = "%s_legacy" % name, testonly = testonly, visibility = visibility, - dep = "%s_rjs" % name, + dep = name, # Forwarded dependencies for linker module mapping aspect. # RJS deps can also transitively pull in module mappings from their `interop_deps`. - deps = [] + ["%s_interop_deps" % name] + deps, + deps = [":%s_interop_deps" % name] + deps, module_name = module_name, ) From eb8d3434d9cbb5cf2592ba5059e374b76be7a468 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Fri, 28 Mar 2025 16:21:06 +0000 Subject: [PATCH 3/3] build: remove `interop_deps` This commit combines `interop_deps` with `deps`; as we are in the stage where the interop is no longer the default; but rather opt-in via a `_legacy` suffix (until we migrate consuming rules further). --- integration/module-tests/index.bzl | 2 +- src/cdk-experimental/BUILD.bazel | 3 +- .../column-resize/BUILD.bazel | 10 ++--- src/cdk-experimental/combobox/BUILD.bazel | 16 +++---- src/cdk-experimental/listbox/BUILD.bazel | 6 +-- src/cdk-experimental/popover-edit/BUILD.bazel | 24 +++++------ src/cdk-experimental/scrolling/BUILD.bazel | 16 +++---- src/cdk-experimental/selection/BUILD.bazel | 18 ++++---- .../table-scroll-container/BUILD.bazel | 18 ++++---- src/cdk-experimental/ui-patterns/BUILD.bazel | 4 +- .../behaviors/event-manager/BUILD.bazel | 2 +- .../behaviors/list-focus/BUILD.bazel | 10 ++--- .../behaviors/list-navigation/BUILD.bazel | 8 ++-- .../behaviors/list-selection/BUILD.bazel | 10 ++--- .../behaviors/list-typeahead/BUILD.bazel | 10 ++--- .../ui-patterns/listbox/BUILD.bazel | 12 +++--- src/cdk/BUILD.bazel | 3 +- src/cdk/a11y/BUILD.bazel | 22 ++++------ src/cdk/accordion/BUILD.bazel | 10 ++--- src/cdk/bidi/BUILD.bazel | 5 +-- src/cdk/clipboard/BUILD.bazel | 7 +--- src/cdk/coercion/BUILD.bazel | 2 +- src/cdk/coercion/private/BUILD.bazel | 8 +--- src/cdk/collections/BUILD.bazel | 8 +--- src/cdk/dialog/BUILD.bazel | 24 +++++------ src/cdk/drag-drop/BUILD.bazel | 20 ++++----- src/cdk/keycodes/BUILD.bazel | 7 +--- src/cdk/layout/BUILD.bazel | 12 ++---- src/cdk/listbox/BUILD.bazel | 18 ++++---- src/cdk/menu/BUILD.bazel | 18 ++++---- src/cdk/observers/BUILD.bazel | 10 ++--- src/cdk/observers/private/BUILD.bazel | 8 +--- src/cdk/overlay/BUILD.bazel | 24 +++++------ src/cdk/platform/BUILD.bazel | 1 - src/cdk/portal/BUILD.bazel | 8 +--- src/cdk/private/BUILD.bazel | 1 - src/cdk/schematics/BUILD.bazel | 18 ++++---- src/cdk/scrolling/BUILD.bazel | 20 ++++----- src/cdk/stepper/BUILD.bazel | 10 ++--- src/cdk/table/BUILD.bazel | 18 ++++---- src/cdk/testing/BUILD.bazel | 4 +- src/cdk/testing/private/BUILD.bazel | 4 +- src/cdk/testing/protractor/BUILD.bazel | 4 +- .../testing/selenium-webdriver/BUILD.bazel | 4 +- src/cdk/testing/testbed/BUILD.bazel | 10 ++--- src/cdk/testing/tests/BUILD.bazel | 42 +++++++------------ src/cdk/text-field/BUILD.bazel | 16 +++---- src/cdk/tree/BUILD.bazel | 16 +++---- src/components-examples/BUILD.bazel | 6 +-- .../cdk-experimental/listbox/BUILD.bazel | 8 ++-- .../cdk-experimental/popover-edit/BUILD.bazel | 8 ++-- .../cdk-experimental/selection/BUILD.bazel | 10 ++--- src/components-examples/cdk/a11y/BUILD.bazel | 6 +-- .../cdk/accordion/BUILD.bazel | 4 +- .../cdk/clipboard/BUILD.bazel | 4 +- .../cdk/dialog/BUILD.bazel | 4 +- .../cdk/drag-drop/BUILD.bazel | 6 +-- .../cdk/layout/BUILD.bazel | 4 +- .../cdk/listbox/BUILD.bazel | 4 +- src/components-examples/cdk/menu/BUILD.bazel | 4 +- .../cdk/overlay/BUILD.bazel | 4 +- .../cdk/platform/BUILD.bazel | 4 +- .../cdk/portal/BUILD.bazel | 4 +- .../cdk/scrolling/BUILD.bazel | 4 +- .../cdk/stepper/BUILD.bazel | 4 +- src/components-examples/cdk/table/BUILD.bazel | 4 +- .../cdk/text-field/BUILD.bazel | 8 ++-- src/components-examples/cdk/tree/BUILD.bazel | 10 ++--- .../column-resize/BUILD.bazel | 6 +-- .../popover-edit/BUILD.bazel | 12 +++--- .../selection/BUILD.bazel | 10 ++--- .../material/autocomplete/BUILD.bazel | 24 +++++------ .../material/badge/BUILD.bazel | 16 +++---- .../material/bottom-sheet/BUILD.bazel | 18 ++++---- .../material/button-toggle/BUILD.bazel | 18 ++++---- .../material/button/BUILD.bazel | 16 +++---- .../material/card/BUILD.bazel | 16 +++---- .../material/checkbox/BUILD.bazel | 22 ++++------ .../material/chips/BUILD.bazel | 20 ++++----- .../material/core/BUILD.bazel | 8 ++-- .../material/datepicker/BUILD.bazel | 28 ++++++------- .../material/dialog/BUILD.bazel | 22 ++++------ .../material/divider/BUILD.bazel | 20 ++++----- .../material/expansion/BUILD.bazel | 18 ++++---- .../material/form-field/BUILD.bazel | 26 +++++------- .../material/grid-list/BUILD.bazel | 16 +++---- .../material/icon/BUILD.bazel | 18 ++++---- .../material/input/BUILD.bazel | 22 ++++------ .../material/list/BUILD.bazel | 22 ++++------ .../material/menu/BUILD.bazel | 18 ++++---- .../material/paginator/BUILD.bazel | 26 +++++------- .../material/progress-bar/BUILD.bazel | 18 ++++---- .../material/progress-spinner/BUILD.bazel | 18 ++++---- .../material/radio/BUILD.bazel | 18 ++++---- .../material/select/BUILD.bazel | 20 ++++----- .../material/sidenav/BUILD.bazel | 22 ++++------ .../material/slide-toggle/BUILD.bazel | 20 ++++----- .../material/slider/BUILD.bazel | 18 ++++---- .../material/snack-bar/BUILD.bazel | 20 ++++----- .../material/sort/BUILD.bazel | 18 ++++---- .../material/stepper/BUILD.bazel | 26 +++++------- .../material/table/BUILD.bazel | 20 ++++----- .../material/tabs/BUILD.bazel | 24 +++++------ .../material/timepicker/BUILD.bazel | 22 ++++------ .../material/toolbar/BUILD.bazel | 16 +++---- .../material/tooltip/BUILD.bazel | 20 ++++----- .../material/tree/BUILD.bazel | 20 ++++----- src/components-examples/private/BUILD.bazel | 4 +- src/dev-app/BUILD.bazel | 18 ++++---- src/dev-app/autocomplete/BUILD.bazel | 10 ++--- src/dev-app/badge/BUILD.bazel | 8 ++-- src/dev-app/baseline/BUILD.bazel | 6 +-- src/dev-app/bottom-sheet/BUILD.bazel | 8 ++-- src/dev-app/button-toggle/BUILD.bazel | 8 ++-- src/dev-app/button/BUILD.bazel | 8 ++-- src/dev-app/card/BUILD.bazel | 8 ++-- src/dev-app/cdk-dialog/BUILD.bazel | 4 +- .../cdk-experimental-combobox/BUILD.bazel | 4 +- .../cdk-experimental-listbox/BUILD.bazel | 4 +- src/dev-app/cdk-listbox/BUILD.bazel | 4 +- src/dev-app/cdk-menu/BUILD.bazel | 6 +-- src/dev-app/checkbox/BUILD.bazel | 8 ++-- src/dev-app/chips/BUILD.bazel | 8 ++-- src/dev-app/clipboard/BUILD.bazel | 4 +- src/dev-app/column-resize/BUILD.bazel | 6 +-- src/dev-app/connected-overlay/BUILD.bazel | 8 ++-- src/dev-app/datepicker/BUILD.bazel | 12 +++--- src/dev-app/dev-app/BUILD.bazel | 10 ++--- src/dev-app/dialog/BUILD.bazel | 10 ++--- src/dev-app/drag-drop/BUILD.bazel | 10 ++--- src/dev-app/drawer/BUILD.bazel | 6 +-- src/dev-app/example/BUILD.bazel | 6 +-- src/dev-app/examples-page/BUILD.bazel | 6 +-- src/dev-app/expansion/BUILD.bazel | 8 ++-- src/dev-app/focus-origin/BUILD.bazel | 4 +- src/dev-app/focus-trap/BUILD.bazel | 6 +-- src/dev-app/google-map/BUILD.bazel | 4 +- src/dev-app/grid-list/BUILD.bazel | 8 ++-- src/dev-app/icon/BUILD.bazel | 4 +- src/dev-app/input-modality/BUILD.bazel | 8 ++-- src/dev-app/input/BUILD.bazel | 12 +++--- src/dev-app/layout/BUILD.bazel | 6 +-- src/dev-app/list/BUILD.bazel | 8 ++-- src/dev-app/live-announcer/BUILD.bazel | 6 +-- src/dev-app/menu/BUILD.bazel | 6 +-- src/dev-app/menubar/BUILD.bazel | 6 +-- src/dev-app/paginator/BUILD.bazel | 8 ++-- src/dev-app/performance/BUILD.bazel | 8 ++-- src/dev-app/platform/BUILD.bazel | 4 +- src/dev-app/popover-edit/BUILD.bazel | 8 ++-- src/dev-app/portal/BUILD.bazel | 4 +- src/dev-app/progress-bar/BUILD.bazel | 8 ++-- src/dev-app/progress-spinner/BUILD.bazel | 8 ++-- src/dev-app/radio/BUILD.bazel | 8 ++-- src/dev-app/ripple/BUILD.bazel | 8 ++-- src/dev-app/screen-type/BUILD.bazel | 8 ++-- src/dev-app/select/BUILD.bazel | 10 ++--- src/dev-app/selection/BUILD.bazel | 8 ++-- src/dev-app/sidenav/BUILD.bazel | 8 ++-- src/dev-app/slide-toggle/BUILD.bazel | 6 +-- src/dev-app/slider/BUILD.bazel | 8 ++-- src/dev-app/snack-bar/BUILD.bazel | 8 ++-- src/dev-app/stepper/BUILD.bazel | 8 ++-- .../table-scroll-container/BUILD.bazel | 8 ++-- src/dev-app/table/BUILD.bazel | 6 +-- src/dev-app/tabs/BUILD.bazel | 6 +-- src/dev-app/theme/BUILD.bazel | 8 ++-- src/dev-app/timepicker/BUILD.bazel | 12 +++--- src/dev-app/toolbar/BUILD.bazel | 6 +-- src/dev-app/tooltip/BUILD.bazel | 6 +-- src/dev-app/tree/BUILD.bazel | 8 ++-- src/dev-app/typography/BUILD.bazel | 4 +- src/dev-app/virtual-scroll/BUILD.bazel | 12 +++--- src/dev-app/youtube-player/BUILD.bazel | 10 ++--- src/e2e-app/BUILD.bazel | 16 ++++--- src/google-maps/BUILD.bazel | 12 ++---- src/google-maps/testing/BUILD.bazel | 4 +- src/material-date-fns-adapter/BUILD.bazel | 14 +++---- src/material-experimental/BUILD.bazel | 3 +- .../column-resize/BUILD.bazel | 16 +++---- src/material-experimental/menubar/BUILD.bazel | 12 ++---- .../popover-edit/BUILD.bazel | 16 +++---- .../selection/BUILD.bazel | 8 ++-- src/material-luxon-adapter/BUILD.bazel | 14 +++---- src/material-moment-adapter/BUILD.bazel | 16 +++---- src/material/BUILD.bazel | 3 +- src/material/autocomplete/BUILD.bazel | 24 +++++------ src/material/autocomplete/testing/BUILD.bazel | 12 +++--- src/material/badge/BUILD.bazel | 16 +++---- src/material/badge/testing/BUILD.bazel | 10 ++--- src/material/bottom-sheet/BUILD.bazel | 18 ++++---- src/material/bottom-sheet/testing/BUILD.bazel | 10 ++--- src/material/button-toggle/BUILD.bazel | 16 +++---- .../button-toggle/testing/BUILD.bazel | 8 ++-- src/material/button/BUILD.bazel | 12 ++---- src/material/button/testing/BUILD.bazel | 12 +++--- src/material/card/BUILD.bazel | 8 +--- src/material/card/testing/BUILD.bazel | 10 ++--- src/material/checkbox/BUILD.bazel | 14 +++---- src/material/checkbox/testing/BUILD.bazel | 12 +++--- src/material/chips/BUILD.bazel | 24 +++++------ src/material/chips/testing/BUILD.bazel | 14 +++---- src/material/core/BUILD.bazel | 24 +++++------ src/material/core/testing/BUILD.bazel | 8 ++-- src/material/core/theming/tests/BUILD.bazel | 6 +-- src/material/datepicker/BUILD.bazel | 26 +++++------- src/material/datepicker/testing/BUILD.bazel | 12 +++--- src/material/dialog/BUILD.bazel | 20 ++++----- src/material/dialog/testing/BUILD.bazel | 16 +++---- src/material/divider/BUILD.bazel | 10 ++--- src/material/divider/testing/BUILD.bazel | 10 ++--- src/material/expansion/BUILD.bazel | 20 ++++----- src/material/expansion/testing/BUILD.bazel | 10 ++--- src/material/form-field/BUILD.bazel | 12 +++--- src/material/form-field/testing/BUILD.bazel | 12 +++--- .../form-field/testing/control/BUILD.bazel | 2 +- src/material/grid-list/BUILD.bazel | 12 ++---- src/material/grid-list/testing/BUILD.bazel | 10 ++--- src/material/icon/BUILD.bazel | 14 +++---- src/material/icon/testing/BUILD.bazel | 14 +++---- src/material/input/BUILD.bazel | 18 ++++---- src/material/input/testing/BUILD.bazel | 12 +++--- src/material/list/BUILD.bazel | 22 ++++------ src/material/list/testing/BUILD.bazel | 8 ++-- src/material/menu/BUILD.bazel | 18 ++++---- src/material/menu/testing/BUILD.bazel | 10 ++--- src/material/paginator/BUILD.bazel | 18 ++++---- src/material/paginator/testing/BUILD.bazel | 10 ++--- src/material/progress-bar/BUILD.bazel | 10 ++--- src/material/progress-bar/testing/BUILD.bazel | 14 +++---- src/material/progress-spinner/BUILD.bazel | 12 ++---- .../progress-spinner/testing/BUILD.bazel | 14 +++---- src/material/radio/BUILD.bazel | 14 +++---- src/material/radio/testing/BUILD.bazel | 12 +++--- src/material/schematics/BUILD.bazel | 10 ++--- .../migration-utilities/BUILD.bazel | 4 +- .../ng-generate/theme-color/BUILD.bazel | 12 +++--- src/material/schematics/ng-update/BUILD.bazel | 10 ++--- src/material/select/BUILD.bazel | 24 +++++------ src/material/select/testing/BUILD.bazel | 12 +++--- src/material/sidenav/BUILD.bazel | 22 ++++------ src/material/sidenav/testing/BUILD.bazel | 10 ++--- src/material/slide-toggle/BUILD.bazel | 14 +++---- src/material/slide-toggle/testing/BUILD.bazel | 16 +++---- src/material/slider/BUILD.bazel | 22 ++++------ src/material/slider/testing/BUILD.bazel | 12 ++---- src/material/snack-bar/BUILD.bazel | 20 ++++----- src/material/snack-bar/testing/BUILD.bazel | 14 +++---- src/material/sort/BUILD.bazel | 18 ++++---- src/material/sort/testing/BUILD.bazel | 14 +++---- src/material/stepper/BUILD.bazel | 24 +++++------ src/material/stepper/testing/BUILD.bazel | 12 +++--- src/material/table/BUILD.bazel | 20 ++++----- src/material/table/testing/BUILD.bazel | 8 ++-- src/material/tabs/BUILD.bazel | 22 ++++------ src/material/tabs/testing/BUILD.bazel | 12 +++--- src/material/testing/BUILD.bazel | 4 +- src/material/timepicker/BUILD.bazel | 22 ++++------ src/material/timepicker/testing/BUILD.bazel | 10 ++--- src/material/toolbar/BUILD.bazel | 12 ++---- src/material/toolbar/testing/BUILD.bazel | 10 ++--- src/material/tooltip/BUILD.bazel | 20 ++++----- src/material/tooltip/testing/BUILD.bazel | 10 ++--- src/material/tree/BUILD.bazel | 16 +++---- src/material/tree/testing/BUILD.bazel | 8 ++-- src/universal-app/BUILD.bazel | 20 ++++----- src/youtube-player/BUILD.bazel | 10 ++--- tools/defaults.bzl | 5 ++- tools/dgeni/BUILD.bazel | 4 +- tools/example-module/BUILD.bazel | 2 +- tools/extract-tokens/BUILD.bazel | 4 +- tools/highlight-files/BUILD.bazel | 7 ++-- tools/highlight-files/highlight-code-block.ts | 3 +- tools/markdown-to-html/BUILD.bazel | 14 +++---- tools/package-docs-content/BUILD.bazel | 2 +- tools/sass/BUILD.bazel | 2 +- tools/server-test/index.bzl | 2 +- 277 files changed, 1236 insertions(+), 1964 deletions(-) diff --git a/integration/module-tests/index.bzl b/integration/module-tests/index.bzl index 54ca6da86809..1de0d7e00906 100644 --- a/integration/module-tests/index.bzl +++ b/integration/module-tests/index.bzl @@ -15,7 +15,7 @@ def module_test(name, npm_packages, skipped_entry_points = [], additional_deps = name = "test", data = [ ":%s_config" % name, - "//integration/module-tests:test_lib_rjs", + "//integration/module-tests:test_lib", "//:node_modules/@angular/common", "//:node_modules/@angular/core", ] + additional_deps + [pkg[0] for pkg in npm_packages.items()], diff --git a/src/cdk-experimental/BUILD.bazel b/src/cdk-experimental/BUILD.bazel index e3b41c7f03eb..c7f38765af48 100644 --- a/src/cdk-experimental/BUILD.bazel +++ b/src/cdk-experimental/BUILD.bazel @@ -1,6 +1,7 @@ load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS") load("//tools:defaults.bzl", "ng_package") load("//tools:defaults2.bzl", "ts_project") +load("//tools/bazel:legacy_target.bzl", "get_legacy_label") package(default_visibility = ["//visibility:public"]) @@ -17,5 +18,5 @@ ng_package( name = "npm_package", srcs = ["package.json"], tags = ["release-package"], - deps = CDK_EXPERIMENTAL_TARGETS, + deps = [get_legacy_label(t) for t in CDK_EXPERIMENTAL_TARGETS], ) diff --git a/src/cdk-experimental/column-resize/BUILD.bazel b/src/cdk-experimental/column-resize/BUILD.bazel index c69956fb550a..6b2929181fa8 100644 --- a/src/cdk-experimental/column-resize/BUILD.bazel +++ b/src/cdk-experimental/column-resize/BUILD.bazel @@ -8,7 +8,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk-experimental/popover-edit", "//src/cdk/bidi", "//src/cdk/coercion", @@ -17,9 +20,4 @@ ng_project( "//src/cdk/portal", "//src/cdk/table", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) diff --git a/src/cdk-experimental/combobox/BUILD.bazel b/src/cdk-experimental/combobox/BUILD.bazel index efc06c274c1c..58003e8ac469 100644 --- a/src/cdk-experimental/combobox/BUILD.bazel +++ b/src/cdk-experimental/combobox/BUILD.bazel @@ -9,17 +9,15 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/collections", "//src/cdk/overlay", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - ], ) ts_project( @@ -29,14 +27,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":combobox", - "//src/cdk/keycodes", - "//src/cdk/testing/private", - ], deps = [ + ":combobox", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/cdk/keycodes", + "//src/cdk/testing/private", ], ) diff --git a/src/cdk-experimental/listbox/BUILD.bazel b/src/cdk-experimental/listbox/BUILD.bazel index 1d8db52bade4..26e8be39840d 100644 --- a/src/cdk-experimental/listbox/BUILD.bazel +++ b/src/cdk-experimental/listbox/BUILD.bazel @@ -8,12 +8,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/cdk-experimental/ui-patterns", "//src/cdk/a11y", "//src/cdk/bidi", ], - deps = [ - "//:node_modules/@angular/core", - ], ) diff --git a/src/cdk-experimental/popover-edit/BUILD.bazel b/src/cdk-experimental/popover-edit/BUILD.bazel index 6a842ec4327c..ce7b1e60c047 100644 --- a/src/cdk-experimental/popover-edit/BUILD.bazel +++ b/src/cdk-experimental/popover-edit/BUILD.bazel @@ -9,7 +9,11 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -17,12 +21,6 @@ ng_project( "//src/cdk/portal", "//src/cdk/scrolling", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) ts_project( @@ -32,8 +30,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":popover-edit", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/cdk/bidi", "//src/cdk/collections", "//src/cdk/keycodes", @@ -41,12 +43,6 @@ ts_project( "//src/cdk/table", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/cdk-experimental/scrolling/BUILD.bazel b/src/cdk-experimental/scrolling/BUILD.bazel index 95db2fdc8c6a..6f828aab91ce 100644 --- a/src/cdk-experimental/scrolling/BUILD.bazel +++ b/src/cdk-experimental/scrolling/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/coercion", "//src/cdk/collections", "//src/cdk/scrolling", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ts_project( @@ -29,12 +27,10 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":scrolling", - "//src/cdk/scrolling", - ], deps = [ + ":scrolling", "//:node_modules/@angular/core", + "//src/cdk/scrolling", ], ) @@ -56,6 +52,6 @@ ts_project( e2e_test_suite( name = "e2e_tests", deps = [ - ":e2e_test_sources", + ":e2e_test_sources_legacy", ], ) diff --git a/src/cdk-experimental/selection/BUILD.bazel b/src/cdk-experimental/selection/BUILD.bazel index 936cc7d0952f..662a63ff0e74 100644 --- a/src/cdk-experimental/selection/BUILD.bazel +++ b/src/cdk-experimental/selection/BUILD.bazel @@ -9,17 +9,15 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src:dev_mode_types", - "//src/cdk/coercion", - "//src/cdk/collections", - "//src/cdk/table", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src:dev_mode_types", + "//src/cdk/coercion", + "//src/cdk/collections", + "//src/cdk/table", ], ) @@ -30,14 +28,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":selection", - "//src/cdk/table", - "//src/cdk/testing/private", - ], deps = [ + ":selection", "//:node_modules/@angular/common", "//:node_modules/@angular/core", + "//src/cdk/table", + "//src/cdk/testing/private", ], ) diff --git a/src/cdk-experimental/table-scroll-container/BUILD.bazel b/src/cdk-experimental/table-scroll-container/BUILD.bazel index 1b042b48a058..9320dc4caf91 100644 --- a/src/cdk-experimental/table-scroll-container/BUILD.bazel +++ b/src/cdk-experimental/table-scroll-container/BUILD.bazel @@ -12,16 +12,14 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/a11y", - "//src/cdk/bidi", - "//src/cdk/platform", - "//src/cdk/table", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/a11y", + "//src/cdk/bidi", + "//src/cdk/platform", + "//src/cdk/table", ], ) @@ -32,16 +30,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":table-scroll-container", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk/collections", "//src/cdk/platform", "//src/cdk/table", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/cdk-experimental/ui-patterns/BUILD.bazel b/src/cdk-experimental/ui-patterns/BUILD.bazel index eaed798277af..b82f77b3fc79 100644 --- a/src/cdk-experimental/ui-patterns/BUILD.bazel +++ b/src/cdk-experimental/ui-patterns/BUILD.bazel @@ -10,7 +10,7 @@ ts_project( ), deps = [ "//:node_modules/@angular/core", - "//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs", - "//src/cdk-experimental/ui-patterns/listbox:listbox_rjs", + "//src/cdk-experimental/ui-patterns/behaviors/signal-like", + "//src/cdk-experimental/ui-patterns/listbox", ], ) diff --git a/src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel index e2682f2952a4..82fb99236733 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel +++ b/src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel @@ -9,6 +9,6 @@ ts_project( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs", + "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], ) diff --git a/src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel index 8a3769cbb12c..1567f3e78fab 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel +++ b/src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel @@ -10,8 +10,8 @@ ts_project( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/ui-patterns/behaviors/list-navigation:list-navigation_rjs", - "//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs", + "//src/cdk-experimental/ui-patterns/behaviors/list-navigation", + "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], ) @@ -19,14 +19,12 @@ ts_project( name = "unit_test_sources", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":list-focus", + "//:node_modules/@angular/core", "//src/cdk-experimental/ui-patterns/behaviors/list-navigation", "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel index 83e2463919a1..7111f782b3bd 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel +++ b/src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel @@ -11,7 +11,7 @@ ts_project( ), deps = [ "//:node_modules/@angular/core", - "//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs", + "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], ) @@ -19,12 +19,10 @@ ts_project( name = "unit_test_sources", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ - ":list-navigation", - "//src/cdk-experimental/ui-patterns/behaviors/signal-like", - ], deps = [ + ":list-navigation", "//:node_modules/@angular/core", + "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], ) diff --git a/src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel index fad561d676a7..9897dbd264e0 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel +++ b/src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel @@ -11,8 +11,8 @@ ts_project( ), deps = [ "//:node_modules/@angular/core", - "//src/cdk-experimental/ui-patterns/behaviors/list-navigation:list-navigation_rjs", - "//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs", + "//src/cdk-experimental/ui-patterns/behaviors/list-navigation", + "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], ) @@ -20,14 +20,12 @@ ts_project( name = "unit_test_sources", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":list-selection", + "//:node_modules/@angular/core", "//src/cdk-experimental/ui-patterns/behaviors/list-navigation", "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel index 3048234a901e..35ad3e22ce25 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel +++ b/src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel @@ -11,8 +11,8 @@ ts_project( ), deps = [ "//:node_modules/@angular/core", - "//src/cdk-experimental/ui-patterns/behaviors/list-navigation:list-navigation_rjs", - "//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs", + "//src/cdk-experimental/ui-patterns/behaviors/list-navigation", + "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], ) @@ -20,14 +20,12 @@ ts_project( name = "unit_test_sources", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":list-typeahead", + "//:node_modules/@angular/core", "//src/cdk-experimental/ui-patterns/behaviors/list-navigation", "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/cdk-experimental/ui-patterns/listbox/BUILD.bazel b/src/cdk-experimental/ui-patterns/listbox/BUILD.bazel index 00b3dd6c0603..7d5ff173e7ed 100644 --- a/src/cdk-experimental/ui-patterns/listbox/BUILD.bazel +++ b/src/cdk-experimental/ui-patterns/listbox/BUILD.bazel @@ -10,11 +10,11 @@ ts_project( ), deps = [ "//:node_modules/@angular/core", - "//src/cdk-experimental/ui-patterns/behaviors/event-manager:event-manager_rjs", - "//src/cdk-experimental/ui-patterns/behaviors/list-focus:list-focus_rjs", - "//src/cdk-experimental/ui-patterns/behaviors/list-navigation:list-navigation_rjs", - "//src/cdk-experimental/ui-patterns/behaviors/list-selection:list-selection_rjs", - "//src/cdk-experimental/ui-patterns/behaviors/list-typeahead:list-typeahead_rjs", - "//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs", + "//src/cdk-experimental/ui-patterns/behaviors/event-manager", + "//src/cdk-experimental/ui-patterns/behaviors/list-focus", + "//src/cdk-experimental/ui-patterns/behaviors/list-navigation", + "//src/cdk-experimental/ui-patterns/behaviors/list-selection", + "//src/cdk-experimental/ui-patterns/behaviors/list-typeahead", + "//src/cdk-experimental/ui-patterns/behaviors/signal-like", ], ) diff --git a/src/cdk/BUILD.bazel b/src/cdk/BUILD.bazel index 68bff715317e..7bdfcac941b3 100644 --- a/src/cdk/BUILD.bazel +++ b/src/cdk/BUILD.bazel @@ -1,6 +1,7 @@ load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS", "CDK_ENTRYPOINTS_WITH_STYLES", "CDK_SCSS_LIBS", "CDK_TARGETS") load("//tools:defaults.bzl", "ng_package", "sass_library") load("//tools:defaults2.bzl", "ts_project") +load("//tools/bazel:legacy_target.bzl", "get_legacy_label") package(default_visibility = ["//visibility:public"]) @@ -58,7 +59,7 @@ ng_package( "//src/cdk/schematics:npm_package", ], tags = ["release-package"], - deps = CDK_TARGETS, + deps = [get_legacy_label(t) for t in CDK_TARGETS], ) filegroup( diff --git a/src/cdk/a11y/BUILD.bazel b/src/cdk/a11y/BUILD.bazel index fe136ac042f6..a745c895bf76 100644 --- a/src/cdk/a11y/BUILD.bazel +++ b/src/cdk/a11y/BUILD.bazel @@ -15,7 +15,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/coercion", "//src/cdk/coercion/private", @@ -25,11 +28,6 @@ ng_project( "//src/cdk/platform", "//src/cdk/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_library( @@ -50,8 +48,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":a11y", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/keycodes", "//src/cdk/observers", "//src/cdk/overlay", @@ -59,12 +61,6 @@ ts_project( "//src/cdk/portal", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/cdk/accordion/BUILD.bazel b/src/cdk/accordion/BUILD.bazel index cad506b8cd12..6a86d9916471 100644 --- a/src/cdk/accordion/BUILD.bazel +++ b/src/cdk/accordion/BUILD.bazel @@ -13,13 +13,11 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/a11y", - "//src/cdk/collections", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/a11y", + "//src/cdk/collections", ], ) @@ -30,10 +28,8 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":accordion", - ], deps = [ + ":accordion", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", ], diff --git a/src/cdk/bidi/BUILD.bazel b/src/cdk/bidi/BUILD.bazel index 0abd06fd864b..b0fc936d51f9 100644 --- a/src/cdk/bidi/BUILD.bazel +++ b/src/cdk/bidi/BUILD.bazel @@ -13,7 +13,6 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", @@ -27,10 +26,8 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":bidi", - ], deps = [ + ":bidi", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", ], diff --git a/src/cdk/clipboard/BUILD.bazel b/src/cdk/clipboard/BUILD.bazel index aa384f15a50f..41f41672fde0 100644 --- a/src/cdk/clipboard/BUILD.bazel +++ b/src/cdk/clipboard/BUILD.bazel @@ -10,7 +10,6 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = glob(["**/*.html"]), - interop_deps = [], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", @@ -25,14 +24,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":clipboard", - "//src/cdk/testing", - ], deps = [ + ":clipboard", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing", ], ) diff --git a/src/cdk/coercion/BUILD.bazel b/src/cdk/coercion/BUILD.bazel index 99c194d71144..466495f4ea93 100644 --- a/src/cdk/coercion/BUILD.bazel +++ b/src/cdk/coercion/BUILD.bazel @@ -22,7 +22,7 @@ ts_project( exclude = ["**/*.e2e.spec.ts"], ), deps = [ - ":coercion_rjs", + ":coercion", "//:node_modules/@angular/core", ], ) diff --git a/src/cdk/coercion/private/BUILD.bazel b/src/cdk/coercion/private/BUILD.bazel index 1d9fa25b157a..81679755f563 100644 --- a/src/cdk/coercion/private/BUILD.bazel +++ b/src/cdk/coercion/private/BUILD.bazel @@ -12,12 +12,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src:dev_mode_types", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src:dev_mode_types", ], ) @@ -28,10 +26,8 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":private", - ], deps = [ + ":private", "//:node_modules/@angular/core", "//:node_modules/rxjs", ], diff --git a/src/cdk/collections/BUILD.bazel b/src/cdk/collections/BUILD.bazel index f0af8eb19deb..e5ee987664a7 100644 --- a/src/cdk/collections/BUILD.bazel +++ b/src/cdk/collections/BUILD.bazel @@ -14,12 +14,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src:dev_mode_types", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src:dev_mode_types", ], ) @@ -30,10 +28,8 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":collections", - ], deps = [ + ":collections", "//:node_modules/@angular/core", ], ) diff --git a/src/cdk/dialog/BUILD.bazel b/src/cdk/dialog/BUILD.bazel index 0cd8d93386fa..6dbabf3a1955 100644 --- a/src/cdk/dialog/BUILD.bazel +++ b/src/cdk/dialog/BUILD.bazel @@ -15,7 +15,11 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":dialog-container.css"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/animations", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -24,12 +28,6 @@ ng_project( "//src/cdk/platform", "//src/cdk/portal", ], - deps = [ - "//:node_modules/@angular/animations", - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ts_project( @@ -39,20 +37,18 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":dialog", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/overlay", "//src/cdk/platform", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/cdk/drag-drop/BUILD.bazel b/src/cdk/drag-drop/BUILD.bazel index 04aa09745ffa..bbc9c43756ec 100644 --- a/src/cdk/drag-drop/BUILD.bazel +++ b/src/cdk/drag-drop/BUILD.bazel @@ -17,7 +17,10 @@ ng_project( assets = [ ":resets_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -26,11 +29,6 @@ ng_project( "//src/cdk/private", "//src/cdk/scrolling", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ts_project( @@ -40,18 +38,16 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":drag-drop", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk/bidi", "//src/cdk/platform", "//src/cdk/scrolling", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_binary( diff --git a/src/cdk/keycodes/BUILD.bazel b/src/cdk/keycodes/BUILD.bazel index de1ac94e4f7a..17458595420c 100644 --- a/src/cdk/keycodes/BUILD.bazel +++ b/src/cdk/keycodes/BUILD.bazel @@ -13,7 +13,6 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [], deps = [], ) @@ -24,13 +23,11 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":keycodes", - "//src/cdk/testing/private", - ], deps = [ + ":keycodes", "//:node_modules/@angular/core", "//:node_modules/@types/jasmine", + "//src/cdk/testing/private", ], ) diff --git a/src/cdk/layout/BUILD.bazel b/src/cdk/layout/BUILD.bazel index 410d633be950..05dc04f5917a 100644 --- a/src/cdk/layout/BUILD.bazel +++ b/src/cdk/layout/BUILD.bazel @@ -13,13 +13,11 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/coercion", - "//src/cdk/platform", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/coercion", + "//src/cdk/platform", ], ) @@ -30,13 +28,11 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":layout", - "//src/cdk/platform", - ], deps = [ + ":layout", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/platform", ], ) diff --git a/src/cdk/listbox/BUILD.bazel b/src/cdk/listbox/BUILD.bazel index e636ca8aa099..68965a0bda88 100644 --- a/src/cdk/listbox/BUILD.bazel +++ b/src/cdk/listbox/BUILD.bazel @@ -9,16 +9,14 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/a11y", - "//src/cdk/bidi", - "//src/cdk/collections", - "//src/cdk/keycodes", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/cdk/a11y", + "//src/cdk/bidi", + "//src/cdk/collections", + "//src/cdk/keycodes", ], ) @@ -29,16 +27,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":listbox", - "//src/cdk/keycodes", - "//src/cdk/testing/private", - ], deps = [ + ":listbox", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", + "//src/cdk/keycodes", + "//src/cdk/testing/private", ], ) diff --git a/src/cdk/menu/BUILD.bazel b/src/cdk/menu/BUILD.bazel index 74f7d238f8d4..b2fcc7539e8c 100644 --- a/src/cdk/menu/BUILD.bazel +++ b/src/cdk/menu/BUILD.bazel @@ -13,7 +13,9 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -22,10 +24,6 @@ ng_project( "//src/cdk/keycodes", "//src/cdk/overlay", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ts_project( @@ -35,16 +33,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":menu", - "//src/cdk/collections", - "//src/cdk/keycodes", - "//src/cdk/testing/private", - ], deps = [ + ":menu", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/rxjs", + "//src/cdk/collections", + "//src/cdk/keycodes", + "//src/cdk/testing/private", ], ) diff --git a/src/cdk/observers/BUILD.bazel b/src/cdk/observers/BUILD.bazel index 0751efaf15ad..03ceab1ef5dd 100644 --- a/src/cdk/observers/BUILD.bazel +++ b/src/cdk/observers/BUILD.bazel @@ -13,12 +13,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/coercion", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/coercion", ], ) @@ -29,8 +27,10 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [":observers"], - deps = ["//:node_modules/@angular/core"], + deps = [ + ":observers", + "//:node_modules/@angular/core", + ], ) ng_web_test_suite( diff --git a/src/cdk/observers/private/BUILD.bazel b/src/cdk/observers/private/BUILD.bazel index 7f8f9e6f11c3..5e2206655d4b 100644 --- a/src/cdk/observers/private/BUILD.bazel +++ b/src/cdk/observers/private/BUILD.bazel @@ -12,12 +12,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src:dev_mode_types", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src:dev_mode_types", ], ) @@ -28,10 +26,8 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":private", - ], deps = [ + ":private", "//:node_modules/@angular/core", ], ) diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel index 54a234699404..19bd316e8e6a 100644 --- a/src/cdk/overlay/BUILD.bazel +++ b/src/cdk/overlay/BUILD.bazel @@ -19,7 +19,10 @@ ng_project( assets = [ ":overlay-structure.css", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -30,11 +33,6 @@ ng_project( "//src/cdk/private", "//src/cdk/scrolling", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_library( @@ -65,8 +63,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":overlay", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/platform", @@ -74,12 +76,6 @@ ts_project( "//src/cdk/scrolling", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( @@ -98,7 +94,7 @@ ts_project( e2e_test_suite( name = "e2e_tests", deps = [ - ":e2e_test_sources", + ":e2e_test_sources_legacy", ], ) diff --git a/src/cdk/platform/BUILD.bazel b/src/cdk/platform/BUILD.bazel index 3ada7ac5a94f..f04ad6f44a29 100644 --- a/src/cdk/platform/BUILD.bazel +++ b/src/cdk/platform/BUILD.bazel @@ -9,7 +9,6 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", diff --git a/src/cdk/portal/BUILD.bazel b/src/cdk/portal/BUILD.bazel index e0701bd16b24..64d4c5e4231e 100644 --- a/src/cdk/portal/BUILD.bazel +++ b/src/cdk/portal/BUILD.bazel @@ -14,12 +14,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src:dev_mode_types", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", + "//src:dev_mode_types", ], ) @@ -30,10 +28,8 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":portal", - ], deps = [ + ":portal", "//:node_modules/@angular/common", "//:node_modules/@angular/core", ], diff --git a/src/cdk/private/BUILD.bazel b/src/cdk/private/BUILD.bazel index c01a2dbd9f58..a13ae468bd5f 100644 --- a/src/cdk/private/BUILD.bazel +++ b/src/cdk/private/BUILD.bazel @@ -10,7 +10,6 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":visually-hidden-styles"], - interop_deps = [], deps = [ "//:node_modules/@angular/core", ], diff --git a/src/cdk/schematics/BUILD.bazel b/src/cdk/schematics/BUILD.bazel index 7f2f4b2f4853..44e7743a1c22 100644 --- a/src/cdk/schematics/BUILD.bazel +++ b/src/cdk/schematics/BUILD.bazel @@ -40,9 +40,6 @@ ts_project( "testing/**/*.ts", ], ), - interop_deps = [ - "//src/cdk/schematics/update-tool", - ], tsconfig = "tsconfig.json", deps = [ "//:node_modules/@angular-devkit/core", @@ -53,6 +50,7 @@ ts_project( "//:node_modules/glob", "//:node_modules/parse5", "//:node_modules/typescript", + "//src/cdk/schematics/update-tool", ], ) @@ -61,8 +59,8 @@ npm_package( name = "npm_package", srcs = [ "package.json", + ":schematics", ":schematics_assets", - ":schematics_rjs", ], package = "@angular/cdk/schematics", ) @@ -78,26 +76,24 @@ ts_project( ], ), extends = "tsconfig.json", - interop_deps = [ - "//src/cdk/schematics/testing", - "//src/cdk/schematics/update-tool", - "//src/cdk/testing/private", - ], tsconfig = "tsconfig-test.json", deps = [ - ":schematics_rjs", + ":schematics", "//:node_modules/@angular-devkit/schematics", "//:node_modules/@bazel/runfiles", "//:node_modules/@schematics/angular", "//:node_modules/@types/jasmine", "//:node_modules/@types/node", "//:node_modules/typescript", + "//src/cdk/schematics/testing", + "//src/cdk/schematics/update-tool", + "//src/cdk/testing/private", ], ) jasmine_node_test( name = "unit_tests", - srcs = [":unit_test_sources"], + srcs = [":unit_test_sources_legacy"], data = [ ":schematics_assets", ], diff --git a/src/cdk/scrolling/BUILD.bazel b/src/cdk/scrolling/BUILD.bazel index 9853c887557e..afe056d6e717 100644 --- a/src/cdk/scrolling/BUILD.bazel +++ b/src/cdk/scrolling/BUILD.bazel @@ -15,18 +15,16 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":virtual-scroll-viewport.css"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/bidi", "//src/cdk/coercion", "//src/cdk/collections", "//src/cdk/platform", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_binary( @@ -41,16 +39,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":scrolling", - "//src/cdk/bidi", - "//src/cdk/collections", - "//src/cdk/testing/private", - ], deps = [ + ":scrolling", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/bidi", + "//src/cdk/collections", + "//src/cdk/testing/private", ], ) diff --git a/src/cdk/stepper/BUILD.bazel b/src/cdk/stepper/BUILD.bazel index 9365445f84c4..921ac099cb19 100644 --- a/src/cdk/stepper/BUILD.bazel +++ b/src/cdk/stepper/BUILD.bazel @@ -9,18 +9,16 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/platform", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) markdown_to_html( diff --git a/src/cdk/table/BUILD.bazel b/src/cdk/table/BUILD.bazel index bbae87e4472d..3fe75c792370 100644 --- a/src/cdk/table/BUILD.bazel +++ b/src/cdk/table/BUILD.bazel @@ -15,7 +15,10 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":table.css"], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/bidi", "//src/cdk/coercion", @@ -23,11 +26,6 @@ ng_project( "//src/cdk/platform", "//src/cdk/scrolling", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_binary( @@ -42,14 +40,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":table", - "//src/cdk/bidi", - "//src/cdk/collections", - ], deps = [ + ":table", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/bidi", + "//src/cdk/collections", ], ) diff --git a/src/cdk/testing/BUILD.bazel b/src/cdk/testing/BUILD.bazel index 63312ed538aa..e97c822591c1 100644 --- a/src/cdk/testing/BUILD.bazel +++ b/src/cdk/testing/BUILD.bazel @@ -38,13 +38,13 @@ ng_web_test_suite( e2e_test_suite( name = "protractor_e2e_tests", deps = [ - "//src/cdk/testing/tests:e2e_test_sources", + "//src/cdk/testing/tests:e2e_test_sources_legacy", ], ) webdriver_test( name = "webdriver_e2e_tests", deps = [ - "//src/cdk/testing/tests:webdriver_test_sources", + "//src/cdk/testing/tests:webdriver_test_sources_legacy", ], ) diff --git a/src/cdk/testing/private/BUILD.bazel b/src/cdk/testing/private/BUILD.bazel index 2b46e900eed2..4b8106275296 100644 --- a/src/cdk/testing/private/BUILD.bazel +++ b/src/cdk/testing/private/BUILD.bazel @@ -9,11 +9,9 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/testing/testbed", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@types/jasmine", + "//src/cdk/testing/testbed", ], ) diff --git a/src/cdk/testing/protractor/BUILD.bazel b/src/cdk/testing/protractor/BUILD.bazel index c8cf8de5fd25..ed928bbb068f 100644 --- a/src/cdk/testing/protractor/BUILD.bazel +++ b/src/cdk/testing/protractor/BUILD.bazel @@ -9,12 +9,10 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/testing", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/protractor", + "//src/cdk/testing", ], ) diff --git a/src/cdk/testing/selenium-webdriver/BUILD.bazel b/src/cdk/testing/selenium-webdriver/BUILD.bazel index 9163d54678e2..1d9fa385e902 100644 --- a/src/cdk/testing/selenium-webdriver/BUILD.bazel +++ b/src/cdk/testing/selenium-webdriver/BUILD.bazel @@ -8,12 +8,10 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/testing", - ], deps = [ "//:node_modules/@types/selenium-webdriver", "//:node_modules/selenium-webdriver", + "//src/cdk/testing", ], ) diff --git a/src/cdk/testing/testbed/BUILD.bazel b/src/cdk/testing/testbed/BUILD.bazel index 3a8d7e524daf..6d85e744230d 100644 --- a/src/cdk/testing/testbed/BUILD.bazel +++ b/src/cdk/testing/testbed/BUILD.bazel @@ -9,13 +9,11 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/keycodes", - "//src/cdk/testing", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/keycodes", + "//src/cdk/testing", ], ) @@ -28,10 +26,8 @@ ts_project( name = "unit_test_sources", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ - ":testbed", - ], deps = [ + ":testbed", "//:node_modules/@angular/core", ], ) diff --git a/src/cdk/testing/tests/BUILD.bazel b/src/cdk/testing/tests/BUILD.bazel index 0a4735e2ea86..d5f29ce9a59f 100644 --- a/src/cdk/testing/tests/BUILD.bazel +++ b/src/cdk/testing/tests/BUILD.bazel @@ -13,20 +13,18 @@ ng_project( ], ), assets = glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/keycodes", - "//src/cdk/platform", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/cdk/keycodes", + "//src/cdk/platform", ], ) ts_project( name = "test_harnesses", srcs = glob(["harnesses/**/*.ts"]), - interop_deps = [ + deps = [ "//src/cdk/testing", ], ) @@ -35,12 +33,10 @@ ts_project( name = "cross_environment_specs", testonly = True, srcs = ["cross-environment.spec.ts"], - interop_deps = [ - ":test_harnesses", - "//src/cdk/testing", - ], deps = [ + ":test_harnesses", "//:node_modules/@angular/core", + "//src/cdk/testing", ], ) @@ -56,20 +52,18 @@ ts_project( "**/*.e2e.spec.ts", ], ), - interop_deps = [ + deps = [ ":cross_environment_specs", ":test_components", ":test_harnesses", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/kagekiri", "//src/cdk/platform", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/kagekiri", - ], ) ts_project( @@ -81,32 +75,28 @@ ts_project( ], exclude = ["webdriver.e2e.spec.ts"], ), - interop_deps = [ + deps = [ + ":cross_environment_specs", + ":test_harnesses", + "//:node_modules/protractor", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/protractor", ], - deps = [ - ":cross_environment_specs_rjs", - ":test_harnesses_rjs", - "//:node_modules/protractor", - ], ) ts_project( name = "webdriver_test_sources", testonly = True, srcs = ["webdriver.e2e.spec.ts"], - interop_deps = [ + deps = [ ":cross_environment_specs", ":test_harnesses", - "//src/cdk/testing", - "//src/cdk/testing/selenium-webdriver", - ], - deps = [ "//:node_modules/@bazel/runfiles", "//:node_modules/@types/jasmine", "//:node_modules/@types/node", "//:node_modules/@types/selenium-webdriver", + "//src/cdk/testing", + "//src/cdk/testing/selenium-webdriver", ], ) diff --git a/src/cdk/text-field/BUILD.bazel b/src/cdk/text-field/BUILD.bazel index fcb192a36d77..5febc5e11910 100644 --- a/src/cdk/text-field/BUILD.bazel +++ b/src/cdk/text-field/BUILD.bazel @@ -18,15 +18,13 @@ ng_project( assets = [ ":text-field-prebuilt.css", ], - interop_deps = [ - "//src/cdk/coercion", - "//src/cdk/platform", - "//src/cdk/private", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/coercion", + "//src/cdk/platform", + "//src/cdk/private", ], ) @@ -48,16 +46,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":text-field", - "//src/cdk/platform", - "//src/cdk/testing/private", - ], deps = [ + ":text-field", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", "//:node_modules/rxjs", + "//src/cdk/platform", + "//src/cdk/testing/private", ], ) diff --git a/src/cdk/tree/BUILD.bazel b/src/cdk/tree/BUILD.bazel index 7dbe1e26d41c..bcb26df524ea 100644 --- a/src/cdk/tree/BUILD.bazel +++ b/src/cdk/tree/BUILD.bazel @@ -14,7 +14,9 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -22,10 +24,6 @@ ng_project( "//src/cdk/collections", "//src/cdk/keycodes", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ts_project( @@ -35,18 +33,16 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":tree", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/collections", "//src/cdk/keycodes", "//src/cdk/testing/testbed", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/components-examples/BUILD.bazel b/src/components-examples/BUILD.bazel index a24fc78534fa..3cd2be9aa2b3 100644 --- a/src/components-examples/BUILD.bazel +++ b/src/components-examples/BUILD.bazel @@ -3,6 +3,7 @@ load("//tools/highlight-files:index.bzl", "highlight_files") load("//tools/package-docs-content:index.bzl", "package_docs_content") load(":config.bzl", "ALL_EXAMPLES") load("//tools:defaults2.bzl", "ng_project") +load("//tools/bazel:legacy_target.bzl", "get_legacy_label") package(default_visibility = ["//visibility:public"]) @@ -12,10 +13,9 @@ ng_project( ["*.ts"], exclude = ["example-module.d.ts"], ) + [":example-module.ts"], - interop_deps = ALL_EXAMPLES, deps = [ "//:node_modules/@angular/core", - ], + ] + ALL_EXAMPLES, ) filegroup( @@ -64,7 +64,7 @@ ng_package( # ng_package does not properly handle tree artifacts currently so we escalate to nested_packages nested_packages = [":docs-content"], tags = ["docs-package"], - deps = [":components-examples"] + ALL_EXAMPLES, + deps = [":components-examples_legacy"] + [get_legacy_label(t) for t in ALL_EXAMPLES], ) genrule( diff --git a/src/components-examples/cdk-experimental/listbox/BUILD.bazel b/src/components-examples/cdk-experimental/listbox/BUILD.bazel index 29d6b9db5eb6..809529b6c4b0 100644 --- a/src/components-examples/cdk-experimental/listbox/BUILD.bazel +++ b/src/components-examples/cdk-experimental/listbox/BUILD.bazel @@ -9,16 +9,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk-experimental/listbox", "//src/material/checkbox", "//src/material/form-field", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) filegroup( diff --git a/src/components-examples/cdk-experimental/popover-edit/BUILD.bazel b/src/components-examples/cdk-experimental/popover-edit/BUILD.bazel index 1b4b6eeb9cdf..cc665c3ea131 100644 --- a/src/components-examples/cdk-experimental/popover-edit/BUILD.bazel +++ b/src/components-examples/cdk-experimental/popover-edit/BUILD.bazel @@ -9,15 +9,13 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk-experimental/popover-edit", - "//src/cdk/collections", - "//src/cdk/table", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/cdk-experimental/popover-edit", + "//src/cdk/collections", + "//src/cdk/table", ], ) diff --git a/src/components-examples/cdk-experimental/selection/BUILD.bazel b/src/components-examples/cdk-experimental/selection/BUILD.bazel index fd15a87bc970..08e8580b0c53 100644 --- a/src/components-examples/cdk-experimental/selection/BUILD.bazel +++ b/src/components-examples/cdk-experimental/selection/BUILD.bazel @@ -9,16 +9,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk-experimental/selection", - "//src/cdk/collections", - "//src/cdk/table", - "//src/material/checkbox", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/cdk-experimental/selection", + "//src/cdk/collections", + "//src/cdk/table", + "//src/material/checkbox", ], ) diff --git a/src/components-examples/cdk/a11y/BUILD.bazel b/src/components-examples/cdk/a11y/BUILD.bazel index 8febd7edb814..e70ccdede978 100644 --- a/src/components-examples/cdk/a11y/BUILD.bazel +++ b/src/components-examples/cdk/a11y/BUILD.bazel @@ -9,13 +9,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/a11y", - "//src/material/select", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/a11y", + "//src/material/select", ], ) diff --git a/src/components-examples/cdk/accordion/BUILD.bazel b/src/components-examples/cdk/accordion/BUILD.bazel index b058db040379..4b207f807877 100644 --- a/src/components-examples/cdk/accordion/BUILD.bazel +++ b/src/components-examples/cdk/accordion/BUILD.bazel @@ -9,11 +9,9 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/accordion", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/accordion", ], ) diff --git a/src/components-examples/cdk/clipboard/BUILD.bazel b/src/components-examples/cdk/clipboard/BUILD.bazel index 9aa2cf8dfd4e..669d990ee5af 100644 --- a/src/components-examples/cdk/clipboard/BUILD.bazel +++ b/src/components-examples/cdk/clipboard/BUILD.bazel @@ -9,12 +9,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/clipboard", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/cdk/clipboard", ], ) diff --git a/src/components-examples/cdk/dialog/BUILD.bazel b/src/components-examples/cdk/dialog/BUILD.bazel index dea22fd9d092..64f3a850f1da 100644 --- a/src/components-examples/cdk/dialog/BUILD.bazel +++ b/src/components-examples/cdk/dialog/BUILD.bazel @@ -12,14 +12,12 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/dialog", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", "//:node_modules/rxjs", + "//src/cdk/dialog", ], ) diff --git a/src/components-examples/cdk/drag-drop/BUILD.bazel b/src/components-examples/cdk/drag-drop/BUILD.bazel index eac4d977202d..8f2515484e66 100644 --- a/src/components-examples/cdk/drag-drop/BUILD.bazel +++ b/src/components-examples/cdk/drag-drop/BUILD.bazel @@ -9,7 +9,8 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/cdk/drag-drop", "//src/cdk/overlay", "//src/cdk/portal", @@ -17,9 +18,6 @@ ng_project( "//src/material/table", "//src/material/tabs", ], - deps = [ - "//:node_modules/@angular/core", - ], ) filegroup( diff --git a/src/components-examples/cdk/layout/BUILD.bazel b/src/components-examples/cdk/layout/BUILD.bazel index 6f9f87e0aaca..d5d623364ffe 100644 --- a/src/components-examples/cdk/layout/BUILD.bazel +++ b/src/components-examples/cdk/layout/BUILD.bazel @@ -9,12 +9,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/layout", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/layout", ], ) diff --git a/src/components-examples/cdk/listbox/BUILD.bazel b/src/components-examples/cdk/listbox/BUILD.bazel index d6a419fb02f2..2b83a957e5b2 100644 --- a/src/components-examples/cdk/listbox/BUILD.bazel +++ b/src/components-examples/cdk/listbox/BUILD.bazel @@ -9,14 +9,12 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/listbox", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/cdk/listbox", ], ) diff --git a/src/components-examples/cdk/menu/BUILD.bazel b/src/components-examples/cdk/menu/BUILD.bazel index c48d794c23bd..24f361340bac 100644 --- a/src/components-examples/cdk/menu/BUILD.bazel +++ b/src/components-examples/cdk/menu/BUILD.bazel @@ -9,12 +9,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/menu", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/cdk/menu", ], ) diff --git a/src/components-examples/cdk/overlay/BUILD.bazel b/src/components-examples/cdk/overlay/BUILD.bazel index b0f576f5b559..505cefb485b9 100644 --- a/src/components-examples/cdk/overlay/BUILD.bazel +++ b/src/components-examples/cdk/overlay/BUILD.bazel @@ -9,11 +9,9 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/overlay", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/overlay", ], ) diff --git a/src/components-examples/cdk/platform/BUILD.bazel b/src/components-examples/cdk/platform/BUILD.bazel index 8974b5f0a13c..2c57e90a8612 100644 --- a/src/components-examples/cdk/platform/BUILD.bazel +++ b/src/components-examples/cdk/platform/BUILD.bazel @@ -9,11 +9,9 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/platform", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/platform", ], ) diff --git a/src/components-examples/cdk/portal/BUILD.bazel b/src/components-examples/cdk/portal/BUILD.bazel index e32b4237c9af..d4185a79fba1 100644 --- a/src/components-examples/cdk/portal/BUILD.bazel +++ b/src/components-examples/cdk/portal/BUILD.bazel @@ -9,11 +9,9 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/portal", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/portal", ], ) diff --git a/src/components-examples/cdk/scrolling/BUILD.bazel b/src/components-examples/cdk/scrolling/BUILD.bazel index c0c94aaaff9e..58c10a3a02cb 100644 --- a/src/components-examples/cdk/scrolling/BUILD.bazel +++ b/src/components-examples/cdk/scrolling/BUILD.bazel @@ -9,12 +9,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/scrolling", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/scrolling", ], ) diff --git a/src/components-examples/cdk/stepper/BUILD.bazel b/src/components-examples/cdk/stepper/BUILD.bazel index c902e803a48c..791c2d417829 100644 --- a/src/components-examples/cdk/stepper/BUILD.bazel +++ b/src/components-examples/cdk/stepper/BUILD.bazel @@ -9,13 +9,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/stepper", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/cdk/stepper", ], ) diff --git a/src/components-examples/cdk/table/BUILD.bazel b/src/components-examples/cdk/table/BUILD.bazel index ac802535d93e..0c7444fc3cc2 100644 --- a/src/components-examples/cdk/table/BUILD.bazel +++ b/src/components-examples/cdk/table/BUILD.bazel @@ -9,12 +9,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/table", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/table", ], ) diff --git a/src/components-examples/cdk/text-field/BUILD.bazel b/src/components-examples/cdk/text-field/BUILD.bazel index b5e6a3b91e20..eec7c8fe0049 100644 --- a/src/components-examples/cdk/text-field/BUILD.bazel +++ b/src/components-examples/cdk/text-field/BUILD.bazel @@ -9,16 +9,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk/text-field", "//src/material/button", "//src/material/input", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) filegroup( diff --git a/src/components-examples/cdk/tree/BUILD.bazel b/src/components-examples/cdk/tree/BUILD.bazel index 41ed2fa1b944..b722372ef9e1 100644 --- a/src/components-examples/cdk/tree/BUILD.bazel +++ b/src/components-examples/cdk/tree/BUILD.bazel @@ -9,16 +9,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/tree", - "//src/material/button", - "//src/material/icon", - "//src/material/progress-spinner", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/tree", + "//src/material/button", + "//src/material/icon", + "//src/material/progress-spinner", ], ) diff --git a/src/components-examples/material-experimental/column-resize/BUILD.bazel b/src/components-examples/material-experimental/column-resize/BUILD.bazel index f96a87992b7c..2a64a4f586a2 100644 --- a/src/components-examples/material-experimental/column-resize/BUILD.bazel +++ b/src/components-examples/material-experimental/column-resize/BUILD.bazel @@ -9,12 +9,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/material-experimental/column-resize", - "//src/material/table", - ], deps = [ "//:node_modules/@angular/core", + "//src/material-experimental/column-resize", + "//src/material/table", ], ) diff --git a/src/components-examples/material-experimental/popover-edit/BUILD.bazel b/src/components-examples/material-experimental/popover-edit/BUILD.bazel index 5cf92155ad36..bd9062ec41a6 100644 --- a/src/components-examples/material-experimental/popover-edit/BUILD.bazel +++ b/src/components-examples/material-experimental/popover-edit/BUILD.bazel @@ -9,7 +9,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/material-experimental/popover-edit", "//src/material/button", "//src/material/checkbox", @@ -19,12 +23,6 @@ ng_project( "//src/material/snack-bar", "//src/material/table", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) filegroup( diff --git a/src/components-examples/material-experimental/selection/BUILD.bazel b/src/components-examples/material-experimental/selection/BUILD.bazel index d9b2eedcd543..0333469fac1f 100644 --- a/src/components-examples/material-experimental/selection/BUILD.bazel +++ b/src/components-examples/material-experimental/selection/BUILD.bazel @@ -9,16 +9,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/collections", - "//src/cdk/table", - "//src/material-experimental/selection", - "//src/material/checkbox", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/cdk/collections", + "//src/cdk/table", + "//src/material-experimental/selection", + "//src/material/checkbox", ], ) diff --git a/src/components-examples/material/autocomplete/BUILD.bazel b/src/components-examples/material/autocomplete/BUILD.bazel index d04eeb248344..a01b615f15ae 100644 --- a/src/components-examples/material/autocomplete/BUILD.bazel +++ b/src/components-examples/material/autocomplete/BUILD.bazel @@ -13,7 +13,13 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//src/cdk/overlay", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -23,14 +29,6 @@ ng_project( "//src/material/input", "//src/material/slide-toggle", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - "//:node_modules/rxjs", - ], ) filegroup( @@ -46,17 +44,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":autocomplete", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/autocomplete", "//src/material/autocomplete/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/badge/BUILD.bazel b/src/components-examples/material/badge/BUILD.bazel index f8a9e56c77d8..32a52c775b87 100644 --- a/src/components-examples/material/badge/BUILD.bazel +++ b/src/components-examples/material/badge/BUILD.bazel @@ -13,7 +13,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/badge", @@ -21,11 +24,6 @@ ng_project( "//src/material/button", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -41,16 +39,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":badge", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/badge", "//src/material/badge/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/bottom-sheet/BUILD.bazel b/src/components-examples/material/bottom-sheet/BUILD.bazel index ad5e17a17c88..aefca6c244a8 100644 --- a/src/components-examples/material/bottom-sheet/BUILD.bazel +++ b/src/components-examples/material/bottom-sheet/BUILD.bazel @@ -13,7 +13,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/overlay", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -22,11 +25,6 @@ ng_project( "//src/material/button", "//src/material/list", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -42,17 +40,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":bottom-sheet", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/bottom-sheet", "//src/material/bottom-sheet/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/button-toggle/BUILD.bazel b/src/components-examples/material/button-toggle/BUILD.bazel index b41801ff2a17..7965a51850fc 100644 --- a/src/components-examples/material/button-toggle/BUILD.bazel +++ b/src/components-examples/material/button-toggle/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button-toggle", @@ -21,12 +25,6 @@ ng_project( "//src/material/checkbox", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -42,16 +40,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":button-toggle", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button-toggle", "//src/material/button-toggle/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/button/BUILD.bazel b/src/components-examples/material/button/BUILD.bazel index 7da79ce99268..950d74ddc379 100644 --- a/src/components-examples/material/button/BUILD.bazel +++ b/src/components-examples/material/button/BUILD.bazel @@ -13,7 +13,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -22,11 +25,6 @@ ng_project( "//src/material/icon", "//src/material/tooltip", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -42,16 +40,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":button", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", "//src/material/button/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/card/BUILD.bazel b/src/components-examples/material/card/BUILD.bazel index 3bc1c678dbed..eada092bd3b7 100644 --- a/src/components-examples/material/card/BUILD.bazel +++ b/src/components-examples/material/card/BUILD.bazel @@ -13,7 +13,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -24,11 +27,6 @@ ng_project( "//src/material/divider", "//src/material/progress-bar", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -44,17 +42,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":card", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button/testing", "//src/material/card", "//src/material/card/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/checkbox/BUILD.bazel b/src/components-examples/material/checkbox/BUILD.bazel index a2b8aa75b8a7..8109e64cdcb0 100644 --- a/src/components-examples/material/checkbox/BUILD.bazel +++ b/src/components-examples/material/checkbox/BUILD.bazel @@ -13,20 +13,18 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/card", - "//src/material/checkbox", - "//src/material/checkbox/testing", - "//src/material/radio", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", "//:node_modules/@types/jasmine", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/card", + "//src/material/checkbox", + "//src/material/checkbox/testing", + "//src/material/radio", ], ) @@ -43,17 +41,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":checkbox", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/checkbox", "//src/material/checkbox/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/chips/BUILD.bazel b/src/components-examples/material/chips/BUILD.bazel index 83464c059c49..54ac55d38b8b 100644 --- a/src/components-examples/material/chips/BUILD.bazel +++ b/src/components-examples/material/chips/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/drag-drop", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -24,12 +28,6 @@ ng_project( "//src/material/form-field", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -45,17 +43,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":chips", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/chips", "//src/material/chips/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/core/BUILD.bazel b/src/components-examples/material/core/BUILD.bazel index 533a4d753b27..dbd0faa281ce 100644 --- a/src/components-examples/material/core/BUILD.bazel +++ b/src/components-examples/material/core/BUILD.bazel @@ -9,16 +9,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/checkbox", "//src/material/core", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) filegroup( diff --git a/src/components-examples/material/datepicker/BUILD.bazel b/src/components-examples/material/datepicker/BUILD.bazel index 40094c9164ef..b735d2431a85 100644 --- a/src/components-examples/material/datepicker/BUILD.bazel +++ b/src/components-examples/material/datepicker/BUILD.bazel @@ -13,7 +13,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", + "//:node_modules/moment", + "//:node_modules/rxjs", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material-moment-adapter", @@ -26,15 +33,6 @@ ng_project( "//src/material/icon", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - "//:node_modules/moment", - "//:node_modules/rxjs", - ], ) filegroup( @@ -50,19 +48,17 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":datepicker", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/core", "//src/material/datepicker", "//src/material/datepicker/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/dialog/BUILD.bazel b/src/components-examples/material/dialog/BUILD.bazel index c8ec01121e4c..5cd82af5e05e 100644 --- a/src/components-examples/material/dialog/BUILD.bazel +++ b/src/components-examples/material/dialog/BUILD.bazel @@ -13,7 +13,12 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -22,13 +27,6 @@ ng_project( "//src/material/input", "//src/material/menu", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - "//:node_modules/rxjs", - ], ) filegroup( @@ -44,17 +42,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":dialog", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/dialog", "//src/material/dialog/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/divider/BUILD.bazel b/src/components-examples/material/divider/BUILD.bazel index 452385cd46fa..f2ab783ba2a5 100644 --- a/src/components-examples/material/divider/BUILD.bazel +++ b/src/components-examples/material/divider/BUILD.bazel @@ -13,18 +13,16 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/divider", "//src/material/divider/testing", "//src/material/list", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -40,18 +38,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":divider", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/divider", "//src/material/divider/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/expansion/BUILD.bazel b/src/components-examples/material/expansion/BUILD.bazel index 99e8f058bfdc..66a51d9a8c65 100644 --- a/src/components-examples/material/expansion/BUILD.bazel +++ b/src/components-examples/material/expansion/BUILD.bazel @@ -13,7 +13,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -23,11 +26,6 @@ ng_project( "//src/material/icon", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -43,17 +41,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":expansion", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/expansion", "//src/material/expansion/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/form-field/BUILD.bazel b/src/components-examples/material/form-field/BUILD.bazel index 2efbae702f4e..e2aad0b99071 100644 --- a/src/components-examples/material/form-field/BUILD.bazel +++ b/src/components-examples/material/form-field/BUILD.bazel @@ -13,7 +13,13 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -26,14 +32,6 @@ ng_project( "//src/material/radio", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - "//:node_modules/rxjs", - ], ) filegroup( @@ -49,8 +47,11 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":form-field", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/form-field", @@ -58,11 +59,6 @@ ts_project( "//src/material/input", "//src/material/input/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/grid-list/BUILD.bazel b/src/components-examples/material/grid-list/BUILD.bazel index 403d897e5dd6..2194f083b654 100644 --- a/src/components-examples/material/grid-list/BUILD.bazel +++ b/src/components-examples/material/grid-list/BUILD.bazel @@ -13,16 +13,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/grid-list", - "//src/material/grid-list/testing", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/@types/jasmine", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/grid-list", + "//src/material/grid-list/testing", ], ) @@ -39,16 +37,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":grid-list", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/grid-list", "//src/material/grid-list/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/icon/BUILD.bazel b/src/components-examples/material/icon/BUILD.bazel index a5dcc310c1e8..c50fb16c0ca1 100644 --- a/src/components-examples/material/icon/BUILD.bazel +++ b/src/components-examples/material/icon/BUILD.bazel @@ -13,16 +13,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/icon", - "//src/material/icon/testing", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/@types/jasmine", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/icon", + "//src/material/icon/testing", ], ) @@ -39,17 +37,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":icon", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/icon", "//src/material/icon/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/input/BUILD.bazel b/src/components-examples/material/input/BUILD.bazel index 93da64b6acc4..dba4677c9f2c 100644 --- a/src/components-examples/material/input/BUILD.bazel +++ b/src/components-examples/material/input/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -21,12 +25,6 @@ ng_project( "//src/material/input", "//src/material/input/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -42,18 +40,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":input", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/input", "//src/material/input/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/list/BUILD.bazel b/src/components-examples/material/list/BUILD.bazel index d88ea04629ad..0e166a2f5420 100644 --- a/src/components-examples/material/list/BUILD.bazel +++ b/src/components-examples/material/list/BUILD.bazel @@ -13,19 +13,17 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/icon", - "//src/material/list", - "//src/material/list/testing", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", "//:node_modules/@types/jasmine", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/icon", + "//src/material/list", + "//src/material/list/testing", ], ) @@ -42,18 +40,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":list", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/list", "//src/material/list/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/menu/BUILD.bazel b/src/components-examples/material/menu/BUILD.bazel index 852bfc413326..4e4e90559298 100644 --- a/src/components-examples/material/menu/BUILD.bazel +++ b/src/components-examples/material/menu/BUILD.bazel @@ -13,7 +13,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/overlay", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -22,11 +25,6 @@ ng_project( "//src/material/menu", "//src/material/menu/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -42,17 +40,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":menu", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/menu", "//src/material/menu/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/paginator/BUILD.bazel b/src/components-examples/material/paginator/BUILD.bazel index abec4bc18a3d..5a69f9926436 100644 --- a/src/components-examples/material/paginator/BUILD.bazel +++ b/src/components-examples/material/paginator/BUILD.bazel @@ -13,16 +13,6 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/card", - "//src/material/form-field", - "//src/material/input", - "//src/material/paginator", - "//src/material/paginator/testing", - "//src/material/slide-toggle", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", @@ -31,6 +21,14 @@ ng_project( "//:node_modules/@angular/platform-browser", "//:node_modules/@types/jasmine", "//:node_modules/rxjs", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/card", + "//src/material/form-field", + "//src/material/input", + "//src/material/paginator", + "//src/material/paginator/testing", + "//src/material/slide-toggle", ], ) @@ -47,17 +45,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":paginator", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/paginator", "//src/material/paginator/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/progress-bar/BUILD.bazel b/src/components-examples/material/progress-bar/BUILD.bazel index 3da4e6a148bc..b18198ca5ad6 100644 --- a/src/components-examples/material/progress-bar/BUILD.bazel +++ b/src/components-examples/material/progress-bar/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/card", @@ -22,12 +26,6 @@ ng_project( "//src/material/radio", "//src/material/slider", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -43,16 +41,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":progress-bar", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/progress-bar", "//src/material/progress-bar/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/progress-spinner/BUILD.bazel b/src/components-examples/material/progress-spinner/BUILD.bazel index 07de10ef86b4..742a1974d065 100644 --- a/src/components-examples/material/progress-spinner/BUILD.bazel +++ b/src/components-examples/material/progress-spinner/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/card", @@ -22,12 +26,6 @@ ng_project( "//src/material/radio", "//src/material/slider", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -43,16 +41,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":progress-spinner", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/progress-spinner", "//src/material/progress-spinner/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/radio/BUILD.bazel b/src/components-examples/material/radio/BUILD.bazel index 84741542e370..470c73cb7a69 100644 --- a/src/components-examples/material/radio/BUILD.bazel +++ b/src/components-examples/material/radio/BUILD.bazel @@ -13,17 +13,15 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/radio", - "//src/material/radio/testing", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", "//:node_modules/@types/jasmine", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/radio", + "//src/material/radio/testing", ], ) @@ -40,17 +38,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":radio", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/radio", "//src/material/radio/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/select/BUILD.bazel b/src/components-examples/material/select/BUILD.bazel index f2ec435902b3..e26a874442ea 100644 --- a/src/components-examples/material/select/BUILD.bazel +++ b/src/components-examples/material/select/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/checkbox", @@ -22,12 +26,6 @@ ng_project( "//src/material/select", "//src/material/select/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -43,17 +41,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":select", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/select", "//src/material/select/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/sidenav/BUILD.bazel b/src/components-examples/material/sidenav/BUILD.bazel index ac9d5fd430ef..d482e99642b6 100644 --- a/src/components-examples/material/sidenav/BUILD.bazel +++ b/src/components-examples/material/sidenav/BUILD.bazel @@ -13,7 +13,12 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@angular/router", + "//:node_modules/@types/jasmine", "//src/cdk/layout", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -27,13 +32,6 @@ ng_project( "//src/material/sidenav", "//src/material/toolbar", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@angular/router", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -49,17 +47,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":sidenav", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/sidenav", "//src/material/sidenav/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/slide-toggle/BUILD.bazel b/src/components-examples/material/slide-toggle/BUILD.bazel index dee58be075da..70e1d6bf36df 100644 --- a/src/components-examples/material/slide-toggle/BUILD.bazel +++ b/src/components-examples/material/slide-toggle/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -23,12 +27,6 @@ ng_project( "//src/material/slide-toggle", "//src/material/slide-toggle/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -44,17 +42,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":slide-toggle", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/slide-toggle", "//src/material/slide-toggle/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/slider/BUILD.bazel b/src/components-examples/material/slider/BUILD.bazel index 2c114591d9a6..9fbb6527c102 100644 --- a/src/components-examples/material/slider/BUILD.bazel +++ b/src/components-examples/material/slider/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/card", @@ -22,12 +26,6 @@ ng_project( "//src/material/slider", "//src/material/slider/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -43,16 +41,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":slider", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/slider", "//src/material/slider/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/snack-bar/BUILD.bazel b/src/components-examples/material/snack-bar/BUILD.bazel index a490d4f6690a..6f83775e3c1f 100644 --- a/src/components-examples/material/snack-bar/BUILD.bazel +++ b/src/components-examples/material/snack-bar/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -22,12 +26,6 @@ ng_project( "//src/material/snack-bar", "//src/material/snack-bar/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -43,17 +41,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":snack-bar", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/snack-bar", "//src/material/snack-bar/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/sort/BUILD.bazel b/src/components-examples/material/sort/BUILD.bazel index fcd7613f8517..8cd6e6a77b9f 100644 --- a/src/components-examples/material/sort/BUILD.bazel +++ b/src/components-examples/material/sort/BUILD.bazel @@ -13,16 +13,14 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/sort", - "//src/material/sort/testing", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/@types/jasmine", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/sort", + "//src/material/sort/testing", ], ) @@ -39,17 +37,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":sort", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/sort", "//src/material/sort/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/stepper/BUILD.bazel b/src/components-examples/material/stepper/BUILD.bazel index e8b16ec4c57b..a33304af37f5 100644 --- a/src/components-examples/material/stepper/BUILD.bazel +++ b/src/components-examples/material/stepper/BUILD.bazel @@ -13,7 +13,13 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//src/cdk/layout", "//src/cdk/stepper", "//src/cdk/testing", @@ -25,14 +31,6 @@ ng_project( "//src/material/stepper", "//src/material/stepper/testing", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - "//:node_modules/rxjs", - ], ) filegroup( @@ -48,18 +46,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":stepper", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/stepper", "//src/material/stepper/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/table/BUILD.bazel b/src/components-examples/material/table/BUILD.bazel index e9b34f0705a4..634be32cf528 100644 --- a/src/components-examples/material/table/BUILD.bazel +++ b/src/components-examples/material/table/BUILD.bazel @@ -13,7 +13,12 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//src/cdk/drag-drop", "//src/cdk/table", "//src/cdk/testing", @@ -30,13 +35,6 @@ ng_project( "//src/material/table", "//src/material/table/testing", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - "//:node_modules/rxjs", - ], ) filegroup( @@ -52,16 +50,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":table", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/table", "//src/material/table/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/tabs/BUILD.bazel b/src/components-examples/material/tabs/BUILD.bazel index d1112b1dea84..61e2ce34363b 100644 --- a/src/components-examples/material/tabs/BUILD.bazel +++ b/src/components-examples/material/tabs/BUILD.bazel @@ -13,7 +13,13 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -24,14 +30,6 @@ ng_project( "//src/material/tabs", "//src/material/tabs/testing", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - "//:node_modules/rxjs", - ], ) filegroup( @@ -47,17 +45,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":tabs", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/tabs", "//src/material/tabs/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/timepicker/BUILD.bazel b/src/components-examples/material/timepicker/BUILD.bazel index f8d458f1d967..a3775e7f45ef 100644 --- a/src/components-examples/material/timepicker/BUILD.bazel +++ b/src/components-examples/material/timepicker/BUILD.bazel @@ -13,7 +13,12 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -24,13 +29,6 @@ ng_project( "//src/material/timepicker", "//src/material/timepicker/testing", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -46,18 +44,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":timepicker", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/core", "//src/material/timepicker", "//src/material/timepicker/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/toolbar/BUILD.bazel b/src/components-examples/material/toolbar/BUILD.bazel index 77be90b6635d..9c3ace9534a0 100644 --- a/src/components-examples/material/toolbar/BUILD.bazel +++ b/src/components-examples/material/toolbar/BUILD.bazel @@ -13,7 +13,10 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -21,11 +24,6 @@ ng_project( "//src/material/toolbar", "//src/material/toolbar/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -41,17 +39,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":toolbar", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/icon", "//src/material/toolbar", "//src/material/toolbar/testing", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/tooltip/BUILD.bazel b/src/components-examples/material/tooltip/BUILD.bazel index b0831056bf2f..8a0b3555f0fa 100644 --- a/src/components-examples/material/tooltip/BUILD.bazel +++ b/src/components-examples/material/tooltip/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", "//src/cdk/scrolling", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -24,12 +28,6 @@ ng_project( "//src/material/tooltip", "//src/material/tooltip/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - ], ) filegroup( @@ -45,17 +43,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":tooltip", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/tooltip", "//src/material/tooltip/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/material/tree/BUILD.bazel b/src/components-examples/material/tree/BUILD.bazel index 2b030347e9d1..0aed77982e89 100644 --- a/src/components-examples/material/tree/BUILD.bazel +++ b/src/components-examples/material/tree/BUILD.bazel @@ -13,7 +13,11 @@ ng_project( "**/*.html", "**/*.css", ]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button", @@ -24,12 +28,6 @@ ng_project( "//src/material/tree", "//src/material/tree/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@types/jasmine", - "//:node_modules/rxjs", - ], ) filegroup( @@ -45,18 +43,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":tree", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/icon", "//src/material/tree", "//src/material/tree/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/components-examples/private/BUILD.bazel b/src/components-examples/private/BUILD.bazel index 7233678ca944..91cd2c01e235 100644 --- a/src/components-examples/private/BUILD.bazel +++ b/src/components-examples/private/BUILD.bazel @@ -5,10 +5,8 @@ package(default_visibility = ["//visibility:public"]) ts_project( name = "private", srcs = glob(["*.ts"]), - interop_deps = [ - "//src/components-examples", - ], deps = [ "//:node_modules/@angular/core", + "//src/components-examples", ], ) diff --git a/src/dev-app/BUILD.bazel b/src/dev-app/BUILD.bazel index 6472af162bb3..978051ef54f0 100644 --- a/src/dev-app/BUILD.bazel +++ b/src/dev-app/BUILD.bazel @@ -13,7 +13,13 @@ ng_project( "main.ts", "routes.ts", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/compiler", + "//:node_modules/@angular/core", + "//:node_modules/@angular/localize", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@angular/router", "//src/cdk/bidi", "//src/cdk/overlay", "//src/dev-app/autocomplete", @@ -83,14 +89,6 @@ ng_project( "//src/dev-app/youtube-player", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/compiler", - "//:node_modules/@angular/core", - "//:node_modules/@angular/localize", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@angular/router", - ], ) esbuild_config( @@ -110,7 +108,7 @@ devmode_esbuild( # Note: We add all linker-processed FW packages as dependencies here so that ESBuild will # map all framework packages to their linker-processed bundles from `tools/angular`. deps = LINKER_PROCESSED_FW_PACKAGES + [ - ":dev-app", + ":dev-app_legacy", ], ) diff --git a/src/dev-app/autocomplete/BUILD.bazel b/src/dev-app/autocomplete/BUILD.bazel index 91d16b7f2c7c..02f7bc2ccecf 100644 --- a/src/dev-app/autocomplete/BUILD.bazel +++ b/src/dev-app/autocomplete/BUILD.bazel @@ -10,7 +10,10 @@ ng_project( "autocomplete-demo.html", ":autocomplete_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/autocomplete", "//src/material/button", "//src/material/card", @@ -19,11 +22,6 @@ ng_project( "//src/material/form-field", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/badge/BUILD.bazel b/src/dev-app/badge/BUILD.bazel index cee0a898a047..e786f7656714 100644 --- a/src/dev-app/badge/BUILD.bazel +++ b/src/dev-app/badge/BUILD.bazel @@ -10,14 +10,12 @@ ng_project( "badge-demo.html", ":badge_demo_scss", ], - interop_deps = [ - "//src/material/badge", - "//src/material/button", - "//src/material/icon", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/material/badge", + "//src/material/button", + "//src/material/icon", ], ) diff --git a/src/dev-app/baseline/BUILD.bazel b/src/dev-app/baseline/BUILD.bazel index caf8f2433716..e50d1e3734a8 100644 --- a/src/dev-app/baseline/BUILD.bazel +++ b/src/dev-app/baseline/BUILD.bazel @@ -10,7 +10,8 @@ ng_project( "baseline-demo.html", ":baseline_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/material/card", "//src/material/checkbox", "//src/material/form-field", @@ -19,9 +20,6 @@ ng_project( "//src/material/select", "//src/material/toolbar", ], - deps = [ - "//:node_modules/@angular/core", - ], ) sass_binary( diff --git a/src/dev-app/bottom-sheet/BUILD.bazel b/src/dev-app/bottom-sheet/BUILD.bazel index 5e33ea40a884..760a07527962 100644 --- a/src/dev-app/bottom-sheet/BUILD.bazel +++ b/src/dev-app/bottom-sheet/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "bottom-sheet-demo.html", ":bottom_sheet_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/bottom-sheet", "//src/material/button", "//src/material/card", @@ -21,10 +23,6 @@ ng_project( "//src/material/list", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/button-toggle/BUILD.bazel b/src/dev-app/button-toggle/BUILD.bazel index aed4af3a8dc9..4f12ef8415e7 100644 --- a/src/dev-app/button-toggle/BUILD.bazel +++ b/src/dev-app/button-toggle/BUILD.bazel @@ -10,14 +10,12 @@ ng_project( "button-toggle-demo.html", ":button_toggle_demo_scss", ], - interop_deps = [ - "//src/material/button-toggle", - "//src/material/checkbox", - "//src/material/icon", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/material/button-toggle", + "//src/material/checkbox", + "//src/material/icon", ], ) diff --git a/src/dev-app/button/BUILD.bazel b/src/dev-app/button/BUILD.bazel index 17f0490b0e35..e0272d587854 100644 --- a/src/dev-app/button/BUILD.bazel +++ b/src/dev-app/button/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "button-demo.html", ":button_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/checkbox", "//src/material/icon", "//src/material/tooltip", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/card/BUILD.bazel b/src/dev-app/card/BUILD.bazel index adcc6c3c4c91..8c8b14bf433c 100644 --- a/src/dev-app/card/BUILD.bazel +++ b/src/dev-app/card/BUILD.bazel @@ -10,14 +10,12 @@ ng_project( "card-demo.html", ":card_demo_scss", ], - interop_deps = [ - "//src/material/button", - "//src/material/card", - "//src/material/checkbox", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/material/button", + "//src/material/card", + "//src/material/checkbox", ], ) diff --git a/src/dev-app/cdk-dialog/BUILD.bazel b/src/dev-app/cdk-dialog/BUILD.bazel index 815d25dddf53..d637334ec443 100644 --- a/src/dev-app/cdk-dialog/BUILD.bazel +++ b/src/dev-app/cdk-dialog/BUILD.bazel @@ -10,13 +10,11 @@ ng_project( "dialog-demo.html", ":dialog_demo_scss", ], - interop_deps = [ - "//src/cdk/dialog", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/cdk/dialog", ], ) diff --git a/src/dev-app/cdk-experimental-combobox/BUILD.bazel b/src/dev-app/cdk-experimental-combobox/BUILD.bazel index 24d958af15e2..c06f00e10eab 100644 --- a/src/dev-app/cdk-experimental-combobox/BUILD.bazel +++ b/src/dev-app/cdk-experimental-combobox/BUILD.bazel @@ -8,10 +8,8 @@ ng_project( assets = [ "cdk-combobox-demo.html", ], - interop_deps = [ - "//src/cdk-experimental/combobox", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk-experimental/combobox", ], ) diff --git a/src/dev-app/cdk-experimental-listbox/BUILD.bazel b/src/dev-app/cdk-experimental-listbox/BUILD.bazel index 08c9aa808dbf..90c97d9a2433 100644 --- a/src/dev-app/cdk-experimental-listbox/BUILD.bazel +++ b/src/dev-app/cdk-experimental-listbox/BUILD.bazel @@ -6,10 +6,8 @@ ng_project( name = "cdk-experimental-listbox", srcs = glob(["**/*.ts"]), assets = ["cdk-listbox-demo.html"], - interop_deps = [ - "//src/components-examples/cdk-experimental/listbox", - ], deps = [ "//:node_modules/@angular/core", + "//src/components-examples/cdk-experimental/listbox", ], ) diff --git a/src/dev-app/cdk-listbox/BUILD.bazel b/src/dev-app/cdk-listbox/BUILD.bazel index 62e1367ca557..76ea8ab813ed 100644 --- a/src/dev-app/cdk-listbox/BUILD.bazel +++ b/src/dev-app/cdk-listbox/BUILD.bazel @@ -8,10 +8,8 @@ ng_project( assets = [ "cdk-listbox-demo.html", ], - interop_deps = [ - "//src/components-examples/cdk/listbox", - ], deps = [ "//:node_modules/@angular/core", + "//src/components-examples/cdk/listbox", ], ) diff --git a/src/dev-app/cdk-menu/BUILD.bazel b/src/dev-app/cdk-menu/BUILD.bazel index f24da3b2d9e3..ce551a5caa10 100644 --- a/src/dev-app/cdk-menu/BUILD.bazel +++ b/src/dev-app/cdk-menu/BUILD.bazel @@ -9,11 +9,9 @@ ng_project( "cdk-menu-demo.html", "cdk-menu-demo.css", ], - interop_deps = [ - "//src/cdk/menu", - "//src/components-examples/cdk/menu", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/menu", + "//src/components-examples/cdk/menu", ], ) diff --git a/src/dev-app/checkbox/BUILD.bazel b/src/dev-app/checkbox/BUILD.bazel index 08c8e046bb4e..9c02cd846897 100644 --- a/src/dev-app/checkbox/BUILD.bazel +++ b/src/dev-app/checkbox/BUILD.bazel @@ -11,7 +11,9 @@ ng_project( "nested-checklist.html", ":checkbox_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/checkbox", "//src/material/core", "//src/material/form-field", @@ -19,10 +21,6 @@ ng_project( "//src/material/select", "//src/material/tooltip", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/chips/BUILD.bazel b/src/dev-app/chips/BUILD.bazel index bf4ad28e7cd9..0d36286a33f3 100644 --- a/src/dev-app/chips/BUILD.bazel +++ b/src/dev-app/chips/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "chips-demo.html", ":chips_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/card", "//src/material/checkbox", @@ -19,10 +21,6 @@ ng_project( "//src/material/form-field", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/clipboard/BUILD.bazel b/src/dev-app/clipboard/BUILD.bazel index 027658103277..b0cb1f85bf12 100644 --- a/src/dev-app/clipboard/BUILD.bazel +++ b/src/dev-app/clipboard/BUILD.bazel @@ -10,12 +10,10 @@ ng_project( ":clipboard_demo_scss", "clipboard-demo.html", ], - interop_deps = [ - "//src/cdk/clipboard", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/cdk/clipboard", ], ) diff --git a/src/dev-app/column-resize/BUILD.bazel b/src/dev-app/column-resize/BUILD.bazel index c57f91cd167e..43f911b00d28 100644 --- a/src/dev-app/column-resize/BUILD.bazel +++ b/src/dev-app/column-resize/BUILD.bazel @@ -6,12 +6,10 @@ ng_project( name = "column-resize", srcs = glob(["**/*.ts"]), assets = ["column-resize-home.html"], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/components-examples/material-experimental/column-resize", "//src/dev-app/example", "//src/material/expansion", ], - deps = [ - "//:node_modules/@angular/core", - ], ) diff --git a/src/dev-app/connected-overlay/BUILD.bazel b/src/dev-app/connected-overlay/BUILD.bazel index 8453c38a9236..1bad51b1fe34 100644 --- a/src/dev-app/connected-overlay/BUILD.bazel +++ b/src/dev-app/connected-overlay/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "connected-overlay-demo.html", ":connected-overlay_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/bidi", "//src/cdk/overlay", "//src/cdk/portal", @@ -19,10 +21,6 @@ ng_project( "//src/material/checkbox", "//src/material/radio", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/datepicker/BUILD.bazel b/src/dev-app/datepicker/BUILD.bazel index 09cecfda95c6..0a8abc72f7f5 100644 --- a/src/dev-app/datepicker/BUILD.bazel +++ b/src/dev-app/datepicker/BUILD.bazel @@ -12,7 +12,11 @@ ng_project( ":datepicker_demo_scss", ":custom_header_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/material/button", "//src/material/checkbox", "//src/material/core", @@ -22,12 +26,6 @@ ng_project( "//src/material/input", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_binary( diff --git a/src/dev-app/dev-app/BUILD.bazel b/src/dev-app/dev-app/BUILD.bazel index 93826f4d9526..b556a79b7dce 100644 --- a/src/dev-app/dev-app/BUILD.bazel +++ b/src/dev-app/dev-app/BUILD.bazel @@ -10,7 +10,10 @@ ng_project( "dev-app-layout.html", ":dev_app_layout_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/router", "//src/cdk/bidi", "//src/cdk/overlay", "//src/material/button", @@ -21,11 +24,6 @@ ng_project( "//src/material/toolbar", "//src/material/tooltip", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/router", - ], ) sass_binary( diff --git a/src/dev-app/dialog/BUILD.bazel b/src/dev-app/dialog/BUILD.bazel index d9c461389efb..d0308d99bdf1 100644 --- a/src/dev-app/dialog/BUILD.bazel +++ b/src/dev-app/dialog/BUILD.bazel @@ -10,7 +10,10 @@ ng_project( "dialog-demo.html", ":dialog_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/drag-drop", "//src/material/button", "//src/material/card", @@ -20,11 +23,6 @@ ng_project( "//src/material/input", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/drag-drop/BUILD.bazel b/src/dev-app/drag-drop/BUILD.bazel index 3177c3b87ec1..0caf424a24d9 100644 --- a/src/dev-app/drag-drop/BUILD.bazel +++ b/src/dev-app/drag-drop/BUILD.bazel @@ -10,7 +10,10 @@ ng_project( "drag-drop-demo.html", ":drag-drop_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/drag-drop", "//src/material/checkbox", "//src/material/form-field", @@ -18,11 +21,6 @@ ng_project( "//src/material/input", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) sass_binary( diff --git a/src/dev-app/drawer/BUILD.bazel b/src/dev-app/drawer/BUILD.bazel index 6597f61a27d0..e6ef1d0de946 100644 --- a/src/dev-app/drawer/BUILD.bazel +++ b/src/dev-app/drawer/BUILD.bazel @@ -10,14 +10,12 @@ ng_project( "drawer-demo.html", ":drawer_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/material/button", "//src/material/list", "//src/material/sidenav", ], - deps = [ - "//:node_modules/@angular/core", - ], ) sass_binary( diff --git a/src/dev-app/example/BUILD.bazel b/src/dev-app/example/BUILD.bazel index a18f1e01a683..a6b4102651ec 100644 --- a/src/dev-app/example/BUILD.bazel +++ b/src/dev-app/example/BUILD.bazel @@ -5,13 +5,11 @@ package(default_visibility = ["//visibility:public"]) ng_project( name = "example", srcs = glob(["**/*.ts"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/cdk/coercion", "//src/components-examples", "//src/components-examples/private", "//src/material/expansion", ], - deps = [ - "//:node_modules/@angular/core", - ], ) diff --git a/src/dev-app/examples-page/BUILD.bazel b/src/dev-app/examples-page/BUILD.bazel index 44c073e971d8..ccdc97725b70 100644 --- a/src/dev-app/examples-page/BUILD.bazel +++ b/src/dev-app/examples-page/BUILD.bazel @@ -5,11 +5,9 @@ package(default_visibility = ["//visibility:public"]) ng_project( name = "examples-page", srcs = glob(["**/*.ts"]), - interop_deps = [ - "//src/components-examples", - "//src/dev-app/example", - ], deps = [ "//:node_modules/@angular/core", + "//src/components-examples", + "//src/dev-app/example", ], ) diff --git a/src/dev-app/expansion/BUILD.bazel b/src/dev-app/expansion/BUILD.bazel index e6c89bd82502..33da223a2d4d 100644 --- a/src/dev-app/expansion/BUILD.bazel +++ b/src/dev-app/expansion/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "expansion-demo.html", ":expansion_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/accordion", "//src/material/button", "//src/material/checkbox", @@ -20,10 +22,6 @@ ng_project( "//src/material/radio", "//src/material/slide-toggle", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/focus-origin/BUILD.bazel b/src/dev-app/focus-origin/BUILD.bazel index c3986a4bd491..ba957573bdeb 100644 --- a/src/dev-app/focus-origin/BUILD.bazel +++ b/src/dev-app/focus-origin/BUILD.bazel @@ -10,11 +10,9 @@ ng_project( "focus-origin-demo.html", ":focus_origin_demo_scss", ], - interop_deps = [ - "//src/cdk/a11y", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/a11y", ], ) diff --git a/src/dev-app/focus-trap/BUILD.bazel b/src/dev-app/focus-trap/BUILD.bazel index 88a674e79152..a1f22c8cce21 100644 --- a/src/dev-app/focus-trap/BUILD.bazel +++ b/src/dev-app/focus-trap/BUILD.bazel @@ -12,7 +12,8 @@ ng_project( ":focus_trap_demo_scss", ":focus_trap_dialog_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/cdk/a11y", "//src/cdk/platform", "//src/material/button", @@ -20,9 +21,6 @@ ng_project( "//src/material/dialog", "//src/material/toolbar", ], - deps = [ - "//:node_modules/@angular/core", - ], ) sass_binary( diff --git a/src/dev-app/google-map/BUILD.bazel b/src/dev-app/google-map/BUILD.bazel index 131b50dde8bc..18b31d30aa52 100644 --- a/src/dev-app/google-map/BUILD.bazel +++ b/src/dev-app/google-map/BUILD.bazel @@ -10,14 +10,12 @@ ng_project( "google-map-demo.html", ":google_map_demo_scss", ], - interop_deps = [ - "//src/google-maps", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@types/google.maps", "//:node_modules/rxjs", + "//src/google-maps", ], ) diff --git a/src/dev-app/grid-list/BUILD.bazel b/src/dev-app/grid-list/BUILD.bazel index 818a4e2b3f93..22ae1d2e8323 100644 --- a/src/dev-app/grid-list/BUILD.bazel +++ b/src/dev-app/grid-list/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "grid-list-demo.html", ":grid_list_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/card", "//src/material/grid-list", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/icon/BUILD.bazel b/src/dev-app/icon/BUILD.bazel index 8e4d9db41154..069f9050de0d 100644 --- a/src/dev-app/icon/BUILD.bazel +++ b/src/dev-app/icon/BUILD.bazel @@ -10,12 +10,10 @@ ng_project( "icon-demo.html", ":icon_demo_scss", ], - interop_deps = [ - "//src/material/icon", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/material/icon", ], ) diff --git a/src/dev-app/input-modality/BUILD.bazel b/src/dev-app/input-modality/BUILD.bazel index ac95c89fb017..4393180d9654 100644 --- a/src/dev-app/input-modality/BUILD.bazel +++ b/src/dev-app/input-modality/BUILD.bazel @@ -6,7 +6,9 @@ ng_project( name = "input-modality", srcs = glob(["**/*.ts"]), assets = ["input-modality-detector-demo.html"], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/material/button", "//src/material/form-field", @@ -14,8 +16,4 @@ ng_project( "//src/material/radio", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) diff --git a/src/dev-app/input/BUILD.bazel b/src/dev-app/input/BUILD.bazel index 3888afba9f02..2a8a01cd68f8 100644 --- a/src/dev-app/input/BUILD.bazel +++ b/src/dev-app/input/BUILD.bazel @@ -10,7 +10,11 @@ ng_project( ":input_demo_scss", "input-demo.html", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/components-examples/material/form-field", "//src/material/autocomplete", "//src/material/button", @@ -24,12 +28,6 @@ ng_project( "//src/material/toolbar", "//src/material/tooltip", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_binary( diff --git a/src/dev-app/layout/BUILD.bazel b/src/dev-app/layout/BUILD.bazel index d5bf997cb8d4..2af0f4fe34ce 100644 --- a/src/dev-app/layout/BUILD.bazel +++ b/src/dev-app/layout/BUILD.bazel @@ -10,12 +10,10 @@ ng_project( "layout-demo.html", ":layout_demo_scss", ], - interop_deps = [ - "//src/cdk/layout", - "//src/components-examples/cdk/layout", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/layout", + "//src/components-examples/cdk/layout", ], ) diff --git a/src/dev-app/list/BUILD.bazel b/src/dev-app/list/BUILD.bazel index aeaa7afbba4b..da6b561e8a91 100644 --- a/src/dev-app/list/BUILD.bazel +++ b/src/dev-app/list/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "list-demo.html", ":list_demo_scss", ], - interop_deps = [ - "//src/material/button", - "//src/material/icon", - "//src/material/list", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/router", + "//src/material/button", + "//src/material/icon", + "//src/material/list", ], ) diff --git a/src/dev-app/live-announcer/BUILD.bazel b/src/dev-app/live-announcer/BUILD.bazel index 4d90a3e39c5c..7f877ad7d12e 100644 --- a/src/dev-app/live-announcer/BUILD.bazel +++ b/src/dev-app/live-announcer/BUILD.bazel @@ -6,12 +6,10 @@ ng_project( name = "live-announcer", srcs = glob(["**/*.ts"]), assets = ["live-announcer-demo.html"], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/cdk/a11y", "//src/material/button", "//src/material/dialog", ], - deps = [ - "//:node_modules/@angular/core", - ], ) diff --git a/src/dev-app/menu/BUILD.bazel b/src/dev-app/menu/BUILD.bazel index 07d7a6dc1dac..d49f90285623 100644 --- a/src/dev-app/menu/BUILD.bazel +++ b/src/dev-app/menu/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "menu-demo.html", ":menu_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/material/button", "//src/material/divider", "//src/material/icon", "//src/material/menu", "//src/material/toolbar", ], - deps = [ - "//:node_modules/@angular/core", - ], ) sass_binary( diff --git a/src/dev-app/menubar/BUILD.bazel b/src/dev-app/menubar/BUILD.bazel index b40e180e9ea7..a8354a566d8d 100644 --- a/src/dev-app/menubar/BUILD.bazel +++ b/src/dev-app/menubar/BUILD.bazel @@ -10,12 +10,10 @@ ng_project( "mat-menubar-demo.html", ":mat_menubar_demo_scss", ], - interop_deps = [ - "//src/cdk/menu", - "//src/material-experimental/menubar", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/menu", + "//src/material-experimental/menubar", ], ) diff --git a/src/dev-app/paginator/BUILD.bazel b/src/dev-app/paginator/BUILD.bazel index 944e158a4f5e..76b4b7b87774 100644 --- a/src/dev-app/paginator/BUILD.bazel +++ b/src/dev-app/paginator/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "paginator-demo.html", ":paginator_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/components-examples/material/paginator", "//src/material/card", "//src/material/form-field", @@ -18,10 +20,6 @@ ng_project( "//src/material/paginator", "//src/material/slide-toggle", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/performance/BUILD.bazel b/src/dev-app/performance/BUILD.bazel index fd7211a8d454..2f07fb0c9409 100644 --- a/src/dev-app/performance/BUILD.bazel +++ b/src/dev-app/performance/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "performance-demo.html", ":performance_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/divider", "//src/material/form-field", @@ -20,10 +22,6 @@ ng_project( "//src/material/select", "//src/material/table", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/platform/BUILD.bazel b/src/dev-app/platform/BUILD.bazel index 887224eddd7c..1504a7d42b71 100644 --- a/src/dev-app/platform/BUILD.bazel +++ b/src/dev-app/platform/BUILD.bazel @@ -6,10 +6,8 @@ ng_project( name = "platform", srcs = glob(["**/*.ts"]), assets = ["platform-demo.html"], - interop_deps = [ - "//src/cdk/platform", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/platform", ], ) diff --git a/src/dev-app/popover-edit/BUILD.bazel b/src/dev-app/popover-edit/BUILD.bazel index e9acf77ccc34..04cd5541893e 100644 --- a/src/dev-app/popover-edit/BUILD.bazel +++ b/src/dev-app/popover-edit/BUILD.bazel @@ -5,13 +5,11 @@ package(default_visibility = ["//visibility:public"]) ng_project( name = "popover-edit", srcs = glob(["**/*.ts"]), - interop_deps = [ - "//src/components-examples/cdk-experimental/popover-edit", - "//src/components-examples/material-experimental/popover-edit", - "//src/dev-app/example", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/components-examples/cdk-experimental/popover-edit", + "//src/components-examples/material-experimental/popover-edit", + "//src/dev-app/example", ], ) diff --git a/src/dev-app/portal/BUILD.bazel b/src/dev-app/portal/BUILD.bazel index b593d2a4a639..ff754b0701c9 100644 --- a/src/dev-app/portal/BUILD.bazel +++ b/src/dev-app/portal/BUILD.bazel @@ -10,11 +10,9 @@ ng_project( "portal-demo.html", ":portal_demo_scss", ], - interop_deps = [ - "//src/cdk/portal", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/portal", ], ) diff --git a/src/dev-app/progress-bar/BUILD.bazel b/src/dev-app/progress-bar/BUILD.bazel index f394d38c0088..e2c88dfd08ff 100644 --- a/src/dev-app/progress-bar/BUILD.bazel +++ b/src/dev-app/progress-bar/BUILD.bazel @@ -10,14 +10,12 @@ ng_project( "progress-bar-demo.html", ":progress_bar_demo_scss", ], - interop_deps = [ - "//src/material/button", - "//src/material/button-toggle", - "//src/material/progress-bar", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/material/button", + "//src/material/button-toggle", + "//src/material/progress-bar", ], ) diff --git a/src/dev-app/progress-spinner/BUILD.bazel b/src/dev-app/progress-spinner/BUILD.bazel index cd3cb5058bab..82e0a4b4a873 100644 --- a/src/dev-app/progress-spinner/BUILD.bazel +++ b/src/dev-app/progress-spinner/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "progress-spinner-demo.html", ":progress_spinner_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/button-toggle", "//src/material/checkbox", "//src/material/progress-spinner", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/radio/BUILD.bazel b/src/dev-app/radio/BUILD.bazel index 763c884ea218..16bd5b6a96ac 100644 --- a/src/dev-app/radio/BUILD.bazel +++ b/src/dev-app/radio/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "radio-demo.html", ":radio_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/checkbox", "//src/material/radio", "//src/material/tooltip", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/ripple/BUILD.bazel b/src/dev-app/ripple/BUILD.bazel index 53ca70b7ec26..0ea17d5ba16e 100644 --- a/src/dev-app/ripple/BUILD.bazel +++ b/src/dev-app/ripple/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "ripple-demo.html", ":ripple_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/components-examples/material/core", "//src/dev-app/example", "//src/material/button", @@ -18,10 +20,6 @@ ng_project( "//src/material/icon", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/screen-type/BUILD.bazel b/src/dev-app/screen-type/BUILD.bazel index 2e3376d858e4..4e389198dc14 100644 --- a/src/dev-app/screen-type/BUILD.bazel +++ b/src/dev-app/screen-type/BUILD.bazel @@ -10,15 +10,13 @@ ng_project( "screen-type-demo.html", ":screen_type_demo_scss", ], - interop_deps = [ - "//src/cdk/layout", - "//src/material/grid-list", - "//src/material/icon", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/layout", + "//src/material/grid-list", + "//src/material/icon", ], ) diff --git a/src/dev-app/select/BUILD.bazel b/src/dev-app/select/BUILD.bazel index 163f522930da..c357fc8ef107 100644 --- a/src/dev-app/select/BUILD.bazel +++ b/src/dev-app/select/BUILD.bazel @@ -10,7 +10,10 @@ ng_project( "select-demo.html", ":select_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/card", "//src/material/checkbox", @@ -19,11 +22,6 @@ ng_project( "//src/material/input", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/selection/BUILD.bazel b/src/dev-app/selection/BUILD.bazel index c917d2cd22be..d348c4d78603 100644 --- a/src/dev-app/selection/BUILD.bazel +++ b/src/dev-app/selection/BUILD.bazel @@ -5,13 +5,11 @@ package(default_visibility = ["//visibility:public"]) ng_project( name = "selection", srcs = glob(["**/*.ts"]), - interop_deps = [ - "//src/components-examples/cdk-experimental/selection", - "//src/components-examples/material-experimental/selection", - "//src/dev-app/example", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/components-examples/cdk-experimental/selection", + "//src/components-examples/material-experimental/selection", + "//src/dev-app/example", ], ) diff --git a/src/dev-app/sidenav/BUILD.bazel b/src/dev-app/sidenav/BUILD.bazel index 7392ada44852..1b31f92c6d7b 100644 --- a/src/dev-app/sidenav/BUILD.bazel +++ b/src/dev-app/sidenav/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "sidenav-demo.html", ":sidenav_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/checkbox", "//src/material/sidenav", "//src/material/toolbar", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/slide-toggle/BUILD.bazel b/src/dev-app/slide-toggle/BUILD.bazel index a89b5dab4eb8..d775d9f30e9c 100644 --- a/src/dev-app/slide-toggle/BUILD.bazel +++ b/src/dev-app/slide-toggle/BUILD.bazel @@ -10,13 +10,11 @@ ng_project( "slide-toggle-demo.html", ":slide_toggle_demo_scss", ], - interop_deps = [ - "//src/material/button", - "//src/material/slide-toggle", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/material/button", + "//src/material/slide-toggle", ], ) diff --git a/src/dev-app/slider/BUILD.bazel b/src/dev-app/slider/BUILD.bazel index e17b621281b0..0d69d1ec7865 100644 --- a/src/dev-app/slider/BUILD.bazel +++ b/src/dev-app/slider/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "slider-demo.html", ":slider_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/button-toggle", "//src/material/checkbox", @@ -18,10 +20,6 @@ ng_project( "//src/material/slider", "//src/material/tabs", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/snack-bar/BUILD.bazel b/src/dev-app/snack-bar/BUILD.bazel index 893d0fdf9b39..339da5f375f2 100644 --- a/src/dev-app/snack-bar/BUILD.bazel +++ b/src/dev-app/snack-bar/BUILD.bazel @@ -10,7 +10,9 @@ ng_project( "snack-bar-demo.html", ":snack_bar_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/bidi", "//src/material/button", "//src/material/checkbox", @@ -19,10 +21,6 @@ ng_project( "//src/material/select", "//src/material/snack-bar", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/stepper/BUILD.bazel b/src/dev-app/stepper/BUILD.bazel index 693356c8b920..412bc3d7c24c 100644 --- a/src/dev-app/stepper/BUILD.bazel +++ b/src/dev-app/stepper/BUILD.bazel @@ -6,7 +6,9 @@ ng_project( name = "stepper", srcs = glob(["**/*.ts"]), assets = ["stepper-demo.html"], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/material/button", "//src/material/checkbox", "//src/material/core", @@ -15,8 +17,4 @@ ng_project( "//src/material/select", "//src/material/stepper", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) diff --git a/src/dev-app/table-scroll-container/BUILD.bazel b/src/dev-app/table-scroll-container/BUILD.bazel index 4a1ddcffb828..7ba16774f85b 100644 --- a/src/dev-app/table-scroll-container/BUILD.bazel +++ b/src/dev-app/table-scroll-container/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "table-scroll-container-demo.html", ":table_scroll_container_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", "//src/cdk-experimental/table-scroll-container", "//src/material/button", "//src/material/button-toggle", "//src/material/table", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - ], ) sass_binary( diff --git a/src/dev-app/table/BUILD.bazel b/src/dev-app/table/BUILD.bazel index 4c1320debaf7..9331821cc831 100644 --- a/src/dev-app/table/BUILD.bazel +++ b/src/dev-app/table/BUILD.bazel @@ -6,12 +6,10 @@ ng_project( name = "table", srcs = glob(["**/*.ts"]), assets = ["table-demo.html"], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/components-examples/cdk/table", "//src/components-examples/material/table", "//src/dev-app/example", ], - deps = [ - "//:node_modules/@angular/core", - ], ) diff --git a/src/dev-app/tabs/BUILD.bazel b/src/dev-app/tabs/BUILD.bazel index 14be80f0e698..a0fd2474552e 100644 --- a/src/dev-app/tabs/BUILD.bazel +++ b/src/dev-app/tabs/BUILD.bazel @@ -6,12 +6,10 @@ ng_project( name = "tabs", srcs = glob(["**/*.ts"]), assets = ["tabs-demo.html"], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/components-examples/material/tabs", "//src/dev-app/example", "//src/material/tabs", ], - deps = [ - "//:node_modules/@angular/core", - ], ) diff --git a/src/dev-app/theme/BUILD.bazel b/src/dev-app/theme/BUILD.bazel index 7620fe26a2c6..22d83499e0e9 100644 --- a/src/dev-app/theme/BUILD.bazel +++ b/src/dev-app/theme/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "theme-demo.html", ":theme_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/dev-app/dev-app", "//src/material/card", "//src/material/expansion", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/timepicker/BUILD.bazel b/src/dev-app/timepicker/BUILD.bazel index 7002382769eb..04162ea264c6 100644 --- a/src/dev-app/timepicker/BUILD.bazel +++ b/src/dev-app/timepicker/BUILD.bazel @@ -10,7 +10,11 @@ ng_project( "timepicker-demo.html", ":timepicker_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/material/button", "//src/material/card", "//src/material/core", @@ -21,12 +25,6 @@ ng_project( "//src/material/select", "//src/material/timepicker", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_binary( diff --git a/src/dev-app/toolbar/BUILD.bazel b/src/dev-app/toolbar/BUILD.bazel index d00f04ff35eb..0618b2e07a1c 100644 --- a/src/dev-app/toolbar/BUILD.bazel +++ b/src/dev-app/toolbar/BUILD.bazel @@ -10,15 +10,13 @@ ng_project( "toolbar-demo.html", ":toolbar_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/components-examples/material/toolbar", "//src/material/button", "//src/material/icon", "//src/material/toolbar", ], - deps = [ - "//:node_modules/@angular/core", - ], ) sass_binary( diff --git a/src/dev-app/tooltip/BUILD.bazel b/src/dev-app/tooltip/BUILD.bazel index 64d2dce6a0b9..2d6f603bb9ec 100644 --- a/src/dev-app/tooltip/BUILD.bazel +++ b/src/dev-app/tooltip/BUILD.bazel @@ -6,11 +6,9 @@ ng_project( name = "tooltip", srcs = glob(["**/*.ts"]), assets = ["tooltip-demo.html"], - interop_deps = [ - "//src/components-examples/material/tooltip", - "//src/dev-app/example", - ], deps = [ "//:node_modules/@angular/core", + "//src/components-examples/material/tooltip", + "//src/dev-app/example", ], ) diff --git a/src/dev-app/tree/BUILD.bazel b/src/dev-app/tree/BUILD.bazel index 7f4d7c00be40..42e83fa28a95 100644 --- a/src/dev-app/tree/BUILD.bazel +++ b/src/dev-app/tree/BUILD.bazel @@ -11,7 +11,9 @@ ng_project( ]) + [ ":tree_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/tree", "//src/components-examples/cdk/tree", "//src/components-examples/material/tree", @@ -24,10 +26,6 @@ ng_project( "//src/material/progress-bar", "//src/material/tree", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_binary( diff --git a/src/dev-app/typography/BUILD.bazel b/src/dev-app/typography/BUILD.bazel index b8841d0719b9..b1a5f5b8fdbc 100644 --- a/src/dev-app/typography/BUILD.bazel +++ b/src/dev-app/typography/BUILD.bazel @@ -10,12 +10,10 @@ ng_project( "typography-demo.html", ":typography_demo_scss", ], - interop_deps = [ - "//src/material/checkbox", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/material/checkbox", ], ) diff --git a/src/dev-app/virtual-scroll/BUILD.bazel b/src/dev-app/virtual-scroll/BUILD.bazel index bc7e93604283..6be4c82703c6 100644 --- a/src/dev-app/virtual-scroll/BUILD.bazel +++ b/src/dev-app/virtual-scroll/BUILD.bazel @@ -10,7 +10,11 @@ ng_project( "virtual-scroll-demo.html", ":virtual_scroll_demo_scss", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/cdk-experimental/scrolling", "//src/cdk/scrolling", "//src/components-examples/cdk/scrolling", @@ -19,12 +23,6 @@ ng_project( "//src/material/input", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_binary( diff --git a/src/dev-app/youtube-player/BUILD.bazel b/src/dev-app/youtube-player/BUILD.bazel index 6f479f568927..bc4120ca5616 100644 --- a/src/dev-app/youtube-player/BUILD.bazel +++ b/src/dev-app/youtube-player/BUILD.bazel @@ -10,16 +10,14 @@ ng_project( "youtube-player-demo.html", ":youtube_player_demo_scss", ], - interop_deps = [ - "//src/material/button", - "//src/material/checkbox", - "//src/material/radio", - "//src/youtube-player", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@types/youtube", + "//src/material/button", + "//src/material/checkbox", + "//src/material/radio", + "//src/youtube-player", ], ) diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index 55d98d68304a..5ab8ee05c5fe 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -33,7 +33,12 @@ ng_project( ], exclude = ["index.html"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/animations", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/@angular/router", "//src/cdk-experimental/scrolling", "//src/cdk/overlay", "//src/cdk/scrolling", @@ -42,13 +47,6 @@ ng_project( "//src/material/core", "//src/material/slider", ], - deps = [ - "//:node_modules/@angular/animations", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/@angular/router", - ], ) sass_binary( @@ -80,7 +78,7 @@ devmode_esbuild( # Note: We add all linker-processed FW packages as dependencies here so that ESBuild will # map all framework packages to their linker-processed bundles from `tools/angular`. deps = LINKER_PROCESSED_FW_PACKAGES + [ - ":e2e-app", + ":e2e-app_legacy", ], ) diff --git a/src/google-maps/BUILD.bazel b/src/google-maps/BUILD.bazel index 97d9d3a4a1b8..6b2b0b4ce8cc 100644 --- a/src/google-maps/BUILD.bazel +++ b/src/google-maps/BUILD.bazel @@ -23,14 +23,12 @@ ng_project( "**/*.spec.ts", ], ), - interop_deps = [ - "//src:dev_mode_types", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@types/google.maps", "//:node_modules/rxjs", + "//src:dev_mode_types", ], ) @@ -40,7 +38,7 @@ ng_package( srcs = ["package.json"], nested_packages = ["//src/google-maps/schematics:npm_package"], tags = ["release-package"], - deps = [":google-maps"], + deps = [":google-maps_legacy"], ) filegroup( @@ -55,14 +53,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":google-maps", - "//src/google-maps/testing", - ], tsconfig = ":tsconfig-test", deps = [ + ":google-maps", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/google-maps/testing", ], ) diff --git a/src/google-maps/testing/BUILD.bazel b/src/google-maps/testing/BUILD.bazel index e6980ecafeac..42ddb4e8ce18 100644 --- a/src/google-maps/testing/BUILD.bazel +++ b/src/google-maps/testing/BUILD.bazel @@ -6,12 +6,10 @@ ts_project( name = "testing", testonly = True, srcs = glob(["**/*.ts"]), - interop_deps = [ - "//src/google-maps", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@types/google.maps", "//:node_modules/@types/jasmine", + "//src/google-maps", ], ) diff --git a/src/material-date-fns-adapter/BUILD.bazel b/src/material-date-fns-adapter/BUILD.bazel index cc6575d29d43..213cfaadc1a7 100644 --- a/src/material-date-fns-adapter/BUILD.bazel +++ b/src/material-date-fns-adapter/BUILD.bazel @@ -9,13 +9,11 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src:dev_mode_types", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/date-fns", + "//src:dev_mode_types", + "//src/material/core", ], ) @@ -26,13 +24,11 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":material-date-fns-adapter", - "//src/material/core", - ], deps = [ + ":material-date-fns-adapter", "//:node_modules/@angular/core", "//:node_modules/date-fns", + "//src/material/core", ], ) @@ -48,5 +44,5 @@ ng_package( srcs = ["package.json"], nested_packages = ["//src/material-date-fns-adapter/schematics:npm_package"], tags = ["release-package"], - deps = [":material-date-fns-adapter"], + deps = [":material-date-fns-adapter_legacy"], ) diff --git a/src/material-experimental/BUILD.bazel b/src/material-experimental/BUILD.bazel index 70a726729d7f..4b5f764165f1 100644 --- a/src/material-experimental/BUILD.bazel +++ b/src/material-experimental/BUILD.bazel @@ -6,6 +6,7 @@ load( ) load("//tools:defaults.bzl", "ng_package", "sass_library") load("//tools:defaults2.bzl", "ts_project") +load("//tools/bazel:legacy_target.bzl", "get_legacy_label") package(default_visibility = ["//visibility:public"]) @@ -38,5 +39,5 @@ ng_package( ":sass_lib", ], tags = ["release-package"], - deps = MATERIAL_EXPERIMENTAL_TARGETS + MATERIAL_EXPERIMENTAL_TESTING_TARGETS, + deps = [get_legacy_label(t) for t in MATERIAL_EXPERIMENTAL_TARGETS + MATERIAL_EXPERIMENTAL_TESTING_TARGETS], ) diff --git a/src/material-experimental/column-resize/BUILD.bazel b/src/material-experimental/column-resize/BUILD.bazel index dad053d62fea..0c7affa8e1e9 100644 --- a/src/material-experimental/column-resize/BUILD.bazel +++ b/src/material-experimental/column-resize/BUILD.bazel @@ -9,16 +9,14 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", "//src/cdk-experimental/column-resize", "//src/cdk/overlay", "//src/cdk/table", "//src/material/table", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - ], ) sass_library( @@ -33,8 +31,10 @@ ts_project( name = "column_resize_test_sources", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":column-resize", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk-experimental/column-resize", "//src/cdk/bidi", "//src/cdk/collections", @@ -43,10 +43,6 @@ ts_project( "//src/cdk/testing/private", "//src/material/table", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material-experimental/menubar/BUILD.bazel b/src/material-experimental/menubar/BUILD.bazel index 73c0c7cce805..f839f7caf25c 100644 --- a/src/material-experimental/menubar/BUILD.bazel +++ b/src/material-experimental/menubar/BUILD.bazel @@ -18,11 +18,9 @@ ng_project( ":menubar.css", ":menubar-item.css", ] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/menu", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/menu", ], ) @@ -48,16 +46,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":menubar", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/keycodes", "//src/cdk/menu", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material-experimental/popover-edit/BUILD.bazel b/src/material-experimental/popover-edit/BUILD.bazel index 030fecebf50c..59de3c89cc5e 100644 --- a/src/material-experimental/popover-edit/BUILD.bazel +++ b/src/material-experimental/popover-edit/BUILD.bazel @@ -13,13 +13,11 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk-experimental/popover-edit", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/cdk-experimental/popover-edit", + "//src/material/core", ], ) @@ -39,8 +37,11 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":popover-edit", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/cdk-experimental/popover-edit", "//src/cdk/collections", "//src/cdk/keycodes", @@ -48,11 +49,6 @@ ts_project( "//src/cdk/testing/private", "//src/material/table", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material-experimental/selection/BUILD.bazel b/src/material-experimental/selection/BUILD.bazel index 88af72914327..7d632b0a47d3 100644 --- a/src/material-experimental/selection/BUILD.bazel +++ b/src/material-experimental/selection/BUILD.bazel @@ -10,14 +10,12 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":selection_column_scss"], - interop_deps = [ - "//src/cdk-experimental/selection", - "//src/material/checkbox", - "//src/material/table", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", + "//src/cdk-experimental/selection", + "//src/material/checkbox", + "//src/material/table", ], ) diff --git a/src/material-luxon-adapter/BUILD.bazel b/src/material-luxon-adapter/BUILD.bazel index b517f797fedb..df2965828e35 100644 --- a/src/material-luxon-adapter/BUILD.bazel +++ b/src/material-luxon-adapter/BUILD.bazel @@ -9,14 +9,12 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src:dev_mode_types", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@types/luxon", "//:node_modules/luxon", + "//src:dev_mode_types", + "//src/material/core", ], ) @@ -27,14 +25,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":material-luxon-adapter", - "//src/material/core", - ], deps = [ + ":material-luxon-adapter", "//:node_modules/@angular/core", "//:node_modules/@types/luxon", "//:node_modules/luxon", + "//src/material/core", ], ) @@ -50,5 +46,5 @@ ng_package( srcs = ["package.json"], nested_packages = ["//src/material-luxon-adapter/schematics:npm_package"], tags = ["release-package"], - deps = [":material-luxon-adapter"], + deps = [":material-luxon-adapter_legacy"], ) diff --git a/src/material-moment-adapter/BUILD.bazel b/src/material-moment-adapter/BUILD.bazel index 240fa76d95ba..9a281672b12a 100644 --- a/src/material-moment-adapter/BUILD.bazel +++ b/src/material-moment-adapter/BUILD.bazel @@ -9,13 +9,11 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src:dev_mode_types", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/moment", + "//src:dev_mode_types", + "//src/material/core", ], ) @@ -26,14 +24,12 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":material-moment-adapter", - "//src/material/core", - "//src/material/testing", - ], deps = [ + ":material-moment-adapter", "//:node_modules/@angular/core", "//:node_modules/moment", + "//src/material/core", + "//src/material/testing", ], ) @@ -49,5 +45,5 @@ ng_package( srcs = ["package.json"], nested_packages = ["//src/material-moment-adapter/schematics:npm_package"], tags = ["release-package"], - deps = [":material-moment-adapter"], + deps = [":material-moment-adapter_legacy"], ) diff --git a/src/material/BUILD.bazel b/src/material/BUILD.bazel index 5b402621d38f..54f10f85bcfb 100644 --- a/src/material/BUILD.bazel +++ b/src/material/BUILD.bazel @@ -7,6 +7,7 @@ load( ) load("//tools:defaults.bzl", "ng_package", "sass_library") load("//tools:defaults2.bzl", "ts_project") +load("//tools/bazel:legacy_target.bzl", "get_legacy_label") package(default_visibility = ["//visibility:public"]) @@ -54,5 +55,5 @@ ng_package( ] + MATERIAL_SCSS_LIBS, nested_packages = ["//src/material/schematics:npm_package"], tags = ["release-package"], - deps = MATERIAL_TARGETS + MATERIAL_TESTING_TARGETS, + deps = [get_legacy_label(t) for t in MATERIAL_TARGETS + MATERIAL_TESTING_TARGETS], ) diff --git a/src/material/autocomplete/BUILD.bazel b/src/material/autocomplete/BUILD.bazel index 20b9973f594a..f44375146a9a 100644 --- a/src/material/autocomplete/BUILD.bazel +++ b/src/material/autocomplete/BUILD.bazel @@ -21,7 +21,11 @@ ng_project( assets = [ ":autocomplete_scss", ] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/coercion", "//src/cdk/overlay", @@ -29,12 +33,6 @@ ng_project( "//src/material/core", "//src/material/form-field", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_library( @@ -63,8 +61,12 @@ ts_project( "**/*.e2e.spec.ts", ], ), - interop_deps = [ + deps = [ ":autocomplete", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/overlay", @@ -75,12 +77,6 @@ ts_project( "//src/material/form-field", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/autocomplete/testing/BUILD.bazel b/src/material/autocomplete/testing/BUILD.bazel index 2d592d7ee233..be334138e378 100644 --- a/src/material/autocomplete/testing/BUILD.bazel +++ b/src/material/autocomplete/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", "//src/material/core/testing", @@ -25,16 +25,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ - ":testing", - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/autocomplete", - ], deps = [ + ":testing", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/autocomplete", ], ) diff --git a/src/material/badge/BUILD.bazel b/src/material/badge/BUILD.bazel index 9e25179150e6..ac300878f03f 100644 --- a/src/material/badge/BUILD.bazel +++ b/src/material/badge/BUILD.bazel @@ -19,17 +19,15 @@ ng_project( assets = [ ":badge_scss", ] + glob(["**/*.html"]), - interop_deps = [ - "//src:dev_mode_types", - "//src/cdk/a11y", - "//src/cdk/private", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/animations", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src:dev_mode_types", + "//src/cdk/a11y", + "//src/cdk/private", + "//src/material/core", ], ) @@ -58,13 +56,11 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":badge", - "//src/material/core", - ], deps = [ + ":badge", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/material/core", ], ) diff --git a/src/material/badge/testing/BUILD.bazel b/src/material/badge/testing/BUILD.bazel index 055288a9ff8e..7b749e898b92 100644 --- a/src/material/badge/testing/BUILD.bazel +++ b/src/material/badge/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", "//src/material/badge", ], @@ -24,16 +24,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/badge", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/bottom-sheet/BUILD.bazel b/src/material/bottom-sheet/BUILD.bazel index c31068dfce52..39f022ad6deb 100644 --- a/src/material/bottom-sheet/BUILD.bazel +++ b/src/material/bottom-sheet/BUILD.bazel @@ -19,7 +19,9 @@ ng_project( assets = [ ":bottom-sheet-container.css", ] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -32,10 +34,6 @@ ng_project( "//src/cdk/portal", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_library( @@ -60,8 +58,11 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":bottom-sheet", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/overlay", @@ -69,11 +70,6 @@ ts_project( "//src/cdk/scrolling", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/bottom-sheet/testing/BUILD.bazel b/src/material/bottom-sheet/testing/BUILD.bazel index 77a65b275d23..b805c132fdf4 100644 --- a/src/material/bottom-sheet/testing/BUILD.bazel +++ b/src/material/bottom-sheet/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", "//src/material/bottom-sheet", ], @@ -24,17 +24,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/overlay", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/bottom-sheet", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/button-toggle/BUILD.bazel b/src/material/button-toggle/BUILD.bazel index 2f5a0cf11692..e379c7d0da93 100644 --- a/src/material/button-toggle/BUILD.bazel +++ b/src/material/button-toggle/BUILD.bazel @@ -17,16 +17,14 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":button-toggle.css"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/collections", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) sass_library( @@ -53,16 +51,14 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":button-toggle", - "//src/cdk/testing", - "//src/cdk/testing/private", - ], deps = [ + ":button-toggle", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing", + "//src/cdk/testing/private", ], ) diff --git a/src/material/button-toggle/testing/BUILD.bazel b/src/material/button-toggle/testing/BUILD.bazel index c394ed96cc6b..4a1a400b94f2 100644 --- a/src/material/button-toggle/testing/BUILD.bazel +++ b/src/material/button-toggle/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", "//src/material/button-toggle", @@ -25,15 +25,13 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/button-toggle", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/material/button/BUILD.bazel b/src/material/button/BUILD.bazel index c7b7f9183bab..6a5d3a222177 100644 --- a/src/material/button/BUILD.bazel +++ b/src/material/button/BUILD.bazel @@ -24,11 +24,9 @@ ng_project( ":fab_scss", ":icon-button_scss", ] + glob(["**/*.html"]), - interop_deps = [ - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", + "//src/material/core", ], ) @@ -89,16 +87,14 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":button", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/platform", "//src/cdk/testing/private", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/button/testing/BUILD.bazel b/src/material/button/testing/BUILD.bazel index 234423ed4e13..f97e846bd7c5 100644 --- a/src/material/button/testing/BUILD.bazel +++ b/src/material/button/testing/BUILD.bazel @@ -11,7 +11,7 @@ ts_project( ), deps = [ "//:node_modules/@angular/core", - "//src/cdk/testing:testing_rjs", + "//src/cdk/testing", ], ) @@ -24,8 +24,11 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/platform", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -33,11 +36,6 @@ ts_project( "//src/material/icon", "//src/material/icon/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/card/BUILD.bazel b/src/material/card/BUILD.bazel index 7bc489c3f610..65c406c0ec45 100644 --- a/src/material/card/BUILD.bazel +++ b/src/material/card/BUILD.bazel @@ -17,11 +17,9 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":card_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", + "//src/material/core", ], ) @@ -47,10 +45,8 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":card", - ], deps = [ + ":card", "//:node_modules/@angular/core", ], ) diff --git a/src/material/card/testing/BUILD.bazel b/src/material/card/testing/BUILD.bazel index 7598701ce11c..c29b59c83fe3 100644 --- a/src/material/card/testing/BUILD.bazel +++ b/src/material/card/testing/BUILD.bazel @@ -10,7 +10,7 @@ ts_project( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk/testing:testing_rjs", + "//src/cdk/testing", ], ) @@ -23,16 +23,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/card", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/checkbox/BUILD.bazel b/src/material/checkbox/BUILD.bazel index c18e7c1f7d99..fdbad39dd72e 100644 --- a/src/material/checkbox/BUILD.bazel +++ b/src/material/checkbox/BUILD.bazel @@ -19,13 +19,11 @@ ng_project( ], ), assets = [":checkbox_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src/material/core", - ], deps = [ "//:node_modules/@angular/animations", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", + "//src/material/core", ], ) @@ -53,16 +51,14 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":checkbox", - "//src/cdk/testing/private", - "//src/cdk/testing/testbed", - "//src/material/core", - ], deps = [ + ":checkbox", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing/private", + "//src/cdk/testing/testbed", + "//src/material/core", ], ) diff --git a/src/material/checkbox/testing/BUILD.bazel b/src/material/checkbox/testing/BUILD.bazel index c5e097133875..1865cbde4684 100644 --- a/src/material/checkbox/testing/BUILD.bazel +++ b/src/material/checkbox/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", ], @@ -24,16 +24,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ - ":testing", - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/checkbox", - ], deps = [ + ":testing", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/checkbox", ], ) diff --git a/src/material/chips/BUILD.bazel b/src/material/chips/BUILD.bazel index d022c0b47701..b4acd7f8c2d8 100644 --- a/src/material/chips/BUILD.bazel +++ b/src/material/chips/BUILD.bazel @@ -22,17 +22,15 @@ ng_project( ":chip_scss", ":chip_set_scss", ] + glob(["**/*.html"]), - interop_deps = [ - "//src:dev_mode_types", - "//src/material/core", - "//src/material/form-field", - ], deps = [ "//:node_modules/@angular/animations", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src:dev_mode_types", + "//src/material/core", + "//src/material/form-field", ], ) @@ -68,8 +66,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":chips", + "//:node_modules/@angular/animations", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -80,14 +84,6 @@ ts_project( "//src/material/form-field", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/animations", - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/chips/testing/BUILD.bazel b/src/material/chips/testing/BUILD.bazel index c69398bbdae0..9346e16f3a19 100644 --- a/src/material/chips/testing/BUILD.bazel +++ b/src/material/chips/testing/BUILD.bazel @@ -9,11 +9,9 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/coercion", - ], deps = [ - "//src/cdk/testing:testing_rjs", + "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -21,8 +19,10 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", "//src/cdk/keycodes", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -30,10 +30,6 @@ ts_project( "//src/material/icon", "//src/material/icon/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - ], ) ng_web_test_suite( diff --git a/src/material/core/BUILD.bazel b/src/material/core/BUILD.bazel index 57cafd8e8a1d..92a5f6cdca2f 100644 --- a/src/material/core/BUILD.bazel +++ b/src/material/core/BUILD.bazel @@ -27,7 +27,13 @@ ng_project( ":ripple/ripple-structure.css", ":focus-indicators/structural-styles.css", ] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/animations", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk", "//src/cdk/a11y", @@ -37,14 +43,6 @@ ng_project( "//src/cdk/platform", "//src/cdk/private", ], - deps = [ - "//:node_modules/@angular/animations", - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ALL_THEMING_FILES = [ @@ -185,17 +183,15 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":core", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/keycodes", "//src/cdk/platform", "//src/cdk/testing/private", "//src/material/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/core/testing/BUILD.bazel b/src/material/core/testing/BUILD.bazel index 096c04b191d9..4d74cd5b44f1 100644 --- a/src/material/core/testing/BUILD.bazel +++ b/src/material/core/testing/BUILD.bazel @@ -10,7 +10,7 @@ ts_project( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk/testing:testing_rjs", + "//src/cdk/testing", ], ) @@ -23,15 +23,13 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/material/core/theming/tests/BUILD.bazel b/src/material/core/theming/tests/BUILD.bazel index 3e236dba3cd3..c9d355abc6b1 100644 --- a/src/material/core/theming/tests/BUILD.bazel +++ b/src/material/core/theming/tests/BUILD.bazel @@ -63,15 +63,15 @@ ts_project( "//:node_modules/@bazel/runfiles", "//:node_modules/postcss", "//:node_modules/sass", - "//tools/postcss:postcss_rjs", - "//tools/sass:sass_lib_rjs", + "//tools/postcss", + "//tools/sass:sass_lib", ], ) jasmine_test( name = "unit_tests", data = [ - ":unit_test_lib_rjs", + ":unit_test_lib", "//src/material:sass_lib", "//src/material-experimental:sass_lib", ], diff --git a/src/material/datepicker/BUILD.bazel b/src/material/datepicker/BUILD.bazel index 87b219cd8bf8..56e85887f885 100644 --- a/src/material/datepicker/BUILD.bazel +++ b/src/material/datepicker/BUILD.bazel @@ -24,7 +24,11 @@ ng_project( ":calendar-body.css", ":calendar.css", ] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -38,12 +42,6 @@ ng_project( "//src/material/form-field", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_library( @@ -109,8 +107,13 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":datepicker", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -123,13 +126,6 @@ ts_project( "//src/material/input", "//src/material/testing", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/datepicker/testing/BUILD.bazel b/src/material/datepicker/testing/BUILD.bazel index ffa35bd0e6ab..a1c678231b5e 100644 --- a/src/material/datepicker/testing/BUILD.bazel +++ b/src/material/datepicker/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", "//src/material/form-field/testing/control", @@ -25,18 +25,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/core", "//src/material/datepicker", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/dialog/BUILD.bazel b/src/material/dialog/BUILD.bazel index 49c39f35ebe7..154a549eb676 100644 --- a/src/material/dialog/BUILD.bazel +++ b/src/material/dialog/BUILD.bazel @@ -17,16 +17,14 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":dialog_scss"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk/dialog", "//src/cdk/overlay", "//src/cdk/portal", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_library( @@ -56,8 +54,12 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":dialog", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/dialog", @@ -67,12 +69,6 @@ ts_project( "//src/cdk/scrolling", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/dialog/testing/BUILD.bazel b/src/material/dialog/testing/BUILD.bazel index bf430fac8408..7b13c71f4218 100644 --- a/src/material/dialog/testing/BUILD.bazel +++ b/src/material/dialog/testing/BUILD.bazel @@ -9,15 +9,13 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/overlay", - "//src/cdk/testing", - "//src/material/dialog", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/rxjs", + "//src/cdk/overlay", + "//src/cdk/testing", + "//src/material/dialog", ], ) @@ -30,17 +28,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/overlay", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/dialog", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/divider/BUILD.bazel b/src/material/divider/BUILD.bazel index 6fbfc1ce769d..bf8309410a4d 100644 --- a/src/material/divider/BUILD.bazel +++ b/src/material/divider/BUILD.bazel @@ -17,12 +17,10 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":divider.css"] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/coercion", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/coercion", + "//src/material/core", ], ) @@ -48,10 +46,8 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":divider", - ], deps = [ + ":divider", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", ], diff --git a/src/material/divider/testing/BUILD.bazel b/src/material/divider/testing/BUILD.bazel index 0694f48f1386..d5d712d6cb82 100644 --- a/src/material/divider/testing/BUILD.bazel +++ b/src/material/divider/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", ], ) @@ -23,16 +23,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/divider", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/expansion/BUILD.bazel b/src/material/expansion/BUILD.bazel index 41d4fdcfc63b..dea7a01b266b 100644 --- a/src/material/expansion/BUILD.bazel +++ b/src/material/expansion/BUILD.bazel @@ -20,7 +20,11 @@ ng_project( ":expansion-panel.css", ":expansion-panel-header.css", ], - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/accordion", "//src/cdk/collections", @@ -28,12 +32,6 @@ ng_project( "//src/cdk/portal", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) sass_library( @@ -66,16 +64,14 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":expansion", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/a11y", "//src/cdk/keycodes", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/expansion/testing/BUILD.bazel b/src/material/expansion/testing/BUILD.bazel index 61200e54a154..e1bbeb936728 100644 --- a/src/material/expansion/testing/BUILD.bazel +++ b/src/material/expansion/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", ], ) @@ -23,16 +23,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/expansion", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/form-field/BUILD.bazel b/src/material/form-field/BUILD.bazel index be42c92241bd..3daace973d1a 100644 --- a/src/material/form-field/BUILD.bazel +++ b/src/material/form-field/BUILD.bazel @@ -16,18 +16,16 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":form_field_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src:dev_mode_types", - "//src/cdk/bidi", - "//src/cdk/observers/private", - "//src/cdk/platform", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src:dev_mode_types", + "//src/cdk/bidi", + "//src/cdk/observers/private", + "//src/cdk/platform", + "//src/material/core", ], ) diff --git a/src/material/form-field/testing/BUILD.bazel b/src/material/form-field/testing/BUILD.bazel index 57af2ea6f979..c1df8f7fdbd7 100644 --- a/src/material/form-field/testing/BUILD.bazel +++ b/src/material/form-field/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", "//src/material/datepicker/testing", "//src/material/form-field/testing/control", @@ -27,8 +27,11 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", @@ -42,11 +45,6 @@ ts_project( "//src/material/select", "//src/material/select/testing", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/form-field/testing/control/BUILD.bazel b/src/material/form-field/testing/control/BUILD.bazel index 0e2fb4d83dbe..6865929b828c 100644 --- a/src/material/form-field/testing/control/BUILD.bazel +++ b/src/material/form-field/testing/control/BUILD.bazel @@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"]) ts_project( name = "control", srcs = glob(["**/*.ts"]), - interop_deps = ["//src/cdk/testing"], + deps = ["//src/cdk/testing"], ) filegroup( diff --git a/src/material/grid-list/BUILD.bazel b/src/material/grid-list/BUILD.bazel index 554ac1c35e57..bd8863701c36 100644 --- a/src/material/grid-list/BUILD.bazel +++ b/src/material/grid-list/BUILD.bazel @@ -17,15 +17,13 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":grid-list.css"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src:dev_mode_types", "//src/cdk/bidi", "//src/cdk/coercion", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - ], ) sass_library( @@ -46,13 +44,11 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":grid-list", - "//src/cdk/bidi", - ], deps = [ + ":grid-list", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/cdk/bidi", ], ) diff --git a/src/material/grid-list/testing/BUILD.bazel b/src/material/grid-list/testing/BUILD.bazel index fef3898f6bb8..6a5267e48a5b 100644 --- a/src/material/grid-list/testing/BUILD.bazel +++ b/src/material/grid-list/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", "//src/material/grid-list", ], @@ -24,17 +24,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/grid-list", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/icon/BUILD.bazel b/src/material/icon/BUILD.bazel index 3d5c2a184679..1d30334f9772 100644 --- a/src/material/icon/BUILD.bazel +++ b/src/material/icon/BUILD.bazel @@ -17,15 +17,13 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":icon.css"] + glob(["**/*.html"]), - interop_deps = [ - "//src:dev_mode_types", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/rxjs", + "//src:dev_mode_types", + "//src/material/core", ], ) @@ -47,15 +45,13 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":icon", - "//src/cdk/testing", - "//src/cdk/testing/private", - ], deps = [ + ":icon", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing", + "//src/cdk/testing/private", ], ) diff --git a/src/material/icon/testing/BUILD.bazel b/src/material/icon/testing/BUILD.bazel index 26c7afaa9094..7a330f074440 100644 --- a/src/material/icon/testing/BUILD.bazel +++ b/src/material/icon/testing/BUILD.bazel @@ -9,14 +9,12 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/testing", - "//src/material/icon", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/testing", + "//src/material/icon", ], ) @@ -29,17 +27,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/platform", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/input/BUILD.bazel b/src/material/input/BUILD.bazel index 07845b4b43f8..f10240a89c35 100644 --- a/src/material/input/BUILD.bazel +++ b/src/material/input/BUILD.bazel @@ -16,15 +16,13 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/text-field", - "//src/material/core", - "//src/material/form-field", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/cdk/text-field", + "//src/material/core", + "//src/material/form-field", ], ) @@ -45,19 +43,17 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":input", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/platform", "//src/cdk/testing/private", "//src/material/core", "//src/material/form-field", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/input/testing/BUILD.bazel b/src/material/input/testing/BUILD.bazel index ff13871f14df..9dca428dcfde 100644 --- a/src/material/input/testing/BUILD.bazel +++ b/src/material/input/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", "//src/material/form-field/testing/control", @@ -20,8 +20,11 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/platform", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -29,11 +32,6 @@ ts_project( "//src/material/form-field/testing/control", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) filegroup( diff --git a/src/material/list/BUILD.bazel b/src/material/list/BUILD.bazel index 87608672efc0..9eb965a8cbc1 100644 --- a/src/material/list/BUILD.bazel +++ b/src/material/list/BUILD.bazel @@ -22,7 +22,11 @@ ng_project( ":list_scss", ":list_option_scss", ] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/coercion", "//src/cdk/collections", @@ -31,12 +35,6 @@ ng_project( "//src/material/core", "//src/material/divider", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_library( @@ -91,18 +89,16 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":list", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/keycodes", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/list/testing/BUILD.bazel b/src/material/list/testing/BUILD.bazel index c04dfb99ba86..626ba114d663 100644 --- a/src/material/list/testing/BUILD.bazel +++ b/src/material/list/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", "//src/material/divider/testing", @@ -26,16 +26,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/divider/testing", "//src/material/list", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/material/menu/BUILD.bazel b/src/material/menu/BUILD.bazel index 4b724a7440e2..8e8f39e82045 100644 --- a/src/material/menu/BUILD.bazel +++ b/src/material/menu/BUILD.bazel @@ -19,15 +19,13 @@ ng_project( ], ), assets = [":menu_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/overlay", - "//src/cdk/scrolling", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/overlay", + "//src/cdk/scrolling", + "//src/material/core", ], ) @@ -54,8 +52,11 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":menu", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -64,11 +65,6 @@ ts_project( "//src/cdk/testing/private", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/menu/testing/BUILD.bazel b/src/material/menu/testing/BUILD.bazel index 1e3ccc0fd0d5..f05c13f0cc8f 100644 --- a/src/material/menu/testing/BUILD.bazel +++ b/src/material/menu/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", ], @@ -24,18 +24,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/overlay", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/menu", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/paginator/BUILD.bazel b/src/material/paginator/BUILD.bazel index ee259d5d0b91..a7e4469e4f48 100644 --- a/src/material/paginator/BUILD.bazel +++ b/src/material/paginator/BUILD.bazel @@ -17,16 +17,14 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":paginator.css"] + glob(["**/*.html"]), - interop_deps = [ - "//src/material/button", - "//src/material/core", - "//src/material/select", - "//src/material/tooltip", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/material/button", + "//src/material/core", + "//src/material/select", + "//src/material/tooltip", ], ) @@ -54,16 +52,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":paginator", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing/private", "//src/material/core", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/paginator/testing/BUILD.bazel b/src/material/paginator/testing/BUILD.bazel index feae923842a6..cc95dad2caa4 100644 --- a/src/material/paginator/testing/BUILD.bazel +++ b/src/material/paginator/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", "//src/material/select/testing", @@ -20,17 +20,15 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/paginator", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/progress-bar/BUILD.bazel b/src/material/progress-bar/BUILD.bazel index 759d65cd93a2..0f08a2a13cb8 100644 --- a/src/material/progress-bar/BUILD.bazel +++ b/src/material/progress-bar/BUILD.bazel @@ -19,12 +19,10 @@ ng_project( ], ), assets = [":progress_bar_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src/material/core", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", + "//src/material/core", ], ) @@ -50,13 +48,11 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":progress-bar", - "//src/cdk/testing/private", - ], deps = [ + ":progress-bar", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing/private", ], ) diff --git a/src/material/progress-bar/testing/BUILD.bazel b/src/material/progress-bar/testing/BUILD.bazel index 0e47f2b1b0c1..352ad6a033b7 100644 --- a/src/material/progress-bar/testing/BUILD.bazel +++ b/src/material/progress-bar/testing/BUILD.bazel @@ -9,12 +9,10 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/coercion", - "//src/cdk/testing", - ], deps = [ "//:node_modules/@angular/core", + "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -22,16 +20,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/progress-bar", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/progress-spinner/BUILD.bazel b/src/material/progress-spinner/BUILD.bazel index 1ac160097710..e715697d5934 100644 --- a/src/material/progress-spinner/BUILD.bazel +++ b/src/material/progress-spinner/BUILD.bazel @@ -19,13 +19,11 @@ ng_project( ], ), assets = [":progress_spinner_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/platform", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", + "//src/cdk/platform", + "//src/material/core", ], ) @@ -52,14 +50,12 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":progress-spinner", - "//src/cdk/platform", - ], deps = [ + ":progress-spinner", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/cdk/platform", ], ) diff --git a/src/material/progress-spinner/testing/BUILD.bazel b/src/material/progress-spinner/testing/BUILD.bazel index 94933b681069..151dee4f01bf 100644 --- a/src/material/progress-spinner/testing/BUILD.bazel +++ b/src/material/progress-spinner/testing/BUILD.bazel @@ -9,14 +9,12 @@ ng_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", "//src/cdk/coercion", "//src/cdk/testing", "//src/material/progress-spinner", ], - deps = [ - "//:node_modules/@angular/core", - ], ) filegroup( @@ -28,16 +26,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/progress-spinner", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/radio/BUILD.bazel b/src/material/radio/BUILD.bazel index 895b86e3ac0d..7f9cc374b0bc 100644 --- a/src/material/radio/BUILD.bazel +++ b/src/material/radio/BUILD.bazel @@ -17,15 +17,13 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":radio_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/a11y", - "//src/cdk/collections", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/cdk/a11y", + "//src/cdk/collections", + "//src/material/core", ], ) @@ -71,15 +69,13 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":radio", - "//src/cdk/testing/private", - ], deps = [ + ":radio", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing/private", ], ) diff --git a/src/material/radio/testing/BUILD.bazel b/src/material/radio/testing/BUILD.bazel index 6fd48f221c5e..99266e820cdb 100644 --- a/src/material/radio/testing/BUILD.bazel +++ b/src/material/radio/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", ], @@ -19,18 +19,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/radio", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/schematics/BUILD.bazel b/src/material/schematics/BUILD.bazel index b3105d3e8df0..d7ae9f13fab8 100644 --- a/src/material/schematics/BUILD.bazel +++ b/src/material/schematics/BUILD.bazel @@ -99,7 +99,7 @@ npm_package( ":collection_assets", ":ng_generate_assets", ":schema_assets", - ":schematics_rjs", + ":schematics", "//src/material/schematics/ng-generate/theme-color:npm_package_assets", "//src/material/schematics/ng-update:ng_update_index", ], @@ -118,8 +118,8 @@ ts_project( tsconfig = ":tsconfig-test", deps = [ ":node_modules/@angular/cdk/schematics", - ":paths_rjs", - ":schematics_rjs", + ":paths", + ":schematics", "//:node_modules/@angular-devkit/core", "//:node_modules/@angular-devkit/schematics", "//:node_modules/@schematics/angular", @@ -127,7 +127,7 @@ ts_project( "//:node_modules/@types/jasmine", "//:node_modules/@types/node", "//:node_modules/fs-extra", - "//src/cdk/schematics/testing:testing_rjs", + "//src/cdk/schematics/testing", ], ) @@ -147,7 +147,7 @@ jasmine_test( ":ng_generate_assets", ":schema_assets", ":schematics_test_cases", - ":unit_test_sources_rjs", + ":unit_test_sources", "//src/material/schematics:package_json", ], ) diff --git a/src/material/schematics/migration-utilities/BUILD.bazel b/src/material/schematics/migration-utilities/BUILD.bazel index cf63af0b6edd..f881da5b21c8 100644 --- a/src/material/schematics/migration-utilities/BUILD.bazel +++ b/src/material/schematics/migration-utilities/BUILD.bazel @@ -20,7 +20,7 @@ ts_project( srcs = glob(["**/*.spec.ts"] + ["rules/components/test-setup-helper.ts"]), tsconfig = "//src/material/schematics:tsconfig-test", deps = [ - ":migration-utilities_rjs", + ":migration-utilities", "//:node_modules/@types/jasmine", "//:node_modules/typescript", ], @@ -29,7 +29,7 @@ ts_project( jasmine_test( name = "unit_tests", data = [ - ":unit_tests_lib_rjs", + ":unit_tests_lib", "//src/material/schematics:package_json", ], ) diff --git a/src/material/schematics/ng-generate/theme-color/BUILD.bazel b/src/material/schematics/ng-generate/theme-color/BUILD.bazel index f1f39d59e761..468b172720c5 100644 --- a/src/material/schematics/ng-generate/theme-color/BUILD.bazel +++ b/src/material/schematics/ng-generate/theme-color/BUILD.bazel @@ -14,9 +14,6 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"] + ["rules/components/test-setup-helper.ts"], ), - interop_deps = [ - "//src/cdk/schematics", - ], tsconfig = "//src/material/schematics:tsconfig", deps = [ "//:node_modules/@angular-devkit/schematics", @@ -24,6 +21,7 @@ ts_project( "//:node_modules/@types/node", "//:node_modules/sass", "//:node_modules/typescript", + "//src/cdk/schematics", ], ) @@ -67,13 +65,13 @@ ts_project( data = [":index_bundled"], tsconfig = "//src/material/schematics:tsconfig-test", deps = [ - ":m3_theme_lib_rjs", + ":m3_theme_lib", "//:node_modules/@angular-devkit/schematics", "//:node_modules/@bazel/runfiles", "//:node_modules/@material/material-color-utilities", "//:node_modules/sass", - "//src/cdk/schematics/testing:testing_rjs", - "//tools/sass:sass_lib_rjs", + "//src/cdk/schematics/testing", + "//tools/sass:sass_lib", ], ) @@ -87,7 +85,7 @@ jasmine_test( name = "unit_tests", data = [ ":unit_tests_assets", - ":unit_tests_lib_rjs", + ":unit_tests_lib", "//src/material:sass_lib", "//src/material-experimental:sass_lib", "//src/material/schematics:collection_assets", diff --git a/src/material/schematics/ng-update/BUILD.bazel b/src/material/schematics/ng-update/BUILD.bazel index 2666465160dd..a17b254511e0 100644 --- a/src/material/schematics/ng-update/BUILD.bazel +++ b/src/material/schematics/ng-update/BUILD.bazel @@ -37,7 +37,7 @@ esbuild( platform = "node", target = "es2015", visibility = ["//src/material/schematics:__pkg__"], - deps = [":ng_update_lib"], + deps = [":ng_update_lib_legacy"], ) filegroup( @@ -55,13 +55,13 @@ ts_project( srcs = glob(["**/*.spec.ts"]), tsconfig = "//src/material/schematics:tsconfig-test", deps = [ - ":ng_update_lib_rjs", + ":ng_update_lib", "//:node_modules/@angular-devkit/core", "//:node_modules/@angular-devkit/schematics", "//:node_modules/@bazel/runfiles", - "//src/cdk/schematics/testing:testing_rjs", + "//src/cdk/schematics/testing", "//src/material/schematics:node_modules/@angular/cdk/schematics", - "//src/material/schematics:paths_rjs", + "//src/material/schematics:paths", ], ) @@ -69,7 +69,7 @@ jasmine_test( name = "test", data = [ ":schematics_test_cases", - ":test_lib_rjs", + ":test_lib", "//src/material/schematics:collection_assets", "//src/material/schematics:node_modules/@angular/cdk/schematics", "//src/material/schematics:package_json", diff --git a/src/material/select/BUILD.bazel b/src/material/select/BUILD.bazel index b460a9953e7d..5be217c00983 100644 --- a/src/material/select/BUILD.bazel +++ b/src/material/select/BUILD.bazel @@ -19,7 +19,11 @@ ng_project( ], ), assets = [":select_scss"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -30,12 +34,6 @@ ng_project( "//src/material/core", "//src/material/form-field", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_library( @@ -61,8 +59,12 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":select", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -72,12 +74,6 @@ ts_project( "//src/material/core", "//src/material/form-field", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/select/testing/BUILD.bazel b/src/material/select/testing/BUILD.bazel index ed439b8f4fae..bcb23ba82e9d 100644 --- a/src/material/select/testing/BUILD.bazel +++ b/src/material/select/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", "//src/material/core/testing", "//src/material/form-field/testing/control", @@ -25,8 +25,11 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/overlay", "//src/cdk/testing", "//src/cdk/testing/testbed", @@ -34,11 +37,6 @@ ts_project( "//src/material/form-field/testing/control", "//src/material/select", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/sidenav/BUILD.bazel b/src/material/sidenav/BUILD.bazel index dee147067774..672da3e91d61 100644 --- a/src/material/sidenav/BUILD.bazel +++ b/src/material/sidenav/BUILD.bazel @@ -17,7 +17,11 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":drawer.css"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -26,12 +30,6 @@ ng_project( "//src/cdk/scrolling", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) sass_library( @@ -55,8 +53,11 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":sidenav", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -65,11 +66,6 @@ ts_project( "//src/cdk/testing", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/sidenav/testing/BUILD.bazel b/src/material/sidenav/testing/BUILD.bazel index 998b560ed4e1..27ee4f03781e 100644 --- a/src/material/sidenav/testing/BUILD.bazel +++ b/src/material/sidenav/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", ], @@ -24,16 +24,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/sidenav", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/slide-toggle/BUILD.bazel b/src/material/slide-toggle/BUILD.bazel index 6f2a591fce5e..9d29609ba9e2 100644 --- a/src/material/slide-toggle/BUILD.bazel +++ b/src/material/slide-toggle/BUILD.bazel @@ -20,14 +20,12 @@ ng_project( ], ), assets = [":slide_toggle_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src/material/core", - ], deps = [ "//:node_modules/@angular/animations", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/material/core", ], ) @@ -54,16 +52,14 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":slide-toggle", - "//src/cdk/a11y", - "//src/cdk/bidi", - "//src/cdk/testing/private", - ], deps = [ + ":slide-toggle", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", + "//src/cdk/a11y", + "//src/cdk/bidi", + "//src/cdk/testing/private", ], ) diff --git a/src/material/slide-toggle/testing/BUILD.bazel b/src/material/slide-toggle/testing/BUILD.bazel index da329cd0eab7..38263c705b7d 100644 --- a/src/material/slide-toggle/testing/BUILD.bazel +++ b/src/material/slide-toggle/testing/BUILD.bazel @@ -14,11 +14,9 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/coercion", - ], deps = [ - "//src/cdk/testing:testing_rjs", + "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -26,16 +24,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ - ":testing", - "//src/cdk/testing", - "//src/cdk/testing/testbed", - "//src/material/slide-toggle", - ], deps = [ + ":testing", "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/@angular/platform-browser", + "//src/cdk/testing", + "//src/cdk/testing/testbed", + "//src/material/slide-toggle", ], ) diff --git a/src/material/slider/BUILD.bazel b/src/material/slider/BUILD.bazel index dd47994fef42..a11dabd1168e 100644 --- a/src/material/slider/BUILD.bazel +++ b/src/material/slider/BUILD.bazel @@ -21,15 +21,13 @@ ng_project( ":slider_scss", ":slider_thumb_scss", ] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/bidi", - "//src/cdk/platform", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/@angular/forms", "//:node_modules/rxjs", + "//src/cdk/bidi", + "//src/cdk/platform", + "//src/material/core", ], ) @@ -81,20 +79,18 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":slider", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/platform", "//src/cdk/testing/private", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( @@ -114,6 +110,6 @@ ts_project( e2e_test_suite( name = "e2e_tests", deps = [ - ":e2e_test_sources", + ":e2e_test_sources_legacy", ], ) diff --git a/src/material/slider/testing/BUILD.bazel b/src/material/slider/testing/BUILD.bazel index a811e7222ad8..c69b310bcd62 100644 --- a/src/material/slider/testing/BUILD.bazel +++ b/src/material/slider/testing/BUILD.bazel @@ -9,28 +9,24 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", + "//src/cdk/testing", "//src/material/slider", ], - deps = [ - "//src/cdk/testing:testing_rjs", - ], ) ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/slider", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/material/snack-bar/BUILD.bazel b/src/material/snack-bar/BUILD.bazel index a797986f4629..21fcbbf51d5b 100644 --- a/src/material/snack-bar/BUILD.bazel +++ b/src/material/snack-bar/BUILD.bazel @@ -20,18 +20,16 @@ ng_project( ":simple_snack_bar_scss", ":snack_bar_container_scss", ] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/overlay", "//src/cdk/portal", "//src/material/button", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_library( @@ -67,16 +65,14 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":snack-bar", - "//src/cdk/a11y", - "//src/cdk/overlay", - "//src/cdk/platform", - ], deps = [ + ":snack-bar", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", + "//src/cdk/a11y", + "//src/cdk/overlay", + "//src/cdk/platform", ], ) diff --git a/src/material/snack-bar/testing/BUILD.bazel b/src/material/snack-bar/testing/BUILD.bazel index aa76aada3b2f..e12a68fb1c3d 100644 --- a/src/material/snack-bar/testing/BUILD.bazel +++ b/src/material/snack-bar/testing/BUILD.bazel @@ -9,11 +9,9 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/cdk/a11y", - ], deps = [ - "//src/cdk/testing:testing_rjs", + "//src/cdk/a11y", + "//src/cdk/testing", ], ) @@ -26,18 +24,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/overlay", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/snack-bar", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/sort/BUILD.bazel b/src/material/sort/BUILD.bazel index f998cb56f0a6..823592593daa 100644 --- a/src/material/sort/BUILD.bazel +++ b/src/material/sort/BUILD.bazel @@ -17,16 +17,14 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":sort-header.css"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/keycodes", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_library( @@ -53,18 +51,16 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":sort", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/collections", "//src/cdk/table", "//src/cdk/testing/private", "//src/material/table", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/sort/testing/BUILD.bazel b/src/material/sort/testing/BUILD.bazel index cc5f3f2cd999..e0fc57f2cdaa 100644 --- a/src/material/sort/testing/BUILD.bazel +++ b/src/material/sort/testing/BUILD.bazel @@ -9,11 +9,9 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ - "//src/material/sort", - ], deps = [ - "//src/cdk/testing:testing_rjs", + "//src/cdk/testing", + "//src/material/sort", ], ) @@ -26,16 +24,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/sort", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/stepper/BUILD.bazel b/src/material/stepper/BUILD.bazel index d0a09695f935..5c0eac1a102f 100644 --- a/src/material/stepper/BUILD.bazel +++ b/src/material/stepper/BUILD.bazel @@ -20,7 +20,11 @@ ng_project( ":stepper.css", ":step-header.css", ] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -29,12 +33,6 @@ ng_project( "//src/material/core", "//src/material/icon", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_library( @@ -71,8 +69,12 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":stepper", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/platform", @@ -82,12 +84,6 @@ ts_project( "//src/material/form-field", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/stepper/testing/BUILD.bazel b/src/material/stepper/testing/BUILD.bazel index 8fddfc06fd00..9eeed8565d9c 100644 --- a/src/material/stepper/testing/BUILD.bazel +++ b/src/material/stepper/testing/BUILD.bazel @@ -10,7 +10,7 @@ ts_project( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk/testing:testing_rjs", + "//src/cdk/testing", ], ) @@ -23,19 +23,17 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/stepper", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/stepper", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/table/BUILD.bazel b/src/material/table/BUILD.bazel index 9649e8c01ce3..c5f90e5fff60 100644 --- a/src/material/table/BUILD.bazel +++ b/src/material/table/BUILD.bazel @@ -17,16 +17,14 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":table_scss"] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/table", - "//src/material/core", - "//src/material/paginator", - "//src/material/sort", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/table", + "//src/material/core", + "//src/material/paginator", + "//src/material/sort", ], ) @@ -65,16 +63,14 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":table", - "//src/cdk/table", - "//src/material/paginator", - "//src/material/sort", - ], deps = [ + ":table", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/rxjs", + "//src/cdk/table", + "//src/material/paginator", + "//src/material/sort", ], ) diff --git a/src/material/table/testing/BUILD.bazel b/src/material/table/testing/BUILD.bazel index 9450e9713afb..3a4c756a9029 100644 --- a/src/material/table/testing/BUILD.bazel +++ b/src/material/table/testing/BUILD.bazel @@ -10,7 +10,7 @@ ts_project( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk/testing:testing_rjs", + "//src/cdk/testing", ], ) @@ -23,15 +23,13 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/table", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/material/tabs/BUILD.bazel b/src/material/tabs/BUILD.bazel index 9f5143bfd477..36b8afe7e81f 100644 --- a/src/material/tabs/BUILD.bazel +++ b/src/material/tabs/BUILD.bazel @@ -23,7 +23,10 @@ ng_project( ":tab-nav-bar/tab-nav-bar.css", ":tab-nav-bar/tab-link.css", ] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/a11y", "//src/cdk/bidi", @@ -36,11 +39,6 @@ ng_project( "//src/cdk/scrolling", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) sass_library( @@ -93,8 +91,12 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":tabs", + "//:node_modules/@angular/common", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/observers", @@ -105,12 +107,6 @@ ts_project( "//src/cdk/testing/testbed", "//src/material/core", ], - deps = [ - "//:node_modules/@angular/common", - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/tabs/testing/BUILD.bazel b/src/material/tabs/testing/BUILD.bazel index 49ebe089fdd6..7ef396f67780 100644 --- a/src/material/tabs/testing/BUILD.bazel +++ b/src/material/tabs/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", ], ) @@ -23,18 +23,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/tabs", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/testing/BUILD.bazel b/src/material/testing/BUILD.bazel index 670387e59d27..011419393213 100644 --- a/src/material/testing/BUILD.bazel +++ b/src/material/testing/BUILD.bazel @@ -6,10 +6,8 @@ ng_project( name = "testing", testonly = True, srcs = glob(["**/*.ts"]), - interop_deps = [ - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", + "//src/material/core", ], ) diff --git a/src/material/timepicker/BUILD.bazel b/src/material/timepicker/BUILD.bazel index 47e2f7af6184..027364b99abd 100644 --- a/src/material/timepicker/BUILD.bazel +++ b/src/material/timepicker/BUILD.bazel @@ -17,7 +17,10 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":timepicker.css"] + glob(["**/*.html"]), - interop_deps = [ + deps = [ + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/rxjs", "//src:dev_mode_types", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -29,11 +32,6 @@ ng_project( "//src/material/core", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/rxjs", - ], ) sass_library( @@ -54,8 +52,12 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ ":timepicker", + "//:node_modules/@angular/core", + "//:node_modules/@angular/forms", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/keycodes", "//src/cdk/overlay", "//src/cdk/scrolling", @@ -64,12 +66,6 @@ ts_project( "//src/material/form-field", "//src/material/input", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/forms", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/timepicker/testing/BUILD.bazel b/src/material/timepicker/testing/BUILD.bazel index 3cb687097b53..0cf18d970d6f 100644 --- a/src/material/timepicker/testing/BUILD.bazel +++ b/src/material/timepicker/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", "//src/material/core/testing", @@ -26,18 +26,16 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/private", "//src/cdk/testing/testbed", "//src/material/core", "//src/material/timepicker", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/toolbar/BUILD.bazel b/src/material/toolbar/BUILD.bazel index 058e9826b9fc..092969f4fbf8 100644 --- a/src/material/toolbar/BUILD.bazel +++ b/src/material/toolbar/BUILD.bazel @@ -17,14 +17,12 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":toolbar.css"] + glob(["**/*.html"]), - interop_deps = [ - "//src:dev_mode_types", - "//src/cdk/platform", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", + "//src:dev_mode_types", + "//src/cdk/platform", + "//src/material/core", ], ) @@ -51,10 +49,8 @@ ts_project( srcs = glob( ["**/*.spec.ts"], ), - interop_deps = [ - ":toolbar", - ], deps = [ + ":toolbar", "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", diff --git a/src/material/toolbar/testing/BUILD.bazel b/src/material/toolbar/testing/BUILD.bazel index 5290a71122f3..9aa33752a5c8 100644 --- a/src/material/toolbar/testing/BUILD.bazel +++ b/src/material/toolbar/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", ], ) @@ -23,16 +23,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/toolbar", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/tooltip/BUILD.bazel b/src/material/tooltip/BUILD.bazel index 748eeec2d14e..923c376f56d7 100644 --- a/src/material/tooltip/BUILD.bazel +++ b/src/material/tooltip/BUILD.bazel @@ -21,16 +21,14 @@ ng_project( assets = [ ":tooltip_scss", ] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/coercion", - "//src/cdk/overlay", - "//src/cdk/portal", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/coercion", + "//src/cdk/overlay", + "//src/cdk/portal", + "//src/material/core", ], ) @@ -59,8 +57,11 @@ ts_project( "**/*.e2e.spec.ts", ], ), - interop_deps = [ + deps = [ ":tooltip", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -68,11 +69,6 @@ ts_project( "//src/cdk/platform", "//src/cdk/testing/private", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/tooltip/testing/BUILD.bazel b/src/material/tooltip/testing/BUILD.bazel index 03fc64f6cf37..f2b4e5443a18 100644 --- a/src/material/tooltip/testing/BUILD.bazel +++ b/src/material/tooltip/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/testing", ], ) @@ -23,16 +23,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", + "//:node_modules/@angular/platform-browser", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/tooltip", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/@angular/platform-browser", - ], ) ng_web_test_suite( diff --git a/src/material/tree/BUILD.bazel b/src/material/tree/BUILD.bazel index b196277a36f5..3487ed7aa6b3 100644 --- a/src/material/tree/BUILD.bazel +++ b/src/material/tree/BUILD.bazel @@ -17,14 +17,12 @@ ng_project( exclude = ["**/*.spec.ts"], ), assets = [":tree.css"] + glob(["**/*.html"]), - interop_deps = [ - "//src/cdk/collections", - "//src/cdk/tree", - "//src/material/core", - ], deps = [ "//:node_modules/@angular/core", "//:node_modules/rxjs", + "//src/cdk/collections", + "//src/cdk/tree", + "//src/material/core", ], ) @@ -51,17 +49,15 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ + deps = [ ":tree", + "//:node_modules/@angular/core", + "//:node_modules/rxjs", "//src/cdk/a11y", "//src/cdk/keycodes", "//src/cdk/testing/private", "//src/cdk/tree", ], - deps = [ - "//:node_modules/@angular/core", - "//:node_modules/rxjs", - ], ) ng_web_test_suite( diff --git a/src/material/tree/testing/BUILD.bazel b/src/material/tree/testing/BUILD.bazel index 97007b861df5..fe526bf693ee 100644 --- a/src/material/tree/testing/BUILD.bazel +++ b/src/material/tree/testing/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - interop_deps = [ + deps = [ "//src/cdk/coercion", "//src/cdk/testing", ], @@ -24,16 +24,14 @@ ts_project( name = "unit_tests_lib", testonly = True, srcs = glob(["**/*.spec.ts"]), - interop_deps = [ + deps = [ ":testing", + "//:node_modules/@angular/core", "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/cdk/tree", "//src/material/tree", ], - deps = [ - "//:node_modules/@angular/core", - ], ) ng_web_test_suite( diff --git a/src/universal-app/BUILD.bazel b/src/universal-app/BUILD.bazel index ec0693711bd0..17b53551c7d9 100644 --- a/src/universal-app/BUILD.bazel +++ b/src/universal-app/BUILD.bazel @@ -29,16 +29,14 @@ ng_project( assets = [ "kitchen-sink/kitchen-sink.html", ], - interop_deps = [ - "//src/google-maps", - "//src/youtube-player", - ] + CDK_TARGETS + CDK_EXPERIMENTAL_TARGETS + MATERIAL_TARGETS + MATERIAL_EXPERIMENTAL_TARGETS + ALL_EXAMPLES, deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-server", "//:node_modules/rxjs", - ], + "//src/google-maps", + "//src/youtube-player", + ] + CDK_TARGETS + CDK_EXPERIMENTAL_TARGETS + MATERIAL_TARGETS + MATERIAL_EXPERIMENTAL_TARGETS + ALL_EXAMPLES, ) ts_project( @@ -46,11 +44,9 @@ ts_project( srcs = [ "main.ts", ], - interop_deps = [ - ":kitchen-sink", - ], tsconfig = ":tsconfig", deps = [ + ":kitchen-sink", "//:node_modules/@angular/platform-browser", ], ) @@ -60,11 +56,9 @@ ts_project( srcs = [ "prerender.ts", ], - interop_deps = [ - ":kitchen-sink", - ], tsconfig = ":tsconfig", deps = [ + ":kitchen-sink", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/@angular/platform-server", @@ -105,7 +99,7 @@ devmode_esbuild( platform = "browser", target = "es2016", deps = LINKER_PROCESSED_FW_PACKAGES + [ - ":client_lib", + ":client_lib_legacy", ], ) @@ -119,7 +113,7 @@ devmode_esbuild( # Note: We add all linker-processed FW packages as dependencies here so that ESBuild will # map all framework packages to their linker-processed bundles from `tools/angular`. deps = LINKER_PROCESSED_FW_PACKAGES + [ - ":prerender_lib", + ":prerender_lib_legacy", ], ) diff --git a/src/youtube-player/BUILD.bazel b/src/youtube-player/BUILD.bazel index aca7fc21687e..05550646820f 100644 --- a/src/youtube-player/BUILD.bazel +++ b/src/youtube-player/BUILD.bazel @@ -33,14 +33,12 @@ ng_project( ":youtube_player_scss", ":youtube_player_placeholder_scss", ], - interop_deps = [ - "//src:dev_mode_types", - ], deps = [ "//:node_modules/@angular/common", "//:node_modules/@angular/core", "//:node_modules/@types/youtube", "//:node_modules/rxjs", + "//src:dev_mode_types", ], ) @@ -59,7 +57,7 @@ ng_package( srcs = ["package.json"], nested_packages = ["//src/youtube-player/schematics:npm_package"], tags = ["release-package"], - deps = [":youtube-player"], + deps = [":youtube-player_legacy"], ) ts_project( @@ -69,11 +67,9 @@ ts_project( ["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"], ), - interop_deps = [ - ":youtube-player", - ], tsconfig = ":tsconfig-test", deps = [ + ":youtube-player", "//:node_modules/@angular/core", "//:node_modules/@angular/platform-browser", "//:node_modules/rxjs", diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 8984da598782..42a404c8b5fd 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -17,6 +17,7 @@ load("//:pkg-externals.bzl", "PKG_EXTERNALS") load("//tools/markdown-to-html:index.bzl", _markdown_to_html = "markdown_to_html") load("//tools/extract-tokens:index.bzl", _extract_tokens = "extract_tokens") load("//tools/angular:index.bzl", "LINKER_PROCESSED_FW_PACKAGES") +load("//tools/bazel:legacy_target.bzl", "get_legacy_label") npmPackageSubstitutions = select({ "//tools:stamp": NPM_PACKAGE_SUBSTITUTIONS, @@ -135,9 +136,11 @@ def karma_web_test_suite(name, **kwargs): kwargs["tags"] = ["partial-compilation-integration"] + kwargs.get("tags", []) kwargs["deps"] = ["%s_bundle" % name] + test_deps_legacy = [get_legacy_label(d) for d in test_deps] + spec_bundle( name = "%s_bundle" % name, - deps = test_deps, + deps = test_deps_legacy, platform = "browser", ) diff --git a/tools/dgeni/BUILD.bazel b/tools/dgeni/BUILD.bazel index 73ae9ff7a4f9..479a0b4fe4be 100644 --- a/tools/dgeni/BUILD.bazel +++ b/tools/dgeni/BUILD.bazel @@ -6,7 +6,7 @@ package(default_visibility = ["//visibility:public"]) nodejs_binary( name = "dgeni", data = [ - ":sources", + ":sources_legacy", "@npm//dgeni", "@npm//dgeni-packages", ], @@ -25,6 +25,6 @@ ts_project( "//:node_modules/dgeni-packages", "//:node_modules/highlight.js", "//:node_modules/typescript", - "//tools/highlight-files:sources_rjs", + "//tools/highlight-files:sources", ], ) diff --git a/tools/example-module/BUILD.bazel b/tools/example-module/BUILD.bazel index 6a3c662d739b..d7d7f2a7800c 100644 --- a/tools/example-module/BUILD.bazel +++ b/tools/example-module/BUILD.bazel @@ -16,7 +16,7 @@ nodejs_binary( name = "bazel-bin", data = [ ":example-module.template", - ":example-module-lib", + ":example-module-lib_legacy", "@npm//typescript", ], entry_point = ":bazel-bin.ts", diff --git a/tools/extract-tokens/BUILD.bazel b/tools/extract-tokens/BUILD.bazel index b34e1c21b0ad..9d46507786c5 100644 --- a/tools/extract-tokens/BUILD.bazel +++ b/tools/extract-tokens/BUILD.bazel @@ -9,14 +9,14 @@ ts_project( tsconfig = "//tools:tsconfig", deps = [ "//:node_modules/sass", - "//tools/highlight-files:sources_rjs", + "//tools/highlight-files:sources", ], ) nodejs_binary( name = "extract-tokens", data = [ - ":extract_tokens_lib", + ":extract_tokens_lib_legacy", "@npm//highlight.js", "@npm//sass", ], diff --git a/tools/highlight-files/BUILD.bazel b/tools/highlight-files/BUILD.bazel index 338d81b9d8fb..dd4a8b5ae73f 100644 --- a/tools/highlight-files/BUILD.bazel +++ b/tools/highlight-files/BUILD.bazel @@ -10,16 +10,15 @@ ts_project( deps = [ "//:node_modules/@types/fs-extra", "//:node_modules/fs-extra", - "//tools/region-parser:region-parser_rjs", + "//:node_modules/highlight.js", + "//tools/region-parser", ], ) nodejs_binary( name = "highlight-files", data = [ - ":sources", - "@npm//fs-extra", - "@npm//highlight.js", + ":sources_legacy", ], entry_point = ":highlight-files.ts", templated_args = [ diff --git a/tools/highlight-files/highlight-code-block.ts b/tools/highlight-files/highlight-code-block.ts index 310be236fea5..f0383dff6c71 100644 --- a/tools/highlight-files/highlight-code-block.ts +++ b/tools/highlight-files/highlight-code-block.ts @@ -1,5 +1,4 @@ -// These type lacks type definitions. -const highlightJs = require('highlight.js'); +import highlightJs from 'highlight.js'; /** * Transforms a given code block into its corresponding HTML output. We do this using diff --git a/tools/markdown-to-html/BUILD.bazel b/tools/markdown-to-html/BUILD.bazel index 1e8bb496f617..63a5dd4b7491 100644 --- a/tools/markdown-to-html/BUILD.bazel +++ b/tools/markdown-to-html/BUILD.bazel @@ -16,7 +16,7 @@ ts_project( deps = [ "//:node_modules/@types/marked", "//:node_modules/marked", - "//tools/highlight-files:sources_rjs", + "//tools/highlight-files:sources", ], ) @@ -40,16 +40,16 @@ ts_project( tsconfig = "//tools:tsconfig-test", visibility = ["//visibility:private"], deps = [ - ":transform-markdown_rjs", - "@npm//@types/jasmine", - "@npm//@types/node", - "@npm//marked", - "@npm//typescript", + ":transform-markdown", + "//:node_modules/@types/jasmine", + "//:node_modules/@types/node", + "//:node_modules/marked", + "//:node_modules/typescript", ], ) jasmine_node_test( name = "unit_tests", - srcs = [":unit_test_lib"], + srcs = [":unit_test_lib_legacy"], visibility = ["//visibility:private"], ) diff --git a/tools/package-docs-content/BUILD.bazel b/tools/package-docs-content/BUILD.bazel index 07abf9533195..e369025542b6 100644 --- a/tools/package-docs-content/BUILD.bazel +++ b/tools/package-docs-content/BUILD.bazel @@ -6,7 +6,7 @@ package(default_visibility = ["//visibility:public"]) nodejs_binary( name = "package-docs-content", data = [ - ":sources", + ":sources_legacy", "@npm//fs-extra", ], entry_point = ":package-docs-content.ts", diff --git a/tools/sass/BUILD.bazel b/tools/sass/BUILD.bazel index 603ab7583188..ea60997d9905 100644 --- a/tools/sass/BUILD.bazel +++ b/tools/sass/BUILD.bazel @@ -21,7 +21,7 @@ ts_project( js_binary( name = "compiler", - data = [":sass_lib_rjs"], + data = [":sass_lib"], entry_point = "compiler-main.js", env = { # TODO(devversion): Replace `rules_sass` with modernized standalone ruleset. diff --git a/tools/server-test/index.bzl b/tools/server-test/index.bzl index b50509a13ff9..0ce26df91766 100644 --- a/tools/server-test/index.bzl +++ b/tools/server-test/index.bzl @@ -8,7 +8,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test") def server_test(server, test, **kwargs): nodejs_test( - data = [server, test, "//tools/server-test:test_runner_lib"], + data = [server, test, "//tools/server-test:test_runner_lib_legacy"], args = ["$(rootpath %s)" % server, "$(rootpath %s)" % test], entry_point = "//tools/server-test:test-runner.ts", # TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver