Skip to content

[pull] main from facebook:main #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Sep 7, 2026
Merged

[pull] main from facebook:main #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6580a9
chore(deps): bump github/codeql-action/analyze from 4.37.8 to 4.37.9 …
dependabot[bot] Sep 7, 2026
1479cd8
chore(deps): bump github/codeql-action/init from 4.37.8 to 4.37.9 (#1…
dependabot[bot] Sep 7, 2026
2dbf8b4
chore(deps): bump @vercel/analytics from 1.6.1 to 2.0.1 (#12417)
dependabot[bot] Sep 7, 2026
331cfa3
chore(deps-dev): bump @testing-library/react from 16.3.2 to 16.3.3 (#…
dependabot[bot] Sep 7, 2026
12ae379
fix(website): fix website Showcase image bug (#12423)
slorber Sep 7, 2026
afbbefb
chore(deps): bump html-tags from 3.3.1 to 5.1.0 (#12419)
dependabot[bot] Sep 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Initialize CodeQL
uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # 4.37.8
uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # 4.37.9
with:
languages: javascript-typescript
config-file: ./.github/codeql/codeql-config.yml

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # 4.37.8
uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # 4.37.9
2 changes: 1 addition & 1 deletion packages/docusaurus-plugin-vercel-analytics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@docusaurus/types": "3.10.1",
"@docusaurus/utils": "3.10.1",
"@docusaurus/utils-validation": "3.10.1",
"@vercel/analytics": "^1.1.1",
"@vercel/analytics": "^2.0.1",
"tslib": "^2.6.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/docusaurus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"eval": "^0.1.8",
"execa": "^10.0.0",
"fs-extra": "^11.2.0",
"html-tags": "^3.3.1",
"html-tags": "^5.1.0",
"html-webpack-plugin": "^5.6.7",
"leven": "^3.1.0",
"lodash": "^4.17.21",
Expand Down
3 changes: 1 addition & 2 deletions packages/docusaurus/src/server/htmlTags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

import _ from 'lodash';
import htmlTags from 'html-tags';
import voidHtmlTags from 'html-tags/void';
import htmlTags, {voidHtmlTags} from 'html-tags';
import escapeHTML from 'escape-html';
import type {
Props,
Expand Down
35 changes: 16 additions & 19 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion website/src/data/users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import {translate} from '@docusaurus/Translate';
import {sortBy} from '@site/src/utils/jsUtils';
import type {Props as IdealImageProps} from '@theme/IdealImage';

/*
* ADD YOUR SITE TO THE DOCUSAURUS SHOWCASE
Expand Down Expand Up @@ -2386,7 +2387,7 @@ const Users: User[] = [
export type User = {
title: string;
description: string;
preview: string | null; // null = use our serverless screenshot service
preview: IdealImageProps['img'] | string | null; // null = use our serverless screenshot service
website: string;
source: string | null;
tags: TagType[];
Expand Down
6 changes: 4 additions & 2 deletions website/src/pages/showcase/_components/ShowcaseCard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import React from 'react';
import clsx from 'clsx';
import Link from '@docusaurus/Link';
import Translate from '@docusaurus/Translate';
import Image from '@theme/IdealImage';
import {Tags, TagList, type TagType, type User} from '@site/src/data/users';
import {sortBy} from '@site/src/utils/jsUtils';
import Heading from '@theme/Heading';
import type {Props as IdealImageProps} from '@theme/IdealImage';
import FavoriteIcon from '../FavoriteIcon';
import styles from './styles.module.css';

Expand Down Expand Up @@ -49,7 +51,7 @@ function ShowcaseCardTag({tags}: {tags: TagType[]}) {
);
}

function getCardImage(user: User): string {
function getCardImage(user: User): IdealImageProps['img'] {
return (
user.preview ??
// TODO make it configurable
Expand All @@ -64,7 +66,7 @@ function ShowcaseCard({user}: {user: User}) {
return (
<li key={user.title} className="card shadow--md">
<div className={clsx('card__image', styles.showcaseCardImage)}>
<img src={image} alt={user.title} loading="lazy" />
<Image img={image} alt={user.title} loading="lazy" />
</div>
<div className="card__body">
<div className={clsx(styles.showcaseCardHeader)}>
Expand Down
Loading