Create a new pull request by comparing changes across two branches

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -0,0 +1,8 @@
+# @generated
+# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
+# This file should be checked into version control along with the pnpm-lock.yaml file.
+.npmrc=-1406867100
+package.json=-443660789
+pnpm-lock.yaml=-1265630020
+pnpm-workspace.yaml=1711114604
+yarn.lock=-38145536

.bazelignore

@@ -26,14 +26,13 @@ integration/ng_update_migrations/node_modules
 integration/ng-add-localize/node_modules
 integration/nodenext_resolution/node_modules
 integration/platform-server/node_modules
+integration/platform-server-zoneless/node_modules
 integration/platform-server-hydration/node_modules
 integration/service-worker-schema/node_modules
 integration/side-effects/node_modules
 integration/standalone-bootstrap/node_modules
 integration/terser/node_modules
 integration/trusted-types/node_modules
 integration/typings_test_rxjs7/node_modules
-integration/typings_test_ts55/node_modules
-integration/typings_test_ts56/node_modules
-integration/typings_test_ts57/node_modules
+integration/typings_test_ts58/node_modules
 modules/ssr-benchmarks/node_modules

.bazelrc

@@ -5,6 +5,10 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # On CI we might set this to `3` to run with deflaking.
 test --flaky_test_attempts=1
 
+# Required by `rules_ts`.
+common --@aspect_rules_ts//ts:skipLibCheck=always
+common --@aspect_rules_ts//ts:default_to_tsc_transpiler
+
 ###############################
 # Filesystem interactions     #
 ###############################
@@ -102,8 +106,6 @@ build:remote --cpu=k8
 build:remote --host_cpu=k8
 
 # Toolchain and platform related flags
-build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite
-build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain
 build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform
 build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform
 build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform
@@ -113,13 +115,22 @@ build:remote --remote_instance_name=projects/internal-200822/instances/primary_i
 build:remote --bes_instance_name=internal-200822
 build:remote --remote_cache=remotebuildexecution.googleapis.com
 build:remote --remote_executor=remotebuildexecution.googleapis.com
+build:remote --remote_upload_local_results=false
+
+build:remote --remote_grpc_log=/tmp/rbe-grpc.log
+
+# See: https://docs.google.com/document/d/1NgDPsCIwprDdqC1zj0qQrh5KGK2hQTSTux1DAvi4rSc/edit?tab=t.0.
+build:remote --experimental_remote_execution_keepalive
 
 # Use HTTP remote cache
 build:remote-cache --remote_cache=https://storage.googleapis.com/angular-team-cache
 build:remote-cache --remote_accept_cached=true
-build:remote-cache --remote_upload_local_results=true
+build:remote-cache --remote_upload_local_results=false
 build:remote-cache --google_default_credentials
 
+# Additional flags added when running a "trusted build" with additional access
+build:trusted-build --remote_upload_local_results=true
+
 # Ensure that tags like "no-remote-exec" get propagated to actions created by rules,
 # even if the rule implementation does not explicitly pass them to the execution requirements.
 # https://bazel.build/reference/command-line-reference#flag--experimental_allow_tags_propagation

.bazelversion

@@ -1 +1 @@
-5.0.0
+6.5.0

.git-blame-ignore-revs

