Skip to content

Commit 6fae3bf

Browse files
devversionjosephperrott
authored andcommitted
build: build material with angular from source (#13655)
1 parent 7b6e90e commit 6fae3bf

File tree

47 files changed

+308
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+308
-187
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- *copy_bazel_config
8484

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

8989
- *save_cache

src/BUILD.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
package(default_visibility = ["//visibility:public"])
22

3+
load("//tools:defaults.bzl", "ts_library")
4+
35
exports_files([
46
"bazel-tsconfig-build.json",
57
"bazel-tsconfig-test.json",
68
])
9+
10+
ts_library(
11+
name = 'module-typings',
12+
srcs = [":module-typings.d.ts"]
13+
)

src/cdk/drag-drop/tsconfig-build.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"extends": "../tsconfig-build",
33
"files": [
4-
"public-api.ts",
5-
"./typings.d.ts"
4+
"public-api.ts"
65
],
76
"angularCompilerOptions": {
87
"annotateForClosureCompiler": true,

src/cdk/drag-drop/typings.d.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/cdk/scrolling/tsconfig-build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "../tsconfig-build",
33
"files": [
44
"public-api.ts",
5-
"./typings.d.ts"
5+
"../typings.d.ts"
66
],
77
"angularCompilerOptions": {
88
"annotateForClosureCompiler": true,

src/cdk/scrolling/typings.d.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/cdk/stepper/typings.d.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/cdk/table/typings.d.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/cdk/tree/typings.d.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/lib/BUILD.bazel

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
package(default_visibility=["//visibility:public"])
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
3-
load("@angular//:index.bzl", "ng_package", "ng_module")
2+
3+
load("@angular//:index.bzl", "ng_package")
44
load("//tools:sass_bundle.bzl", "sass_bundle")
55
load("//:packages.bzl", "MATERIAL_PACKAGES", "MATERIAL_TARGETS", "ROLLUP_GLOBALS",
66
"VERSION_PLACEHOLDER_REPLACEMENTS")
7-
8-
9-
# Export the root material tsconfig so that subpackages can reference it directly.
10-
exports_files(["tsconfig-build.json"])
7+
load("//tools:defaults.bzl", "ng_module")
118

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

2117
sass_bundle(

0 commit comments

Comments
 (0)