From 8fe0c8af85c80359cf96a19fb00e423332cf700f Mon Sep 17 00:00:00 2001
From: OIRNOIR <70721372+OIRNOIR@users.noreply.github.com>
Date: Wed, 1 Apr 2026 21:32:11 -0700
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#74822=20[react?=
 =?UTF-8?q?-file-icon]=20Add=20missing=20"android"=20and=20"code2"=20FileI?=
 =?UTF-8?q?con=20Types=20by=20@OIRNOIR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/react-file-icon/index.d.ts               |  2 ++
 .../react-file-icon/react-file-icon-tests.tsx  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/types/react-file-icon/index.d.ts b/types/react-file-icon/index.d.ts
index 465f4714f03c54..b4069162d32de2 100644
--- a/types/react-file-icon/index.d.ts
+++ b/types/react-file-icon/index.d.ts
@@ -3,9 +3,11 @@ import * as React from "react";
 export type IconType =
     | "3d"
     | "acrobat"
+    | "android"
     | "audio"
     | "binary"
     | "code"
+    | "code2"
     | "compressed"
     | "document"
     | "drive"
diff --git a/types/react-file-icon/react-file-icon-tests.tsx b/types/react-file-icon/react-file-icon-tests.tsx
index 62a09a8859d385..f0284331dff02f 100644
--- a/types/react-file-icon/react-file-icon-tests.tsx
+++ b/types/react-file-icon/react-file-icon-tests.tsx
@@ -6,3 +6,21 @@ class TestFileIcon extends React.Component {
         return <FileIcon extension={"docx"} labelUppercase={true} {...defaultStyles.docx} />;
     }
 }
+
+class TestFileIconCode extends React.Component {
+    render() {
+        return <FileIcon extension={"docx"} type="code" color="aliceblue" />;
+    }
+}
+
+class TestFileIconCode2 extends React.Component {
+    render() {
+        return <FileIcon extension={"docx"} type="code2" color="aliceblue" />;
+    }
+}
+
+class TestFileIconAndroid extends React.Component {
+    render() {
+        return <FileIcon extension={"docx"} type="android" color="aliceblue" />;
+    }
+}

From f0dfa3025cc9eaacd1493baccd5603b2a77755b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 15:54:40 -0700
Subject: [PATCH 2/2] Bump actions/cache from 5.0.3 to 5.0.4 in the
 github-actions group across 1 directory (#74795)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/CI.yml                | 2 +-
 .github/workflows/format-and-commit.yml | 2 +-
 .github/workflows/pnpm-cache.yml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 6e81bb65694808..aecb9596a5d32e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -87,7 +87,7 @@ jobs:
           echo "store=$(pnpm store path)" >> $GITHUB_OUTPUT
 
       - name: Restore pnpm cache
-        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: ${{ steps.pnpm-cache.outputs.store }}
           key: ${{ runner.os }}-pnpm-store-cache-
diff --git a/.github/workflows/format-and-commit.yml b/.github/workflows/format-and-commit.yml
index 461ba1f843a9a8..5f9dfffcd941f8 100644
--- a/.github/workflows/format-and-commit.yml
+++ b/.github/workflows/format-and-commit.yml
@@ -24,7 +24,7 @@ jobs:
         id: date
         run: echo "date=$(/bin/date -u "+%Y-%m-%d")" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+      - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           # dprint caches info about the files in the repo to skip formatting them.
           # However, since package.json and .dprint.jsonc don't change very often,
diff --git a/.github/workflows/pnpm-cache.yml b/.github/workflows/pnpm-cache.yml
index f91d14c88d6927..36e104e490c35a 100644
--- a/.github/workflows/pnpm-cache.yml
+++ b/.github/workflows/pnpm-cache.yml
@@ -27,7 +27,7 @@ jobs:
         run: pnpm install
 
       - name: Save pnpm cache
-        uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: ${{ steps.pnpm-cache.outputs.store }}
           key: ${{ runner.os }}-pnpm-store-cache-${{ steps.pnpm-cache.outputs.date }}