Skip to content

Commit 0311659

Browse files
fiskerfisker
committed
Merge branch 'main' into dev-202407-merge-upstream
# Conflicts: # packages/compiler/src/ml_parser/ast.ts # packages/compiler/src/ml_parser/html_tags.ts # packages/compiler/src/ml_parser/html_whitespaces.ts # packages/compiler/src/ml_parser/icu_ast_expander.ts # packages/compiler/src/ml_parser/lexer.ts # packages/compiler/src/ml_parser/parser.ts # packages/compiler/src/ml_parser/tokens.ts
2 parents ef17eaa + dd6e548 commit 0311659

File tree

9,679 files changed

+538497
-533384
lines changed

Some content is hidden

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

9,679 files changed

+538497
-533384
lines changed

‎.bazelignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
.git
66
node_modules
77
dist
8-
aio/node_modules
9-
aio/tools/examples/shared/node_modules
10-
aio/tools/examples/shared/example-scaffold
118

129
# All integration test node_modules folders
1310
integration/animations/node_modules
@@ -16,6 +13,8 @@ integration/cli-hello-world/node_modules
1613
integration/cli-hello-world-ivy-i18n/node_modules
1714
integration/cli-hello-world-lazy/node_modules
1815
integration/cli-hello-world-mocha/node_modules
16+
integration/cli-signal-inputs/node_modules
17+
integration/platform-server-hydration/node_modules
1918
integration/defer/node_modules
2019
integration/dynamic-compiler/node_modules
2120
integration/forms/node_modules

‎.bazelrc‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Enable debugging tests with --config=debug
2-
test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results
2+
test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results --spawn_strategy=local
33

44
# Do not attempt to de-flake locally.
55
# On CI we might set this to `3` to run with deflaking.
@@ -56,31 +56,16 @@ build --enable_runfiles
5656
build:release --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=release"
5757
build:release --stamp
5858

59-
# Building AIO against local Angular deps requires stamping
60-
# versions in Angular packages due to CLI version checks.
61-
build:aio_local_deps --stamp
62-
build:aio_local_deps --workspace_status_command="yarn -s --cwd aio local-workspace-status"
63-
6459
# Snapshots should also be stamped with version control information.
6560
build:snapshot-build --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=snapshot"
6661
build:snapshot-build --stamp
6762

68-
##########################################################
69-
# AIO architect build configuration #
70-
# See aio/angular.json for available configurations. #
71-
# To build with a partiular configuration: #
72-
# bazel build //aio:build --aio_build_config=<config> #
73-
# Default config is `stable``. #
74-
##########################################################
75-
build --flag_alias=aio_build_config=//aio:flag_aio_build_config
76-
77-
####################################
78-
# AIO first party dep substitution #
79-
# Turn on with #
80-
# --config=aio_local_deps #
81-
####################################
82-
83-
build:aio_local_deps --//aio:flag_aio_local_deps
63+
# Angular DevTools for Firefox releases *cannot* be stamped and `--config snapshot-build-firefox` is a no-op.
64+
# This is because Mozilla requires add-on source code to be uploaded and then they manually reproduce the build.
65+
# If we stamp the build based on Git information such as the current commit, then reproducing the build would require
66+
# uploading the entire `.git` directory. We already must upload the entire monorepo, and uploading `.git` as well
67+
# exceeds the max source file size. To address this, we just *don't* stamp Firefox builds of Angular DevTools.
68+
build:snapshot-build-firefox --nostamp
8469

8570
###############################
8671
# Output #
@@ -118,10 +103,6 @@ common:remote --jobs=200
118103

119104
build:remote --google_default_credentials
120105

121-
# Limit the number of test jobs for on an AIO local deps build. The example tests running
122-
# concurrently pushes the circleci executor RAM usage to its limits.
123-
test:aio_local_deps --jobs=24
124-
125106
# Force remote exeuctions to consider the entire run as linux
126107
build:remote --cpu=k8
127108
build:remote --host_cpu=k8
@@ -177,6 +158,9 @@ test:saucelabs --flaky_test_attempts=1
177158

178159
# --ng_perf will ask the Ivy compiler to produce performance results for each build.
179160
build --flag_alias=ng_perf=//packages/compiler-cli:ng_perf
161+
# --adev_fast will run adev build/serve in a faster mode, skipping things like prerendering
162+
# for local development.
163+
build --flag_alias=fast_adev=//adev:fast_build_mode
180164

