build: update to rules_nodejs 0.32.2

Brings in ts_library fixes required to get angular/angular building after 0.32.0:
typescript: exclude typescript lib declarations in node_module_library transitive_declarations
typescript: remove override of @bazel/tsetse (+1 squashed commit)

@npm//node_modules/foobar:foobar.js labels changed to @npm//:node_modules/foobar/foobar.js with fix for bazel-contrib/rules_nodejs#802

also updates to rules_rass commit compatible with rules_nodejs 0.32.0

.bazelignore

@@ -1,3 +1,4 @@
+.git
 node_modules
 dist
 aio/content

.bazelrc

@@ -11,9 +11,7 @@ build:angular-team --remote_http_cache=https://storage.googleapis.com/angular-te
 # Make compilation fast, by keeping a few copies of the compilers
 # running as daemons, and cache SourceFile AST's to reduce parse time.
 build --strategy=AngularTemplateCompile=worker
-# TODO(alexeagle): re-enable after fixing worker instability with rxjs typings
-# build --strategy=TypeScriptCompile=worker
-build --strategy=TypeScriptCompile=standalone
+build --strategy=TypeScriptCompile=worker
 
 # Enable debugging tests with --config=debug
 test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results

BUILD.bazel

@@ -18,15 +18,15 @@ filegroup(
     name = "web_test_bootstrap_scripts",
     # do not sort
     srcs = [
-        "@npm//node_modules/core-js:client/core.js",
-        "@npm//node_modules/zone.js:dist/zone.js",
-        "@npm//node_modules/zone.js:dist/zone-testing.js",
-        "@npm//node_modules/zone.js:dist/task-tracking.js",
+        "@npm//:node_modules/core-js/client/core.js",
+        "@npm//:node_modules/zone.js/dist/zone.js",
+        "@npm//:node_modules/zone.js/dist/zone-testing.js",
+        "@npm//:node_modules/zone.js/dist/task-tracking.js",
         "//:test-events.js",
         "//:shims_for_IE.js",
         # Including systemjs because it defines `__eval`, which produces correct stack traces.
-        "@npm//node_modules/systemjs:dist/system.src.js",
-        "@npm//node_modules/reflect-metadata:Reflect.js",
+        "@npm//:node_modules/systemjs/dist/system.src.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
 )
 
@@ -35,15 +35,15 @@ filegroup(
     srcs = [
         # We also declare the unminfied AngularJS files since these can be used for
         # local debugging (e.g. see: packages/upgrade/test/common/test_helpers.ts)
-        "@npm//node_modules/angular:angular.js",
-        "@npm//node_modules/angular:angular.min.js",
-        "@npm//node_modules/angular-1.5:angular.js",
-        "@npm//node_modules/angular-1.5:angular.min.js",
-        "@npm//node_modules/angular-1.6:angular.js",
-        "@npm//node_modules/angular-1.6:angular.min.js",
-        "@npm//node_modules/angular-mocks:angular-mocks.js",
-        "@npm//node_modules/angular-mocks-1.5:angular-mocks.js",
-        "@npm//node_modules/angular-mocks-1.6:angular-mocks.js",
+        "@npm//:node_modules/angular/angular.js",
+        "@npm//:node_modules/angular/angular.min.js",
+        "@npm//:node_modules/angular-1.5/angular.js",
+        "@npm//:node_modules/angular-1.5/angular.min.js",
+        "@npm//:node_modules/angular-1.6/angular.js",
+        "@npm//:node_modules/angular-1.6/angular.min.js",
+        "@npm//:node_modules/angular-mocks/angular-mocks.js",
+        "@npm//:node_modules/angular-mocks-1.5/angular-mocks.js",
+        "@npm//:node_modules/angular-mocks-1.6/angular-mocks.js",
     ],
 )
 

WORKSPACE

@@ -18,8 +18,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "e04a82a72146bfbca2d0575947daa60fda1878c8d3a3afe868a8ec39a6b968bb",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.31.1/rules_nodejs-0.31.1.tar.gz"],
+    sha256 = "6d4edbf28ff6720aedf5f97f9b9a7679401bf7fca9d14a0fff80f644a99992b4",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.32.2/rules_nodejs-0.32.2.tar.gz"],
 )
 
 # Check the bazel version and download npm dependencies
@@ -47,7 +47,10 @@ Try running `yarn bazel` instead.
 #   - 0.27.12 Adds NodeModuleSources provider for transtive npm deps support
 #   - 0.30.0 yarn_install now uses symlinked node_modules with new managed directories Bazel 0.26.0 feature
 #   - 0.31.1 entry_point attribute of nodejs_binary & rollup_bundle is now a label
