Skip to content

build: build material with angular from source#13655

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
josephperrott merged 1 commit into from
Oct 17, 2018
Merged

build: build material with angular from source #13655

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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ 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/...
- run: bazel build src/cdk/... src/lib:material
- run: bazel test src/cdk/...

- *save_cache
Expand Down
7 changes: 7 additions & 0 deletions src/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
package(default_visibility = ["//visibility:public"])

load("//tools:defaults.bzl", "ts_library")

exports_files([
"bazel-tsconfig-build.json",
"bazel-tsconfig-test.json",
])

ts_library(
name = 'module-typings',
srcs = [":module-typings.d.ts"]
)
3 changes: 1 addition & 2 deletions src/cdk/drag-drop/tsconfig-build.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
{
"extends": "../tsconfig-build",
"files": [
"public-api.ts",
"./typings.d.ts"
"public-api.ts"
],
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
Expand Down
1 change: 0 additions & 1 deletion src/cdk/drag-drop/typings.d.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/cdk/scrolling/tsconfig-build.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"extends": "../tsconfig-build",
"files": [
"public-api.ts",
"./typings.d.ts"
"../typings.d.ts"
],
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
Expand Down
1 change: 0 additions & 1 deletion src/cdk/scrolling/typings.d.ts
View file
Open in desktop

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

10 changes: 3 additions & 7 deletions src/lib/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
package(default_visibility=["//visibility:public"])
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
load("@angular//:index.bzl", "ng_package", "ng_module")

load("@angular//:index.bzl", "ng_package")
load("//tools:sass_bundle.bzl", "sass_bundle")
load("//:packages.bzl", "MATERIAL_PACKAGES", "MATERIAL_TARGETS", "ROLLUP_GLOBALS",
"VERSION_PLACEHOLDER_REPLACEMENTS")


# Export the root material tsconfig so that subpackages can reference it directly.
exports_files(["tsconfig-build.json"])
load("//tools:defaults.bzl", "ng_module")

# Root "@angular/material" entry-point.
ng_module(
name = "material",
srcs = glob(["*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material",
deps = ["//src/lib/%s" % p for p in MATERIAL_PACKAGES],
tsconfig = "//src/lib:tsconfig-build.json",
)

sass_bundle(
Expand Down
22 changes: 13 additions & 9 deletions src/lib/autocomplete/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
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_module(
name = "autocomplete",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material/autocomplete",
assets = [":autocomplete.css"] + glob(["**/*.html"]),
deps = [
"//src/lib/core",
"//src/lib/form-field",
"@angular//packages/common",
"@angular//packages/core",
"@angular//packages/forms",
"@rxjs",
"@rxjs//operators",
"//src/cdk/a11y",
"//src/cdk/bidi",
"//src/cdk/collections",
"//src/cdk/coercion",
"//src/cdk/keycodes",
"//src/cdk/portal",
"//src/cdk/overlay",
"//src/cdk/coercion",
],
tsconfig = "//src/lib:tsconfig-build.json",
"//src/cdk/portal",
"//src/cdk/scrolling",
"//src/lib/core",
"//src/lib/form-field",
]
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand Down
9 changes: 5 additions & 4 deletions src/lib/badge/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
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_module(
name = "badge",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material/badge",
deps = [
"//src/lib/core",
"@angular//packages/common",
"@angular//packages/core",
"//src/cdk/a11y",
"//src/cdk/coercion",
"//src/lib/core",
] + glob(["**/*.html"]),
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand Down
18 changes: 11 additions & 7 deletions src/lib/bottom-sheet/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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_module(
name = "bottom-sheet",
Expand All@@ -11,15 +11,19 @@ ng_module(
":bottom-sheet-container.css",
] + glob(["**/*.html"]),
deps = [
"//src/lib/core",
"@angular//packages/animations",
"@angular//packages/common",
"@angular//packages/core",
"@rxjs",
"@rxjs//operators",
"//src/cdk/keycodes",
"//src/cdk/overlay",
"//src/cdk/a11y",
"//src/cdk/bidi",
"//src/cdk/overlay",
"//src/cdk/portal",
"//src/cdk/layout",
"@rxjs",
"//src/cdk/portal",
"//src/lib/core",
],
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand Down
13 changes: 7 additions & 6 deletions src/lib/button-toggle/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
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_module(
name = "button-toggle",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material/button-toggle",
assets = [":button-toggle.css"] + glob(["**/*.html"]),
deps = [
"//src/lib/core",
"//src/cdk/a11y",
"//src/cdk/coercion",
"@angular//packages/core",
"@angular//packages/forms",
"//src/cdk/collections",
"//src/cdk/coercion",
"//src/cdk/a11y",
"//src/lib/core",
],
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand Down
12 changes: 7 additions & 5 deletions src/lib/button/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
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_module(
name = "button",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material/button",
assets = [":button.css"] + glob(["**/*.html"]),
deps = [
"//src/lib/core",
"//src/cdk/a11y",
"@angular//packages/common",
"@angular//packages/core",
"@angular//packages/platform-browser/animations",
"//src/cdk/platform",
"//src/cdk/a11y",
"//src/lib/core",
],
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): remove this when sass_library acts like a filegroup
Expand Down
6 changes: 3 additions & 3 deletions src/lib/card/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
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_module(
name = "card",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material/card",
assets = [":card.css"] + glob(["**/*.html"]),
deps = [
"@angular//packages/core",
"//src/lib/core",
],
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand Down
11 changes: 7 additions & 4 deletions src/lib/checkbox/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
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_module(
name = "checkbox",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material/checkbox",
assets = [":checkbox.css"] + glob(["**/*.html"]),
deps = [
"//src/lib/core",
"@angular//packages/common",
"@angular//packages/core",
"@angular//packages/forms",
"@angular//packages/platform-browser/animations",
"//src/cdk/a11y",
"//src/cdk/coercion",
"//src/cdk/observers",
"//src/lib/core",
],
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand Down
9 changes: 6 additions & 3 deletions src/lib/chips/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
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_module(
name = "chips",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material/chips",
assets = [":chips.css"] + glob(["**/*.html"]),
deps = [
"@angular//packages/core",
"@angular//packages/forms",
"@rxjs",
"@rxjs//operators",
"//src/cdk/a11y",
"//src/cdk/bidi",
"//src/cdk/coercion",
Expand All@@ -18,7 +22,6 @@ ng_module(
"//src/lib/core",
"//src/lib/form-field",
],
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand Down
11 changes: 7 additions & 4 deletions src/lib/core/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
package(default_visibility=["//visibility:public"])

load("@angular//:index.bzl", "ng_module")
load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary")
load("//:packages.bzl", "MATERIAL_PACKAGES")
load("//tools:defaults.bzl", "ng_module")

exports_files(["theming/_theming.scss"])


ng_module(
name = "core",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
Expand All@@ -17,14 +16,18 @@ ng_module(
":option/optgroup.css",
] + glob(["**/*.html"]),
deps = [
"@angular//packages/common",
"@angular//packages/core",
"@angular//packages/forms",
"@angular//packages/platform-browser",
"@angular//packages/platform-browser/animations",
"@rxjs",
"//src/cdk/a11y",
"//src/cdk/bidi",
"//src/cdk/coercion",
"//src/cdk/keycodes",
"//src/cdk/platform",
"@rxjs",
],
tsconfig = "//src/lib:tsconfig-build.json",
)


Expand Down
22 changes: 14 additions & 8 deletions src/lib/datepicker/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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_module(
name = "datepicker",
Expand All@@ -14,18 +14,24 @@ ng_module(
":calendar.css",
] + glob(["**/*.html"]),
deps = [
"//src/lib/core",
"//src/lib/button",
"//src/lib/dialog",
"//src/lib/input",
"@angular//packages/animations",
"@angular//packages/common",
"@angular//packages/core",
"@angular//packages/forms",
"@rxjs",
"@rxjs//operators",
"//src/cdk/a11y",
"//src/cdk/bidi",
"//src/cdk/coercion",
"//src/cdk/keycodes",
"//src/cdk/portal",
"//src/cdk/overlay",
"//src/cdk/portal",
"//src/lib/button",
"//src/lib/core",
"//src/lib/dialog",
"//src/lib/form-field",
"//src/lib/input",
],
tsconfig = "//src/lib:tsconfig-build.json",
)

# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
Expand Down
Loading