Merge pull request #251 from angular/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -4,7 +4,7 @@
 # https://github.com/bazelbuild/bazel/issues/8106
 .git
 node_modules
-dist
+dist/
 
 # All integration test node_modules folders
 integration/animations/node_modules
@@ -24,6 +24,7 @@ integration/ng_elements/node_modules
 integration/ng_update/node_modules
 integration/ng_update_migrations/node_modules
 integration/ng-add-localize/node_modules
+integration/no_ts_linker/node_modules
 integration/nodenext_resolution/node_modules
 integration/platform-server/node_modules
 integration/platform-server-zoneless/node_modules
@@ -34,5 +35,43 @@ integration/standalone-bootstrap/node_modules
 integration/terser/node_modules
 integration/trusted-types/node_modules
 integration/typings_test_rxjs7/node_modules
-integration/typings_test_ts58/node_modules
+integration/legacy-animations/node_modules
+integration/legacy-animations-async/node_modules
+integration/typings_test_ts59/node_modules
 modules/ssr-benchmarks/node_modules
+vscode-ng-language-service/integration/project/dist/
+
+# For rules_js
+adev/node_modules
+adev/shared-docs/node_modules
+adev/shared-docs/pipeline/api-gen/node_modules
+dev-app/node_modules
+modules/node_modules
+integration/node_modules
+packages/animations/node_modules
+packages/common/node_modules
+packages/localize/node_modules
+packages/compiler-cli/node_modules
+packages/compiler-cli/linker/babel/test/node_modules
+packages/compiler/node_modules
+packages/core/node_modules
+packages/core/test/bundling/node_modules
+packages/elements/node_modules
+packages/forms/node_modules
+packages/language-service/node_modules
+packages/platform-browser/node_modules
+packages/platform-server/node_modules
+packages/platform-browser-dynamic/node_modules
+packages/router/node_modules
+packages/zone.js/node_modules
+packages/zone.js/test/typings/node_modules
+packages/upgrade/node_modules
+packages/benchpress/node_modules
+packages/service-worker/node_modules
+packages/zone.js/test/typings/node_modules
+packages/zone.js/node_modules
+tools/bazel/rules_angular_store/node_modules
+vscode-ng-language-service/node_modules
+vscode-ng-language-service/server/node_modules
+vscode-ng-language-service/integration/pre_standalone_project/node_modules
+vscode-ng-language-service/integration/project/node_modules

.bazelignore

@@ -1,5 +1,5 @@
 # Enable debugging tests with --config=debug
-test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results --spawn_strategy=local
+test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results --strategy=TestRunner=standalone
 
 # Do not attempt to de-flake locally.
 # On CI we might set this to `3` to run with deflaking.
@@ -9,6 +9,12 @@ test --flaky_test_attempts=1
 common --@aspect_rules_ts//ts:skipLibCheck=always
 common --@aspect_rules_ts//ts:default_to_tsc_transpiler
 
+# Needed as otherwise `env` of TS actions would be ignored.
+common --incompatible_merge_fixed_and_default_shell_env
+
+# Frozen lockfile
+common --lockfile_mode=error
+
 ###############################
 # Filesystem interactions     #
 ###############################
@@ -35,7 +41,7 @@ test --nolegacy_external_runfiles
 # in Bazel 0.21.0 but turned off again in 0.22.0. Follow
 # https://github.com/bazelbuild/bazel/issues/7026 for more details.
 # This flag is needed to so that the bazel cache is not invalidated
-# when running bazel via `yarn bazel`.
+# when running bazel via `pnpm bazel`.
 # See https://github.com/angular/angular/issues/27514.
 build --incompatible_strict_action_env
 run --incompatible_strict_action_env
@@ -57,12 +63,15 @@ build --enable_runfiles
 # Releases should always be stamped with version control info
 # This command assumes node on the path and is a workaround for
 # https://github.com/bazelbuild/bazel/issues/4802
-build:release --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=release"
+build:release --workspace_status_command="pnpm --silent ng-dev release build-env-stamp --mode=release"
 build:release --stamp
 
 # Snapshots should also be stamped with version control information.
