Skip to content

Commit

Permalink
remove spurious changes
Browse files Browse the repository at this point in the history
  • Loading branch information
danjuv committed Nov 27, 2019
1 parent 8e85d90 commit 6a85fe3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion internal/node/node.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ def _nodejs_binary_impl(ctx):
node_tool_files.append(ctx.outputs.templated_args_file)

is_builtin = ctx.attr._node.label.workspace_name in ["nodejs_%s" % p for p in BUILT_IN_NODE_PLATFORMS]

output_files = [ctx.outputs.loader]
if ctx.file.pnp_file:
templated_args.append("--pnp")
Expand Down Expand Up @@ -261,7 +262,7 @@ def _nodejs_binary_impl(ctx):

# entry point is only needed in runfiles if it is a .js file
if ctx.file.entry_point.extension == "js":
runfiles = depset([ctx.file.entry_point], transitive = [runfiles])
runfiles = depset([ctx.file.entry_point], transitive = [runfiles])

return [
DefaultInfo(
Expand Down
6 changes: 3 additions & 3 deletions internal/npm_install/npm_install.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ load("//internal/common:check_bazel_version.bzl", "check_bazel_version")
load("//internal/common:os_name.bzl", "is_windows_os")
load("//internal/node:node_labels.bzl", "get_node_label", "get_npm_label", "get_yarn_label")
load("//third_party/github.com/bazel_json/lib:json_parser.bzl", "json_parse")

COMMON_ATTRIBUTES = dict(dict(), **{
"always_hide_bazel_files": attr.bool(
doc = """Always hide Bazel build files such as `BUILD` and BUILD.bazel` by prefixing them with `_`.
Expand Down Expand Up @@ -180,7 +181,7 @@ def _add_scripts(repository_ctx):
repository_ctx.path(Label("//internal/npm_install:pre_process_package_json.js")),
{},
)
repository_ctx.template(
repository_ctx.template(
"generate_build_file.js",
repository_ctx.path(Label("//internal/npm_install:generate_build_file.js")),
{},
Expand Down Expand Up @@ -375,7 +376,6 @@ def _yarn_install_impl(repository_ctx):
_add_data_dependencies(repository_ctx)

_add_scripts(repository_ctx)

args = [
repository_ctx.path(yarn),
"--cwd",
Expand Down Expand Up @@ -457,4 +457,4 @@ cache_directory.
}),
doc = "Runs yarn install during workspace setup.",
implementation = _yarn_install_impl,
)
)

0 comments on commit 6a85fe3

Please sign in to comment.