Merge branch 'angular-master' into align-attr-as-input-in-dialog-acti…

…ons-#18479

.bazelignore

@@ -1 +1,7 @@
 node_modules
+
+integration/ng-update-v13/.angular
+integration/ng-update-v13/node_modules
+
+integration/ng-add/.angular
+integration/ng-add/node_modules

.bazelrc

@@ -45,36 +45,35 @@ test --test_output=errors
 
 # Configures script to do version stamping.
 # See https://docs.bazel.build/versions/master/user-manual.html#flag--workspace_status_command
-build:release --workspace_status_command="node ./tools/bazel-stamp-vars.js"
+build:release --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=release"
 build:release --stamp
 
-build:snapshot-build --workspace_status_command="node ./tools/bazel-stamp-vars.js --snapshot"
+build:snapshot-build --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=snapshot"
 build:snapshot-build --stamp
 
-################################
-# View Engine / Ivy toggle     #
-################################
-build:view-engine --define=angular_ivy_enabled=False
-build:ivy --define=angular_ivy_enabled=True
+####################################
+# Bazel custom flags               #
+####################################
+build --flag_alias=partial_compilation=@npm//@angular/bazel/src:partial_compilation
 
-# Set Ivy as the default
-build --config=ivy
+##################################
+# Always enable Ivy compilation  #
+##################################
+build --define=angular_ivy_enabled=True
 
 ################################
 # Remote Execution Setup       #
 ################################
 
 # Use the Angular team internal GCP instance for remote execution.
-build:remote --remote_instance_name=projects/internal-200822/instances/default_instance
+build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance
 build:remote --project_id=internal-200822
 
 # Needed due to: https://github.com/bazelbuild/bazel/issues/7254
 build:remote --define=EXECUTOR=remote
 
-# For remote execution, we use the `ubuntu16_04_clang` toolchain configurations. These only
-# support `k8` or `armeabi-v7a`. Since we run on remotely with `k8` containers, we need to
-# ensure that the proper CPU is configured so that the correct toolchain can be used.
-# https://github.com/bazelbuild/bazel-toolchains/blob/master/configs/ubuntu16_04_clang/10.0.0/bazel_2.1.0/cc/BUILD#L50
+# Since remote builds run within Google Cloud `k8`-based containers, we set the
+# host and target CPU accordingly.
 build:remote --cpu=k8
 build:remote --host_cpu=k8
 
@@ -84,16 +83,21 @@ build:remote --remote_executor=remotebuildexecution.googleapis.com
 build:remote --auth_enabled=true
 
 # Setup the toolchain and platform for the remote build execution. The platform
-# is automatically configured by the "rbe_autoconfig" rule in the project workpsace.
-build:remote --crosstool_top=@rbe_default//cc:toolchain
-build:remote --host_javabase=@rbe_default//java:jdk
-build:remote --javabase=@rbe_default//java:jdk
-build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
-build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
-build:remote --extra_execution_platforms=//tools:rbe_platform
-build:remote --host_platform=//tools:rbe_platform
-build:remote --platforms=//tools:rbe_platform
-build:remote --extra_toolchains=@rbe_default//config:cc-toolchain
+# is provided by the shared dev-infra package and targets k8 remote containers.
+build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
+build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
+build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
+build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
+build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
+
+################################
+#  Sandbox settings            #
+################################
+
+# By default, network access should be disabled unless explicitly granted for certain targets
+# using the `requires-network` tag. https://docs.bazel.build/versions/main/be/common-definitions.html
+build --sandbox_default_allow_network=false
+test --sandbox_default_allow_network=false
 
 ################################
 # --config=build-results       #

.bazelversion

@@ -1 +1 @@
-3.6.0
+4.0.0