-build:snapshot-build --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=snapshot"
+build:snapshot-build --workspace_status_command="pnpm --silent ng-dev release build-env-stamp --mode=snapshot"
 build:snapshot-build --stamp
+# @angular/language-server package depends directly on other Angular framework packages.
+# This flag ensures that the language server uses the snapshot-built framework packages from the repository.
+build:snapshot-build --//:enable_language_server_snapshot_repo_deps
 
 # Angular DevTools for Firefox releases *cannot* be stamped and `--config snapshot-build-firefox` is a no-op.
 # This is because Mozilla requires add-on source code to be uploaded and then they manually reproduce the build.
@@ -106,9 +115,9 @@ build:remote --cpu=k8
 build:remote --host_cpu=k8
 
 # Toolchain and platform related flags
-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
+build:remote --extra_execution_platforms=@devinfra//bazel/remote-execution:platform_with_network
+build:remote --host_platform=@devinfra//bazel/remote-execution:platform_with_network
+build:remote --platforms=@devinfra//bazel/remote-execution:platform_with_network
 
 # Remote instance and caching
 build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance
@@ -139,7 +148,7 @@ common --experimental_allow_tags_propagation
 # Disable network access in the sandbox by default. To enable network access
 # for a particular target, use:
 #
-# load("@npm//@angular/build-tooling/bazel/remote-execution:index.bzl", "ENABLE_NETWORK")
+# load("@devinfra//bazel/remote-execution:index.bzl", "ENABLE_NETWORK")
 # my_target(
 #   ...,
 #   exec_properties = ENABLE_NETWORK,   # Enables network in remote exec
@@ -163,8 +172,6 @@ test:saucelabs --flaky_test_attempts=1
 
 # --ng_perf will ask the Ivy compiler to produce performance results for each build.
 build --flag_alias=ng_perf=//packages/compiler-cli:ng_perf
-# --full_build_adev will run adev build/serve in a full mode, performing prerendering and DCE.
-build --flag_alias=full_build_adev=//adev:full_build_adev
 
 ####################################################
 # User bazel configuration

.bazelrc

@@ -1 +1 @@
-6.5.0
+7.7.1

.bazelversion

@@ -3,7 +3,7 @@
   "name": "Angular dev container",
   "dockerFile": "Dockerfile",
   "appPort": [4000, 4200, 4433, 5000, 8080, 9876],
