8000 build: upgrade angular build, integration/bazel and @angular/bazel pa… · angular/angular@7628c36 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7628c36

Browse files
gregmagolanatscott
gregmagolan
authored and
atscott
committed
build: upgrade angular build, integration/bazel and @angular/bazel package to rule_nodejs 2.2.0 (#39182)
Updates to rules_nodejs 2.2.0. This is the first major release in 7 months and includes a number of features as well as breaking changes. Release notes: https://github.com/bazelbuild/rules_nodejs/releases/tag/2.0.0 Features of note for angular/angular: * stdout/stderr/exit code capture; this could be potentially be useful * TypeScript (ts_project); a simpler tsc rule that ts_library that can be used in the repo where ts_library is too heavy weight Breaking changes of note for angular/angular: * loading custom rules from npm packages: `ts_library` is no longer loaded from `@npm_bazel_typescript//:index.bzl` (which no longer exists) but is now loaded from `@npm//@bazel/typescript:index.bzl` * with the loading changes above, `load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")` is no longer needed in the WORKSPACE which also means that yarn_install does not need to run unless building/testing a target that depends on @npm. In angular/angular this is a minor improvement as almost everything depends on @npm. * @angular/bazel package is also updated in this PR to support the new load location; Angular + Bazel users that require it for ng_package (ng_module is no longer needed in OSS with Angular 10) will need to load from `@npm//@angular/bazel:index.bzl`. I investigated if it was possible to maintain backward compatability for the old load location `@npm_angular_bazel` but it is not since the package itself needs to be updated to load from `@npm//@bazel/typescript:index.bzl` instead of `@npm_bazel_typescript//:index.bzl` as it depends on ts_library internals for ng_module. * runfiles.resolve will now throw instead of returning undefined to match behavior of node require Other changes in angular/angular: * integration/bazel has been updated to use both ng_module and ts_libary with use_angular_plugin=true. The latter is the recommended way for rules_nodejs users to compile Angular 10 with Ivy. Bazel + Angular ViewEngine is supported with @angular/bazel <= 9.0.5 and Angular <= 8. There is still Angular ViewEngine example on rules_nodejs https://github.com/bazelbuild/rules_nodejs/tree/stable/examples/angular_view_engine on these older versions but users that want to update to Angular 10 and are on Bazel must switch to Ivy and at that point ts_library with use_angular_plugin=true is more performant that ng_module. Angular example in rules_nodejs is configured this way as well: https://github.com/bazelbuild/rules_nodejs/tree/stable/examples/angular. As an aside, we also have an example of building Angular 10 with architect() rule directly instead of using ts_library with angular plugin: https://github.com/bazelbuild/rules_nodejs/tree/stable/examples/angular_bazel_architect. NB: ng_module is still required for angular/angular repository as it still builds ViewEngine & @angular/bazel also provides the ng_package rule. ng_module can be removed in the future if ViewEngine is no longer needed in angular repo. * JSModuleInfo provider added to ng_module. this is for forward compat for future rules_nodejs versions. PR Close #39182
1 parent b417dd7 commit 7628c36

File tree

63 files changed

+833
-536
lines changed
  • ngc-wrapped
  • test/ngc-wrapped
  • third_party/github.com/bazelbuild/bazel/src/main/protobuf
  • compiler-cli
  • core/test/strict_types
  • localize
  • zone.js
  • tools
  • yarn.lock

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    63 files changed

    +833
    -536
    lines changed

    ‎.bazelrc

    +2-2
    Original file line numberDiff line numberDiff line change
    @@ -74,8 +74,8 @@ test --test_output=errors
    7474
    # Trick bazel into treating BUILD files under integration/bazel as being regular files
    7575
    # This lets us glob() up all the files inside this integration test to make them inputs to tests
    7676
    # (Note, we cannot use common --deleted_packages because the bazel version command doesn't support it)
    77-
    build --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/test/e2e
    78-
    query --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/test/e2e
    77+
    build --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/tools,integration/bazel/test/e2e
    78+
    query --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/tools,integration/bazel/test/e2e
    7979

    8080
    ################################
    8181
    # Temporary Settings for Ivy #

    ‎.circleci/config.yml

    +10-3
    Original file line numberDiff line numberDiff line change
    @@ -858,9 +858,16 @@ workflows:
    858858
    - build-npm-packages
    859859
    - build-ivy-npm-packages
    860860
    - legacy-unit-tests-saucelabs
    861-
    - components-repo-unit-tests:
    862-
    requires:
    863-
    - build-npm-packages
    861+
    # Temporarily disabled components-repo-unit-tests to update rules_nodejs to 2.0.0. Breaking changes in
    862+
    # rules_nodejs create a dependency sandwich between angular/angular & angular/components that are very
    863+
    # difficult and time consuming to resolve and involve patching @angular/bazel in components repo such
    864+
    # as https://github.com/angular/components/commit/9e7ba251207df77164d73d66620e619bcbc4d2ad. It is simpler to
    865+
    # 1) land angular/angular upgrade to rule_nodejs 2.0.0 which has breaking changes
    866+
    # 2) land angular/components upgrade to rules_nodejs 2.0.0 using the @angular/bazel builds snapshot
    867+
    # 3) update angular/angular to the landed components commit and re-enable these tests
    868+
    # - components-repo-unit-tests:
    869+
    # requires:
    870+
    # - build-npm-packages
    864871
    - test_zonejs:
    865872
    requires:
    866873
    - setup

    ‎BUILD.bazel

    +6
    Original file line numberDiff line numberDiff line change
    @@ -47,3 +47,9 @@ filegroup(
    4747
    "@npm//:node_modules/angular-mocks-1.6/angular-mocks.js",
    4848
    ],
    4949
    )
    50+
    51+
    # Detect if the build is running under --stamp
    52+
    config_setting(
    53+
    name = "stamp",
    54+
    values = {"stamp": "true"},
    55+
    )

    ‎WORKSPACE

    +5-15
    Original file line numberDiff line numberDiff line change
    @@ -8,16 +8,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
    88
    # Fetch rules_nodejs so we can install our npm dependencies
    99
    http_archive(
    1010
    name = "build_bazel_rules_nodejs",
    11-
    sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
    12-
    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
    11+
    sha256 = "4952ef879704ab4ad6729a29007e7094aef213ea79e9f2e94cbe1c9a753e63ef",
    12+
    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.0/rules_nodejs-2.2.0.tar.gz"],
    1313
    )
    1414

    1515
    # Check the rules_nodejs version and download npm dependencies
    1616
    # Note: bazel (version 2 and after) will check the .bazelversion file so we don't need to
    1717
    # assert on that.
    1818
    load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
    1919

    20-
    check_rules_nodejs_version(minimum_version_string = "1.7.0")
    20+
    check_rules_nodejs_version(minimum_version_string = "2.2.0")
    2121

    2222
    # Setup the Node.js toolchain
    2323
    node_repositories(
    @@ -39,23 +39,18 @@ yarn_install(
    3939
    yarn_lock = "//:yarn.lock",
    4040
    )
    4141

    42-
    # Install all bazel dependencies of the @npm npm packages
    43-
    load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
    44-
    45-
    install_bazel_dependencies()
    46-
    4742
    # Load angular dependencies
    4843
    load("//packages/bazel:package.bzl", "rules_angular_dev_dependencies")
    4944

    5045
    rules_angular_dev_dependencies()
    5146

    5247
    # Load protractor dependencies
    53-
    load("@npm_bazel_protractor//:package.bzl", "npm_bazel_protractor_dependencies")
    48+
    load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
    5449

    5550
    npm_bazel_protractor_dependencies()
    5651

    5752
    # Load karma dependencies
    58-
    load("@npm_bazel_karma//:package.bzl", "npm_bazel_karma_dependencies")
    53+
    load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies")
    5954

    6055
    npm_bazel_karma_dependencies()
    6156

    @@ -68,11 +63,6 @@ load("//dev-infra/browsers:browser_repositories.bzl", "browser_repositories")
    6863

    6964
    browser_repositories()
    7065

    71-
    # Setup the rules_typescript tooolchain
    72-
    load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
    73-
    74-
    ts_setup_workspace()
    75-
    7666
    # Setup the rules_sass toolchain
    7767
    load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
    7868

    ‎dev-infra/BUILD.bazel

    +3-3
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
    2-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    2+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    33

    44
    ts_library(
    55
    name = "cli",
    @@ -49,15 +49,15 @@ pkg_npm(
    4949
    # substitutions to replace these in the published version of dev-infra.
    5050
    "//dev-infra/": "@npm_angular_dev_infra_private//",
    5151
    "//packages/benchpress": "@npm//@angular/benchpress",
    52-
    "//packages/bazel/": "@npm_angular_bazel//",
    52+
    "//packages/bazel": "@npm//@angular/bazel",
    5353
    "//packages/zone.js/bundles:zone.umd.js": "@npm//:node_modules/zone.js/dist/zone.js",
    5454
    "//packages/core": "@npm//@angular/core",
    5555
    "//packages/platform-browser": "@npm//@angular/platform-browser",
    5656

    5757
    # This substitution is particularly verbose because we need to make sure
    5858
    # that only things available via Angular Bazel are imported from
    5959
    # tools/defaults.bzl.
    60-
    "load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm_angular_bazel//:index.bzl\", \"ng_module\")",
    60+
    "load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm//@angular/bazel:index.bzl\", \"ng_module\")",
    6161
    },
    6262
    visibility = ["//visibility:public"],
    6363
    deps = [

    ‎dev-infra/benchmark/component_benchmark/benchmark_test.bzl

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_protractor//:index.bzl", "protractor_web_test_suite")
    1+
    load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite")
    22

    33
    """
    44
    Macro that can be used to define a benchmark test. This differentiates from

    ‎dev-infra/benchmark/component_benchmark/component_benchmark.bzl

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", "ng_rollup_bundle")
    22
    load("//tools:defaults.bzl", "ng_module")
    3-
    load("@npm_bazel_typescript//:index.bzl", "ts_devserver", "ts_library")
    3+
    load("@npm//@bazel/typescript:index.bzl", "ts_devserver", "ts_library")
    44
    load(":benchmark_test.bzl", "benchmark_test")
    55

    66
    def copy_default_file(origin, destination):

    ‎dev-infra/benchmark/driver-utilities/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,6 @@
    11
    package(default_visibility = ["//visibility:public"])
    22

    3-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    3+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    44

    55
    ts_library(
    66
    name = "driver-utilities",

    ‎dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl

    +2-2
    Original file line numberDiff line numberDiff line change
    @@ -4,8 +4,8 @@
    44
    # found in the LICENSE file at https://angular.io/license
    55

    66
    load("@build_bazel_rules_nodejs//:index.bzl", "npm_package_bin")
    7-
    load("@npm_bazel_terser//:index.bzl", "terser_minified")
    8-
    load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
    7+
    load("@npm//@bazel/terser:index.bzl", "terser_minified")
    8+
    load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
    99
    load("//dev-infra/bazel:expand_template.bzl", "expand_template")
    1010

    1111
    def ng_rollup_bundle(

    ‎dev-infra/caretaker/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "caretaker",

    ‎dev-infra/commit-message/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    load("//tools:defaults.bzl", "jasmine_node_test")
    2-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    2+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    33

    44
    ts_library(
    55
    name = "commit-message",

    ‎dev-infra/format/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "format",

    ‎dev-infra/ngbot/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "ngbot",

    ‎dev-infra/pr/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "pr",

    ‎dev-infra/pr/checkout/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "checkout",

    ‎dev-infra/pr/common/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "common",

    ‎dev-infra/pr/discover-new-conflicts/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "discover-new-conflicts",

    ‎dev-infra/pr/merge/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22
    load("//tools:defaults.bzl", "jasmine_node_test")
    33

    44
    ts_library(

    ‎dev-infra/pr/rebase/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "rebase",

    ‎dev-infra/pullapprove/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22
    load("//tools:defaults.bzl", "jasmine_node_test")
    33

    44
    ts_library(

    ‎dev-infra/release/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "release",

    ‎dev-infra/release/build/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22
    load("//tools:defaults.bzl", "jasmine_node_test")
    33

    44
    ts_library(

    ‎dev-infra/release/config/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "config",

    ‎dev-infra/release/publish/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "publish",

    ‎dev-infra/release/publish/test/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22
    load("//tools:defaults.bzl", "jasmine_node_test")
    33

    44
    ts_library(

    ‎dev-infra/release/set-dist-tag/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22
    load("//tools:defaults.bzl", "jasmine_node_test")
    33

    44
    ts_library(

    ‎dev-infra/release/versioning/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "versioning",

    ‎dev-infra/ts-circular-dependencies/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "ts-circular-dependencies",

    ‎dev-infra/utils/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "utils",

    ‎dev-infra/utils/testing/BUILD.bazel

    +1-1
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    load("@npm_bazel_typescript//:index.bzl", "ts_library")
    1+
    load("@npm//@bazel/typescript:index.bzl", "ts_library")
    22

    33
    ts_library(
    44
    name = "testing",

    ‎integration/bazel/.bazelignore

    +1
    Original file line numberDiff line numberDiff line change
    @@ -1 +1,2 @@
    11
    node_modules
    2+
    .yarn_local_cache

    ‎integration/bazel/WORKSPACE

    +4-14
    Original file line numberDiff line numberDiff line change
    @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
    55
    # Fetch rules_nodejs so we can install our npm dependencies
    66
    http_archive(
    77
    name = "build_bazel_rules_nodejs",
    8-
    sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
    9-
    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
    8+
    sha256 = "4952ef879704ab4ad6729a29007e7094aef213ea79e9f2e94cbe1c9a753e63ef",
    9+
    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.0/rules_nodejs-2.2.0.tar.gz"],
    1010
    )
    1111

    1212
    # Fetch sass rules for compiling sass files
    @@ -48,18 +48,13 @@ yarn_install(
    4848
    yarn_lock = "//:yarn.lock",
    4949
    )
    5050

    51-
    # Install all bazel dependencies of our npm packages
    52-
    load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
    53-
    54-
    install_bazel_dependencies()
    55-
    5651
    # Load protractor dependencies
    57-
    load("@npm_bazel_protractor//:package.bzl", "npm_bazel_protractor_dependencies")
    52+
    load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
    5853

    5954
    npm_bazel_protractor_dependencies()
    6055

    6156
    # Load karma dependencies
    62-
    load("@npm_bazel_karma//:package.bzl", "npm_bazel_karma_dependencies")
    57+
    load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies")
    6358

    6459
    npm_bazel_karma_dependencies()
    6560

    @@ -75,11 +70,6 @@ browser_repositories(
    7570
    firefox = True,
    7671
    )
    7772

    78-
    # Setup the rules_typescript tooolchain
    79-
    load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
    80-
    81-
    ts_setup_workspace()
    82-
    8373
    # Setup the rules_sass toolchain
    8474
    load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
    8575

    ‎integration/bazel/package.json

    +7-7
    Original file line numberDiff line numberDiff line change
    @@ -16,18 +16,18 @@
    1616
    "reflect-metadata": "0.1.12",
    1717
    "rxjs": "file:../../node_modules/rxjs",
    1818
    "tslib": "file:../../node_modules/tslib",
    19-
    "zone.js": "file:../../dist/zone.js-dist"
    19+
    "zone.js": "file:../../dist/zone.js-dist/zone.js"
    2020
    },
    2121
    "devDependencies": {
    2222
    "@angular/bazel": "file:../../dist/packages-dist/bazel",
    2323
    "@angular/compiler": "file:../../dist/packages-dist/compiler",
    2424
    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
    2525
    "@bazel/bazelisk": "file:../../node_modules/@bazel/bazelisk",
    26-
    "@bazel/karma": "1.7.0",
    27-
    "@bazel/protractor": "1.7.0",
    28-
    "@bazel/rollup": "1.7.0",
    29-
    "@bazel/terser": "1.7.0",
    30-
    "@bazel/typescript": "1.7.0",
    26+
    "@bazel/karma": "2.2.0",
    27+
    "@bazel/protractor": "2.2.0",
    28+
    "@bazel/rollup": "2.2.0",
    29+
    "@bazel/terser": "2.2.0",
    30+
    "@bazel/typescript": "2.2.0",
    3131
    "@types/jasmine": "2.8.8",
    3232
    "http-server": "0.12.0",
    3333
    "karma": "4.4.1",
    @@ -43,7 +43,7 @@
    4343
    "rollup-plugin-node-resolve": "5.2.0",
    4444
    "rollup-plugin-sourcemaps": "0.4.2",
    4545
    "terser": "4.4.0",
    46-
    "typescript": "3.8.3"
    46+
    "typescript": "file:../../node_modules/typescript"
    4747
    },
    4848
    "scripts": {
    4949
    "test": "bazelisk build ... --noshow_progress && bazelisk test ...",

    ‎integration/bazel/src/BUILD.bazel

    +4-4
    Original file line numberDiff line numberDiff line change
    @@ -2,10 +2,10 @@ package(default_visibility = ["//visibility:public"])
    22

    33
    load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web")
    44
    load("@npm//http-server:index.bzl", "http_server")
    5-
    load("@npm_angular_bazel//:index.bzl", "ng_module")
    6-
    load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
    7-
    load("@npm_bazel_terser//:index.bzl", "terser_minified")
    8-
    load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
    5+
    load("@npm//@angular/bazel:index.bzl", "ng_module")
    6+
    load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
    7+
    load("@npm//@bazel/terser:index.bzl", "terser_minified")
    8+
    load("@npm//@bazel/typescript:index.bzl", "ts_devserver")
    99

    1010
    # Allow targets under sub-packages to reference the tsconfig.json file
    1111
    exports_files(["tsconfig.json"])

    0 commit comments

    Comments
     (0)
    0