Merge pull request #201 from angular/main

Create a new pull request by comparing changes across two branches
angular-indonesia · May 8, 2024 · d8237e0 · d8237e0
2 parents edc0bba + 7287fef
commit d8237e0
Show file tree

Hide file tree

Showing 85 changed files with 8,013 additions and 293 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -17,6 +17,7 @@ integration/cli-hello-world-ivy-i18n/node_modules
 integration/cli-hello-world-lazy/node_modules
 integration/cli-hello-world-mocha/node_modules
 integration/cli-signal-inputs/node_modules
+integration/platform-server-hydration/node_modules
 integration/defer/node_modules
 integration/dynamic-compiler/node_modules
 integration/forms/node_modules

diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml
@@ -13,7 +13,7 @@ jobs:
   assistant_to_the_branch_manager:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           persist-credentials: false
       - uses: angular/dev-infra/github-actions/branch-manager@e6e98d32d7d4d350ecf4ec10ad9c7e75198daabd

diff --git a/.github/workflows/benchmark-compare.yml b/.github/workflows/benchmark-compare.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: alessbell/pull-request-comment-branch@aad01d65d6982b8eacabed5e9a684cd8ceb98da6 # v1.1
         id: comment-branch
 
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           # Specify repository as the PR branch might be from a fork.
           repository: ${{steps.comment-branch.outputs.head_owner}}/${{steps.comment-branch.outputs.head_repo}}

diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml
@@ -12,14 +12,14 @@ jobs:
   labels:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - uses: angular/dev-infra/github-actions/commit-message-based-labels@e6e98d32d7d4d350ecf4ec10ad9c7e75198daabd
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
   post_approval_changes:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - uses: angular/dev-infra/github-actions/post-approval-changes@e6e98d32d7d4d350ecf4ec10ad9c7e75198daabd
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/.github/workflows/google-internal-tests.yml b/.github/workflows/google-internal-tests.yml
@@ -13,7 +13,7 @@ jobs:
       statuses: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - uses: angular/dev-infra/github-actions/google-internal-tests@e6e98d32d7d4d350ecf4ec10ad9c7e75198daabd
         with:
           run-tests-guide-url: http://go/angular-g3sync-start

diff --git a/.github/workflows/update-cli-help.yml b/.github/workflows/update-cli-help.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           # Setting `persist-credentials: false` prevents the github-action account from being the
           # account that is attempted to be used for authentication, instead the remote is set to

diff --git a/WORKSPACE b/WORKSPACE
@@ -167,10 +167,10 @@ cldr_xml_data_repository(
 # sass rules
 http_archive(
     name = "io_bazel_rules_sass",
-    sha256 = "845061fad5cb42a353ac394fe6450ec9f21d337acf5b98011ef29ddcb33e3671",
-    strip_prefix = "rules_sass-9f8be59f5175d0dd3438d7da994b2782299e0c2c",
+    sha256 = "a2aeaf52f9a17b07e91c116d64bca3fd1a709addd02a390efff1b78b8f88bc13",
+    strip_prefix = "rules_sass-9a4a4be9e8f208375892d27212cbbcf27685d333",
     urls = [
-        "https://github.com/bazelbuild/rules_sass/archive/9f8be59f5175d0dd3438d7da994b2782299e0c2c.zip",
+        "https://github.com/bazelbuild/rules_sass/archive/9a4a4be9e8f208375892d27212cbbcf27685d333.zip",
     ],
 )
 

diff --git a/adev/src/app/app.component.html b/adev/src/app/app.component.html
@@ -1,11 +1,11 @@
 @defer (when isBrowser) {
-<adev-progress-bar />
+  <adev-progress-bar />
 }
 <button (click)="focusFirstHeading()" class="adev-skip">Skip to main content</button>
 
 <div class="adev-nav"></div>
 @if (displaySecondaryNav()) {
-<adev-secondary-navigation />
+  <adev-secondary-navigation />
 }
 <div class="docs-app-main-content">
   <!--
@@ -22,9 +22,9 @@
       }
     }
   }
-    <router-outlet />
+  <router-outlet />
 
   @if (displayFooter()) {
-  <footer adev-footer></footer>
+    <footer adev-footer></footer>
   }
 </div>
diff --git a/adev/src/app/core/layout/navigation/navigation.component.html b/adev/src/app/core/layout/navigation/navigation.component.html
@@ -82,7 +82,8 @@
       >
         <a aria-label="Angular homepage" routerLink="/">
           <!-- Logo Symbol -->
-          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 223 236" width="32">
+          @if(!isUwu) {
+          <svg class="angular-logo" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 223 236" width="32">
             <g clip-path="url(#a)">
               <path
                 fill="url(#b)"
@@ -125,6 +126,14 @@
               </clipPath>
             </defs>
           </svg>
+        } @else {
+          <img
+            src="assets/images/uwu.png"
+            style="width: auto; margin: 0"
+            class="uwu-logo"
+            alt="Angular logo"
+            height="34"/>
+        }
         </a>
 
         <!-- Version picker for v18+ -->

diff --git a/adev/src/app/core/layout/navigation/navigation.component.scss b/adev/src/app/core/layout/navigation/navigation.component.scss
@@ -251,6 +251,10 @@
   }
 }
 
+.adev-nav-item--logo a {
+  height: 34px;
+}
+
 .adev-close-nav {
   display: none;
   @include mq.for-phone-only {

diff --git a/adev/src/app/core/layout/navigation/navigation.component.ts b/adev/src/app/core/layout/navigation/navigation.component.ts
@@ -27,7 +27,7 @@ import {
   isApple,
   IS_SEARCH_DIALOG_OPEN,
 } from '@angular/docs';
-import {NavigationEnd, Router, RouterLink} from '@angular/router';
+import {ActivatedRoute, NavigationEnd, Router, RouterLink} from '@angular/router';
 import {filter, map, startWith} from 'rxjs/operators';
 import {DOCS_ROUTES, REFERENCE_ROUTES, TUTORIALS_ROUTES} from '../../../routes';
 import {GITHUB, MEDIUM, X, YOUTUBE} from '../../constants/links';
@@ -83,6 +83,9 @@ export class Navigation implements OnInit {
   readonly PRIMARY_NAV_ID = PRIMARY_NAV_ID;
   readonly SECONDARY_NAV_ID = SECONDARY_NAV_ID;
 
+  // We can't use the ActivatedRouter queryParams as we're outside the router outlet
+  readonly isUwu = 'location' in globalThis ? location.search.includes('uwu') : false;
+
   miniMenuPositions = [
     new ConnectionPositionPair(
       {originX: 'end', originY: 'center'},