-  "postCreateCommand": "yarn install",
+  "postCreateCommand": "pnpm install",
   "extensions": [
     "devondcarew.bazel-code",
     "ms-vscode.vscode-typescript-tslint-plugin"

.devcontainer/recommended-devcontainer.json

@@ -0,0 +1,10 @@
+have_fun: false
+code_review:
+  disable: false
+  comment_severity_threshold: MEDIUM
+  max_review_comments: -1
+  pull_request_opened:
+    help: false
+    summary: false
+    code_review: false
+ignore_patterns: []

.gemini/config.yaml

@@ -1,6 +1,4 @@
-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")
+load("//tools:defaults.bzl", "esbuild_checked_in", "ts_config", "ts_project")
 
 package(default_visibility = ["//.github/actions/deploy-docs-site:__subpackages__"])
 
@@ -10,18 +8,21 @@ exports_files([
 
 esbuild_checked_in(
     name = "main",
+    config = "esbuild.conf.js",
     entry_point = ":lib/main.mts",
     external = [
         "undici",
+        "pnpapi",
     ],
+    metafile = False,
     platform = "node",
     target = "node20",
     deps = [
         ":lib",
     ],
 )
 
-rules_js_tsconfig(
+ts_config(
     name = "tsconfig",
     src = "tsconfig.json",
 )

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

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+
+module.exports = {
+  resolveExtensions: ['.mjs', '.js'],
+  format: 'esm',
+  banner: {
+    // Workaround for: https://github.com/evanw/esbuild/issues/946
+    js: `import {createRequire as __cjsCompatRequire} from 'module';
+const require = __cjsCompatRequire(import.meta.url);`,
+  },
+};

.github/actions/deploy-docs-site/esbuild.conf.js

@@ -1,4 +1,4 @@
-import {cp, mkdtemp, readFile, rm, writeFile} from 'node:fs/promises';
+import {mkdtemp, readFile, rm, writeFile} from 'node:fs/promises';
 import {Deployment} from './deployments.mjs';
 import {join} from 'node:path';
 
@@ -9,7 +9,7 @@ import {getCredentialFilePath} from './credential.mjs';
 export async function deployToFirebase(
   deployment: Deployment,
   configPath: string,
-  distDirPath: string,
+  stagingDir: string,
 ) {
   if (deployment.destination == undefined) {
     console.log(`No deployment necessary for docs created from: ${deployment.branch}`);
@@ -18,37 +18,33 @@ export async function deployToFirebase(
 
   console.log('Preparing for deployment to firebase...');
 
-  const tmpDeployDir = await mkdtemp(join(tmpdir(), 'deploy-directory'));
-  const deployConfigPath = join(tmpDeployDir, 'firebase.json');
+  const deployConfigPath = join(stagingDir, 'firebase.json');
 
   const config = JSON.parse(await readFile(configPath, {encoding: 'utf-8'})) as {
     hosting: {public: string};
   };
-  config['hosting']['public'] = './dist';
+  config['hosting']['public'] = './browser';
 
   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,
+    stagingDir,
   );
   firebase(
     `target:apply --config ${deployConfigPath} --project angular-dev-site hosting angular-docs ${deployment.destination}`,
-    tmpDeployDir,
+    stagingDir,
   );
   firebase(
     `deploy --config ${deployConfigPath} --project angular-dev-site --only hosting --non-interactive`,
-    tmpDeployDir,
+    stagingDir,
   );
   firebase(
     `target:clear --config ${deployConfigPath} --project angular-dev-site hosting angular-docs`,
-    tmpDeployDir,
+    stagingDir,
   );
 
-  await rm(tmpDeployDir, {recursive: true});
+  await rm(stagingDir, {recursive: true});
 }
 
 export async function setupRedirect(deployment: Deployment) {
@@ -103,7 +99,7 @@ export async function setupRedirect(deployment: Deployment) {
 }
 
 function firebase(cmd: string, cwd?: string) {
-  spawnSync('npx', `-y [email protected] ${cmd}`.split(' '), {
+  const {status} = spawnSync('npx', `-y [email protected] ${cmd}`.split(' '), {
     cwd,
     encoding: 'utf-8',
     shell: true,
@@ -113,4 +109,8 @@ function firebase(cmd: string, cwd?: string) {
       GOOGLE_APPLICATION_CREDENTIALS: getCredentialFilePath(),
     },
   });
+  if (status !== 0) {
+    console.error('Firebase command failed, see log above for details.');
+    process.exit(status);
+  }
 }

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

@@ -9,6 +9,7 @@ export interface Deployment {
     to: string;
   };
   destination?: string;
+  servingUrl: string;
 }
 
 export type Deployments = Map<string, Deployment>;
@@ -31,6 +32,7 @@ export async function getDeployments(): Promise<Deployments> {
     docSites.set(branch.name, {
       branch: branch.name,
       destination: `v${branch.version.major}-angular-dev`,
+      servingUrl: `https://v${branch.version.major}.angular.dev/`,
     });
   });
 
@@ -40,12 +42,14 @@ export async function getDeployments(): Promise<Deployments> {
       from: `v${releaseTrains.latest.version.major}-angular-dev`,
       to: 'https://angular.dev',
     },
+    servingUrl: 'https://angular.dev/',
     destination: 'angular-dev-site',
   });
 
   if (releaseTrains.releaseCandidate) {
     docSites.set(releaseTrains.next.branchName, {
       branch: releaseTrains.next.branchName,
+      servingUrl: 'https://next.angular.dev/',
     });
 
     docSites.set(releaseTrains.releaseCandidate.branchName, {
@@ -55,11 +59,13 @@ export async function getDeployments(): Promise<Deployments> {
         from: `v${releaseTrains.releaseCandidate.version.major}-angular-dev`,
         to: 'https://next.angular.dev',
       },
+      servingUrl: 'https://next.angular.dev/',
     });
   } else {
     docSites.set(releaseTrains.next.branchName, {
       branch: releaseTrains.next.branchName,
       destination: 'next-angular-dev',
+      servingUrl: 'https://next.angular.dev/',
     });
   }