Skip to content

build: test remaining packages with bazel#13844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jelbourn merged 1 commit into from
Oct 29, 2018
Merged

build: test remaining packages with bazel #13844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,8 @@ jobs:
- *copy_bazel_config

# TODO(jelbourn): Update this command to run all tests if the Bazel issues have been fixed.
- run: bazel build src/cdk/... src/lib/...
- run: bazel test src/cdk/... src/lib/...
- run: bazel build src/...
- run: bazel test src/...

- *save_cache

Expand Down
14 changes: 8 additions & 6 deletions src/cdk-experimental/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
package(default_visibility=["//visibility:public"])
load("@angular//:index.bzl", "ng_module", "ng_package")
load("//:packages.bzl", "CDK_EXPERIMENTAL_PACKAGES", "CDK_EXPERIMENTAL_TARGETS", "CDK_TARGETS", "ROLLUP_GLOBALS", "VERSION_PLACEHOLDER_REPLACEMENTS")

# Export the CDK tsconfig so that subpackages can reference it directly.
exports_files(["tsconfig-build.json"])
load("@angular//:index.bzl", "ng_package")
load("//tools:defaults.bzl", "ng_module")
load("//:packages.bzl", "CDK_EXPERIMENTAL_PACKAGES", "CDK_EXPERIMENTAL_TARGETS",
"CDK_TARGETS", "ROLLUP_GLOBALS", "VERSION_PLACEHOLDER_REPLACEMENTS")