@@ -0,0 +1,43 @@
+# all commits that change formatting to prettier
+fd544159e300340a25a48e3f40c58795991a4c17
+31fdf0fbea6b89c8d3d141b2ef8e79c2737287cb
+0d78a92431178be73342aeddda4b62d9e49138ba
+f307e95459898b9027d5e13357a809d8952e9017
+b1dffa4abe8321a47d79b2ea29ee32a81acfe031
+ca517d7f2c38775969a65fde1d88f41ad5f27931
+8f69c83b848ad0dc3c7ffce2541fc726693dedcf
+a5b5b7d5ef84b9852d2115dd7a764f4ab3299379
+894c1c5f100a62866cc7ed3e23d025c8e505c60d
+ca39926de2ccaceb11de47a35e5bf9899147a877
+b857aafcb9bdb5f1400a4cfedd56657e71ebe8cd
+c4b880a025823efadb9d76195c6261f2992c7654
+4c2b0d94e22f022969b86b95af516b76322840e0
+0460a9dfafe3a7ebbff1b87e52048fb7416bba43
+ec03e462f3d4ec90d1267474cc344563c949c2cf
+bbbe477f479f20722f0fea7ccc46095aad5d4253
+cc34e5fb072e7903e01463953a19d18503a39347
+f9781f9804f1e7c84df356d9aeb267730a7fc499
+dc62446ef7f2898a20d3be1196ecaf2a92a1077d
+711cb416260ca11ff158fc39b372efa2cf022d36
+# commits that switch to relative imports
+3d2263cb1f208e561692e41c5a17196c3c57877f
+ae047c59c0041e0a43cec020520d40ccd981b444
+6a207ebfb0b915bcb848e8e17425757314116ce3
+88ae6517a2490ccbef97126c011a3d5bcaddd637
+6d3849ffc85cc52b0eba3836b24f10895621acbe
+bc042935d045c46d09c2c316dcbbc39cbae4615c
+34393874e6b6f53692f1f30d0f536cd72e5220d2
+cfda43b97d3c1aedc4a1eccf123475617640e696
+006a14da89c58692d411e403b1b1cc8fd733de25
+33c24624be73a4c16abdd5fb2f93810e151f6a58
+e5cc624b8736c4e2aa87f86bb268957e656e0994
+30a61f12a7d414ad35a1a06eaadff873880d8e8f
+f773e08ee59724739093a33811a62661680df1f0
+49234007916980526db78503452bba7121dc91ff
+5c0335754a2b45b2a27fa7a9bffe5df93aec4eee
+be7c8d4fc6cb3a71bd21fbb228e01cfcdce0717f
+c702e8af0b2144d97b93171dc2806ed1a0346762
+4f458a825d17e776500cc1597efb904e0dfdfe20
+6d3f5752f204a5a30f3c09fbf6d4a510a4522bcb
+3fa7b2b136696464e0a91b5ec25c6adf272d4d6b
+ad65f44877f22caadbc8b977b5b720c3c86fcc45

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 ## PR Checklist
 Please check if your PR fulfills the following requirements:
 
-- [ ] The commit message follows our guidelines: https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit
+- [ ] The commit message follows our guidelines: https://github.com/angular/angular/blob/main/contributing-docs/commit-message-guidelines.md
 - [ ] Tests for the changes have been added (for bug fixes / features)
 - [ ] Docs have been added / updated (for bug fixes / features)
 

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

@@ -1,18 +1,41 @@
+load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
 load("//tools:defaults.bzl", "esbuild_checked_in")
+load("//tools:defaults2.bzl", "ts_project")
+
+package(default_visibility = ["//.github/actions/deploy-docs-site:__subpackages__"])
 
 exports_files([
     "tsconfig.json",
 ])
 
 esbuild_checked_in(
     name = "main",
-    entry_point = "//.github/actions/deploy-docs-site/lib:main.ts",
+    entry_point = ":lib/main.mts",
     external = [
         "undici",
     ],
     platform = "node",
-    target = "node14",
+    target = "node20",
+    deps = [
+        ":lib",
+    ],
+)
+
+rules_js_tsconfig(
+    name = "tsconfig",
+    src = "tsconfig.json",
+)
+
+ts_project(
+    name = "lib",
+    srcs = glob(["lib/*.mts"]),
+    tsconfig = ":tsconfig",
     deps = [
-        "//.github/actions/deploy-docs-site/lib",
+        "//:node_modules/@actions/core",
+        "//:node_modules/@actions/github",
+        "//:node_modules/@angular/ng-dev",
+        "//:node_modules/@types/node",
+        "//:node_modules/@types/tmp",
+        "//:node_modules/tmp",
     ],
 )

.github/actions/deploy-docs-site/lib/credential.mts

@@ -0,0 +1,20 @@
+import {fileSync} from 'tmp';
+import {writeSync} from 'node:fs';
+import {getInput, setSecret} from '@actions/core';
+
+let credentialFilePath: undefined | string;
+
+export function getCredentialFilePath(): string {
+  if (credentialFilePath === undefined) {
+    const tmpFile = fileSync({postfix: '.json'});
+    writeSync(tmpFile.fd, getInput('serviceKey', {required: true}));
+    setSecret(tmpFile.name);
+    credentialFilePath = tmpFile.name;
+  }
+  return credentialFilePath;
+}
+
+/** Github access token. Used for querying the active release trains. */
+export const githubReleaseTrainReadToken: string = getInput('githubReleaseTrainReadToken', {
+  required: true,
+});