-check_rules_nodejs_version(minimum_version_string = "0.31.1")
+#   - 0.32.0 yarn_install and npm_install no longer puts build files under symlinked node_modules
+#   - 0.32.1 remove override of @bazel/tsetse & exclude typescript lib declarations in node_module_library transitive_declarations
+#   - 0.32.2 resolves bug in @bazel/hide-bazel-files postinstall step
+check_rules_nodejs_version(minimum_version_string = "0.32.2")
 
 # Setup the Node.js toolchain
 node_repositories(
@@ -71,19 +74,7 @@ node_repositories(
 
 yarn_install(
     name = "npm",
-    data = [
-        "//:tools/npm/@angular_bazel/index.js",
-        "//:tools/npm/@angular_bazel/package.json",
-        "//:tools/postinstall-patches.js",
-        "//:tools/yarn/check-yarn.js",
-    ],
     package_json = "//:package.json",
-    # Don't install devDependencies, they are large and not used under Bazel
-    prod_only = True,
-    # Temporarily disable node_modules symlinking until the fix for
-    # https://github.com/bazelbuild/bazel/issues/8487 makes it into a
-    # future Bazel release
-    symlink_node_modules = False,
     yarn_lock = "//:yarn.lock",
 )
 

integration/bazel/.bazelrc

@@ -20,7 +20,3 @@ build --symlink_prefix=/
 # Turn on managed directories feature in Bazel
 # This allows us to avoid installing a second copy of node_modules
 common --experimental_allow_incremental_repository_updates
-
-# Temporary flag to for using nodejs rules 0.31.1 with Bazel 0.27.0
-# TODO(gregmagolan): remove after updating to next nodejs rules release
-common --incompatible_depset_is_not_iterable=false

integration/bazel/WORKSPACE

@@ -8,16 +8,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "e04a82a72146bfbca2d0575947daa60fda1878c8d3a3afe868a8ec39a6b968bb",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.31.1/rules_nodejs-0.31.1.tar.gz"],
+    sha256 = "6d4edbf28ff6720aedf5f97f9b9a7679401bf7fca9d14a0fff80f644a99992b4",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.32.2/rules_nodejs-0.32.2.tar.gz"],
 )
 
 # Fetch sass rules for compiling sass files
-# TODO: change back to upstream release after https://github.com/bazelbuild/rules_sass/pull/87 merged and released
 http_archive(
     name = "io_bazel_rules_sass",
-    strip_prefix = "rules_sass-9862dfc96a4a1f66fe171ef5e043b29853e8445b",
-    url = "https://github.com/manekinekko/rules_sass/archive/9862dfc96a4a1f66fe171ef5e043b29853e8445b.zip",
+    sha256 = "4f05239080175a3f4efa8982d2b7775892d656bb47e8cf56914d5f9441fb5ea6",
+    strip_prefix = "rules_sass-86ca977cf2a8ed481859f83a286e164d07335116",
+    url = "https://github.com/bazelbuild/rules_sass/archive/86ca977cf2a8ed481859f83a286e164d07335116.zip",
 )
 
 # Check the bazel version and download npm dependencies
@@ -39,7 +39,14 @@ Try running `yarn bazel` instead.
 
 # Setup the Node.js toolchain
 node_repositories(
-    node_version = "10.9.0",
+    # Use same node version as root angular WORKSPACE since
+    # we share node_module packages and some require node >= 10.15.0
+    node_repositories = {
+        "10.16.0-darwin_amd64": ("node-v10.16.0-darwin-x64.tar.gz", "node-v10.16.0-darwin-x64", "6c009df1b724026d84ae9a838c5b382662e30f6c5563a0995532f2bece39fa9c"),
+        "10.16.0-linux_amd64": ("node-v10.16.0-linux-x64.tar.xz", "node-v10.16.0-linux-x64", "1827f5b99084740234de0c506f4dd2202a696ed60f76059696747c34339b9d48"),
+        "10.16.0-windows_amd64": ("node-v10.16.0-win-x64.zip", "node-v10.16.0-win-x64", "aa22cb357f0fb54ccbc06b19b60e37eefea5d7dd9940912675d3ed988bf9a059"),
+    },
+    node_version = "10.16.0",
     yarn_version = "1.12.1",
 )
 

integration/bazel/package.json

@@ -23,16 +23,16 @@
     "@angular/compiler": "file:../../dist/packages-dist/compiler",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@bazel/bazel": "file:../../node_modules/@bazel/bazel",
-    "@bazel/karma": "0.30.1",
-    "@bazel/typescript": "0.30.1",
+    "@bazel/hide-bazel-files": "0.32.2",
+    "@bazel/karma": "0.32.2",
+    "@bazel/typescript": "0.32.2",
     "@types/jasmine": "2.8.8",
     "@types/source-map": "0.5.1",
     "protractor": "5.1.2",
     "typescript": "3.4.2"
   },
   "scripts": {
     "test": "bazel build ... --noshow_progress && bazel test ...",
-    "postinstall": "ngc -p ./angular-metadata.tsconfig.json",
-    "//": "TODO(gregmagolan): figure out how to keep dependencies here up to date with the root package.json"
+    "postinstall": "ngc -p ./angular-metadata.tsconfig.json"
   }
 }

integration/bazel/src/BUILD.bazel

@@ -26,7 +26,7 @@ filegroup(
     name = "rxjs_umd_modules",
     srcs = [
         # do not sort
-        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
         ":rxjs_shims.js",
     ],
 )
@@ -40,7 +40,7 @@ ts_devserver(
     ],
     serving_path = "/bundle.min.js",
     static_files = [
-        "@npm//node_modules/zone.js:dist/zone.min.js",
+        "@npm//:node_modules/zone.js/dist/zone.min.js",
     ],
     deps = ["//src"],
 )
@@ -64,7 +64,7 @@ web_package(
     name = "prodapp",
     assets = [
         # do not sort
-        "@npm//node_modules/zone.js:dist/zone.min.js",
+        "@npm//:node_modules/zone.js/dist/zone.min.js",
         ":bundle.min.js",
     ],
     data = [

integration/bazel/src/hello-world/BUILD.bazel

@@ -46,8 +46,8 @@ ts_library(
 ts_web_test_suite(
     name = "test",
     bootstrap = [
-        "@npm//node_modules/zone.js:dist/zone-testing-bundle.js",
-        "@npm//node_modules/reflect-metadata:Reflect.js",
+        "@npm//:node_modules/zone.js/dist/zone-testing-bundle.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     browsers = [
         "@io_bazel_rules_webtesting//browsers:chromium-local",