ng_module(
name = "cdk-experimental",
srcs = glob(["*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/cdk-experimental",
deps = ["//src/cdk-experimental/%s" % p for p in CDK_EXPERIMENTAL_PACKAGES],
tsconfig = "//src/lib:tsconfig-build.json",
)

ng_package(
Expand All@@ -20,5 +19,8 @@ ng_package(
globals = ROLLUP_GLOBALS,
replacements = VERSION_PLACEHOLDER_REPLACEMENTS,
deps = CDK_EXPERIMENTAL_TARGETS,
tags = ["publish"],
# TODO(devversion): Use the npm package for publishing. Right now this is disabled because
# we build using AOT for serving & testing, but the `ng_package` rule should not include factory
# files.
tags = ["manual"],
)
31 changes: 28 additions & 3 deletions src/cdk-experimental/dialog/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
package(default_visibility=["//visibility:public"])
load("@angular//:index.bzl", "ng_module")
load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary")

load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary")
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")

ng_module(
name = "dialog",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/cdk-experimental/dialog",
assets = [":dialog-container.css"] + glob(["**/*.html"]),
deps = [
"@angular//packages/animations",
"@angular//packages/common",
"@angular//packages/core",
"@rxjs",
"@rxjs//operators",
"//src/cdk/a11y",
"//src/cdk/bidi",
"//src/cdk/keycodes",
"//src/cdk/overlay",
"//src/cdk/portal",
],
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand All@@ -29,3 +33,24 @@ sass_binary(
src = "dialog-container.scss",
)

ng_test_library(
name = "dialog_test_sources",
srcs = glob(["**/*.spec.ts"]),
deps = [
"@angular//packages/common",
"@angular//packages/common/testing",
"@angular//packages/platform-browser",
"@angular//packages/platform-browser/animations",
"//src/cdk/bidi",
"//src/cdk/keycodes",
"//src/cdk/overlay",
"//src/cdk/testing",
":dialog",
],
)

ng_web_test_suite(
name = "unit_tests",
deps = [":dialog_test_sources"]
)

1 change: 0 additions & 1 deletion src/cdk-experimental/dialog/typings.d.ts
View file
Open in desktop

This file was deleted.

29 changes: 7 additions & 22 deletions src/cdk-experimental/scrolling/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,30 @@
package(default_visibility=["//visibility:public"])
load("@angular//:index.bzl", "ng_module")
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_web_test")

load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")

ng_module(
name = "scrolling",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/cdk-experimental/scrolling",
deps = [
"@angular//packages/core",
"@rxjs",
"//src/cdk/coercion",
"//src/cdk/collections",
"//src/cdk/scrolling",
"@rxjs",
],
tsconfig = "//src/cdk-experimental:tsconfig-build.json",
)

ts_library(
ng_test_library(
name = "scrolling_test_sources",
testonly = 1,
srcs = glob(["**/*.spec.ts"]),
deps = [
":scrolling",
"//src/cdk/scrolling",
"//src/cdk/testing",
"@rxjs",
":scrolling",

@josephperrottjosephperrottOct 29, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this ng_test_library you rely on scrolling to provide all of the cdk module build rules, but in dialog's ng_test_library you require them all in both places. Is there a reason we don't do them the same way?

@jelbournjelbournOct 29, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests in cdk-experimental/scrolling only directly depend on cdk/scrolling whereas the experimental dialog test imports all of those packages directly.

],
tsconfig = "//src/cdk-experimental:tsconfig-build.json",
)

ts_web_test(
ng_web_test_suite(
name = "unit_tests",
bootstrap = [
"//:web_test_bootstrap_scripts",
],
# Do not sort
deps = [
"//:tslib_bundle",
"//:angular_bundles",
"//:angular_test_bundles",
"//test:angular_test_init",
":scrolling_test_sources",
],
deps = [":scrolling_test_sources"]
)
13 changes: 6 additions & 7 deletions src/material-experimental/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
package(default_visibility=["//visibility:public"])
load("@angular//:index.bzl", "ng_module", "ng_package")
load("//:packages.bzl", "CDK_TARGETS", "ROLLUP_GLOBALS", "VERSION_PLACEHOLDER_REPLACEMENTS")

load("@angular//:index.bzl", "ng_package")
load("//tools:defaults.bzl", "ng_module")
load("//:packages.bzl", "CDK_TARGETS", "ROLLUP_GLOBALS", "VERSION_PLACEHOLDER_REPLACEMENTS")

ng_module(
name = "material-experimental",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material-experimental",
deps = [
"//src/lib:material",
] + CDK_TARGETS,
tsconfig = "//src/lib:tsconfig-build.json",
deps = ["//src/lib:material"] + CDK_TARGETS,
)

ng_package(
Expand All@@ -20,5 +18,6 @@ ng_package(
globals = ROLLUP_GLOBALS,
replacements = VERSION_PLACEHOLDER_REPLACEMENTS,
deps = [":material-experimental"],
tags = ["publish"],
# TODO(devversion): re-enable once we have set up the proper compiler for the ng_package
tags = ["manual"],
)
19 changes: 13 additions & 6 deletions src/material-moment-adapter/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
package(default_visibility=["//visibility:public"])
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")

load("@angular//:index.bzl", "ng_package")
load("//tools:defaults.bzl", "ng_module")
load("//:packages.bzl", "ROLLUP_GLOBALS", "VERSION_PLACEHOLDER_REPLACEMENTS")


ts_library(
ng_module(
name = "material-moment-adapter",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material-moment-adapter",
deps = ["//src/lib:material"],
tsconfig = "//src/material-moment-adapter:tsconfig-build.json",
deps = [
"@npm//moment",
"//src/lib:material"
],
# Explicitly specify the tsconfig that is also used by Gulp. We need to explicitly use this
# tsconfig because in order to import Moment with TypeScript, we need some special options
# enabled.
tsconfig = ":tsconfig-build.json",
)

ng_package(
Expand All@@ -19,5 +25,6 @@ ng_package(
globals = ROLLUP_GLOBALS,
replacements = VERSION_PLACEHOLDER_REPLACEMENTS,
deps = [":material-moment-adapter"],
tags = ["publish"],
# TODO(devversion): re-enable once we have set up the proper compiler for the ng_package
tags = ["manual"],
)
12 changes: 2 additions & 10 deletions src/material-moment-adapter/adapter/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,21 +7,13 @@
*/

import {NgModule} from '@angular/core';
import {
DateAdapter,
MAT_DATE_LOCALE,
MAT_DATE_FORMATS
} from '@angular/material';
import {
MomentDateAdapter,
MAT_MOMENT_DATE_ADAPTER_OPTIONS
} from './moment-date-adapter';
import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material';
import {MAT_MOMENT_DATE_ADAPTER_OPTIONS, MomentDateAdapter} from './moment-date-adapter';
import {MAT_MOMENT_DATE_FORMATS} from './moment-date-formats';

export * from './moment-date-adapter';
export * from './moment-date-formats';


@NgModule({
providers: [
{
Expand Down