.github/actions/deploy-docs-site/lib/deploy.mts

@@ -0,0 +1,116 @@
+import {cp, mkdtemp, readFile, rm, writeFile} from 'node:fs/promises';
+import {Deployment} from './deployments.mjs';
+import {join} from 'node:path';
+
+import {tmpdir} from 'node:os';
+import {spawnSync} from 'node:child_process';
+import {getCredentialFilePath} from './credential.mjs';
+
+export async function deployToFirebase(
+  deployment: Deployment,
+  configPath: string,
+  distDirPath: string,
+) {
+  if (deployment.destination == undefined) {
+    console.log(`No deployment necessary for docs created from: ${deployment.branch}`);
+    return;
+  }
+
+  console.log('Preparing for deployment to firebase...');
+
+  const tmpDeployDir = await mkdtemp(join(tmpdir(), 'deploy-directory'));
+  const deployConfigPath = join(tmpDeployDir, 'firebase.json');
+
+  const config = JSON.parse(await readFile(configPath, {encoding: 'utf-8'})) as {
+    hosting: {public: string};
+  };
+  config['hosting']['public'] = './dist';
+
+  await writeFile(deployConfigPath, JSON.stringify(config, null, 2));
+
+  await cp(distDirPath, join(tmpDeployDir, 'dist'), {recursive: true});
+  spawnSync(`chmod 777 -R ${tmpDeployDir}`, {encoding: 'utf-8', shell: true});
+
+  firebase(
+    `target:clear --config ${deployConfigPath} --project angular-dev-site hosting angular-docs`,
+    tmpDeployDir,
+  );
+  firebase(
+    `target:apply --config ${deployConfigPath} --project angular-dev-site hosting angular-docs ${deployment.destination}`,
+    tmpDeployDir,
+  );
+  firebase(
+    `deploy --config ${deployConfigPath} --project angular-dev-site --only hosting --non-interactive`,
+    tmpDeployDir,
+  );
+  firebase(
+    `target:clear --config ${deployConfigPath} --project angular-dev-site hosting angular-docs`,
+    tmpDeployDir,
+  );
+
+  await rm(tmpDeployDir, {recursive: true});
+}
+
+export async function setupRedirect(deployment: Deployment) {
+  if (deployment.redirect === undefined) {
+    console.log(`No redirect necessary for docs created from: ${deployment.branch}`);
+    return;
+  }
+
+  console.log('Preparing to set up redirect on firebase...');
+
+  const redirectConfig = JSON.stringify(
+    {
+      hosting: {
+        target: 'angular-docs',
+        redirects: [
+          {
+            type: 302,
+            regex: '^(.*)$',
+            destination: `${deployment.redirect.to}:1`,
+          },
+        ],
+      },
+    },
+    null,
+    2,
+  );
+
+  const tmpRedirectDir = await mkdtemp(join(tmpdir(), 'redirect-directory'));
+  const redirectConfigPath = join(tmpRedirectDir, 'firebase.json');
+
+  await writeFile(redirectConfigPath, redirectConfig);
+  spawnSync(`chmod 777 -R ${tmpRedirectDir}`, {encoding: 'utf-8', shell: true});
+
+  firebase(
+    `target:clear --config ${redirectConfigPath} --project angular-dev-site hosting angular-docs`,
+    tmpRedirectDir,
+  );
+  firebase(
+    `target:apply --config ${redirectConfigPath} --project angular-dev-site hosting angular-docs ${deployment.redirect.from}`,
+    tmpRedirectDir,
+  );
+  firebase(
+    `deploy --config ${redirectConfigPath} --project angular-dev-site --only hosting --non-interactive`,
+    tmpRedirectDir,
+  );
+  firebase(
+    `target:clear --config ${redirectConfigPath} --project angular-dev-site hosting angular-docs`,
+    tmpRedirectDir,
+  );
+
+  await rm(tmpRedirectDir, {recursive: true});
+}
+
+function firebase(cmd: string, cwd?: string) {
+  spawnSync('npx', `-y [email protected] ${cmd}`.split(' '), {
+    cwd,
+    encoding: 'utf-8',
+    shell: true,
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      GOOGLE_APPLICATION_CREDENTIALS: getCredentialFilePath(),
+    },
+  });
+}