Skip to content

Commit 72f19e7

Browse files
gregmagolanalexeagle
gregmagolan
authored and
alexeagle
committed
refactor: remove install_source_map_support from nodejs_binary since it is vendored in
BREAKING CHANGE: `install_source_map_support` attribute removed from `nodejs_binary`. `source-map-support` is vendored in at `/third_party/github.com/source-map-support` so it can always be installed.
1 parent 88740e7 commit 72f19e7

16 files changed

Lines changed: 10 additions & 43 deletions

File tree

‎examples/angular/tools/angular_prerender.bzl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ def ng_prerender(name, index, prerender_roots = [], **kwargs):
4545
"@npm//domino",
4646
"@npm//reflect-metadata",
4747
],
48-
install_source_map_support = False,
4948
entry_point = "//src:prerender.ts",
5049
)
5150

‎internal/bazel_integration_test/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ nodejs_binary(
2222
configuration_env_vars = ["BAZEL_INTEGRATION_TEST_DEBUG"],
2323
data = ["@npm//tmp"],
2424
entry_point = ":test_runner.js",
25-
# reduce memory usage by disabling source_map_support
26-
install_source_map_support = False,
2725
templated_args = ["--node_options=--max-old-space-size=1024"],
2826
)
2927

‎internal/node/node.bzl‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ def _write_require_patch_script(ctx, node_modules_root):
9797
substitutions = {
9898
"TEMPLATED_bin_dir": ctx.bin_dir.path,
9999
"TEMPLATED_gen_dir": ctx.genfiles_dir.path,
100-
"TEMPLATED_install_source_map_support": str(ctx.attr.install_source_map_support).lower(),
101100
"TEMPLATED_module_roots": "\n " + ",\n ".join(module_mappings),
102101
"TEMPLATED_node_modules_root": node_modules_root,
103102
"TEMPLATED_target": str(ctx.label),
@@ -411,12 +410,6 @@ nodejs_binary(
411410
mandatory = True,
412411
allow_single_file = True,
413412
),
414-
"install_source_map_support": attr.bool(
415-
doc = """Install the source-map-support package.
416-
Enable this to get stack traces that point to original sources, e.g. if the program was written
417-
in TypeScript.""",
418-
default = True,
419-
),
420413
"node_modules": attr.label(
421414
doc = """The npm packages which should be available to `require()` during
422415
execution.

‎internal/node/require_patch.js‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ const USER_WORKSPACE_NAME = 'TEMPLATED_user_workspace_name';
5252
const NODE_MODULES_ROOT = 'TEMPLATED_node_modules_root';
5353
const BIN_DIR = 'TEMPLATED_bin_dir';
5454
const GEN_DIR = 'TEMPLATED_gen_dir';
55-
const INSTALL_SOURCE_MAP_SUPPORT = TEMPLATED_install_source_map_support;
5655
const TARGET = 'TEMPLATED_target';
5756

5857
log_verbose(`patching require for ${TARGET}
@@ -61,7 +60,6 @@ log_verbose(`patching require for ${TARGET}
6160
TARGET: ${TARGET}
6261
BIN_DIR: ${BIN_DIR}
6362
GEN_DIR: ${GEN_DIR}
64-
INSTALL_SOURCE_MAP_SUPPORT: ${INSTALL_SOURCE_MAP_SUPPORT}
6563
MODULE_ROOTS: ${JSON.stringify(MODULE_ROOTS, undefined, 2)}
6664
NODE_MODULES_ROOT: ${NODE_MODULES_ROOT}
6765
USER_WORKSPACE_NAME: ${USER_WORKSPACE_NAME}
@@ -490,14 +488,11 @@ module.constructor._resolveFilename =
490488

491489
// Before loading anything that might print a stack, install the
492490
// source-map-support.
493-
if (INSTALL_SOURCE_MAP_SUPPORT) {
494-
try {
495-
const sourcemap_support_package = path.resolve(
496-
process.cwd(), '../build_bazel_rules_nodejs/third_party/github.com/source-map-support');
497-
require(sourcemap_support_package).install();
498-
} catch (_) {
499-
log_verbose(`WARNING: source-map-support module not installed.
500-
Stack traces from languages like TypeScript will point to generated .js files.
501-
Set install_source_map_support = False in ${TARGET} to turn off this warning.`);
502-
}
491+
try {
492+
const sourcemap_support_package = path.resolve(
493+
process.cwd(), '../build_bazel_rules_nodejs/third_party/github.com/source-map-support');
494+
require(sourcemap_support_package).install();
495+
} catch (_) {
496+
log_verbose(`WARNING: source-map-support module not installed.
497+
Stack traces from languages like TypeScript will point to generated .js files.`);
503498
}

‎internal/npm_install/BUILD.bazel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
55
# avoid leaking a ts dependency
66
load("//packages/typescript:checked_in_ts_project.bzl", "checked_in_ts_project")
77

8-
# using checked in ts library like the linker
8+
# Using checked in ts library like the linker
9+
# To update index.js run:
10+
# bazel run //internal/npm_install:compile_generate_build_file_check_compiled.accept
911
checked_in_ts_project(
1012
name = "compile_generate_build_file",
1113
src = "generate_build_file.ts",
@@ -54,6 +56,5 @@ nodejs_binary(
5456
"//third_party/npm/node_modules/named-amd",
5557
],
5658
entry_point = ":browserify-wrapped.js",
57-
install_source_map_support = False,
5859
visibility = ["//visibility:public"],
5960
)

‎internal/npm_install/generate_build_file.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,6 @@ export function printPackageBin(pkg: Dep) {
10711071
nodejs_binary(
10721072
name = "${name}",
10731073
entry_point = "//:node_modules/${pkg._dir}/${path}",
1074-
install_source_map_support = False,
10751074
data = [${data.map(p => `"${p}"`).join(', ')}],
10761075
templated_args = ["--nobazel_patch_module_resolver"],${additionalAttributes(pkg, name)}
10771076
)
@@ -1107,7 +1106,6 @@ def ${name.replace(/-/g, '_')}(**kwargs):
11071106
else:
11081107
nodejs_binary(
11091108
entry_point = "@${WORKSPACE}//:node_modules/${pkg._dir}/${path}",
1110-
install_source_map_support = False,
11111109
data = [${data.map(p => `"${p}"`).join(', ')}] + kwargs.pop("data", []),
11121110
templated_args = ["--nobazel_patch_module_resolver"] + kwargs.pop("templated_args", []),${
11131111
additionalAttributes(pkg, name)}
@@ -1118,7 +1116,6 @@ def ${name.replace(/-/g, '_')}(**kwargs):
11181116
def ${name.replace(/-/g, '_')}_test(**kwargs):
11191117
nodejs_test(
11201118
entry_point = "@${WORKSPACE}//:node_modules/${pkg._dir}/${path}",
1121-
install_source_map_support = False,
11221119
data = [${data.map(p => `"${p}"`).join(', ')}] + kwargs.pop("data", []),
11231120
templated_args = ["--nobazel_patch_module_resolver"] + kwargs.pop("templated_args", []),${
11241121
additionalAttributes(pkg, name)}

‎internal/npm_install/index.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,6 @@ function printPackageBin(pkg) {
656656
nodejs_binary(
657657
name = "${name}",
658658
entry_point = "//:node_modules/${pkg._dir}/${path}",
659-
install_source_map_support = False,
660659
data = [${data.map(p => `"${p}"`).join(', ')}],
661660
templated_args = ["--nobazel_patch_module_resolver"],${additionalAttributes(pkg, name)}
662661
)
@@ -689,7 +688,6 @@ def ${name.replace(/-/g, '_')}(**kwargs):
689688
else:
690689
nodejs_binary(
691690
entry_point = "@${WORKSPACE}//:node_modules/${pkg._dir}/${path}",
692-
install_source_map_support = False,
693691
data = [${data.map(p => `"${p}"`).join(', ')}] + kwargs.pop("data", []),
694692
templated_args = ["--nobazel_patch_module_resolver"] + kwargs.pop("templated_args", []),${additionalAttributes(pkg, name)}
695693
**kwargs
@@ -699,7 +697,6 @@ def ${name.replace(/-/g, '_')}(**kwargs):
699697
def ${name.replace(/-/g, '_')}_test(**kwargs):
700698
nodejs_test(
701699
entry_point = "@${WORKSPACE}//:node_modules/${pkg._dir}/${path}",
702-
install_source_map_support = False,
703700
data = [${data.map(p => `"${p}"`).join(', ')}] + kwargs.pop("data", []),
704701
templated_args = ["--nobazel_patch_module_resolver"] + kwargs.pop("templated_args", []),${additionalAttributes(pkg, name)}
705702
**kwargs

‎internal/npm_install/test/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ nodejs_binary(
3030
"@npm//unidiff",
3131
],
3232
entry_point = ":update_golden.js",
33-
install_source_map_support = False,
3433
)
3534

3635
npm_umd_bundle(

‎internal/npm_install/test/golden/@gregmagolan/test-a/bin/BUILD.bazel.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
44
nodejs_binary(
55
name = "test",
66
entry_point = "//:node_modules/@gregmagolan/test-a/@bin/test.js",
7-
install_source_map_support = False,
87
data = ["//@gregmagolan/test-a:test-a"],
98
templated_args = ["--nobazel_patch_module_resolver"],
109
)

‎internal/npm_install/test/golden/@gregmagolan/test-a/index.bzl.golden‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ def test(**kwargs):
66
else:
77
nodejs_binary(
88
entry_point = "@fine_grained_goldens//:node_modules/@gregmagolan/test-a/@bin/test.js",
9-
install_source_map_support = False,
109
data = ["@fine_grained_goldens//@gregmagolan/test-a:test-a"] + kwargs.pop("data", []),
1110
templated_args = ["--nobazel_patch_module_resolver"] + kwargs.pop("templated_args", []),
1211
**kwargs
1312
)
1413
def test_test(**kwargs):
1514
nodejs_test(
1615
entry_point = "@fine_grained_goldens//:node_modules/@gregmagolan/test-a/@bin/test.js",
17-
install_source_map_support = False,
1816
data = ["@fine_grained_goldens//@gregmagolan/test-a:test-a"] + kwargs.pop("data", []),
1917
templated_args = ["--nobazel_patch_module_resolver"] + kwargs.pop("templated_args", []),
2018
**kwargs

0 commit comments

Comments
 (0)