181165
####################################################
182166
# User bazel configuration

‎.circleci/env-helpers.inc.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function setSecretVar() {
4444
# Create a function to set an environment variable, when called.
4545
#
4646
# Use this function for creating setter for public environment variables that require expensive or
47-
# time-consuming computaions and may not be needed. When needed, you can call this function to set
47+
# time-consuming computations and may not be needed. When needed, you can call this function to set
4848
# the environment variable (which will be available through `$BASH_ENV` from that point onwards).
4949
#
5050
# Arguments:

‎.circleci/env.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ echo "source $envHelpersPath;" >> $BASH_ENV;
1616
####################################################################################################
1717
setPublicVar CI "$CI"
1818
setPublicVar PROJECT_ROOT "$projectDir";
19-
setPublicVar CI_AIO_MIN_PWA_SCORE "95";
2019
# This is the branch being built; e.g. `pull/12345` for PR builds.
2120
setPublicVar CI_BRANCH "$CIRCLE_BRANCH";
2221
setPublicVar CI_BUILD_URL "$CIRCLE_BUILD_URL";

‎.devcontainer/recommended-Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Image metadata and config.
22
# Ideally, the Node.js version should match what we use on CI.
33
# See `executors > default-executor` in `.circleci/config.yml`.
4-
FROM cimg/node:16.13-browsers@sha256:6c7a82701665dda03e92d682360fa2e4358e07dab8d1b6a7e48f7d36e3d98117
4+
FROM cimg/node:18.13.0@sha256:45d0ee279f522c4562a464df71108104cc9b2187205333ffd0707d4f05589731
55

66

77
LABEL name="Angular dev environment" \

‎.devcontainer/recommended-devcontainer.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
"postCreateCommand": "yarn install",
77
"extensions": [
88
"devondcarew.bazel-code",
9-
"gkalpak.aio-docs-utils",
10-
"ms-vscode.vscode-typescript-tslint-plugin",
11-
"xaver.clang-format",
12-
// The following extensions are useful when working on angular.io (i.e. inside the `aio/` directory).
13-
//"angular.ng-template",
14-
//"dbaeumer.vscode-eslint",
9+
"ms-vscode.vscode-typescript-tslint-plugin"
1510
],
1611
}

‎.github/ISSUE_TEMPLATE/3-docs-bug.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Docs or angular.io Bug Report'
1+
name: 'Docs or angular.dev Bug Report'
22
description: Report an issue in Angular's documentation or angular.io application
33

44
body:

‎.github/actions/deploy-docs-site/BUILD.bazel‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
load("//tools:defaults.bzl", "esbuild_checked_in")
2+
3+
exports_files([
4+
"tsconfig.json",
5+
])
6+
7+
esbuild_checked_in(
8+
name = "main",
9+
entry_point = "//.github/actions/deploy-docs-site/lib:main.ts",
10+
external = [
11+
"undici",
12+
],
13+
platform = "node",
14+
target = "node14",
15+
deps = [
16+
"//.github/actions/deploy-docs-site/lib",
17+
],
18+
)

‎.github/actions/deploy-docs-site/action.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: 'Deploy angular.dev site'
2+
description: 'Automatically deploy and set up redirects for angular.dev'
3+
author: 'Angular'
4+
inputs:
5+
serviceKey:
6+
description: 'The service key used for firebase deployments.'
7+
required: true
8+
configPath:
9+
description: 'The path to the firebase config file.'
10+
required: true
11+
distDir:
12+
description: 'The path to the firebase dist directory.'
13+
required: true
14+
runs:
15+
using: 'node20'
16+
main: 'main.js'

‎.github/actions/deploy-docs-site/lib/BUILD.bazel‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
load("//tools:defaults.bzl", "ts_library")
2+
3+
package(default_visibility = ["//.github/actions/deploy-docs-site:__subpackages__"])
4+
5+
exports_files([
6+
"main.ts",
7+
])
8+
9+
ts_library(
10+
name = "lib",
11+
srcs = glob(
12+
["*.ts"],
13+
),
14+
#tsconfig = "//.github/actions/deploy-docs-site:tsconfig.json",
15+
deps = [
16+
"@npm//@actions/core",
17+
"@npm//@actions/github",
18+
"@npm//@angular/ng-dev",
19+
"@npm//@types/node",
20+
"@npm//@types/tmp",
21+
"@npm//tmp",
22+
],
23+
)

0 commit comments

Comments
 (0)