Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ tasks:
- "//internal/npm_install/test:index"
# Disabled due to https://github.com/bazelbuild/rules_nodejs/issues/1486
#- "@fine_grained_deps_yarn//typescript/bin:tsc"
- "@bazel_workspace_a//:bin"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my only concern is that these tests might be giving us coverage for something. Maybe we can update them to not rely on install_bazel_dependencies? ppl should still be able to ship npm packages that include bazel rules

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I patched the change locally to try that out and understand it better. These nested workspaces are specifically testing the package.json bazelWorkspaces install-as-separate-repository feature that's being removed here, so I think what you have is correct ;)

- "@bazel_workspace_a//subdir:bin"
- "@bazel_workspace_b//:bin"
- "@bazel_workspace_b//subdir:bin"
build_targets:
- "//..."
build_flags:
Expand Down Expand Up @@ -118,10 +114,6 @@ tasks:
- "//internal/npm_install/test:index"
# Disabled due to https://github.com/bazelbuild/rules_nodejs/issues/1486
#- "@fine_grained_deps_yarn//typescript/bin:tsc"
- "@bazel_workspace_a//:bin"
- "@bazel_workspace_a//subdir:bin"
- "@bazel_workspace_b//:bin"
- "@bazel_workspace_b//subdir:bin"
build_targets:
- "//..."
build_flags:
Expand Down Expand Up @@ -277,10 +269,6 @@ tasks:
- "//internal/npm_install/test:index"
# Disabled due to https://github.com/bazelbuild/rules_nodejs/issues/1486
#- "@fine_grained_deps_yarn//typescript/bin:tsc"
- "@bazel_workspace_a//:bin"
- "@bazel_workspace_a//subdir:bin"
- "@bazel_workspace_b//:bin"
- "@bazel_workspace_b//subdir:bin"
build_targets:
- "//..."
test_flags:
Expand Down Expand Up @@ -387,10 +375,6 @@ tasks:
- "//internal/npm_install/test:index"
# Disabled due to https://github.com/bazelbuild/rules_nodejs/issues/1486
#- "@fine_grained_deps_yarn//typescript/bin:tsc"
- "@bazel_workspace_a//:bin"
- "@bazel_workspace_a//subdir:bin"
- "@bazel_workspace_b//:bin"
- "@bazel_workspace_b//subdir:bin"
build_flags:
- "--build_tag_filters=-e2e,-examples,-fix-windows,-manual"
build_targets:
Expand Down
8 changes: 0 additions & 8 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,6 @@ yarn_install(
yarn_lock = "//packages/cypress/test:yarn.lock",
)

# Install all Bazel dependencies needed for integration test
# tools/npm_packages/bazel_workspaces
# (tested on CI and in the scripts/test_all.sh)
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")

install_bazel_dependencies(suppress_warning = True)

# We have a source dependency on build_bazel_rules_typescript
# so we must repeat its transitive toolchain deps
load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dev_dependencies")
Expand Down Expand Up @@ -250,7 +243,6 @@ filegroup(
name = "golden_files",
srcs = [
"//:BUILD.bazel",
"//:install_bazel_dependencies.bzl",
"//:manual_build_file_contents",
"//:WORKSPACE",
"//@angular/core:BUILD.bazel",
Expand Down
1 change: 0 additions & 1 deletion docs/repositories.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/repositories.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Commonly used ones are:
- If you had a dependency on the `foo` package, you can reference `@npm//foo` to get all the files. We mirror the npm dependency graph, so if `foo` declares a dependency on another package `dep`, Bazel will include that dependency when `foo` is used.
- If the `foo` package has an executable program `bar`, then `@npm//foo/bin:bar` is a `nodejs_binary` that you can call with `bazel run` or can pass as the `executable` to your own rules.
- Sometimes you need a UMD bundle, but a package doesn't ship one. For example, the `concatjs_devserver` rule depends on third-party libraries having a named UMD entry point. The `@npm//foo:foo__umd` target will automatically run Browserify to convert the package's `main` entry into UMD.
- DEPRECATED: A helper to install npm packages into their own Bazel repository: `@npm//:install_bazel_dependencies.bzl` provides a `install_bazel_dependencies` function. Some npm packages ship custom bazel rules, for example, the `@angular/bazel` package provides rules which you should load from `@npm_angular_bazel//:index.bzl`. However this causes the build to always fetch npm packages even when not needed, so we plan to remove this in a future release.

> One convenient (maybe also confusing) way to understand what BUILD files are generated is to look at our integration test at https://github.com/bazelbuild/rules_nodejs/tree/stable/internal/npm_install/test/golden - this directory looks similar to the content of an `@npm` repository.

Expand Down
7 changes: 0 additions & 7 deletions examples/angular_view_engine/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,6 @@ yarn_install(
yarn_lock = "//:yarn.lock",
)

# Install the @angular/bazel package into @npm_angular_bazel
# Note, this will probably break in a future rules_nodejs release.
# It causes all builds to fetch npm packages even if not needed (eg. only building go code)
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")

install_bazel_dependencies(suppress_warning = True)

# Load @bazel/protractor dependencies
load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")

Expand Down
Loading