Skip to content

Commit 1784819

Browse files
committed
Use fine grained dependencies
1 parent 6204989 commit 1784819

File tree

7 files changed

+762
-449
lines changed

7 files changed

+762
-449
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ jobs:
4848
- restore_cache:
4949
key: *cache_key
5050

51-
- run: bazel run @nodejs//:npm install
52-
# TODO(jelbourn): Update this command to run all tests if the Bazel issues have been fixed.
51+
# TODO(jelbourn): Update this command to run all tests if the Bazel issues have been fixed.
5352
- run: bazel test src/{cdk,lib}/schematics:unit_tests
5453

5554
- save_cache:

BUILD.bazel

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@ filegroup(
1212
"@schematics",
1313
"@types",
1414
"bytebuffer",
15-
"chalk",
16-
"fs-extra",
17-
"glob",
1815
"hammerjs",
1916
"jasmine",
2017
"minimist",
2118
"moment",
22-
"mock-fs",
2319
"parse5",
2420
"protobufjs",
2521
"protractor",
@@ -28,7 +24,6 @@ filegroup(
2824
"tsickle",
2925
"tslib",
3026
"tslint",
31-
"tsutils",
3227
"typescript",
3328
"zone.js",
3429
] for ext in [

WORKSPACE

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ workspace(name = "angular_material")
33
# Add TypeScript rules
44
http_archive(
55
name = "build_bazel_rules_typescript",
6-
url = "https://github.com/bazelbuild/rules_typescript/archive/0.17.0.zip",
7-
strip_prefix = "rules_typescript-0.17.0",
8-
sha256 = "1626ee2cc9770af6950bfc77dffa027f9aedf330fe2ea2ee7e504428927bd95d",
6+
url = "https://github.com/bazelbuild/rules_typescript/archive/0.18.0.zip",
7+
strip_prefix = "rules_typescript-0.18.0",
8+
sha256 = "4726e07a2f8d23b5e3af166f3b2a6e8aa75adad94b35ab4d959e8fe875f90272",
99
)
1010

1111
# Fetch transient dependencies of the TypeScript bazel rules.
@@ -25,14 +25,18 @@ sass_repositories()
2525

2626
# NOTE: this rule installs nodejs, npm, and yarn, but does NOT install
2727
# your npm dependencies. You must still run the package manager.
28-
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
28+
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories",
29+
"npm_install")
2930

3031
check_bazel_version("0.15.0")
31-
node_repositories(
32-
package_json = ["//:package.json"],
33-
# Disabled until we use fine-grained dependencies. This was previously disabled but is now
34-
# enabled by default.
35-
preserve_symlinks = False,
32+
node_repositories()
33+
34+
# Use Bazel managed node modules. See more below:
35+
# https://github.com/bazelbuild/rules_nodejs#bazel-managed-vs-self-managed-dependencies
36+
npm_install(
37+
name = "npm",
38+
package_json = "//:package.json",
39+
package_lock_json = "//:package-lock.json",
3640
)
3741

3842
# Setup TypeScript Bazel workspace

0 commit comments

Comments
 (0)