Skip to content

Commit 15c1b3d

Browse files
authored
Merge branch 'angular:main' into secondaryEntrypoint
2 parents 6392681 + c40d726 commit 15c1b3d

File tree

229 files changed

+30294
-8127
lines changed

Some content is hidden

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

229 files changed

+30294
-8127
lines changed
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=1733430966
6+
pnpm-lock.yaml=-703346517
7+
pnpm-workspace.yaml=1711114604
8+
yarn.lock=-931254131

.bazelrc

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Disable NG CLI TTY mode
22
build --action_env=NG_FORCE_TTY=false
33

4+
# Required by `rules_ts`.
5+
common --@aspect_rules_ts//ts:skipLibCheck=always
6+
common --@aspect_rules_ts//ts:default_to_tsc_transpiler
7+
48
# Make TypeScript compilation fast, by keeping a few copies of the compiler
59
# running as daemons, and cache SourceFile AST's to reduce parse time.
610
build --strategy=TypeScriptCompile=worker
@@ -109,13 +113,6 @@ query --output=label_kind
109113

110114
# By default, failing tests don't print any output, it goes to the log file
111115
test --test_output=errors
112-
113-
################################
114-
# Settings for CircleCI #
115-
################################
116-
117-
# Bazel flags for CircleCI are in /.circleci/bazel.rc
118-
119116
################################
120117
# Remote Execution Setup #
121118
################################
@@ -136,8 +133,6 @@ build:remote --jobs=150
136133

137134
# Setup the toolchain and platform for the remote build execution. The platform
138135
# is provided by the shared dev-infra package and targets k8 remote containers.
139-
build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite
140-
build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain
141136
build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
142137
build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
143138
build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.4.1
1+
6.5.0

.circleci/bazel.common.rc

-35
This file was deleted.

.circleci/bazel.linux.rc

-5
This file was deleted.

.circleci/config.yml

-16
This file was deleted.

.circleci/env-helpers.inc.sh

-73
This file was deleted.

.circleci/env.sh

-43
This file was deleted.

.eslintrc.json

-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
"import/newline-after-import": "error",
7676
"import/no-absolute-path": "error",
7777
"import/no-duplicates": "error",
78-
"import/no-extraneous-dependencies": ["off", { "devDependencies": false }],
7978
"import/no-unassigned-import": ["error", { "allow": ["symbol-observable"] }],
8079
"import/order": [
8180
"error",
@@ -142,7 +141,6 @@
142141
{
143142
"files": ["!packages/**", "**/*_spec.ts"],
144143
"rules": {
145-
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
146144
"max-lines-per-function": "off",
147145
"no-case-declarations": "off",
148146
"no-console": "off"

.github/workflows/assistant-to-the-branch-manager.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
with:
1818
persist-credentials: false
19-
- uses: angular/dev-infra/github-actions/branch-manager@933dcd42f8837d6d6ce3a28419a760edb94f10e6
19+
- uses: angular/dev-infra/github-actions/branch-manager@e8ee8c5c247dc83e161ab8cf2281d0f6569ee626
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

0 commit comments

Comments
 (0)