Skip to content

Commit 759804d

Browse files
committed
Use fine grained dependencies
1 parent 6204989 commit 759804d

File tree

7 files changed

+767
-483
lines changed

7 files changed

+767
-483
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: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,9 @@ package(default_visibility = ["//visibility:public"])
44

55
# TODO: Replace with fine-grained node_modules using `npm_install` / `yarn_install`.
66
# TODO: See https://github.com/bazelbuild/rules_nodejs/wiki#migrating-to-rules_nodejs-013
7-
filegroup(
7+
alias(
88
name = "node_modules",
9-
srcs = glob(["/".join(["node_modules", pkg, "**", ext]) for pkg in [
10-
"@angular",
11-
"@angular-devkit",
12-
"@schematics",
13-
"@types",
14-
"bytebuffer",
15-
"chalk",
16-
"fs-extra",
17-
"glob",
18-
"hammerjs",
19-
"jasmine",
20-
"minimist",
21-
"moment",
22-
"mock-fs",
23-
"parse5",
24-
"protobufjs",
25-
"protractor",
26-
"reflect-metadata",
27-
"rxjs",
28-
"tsickle",
29-
"tslib",
30-
"tslint",
31-
"tsutils",
32-
"typescript",
33-
"zone.js",
34-
] for ext in [
35-
"*.js",
36-
"*.json",
37-
"*.d.ts",
38-
]] + [
39-
"node_modules/http-server/**",
40-
# Reference all files of the "@schematics/angular" package because the schematic
41-
# tests depend on the template files of the angular schematics.
42-
"node_modules/@schematics/angular/**",
43-
]),
9+
actual = "@npm//:node_modules",
4410
)
4511

4612
# Glob pattern that matches all Angular testing bundles.

WORKSPACE

Lines changed: 16 additions & 12 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.
@@ -15,24 +15,28 @@ rules_typescript_dependencies()
1515
# Add sass rules
1616
http_archive(
1717
name = "io_bazel_rules_sass",
18-
url = "https://github.com/bazelbuild/rules_sass/archive/0.1.0.zip",
19-
strip_prefix = "rules_sass-0.1.0",
20-
sha256 = "b243c4d64f054c174051785862ab079050d90b37a1cef7da93821c6981cb9ad4",
18+
url = "https://github.com/bazelbuild/rules_sass/archive/1.13.4.zip",
19+
strip_prefix = "rules_sass-1.13.4",
20+
sha256 = "5ddde0d3df96978fa537f76e766538c031dee4d29f91a895f4b1345b5e3f9b16",
2121
)
2222

2323
load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
2424
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)