Skip to content

Commit 8b6b28e

Browse files
committed
Merge branch 'main' into fix/automcomplete-overlay-backdrop
2 parents 2cea4f0 + 23269f3 commit 8b6b28e

File tree

145 files changed

+17339
-1469
lines changed

Some content is hidden

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

145 files changed

+17339
-1469
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# @generated
2+
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
3+
# This file should be checked into version control along with the pnpm-lock.yaml file.
4+
.npmrc=-2023857461
5+
package.json=1204886269
6+
pnpm-lock.yaml=1975546108
7+
pnpm-workspace.yaml=1711114604
8+
yarn.lock=824621907

.bazelrc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Required by `rules_ts`.
2+
common --@aspect_rules_ts//ts:skipLibCheck=always
3+
common --@aspect_rules_ts//ts:default_to_tsc_transpiler
4+
15
###############################
26
# Filesystem interactions #
37
###############################
@@ -87,11 +91,9 @@ build:remote --google_default_credentials=true
8791

8892
# Setup the toolchain and platform for the remote build execution. The platform
8993
# is provided by the shared dev-infra package and targets k8 remote containers.
90-
build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite
91-
build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain
92-
build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
93-
build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
94-
build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
94+
build:remote --extra_execution_platforms=@devinfra//bazel/remote-execution:platform_with_network
95+
build:remote --host_platform=@devinfra//bazel/remote-execution:platform_with_network
96+
build:remote --platforms=@devinfra//bazel/remote-execution:platform_with_network
9597

9698
################################
9799
# Sandbox settings #

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0
1+
6.5.0

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@
1313
/.github/ISSUE_TEMPLATE/** @angular/components-googlers
1414

1515
/tools/ @angular/dev-infra-components
16-
/tools/public_api_guard/**/*.md @angular/components-googlers

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install node modules
6565
run: yarn install --frozen-lockfile
6666
- name: Check API Goldens
67-
run: yarn bazel test tools/public_api_guard/...
67+
run: yarn bazel test goldens/...
6868
- uses: ./.github/actions/slack
6969
if: failure()
7070
with:
@@ -173,6 +173,8 @@ jobs:
173173
run: yarn install --frozen-lockfile
174174
- name: Run tests
175175
run: bazel test --build_tag_filters=-e2e --test_tag_filters=-e2e --build_tests_only -- src/...
176+
env:
177+
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
176178
- uses: ./.github/actions/slack
177179
if: failure()
178180
with:

.github/workflows/pr.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Install node modules
6666
run: yarn install --frozen-lockfile
6767
- name: Check API Goldens
68-
run: yarn bazel test tools/public_api_guard/...
68+
run: yarn bazel test goldens/...
6969

7070
e2e:
7171
runs-on: ubuntu-latest
@@ -149,6 +149,8 @@ jobs:
149149
run: yarn install --frozen-lockfile
150150
- name: Run tests
151151
run: bazel test --build_tag_filters=-e2e --test_tag_filters=-e2e --build_tests_only -- src/...
152+
env:
153+
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
152154

153155
build:
154156
runs-on: ubuntu-latest-16core

.ng-dev/release.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export const releasePackages = [
2323

2424
/** Configuration for the `ng-dev release` command. */
2525
export const release: ReleaseConfig = {
26+
rulesJsInteropMode: true,
2627
releaseNotes: {
2728
useReleaseTitle: true,
2829
groupOrder: releasePackages,

.npmrc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
engine-strict = true
1+
# Yarn Berry doesn't check engines at all, so pnpm shouldn't either.
2+
engine-strict = false
3+
4+
# Disabling pnpm [hoisting](https://pnpm.io/npmrc#hoist) by setting `hoist=false` is recommended on
5+
# projects using rules_js so that pnpm outside of Bazel lays out a node_modules tree similar to what
6+
# rules_js lays out under Bazel (without a hidden node_modules/.pnpm/node_modules)
7+
hoist=false

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ src/cdk/schematics/ng-update/test-cases/**/*_input.ts
1212
src/cdk/schematics/ng-update/test-cases/**/*_expected_output.ts
1313
src/material/schematics/ng-update/test-cases/**/*_input.ts
1414
src/material/schematics/ng-update/test-cases/**/*_expected_output.ts
15+
16+
pnpm-lock.yaml

BUILD.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
44
load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_ENTRYPOINTS")
55
load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
66
load("//src/material-experimental:config.bzl", "MATERIAL_EXPERIMENTAL_ENTRYPOINTS", "MATERIAL_EXPERIMENTAL_TESTING_ENTRYPOINTS")
7+
load("@npm2//:defs.bzl", "npm_link_all_packages")
78

89
package(default_visibility = ["//visibility:public"])
910

@@ -12,6 +13,10 @@ exports_files([
1213
"package.json",
1314
])
1415

16+
npm_link_all_packages(
17+
name = "node_modules",
18+
)
19+
1520
nodejs_binary(
1621
name = "yarn_vendored",
1722
data = [".yarn/releases/yarn-1.22.17.cjs"],

0 commit comments

Comments
 (0)