Skip to content

Commit e085664

Browse files
devversionandrewseguin
authored andcommitted
build: enable sourcemaps for bazel (#13471)
* Since the NodeJS rules execute built code in a sandbox, we need to enable source map support. This is recommended by the `Bazel NodeJS` rules. * Also introduces support for repository-wide defaults. This will be helpful when fully switching to Bazel.
1 parent 4ada0c4 commit e085664

File tree

5 files changed

+23
-8
lines changed

5 files changed

+23
-8
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
"scss-bundle": "^2.0.1-beta.7",
130130
"selenium-webdriver": "^3.6.0",
131131
"sorcery": "^0.10.0",
132+
"source-map-support": "^0.5.9",
132133
"stylelint": "^9.5.0",
133134
"ts-node": "^3.0.4",
134135
"tsconfig-paths": "^2.3.0",

src/cdk/schematics/BUILD.bazel

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package(default_visibility = ["//visibility:public"])
22

33
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
4-
load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package", "jasmine_node_test")
4+
load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
55
load("//:packages.bzl", "VERSION_PLACEHOLDER_REPLACEMENTS")
6+
load("//tools:defaults.bzl", "jasmine_node_test")
67

78
# TODO(devversion): remove when https://github.com/bazelbuild/rules_nodejs/issues/352 is fixed
89
exports_files(["#bazel_workaround.txt"])
@@ -20,11 +21,10 @@ ts_library(
2021
deps = [
2122
"@npm//:@schematics/angular",
2223
"@npm//:@angular-devkit/schematics",
23-
# TODO(devversion): Only include jasmine for test sources.
24+
# TODO(devversion): Only include jasmine for test sources (See: tsconfig types).
2425
"@npm//:@types/jasmine",
2526
"@npm//:@types/node",
2627
"@npm//:glob",
27-
"@npm//:jasmine",
2828
"@npm//:parse5",
2929
"@npm//:rxjs",
3030
"@npm//:tslint",
@@ -46,7 +46,6 @@ jasmine_node_test(
4646
name = "unit_tests",
4747
srcs = [":schematics_test_sources"],
4848
data = [":schematics_assets"],
49-
deps = ["@npm//:jasmine"],
5049
)
5150

5251
ts_library(

src/lib/schematics/BUILD.bazel

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

33
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
4-
load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package", "jasmine_node_test")
4+
load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
55
load("//:packages.bzl", "VERSION_PLACEHOLDER_REPLACEMENTS")
6+
load("//tools:defaults.bzl", "jasmine_node_test")
67

78
filegroup(
89
name = "schematics_assets",
@@ -21,7 +22,7 @@ ts_library(
2122
"//src/cdk/schematics",
2223
"@npm//:@angular-devkit/schematics",
2324
"@npm//:@schematics/angular",
24-
# TODO(devversion): Only include jasmine for test sources.
25+
# TODO(devversion): Only include jasmine for test sources (See: tsconfig types).
2526
"@npm//:@types/jasmine",
2627
"@npm//:@types/node",
2728
"@npm//:parse5",
@@ -45,7 +46,6 @@ jasmine_node_test(
4546
name = "unit_tests",
4647
srcs = [":schematics_test_sources"],
4748
data = [":node_loader_workaround", ":schematics_assets", ":schematics_test_cases"],
48-
deps = ["@npm//:jasmine"]
4949
)
5050

5151
ts_library(

tools/defaults.bzl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Re-export of Bazel rules with repository-wide defaults
2+
3+
load("@build_bazel_rules_nodejs//:defs.bzl", _jasmine_node_test = "jasmine_node_test")
4+
5+
def jasmine_node_test(deps = [], **kwargs):
6+
local_deps = [
7+
# Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/344
8+
"@npm//:jasmine",
9+
"@npm//:source-map-support",
10+
] + deps
11+
12+
_jasmine_node_test(
13+
deps = local_deps,
14+
**kwargs
15+
)

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9720,7 +9720,7 @@ source-map-resolve@^0.5.0:
97209720
source-map-url "^0.4.0"
97219721
urix "^0.1.0"
97229722

9723-
[email protected], source-map-support@^0.5.0:
9723+
[email protected], source-map-support@^0.5.0, source-map-support@^0.5.9:
97249724
version "0.5.9"
97259725
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
97269726
integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==

0 commit comments

Comments
 (0)