diff --git a/lib/constants.ts b/lib/constants.ts
index 426a7699a..2452de8b6 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -18,4 +18,5 @@ export const OG_IMAGE_BASE_URL = enforceHTTPS(
);
// OG IMAGE RELATED
-export const OG_IMAGE_CACHE_VERSION = "1.0.0";
+export const OG_IMAGE_CACHE_VERSION = "1.0.1";
+export const TWEMOJI_OPTIONS = { folder: "svg", ext: ".svg" };
diff --git a/package.json b/package.json
index 671a6f899..0b18ab0f5 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
"react-icons": "^4.2.0",
"react-markdown": "^8.0.3",
"react-table": "^7.7.0",
+ "react-twemoji": "^0.5.0",
"react-vis": "^1.11.7",
"remark-gfm": "^3.0.1",
"spdx-correct": "^3.1.1",
@@ -78,6 +79,7 @@
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react-table": "^7.7.7",
+ "@types/react-twemoji": "^0.4.0",
"@types/react-vis": "^1.11.10",
"@types/spdx-correct": "^3.1.0",
"@typescript-eslint/eslint-plugin": "^5.0.0",
diff --git a/pages/_app.tsx b/pages/_app.tsx
index df63f0cff..a86d9f760 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -146,6 +146,14 @@ function ConsoleApp({ Component, pageProps }: AppPropsWithLayout) {
@@ -171,6 +179,14 @@ function ConsoleApp({ Component, pageProps }: AppPropsWithLayout) {
opacity: 0.7;
}
${fontSizeCssVars}
+
+ .emoji {
+ height: 1em;
+ width: 1em;
+ margin: 0 .05em 0 .1em;
+ vertical-align: -0.1em;
+ display: inline;
+ }
#nprogress {
pointer-events: none;
diff --git a/pages/_og/profile.tsx b/pages/_og/profile.tsx
index d86c566ae..ed71e2702 100644
--- a/pages/_og/profile.tsx
+++ b/pages/_og/profile.tsx
@@ -5,9 +5,11 @@ import {
BASE_URL,
OG_IMAGE_BASE_URL,
OG_IMAGE_CACHE_VERSION,
+ TWEMOJI_OPTIONS,
} from "lib/constants";
import { useRouter } from "next/router";
import { VscFile } from "react-icons/vsc";
+import Twemoji from "react-twemoji";
import { Heading } from "tw-components";
import { z } from "zod";
@@ -36,7 +38,7 @@ export function createProfileOGUrl(metadata: z.infer) {
url.searchParams.sort();
ogUrl.searchParams.append("url", url.toString());
- ogUrl.searchParams.append("version", OG_IMAGE_CACHE_VERSION);
+ ogUrl.searchParams.append("ogv", OG_IMAGE_CACHE_VERSION);
return ogUrl.toString();
}
@@ -44,6 +46,10 @@ export function createProfileOGUrl(metadata: z.infer) {
export default function OgProfileImage() {
const router = useRouter();
+ if (!router.isReady) {
+ return null;
+ }
+
let metadata;
try {
@@ -91,7 +97,7 @@ export default function OgProfileImage() {
}
/>
- {metadata.displayName}
+ {metadata.displayName}
{metadata.bio && (
- {metadata.bio}
+ {metadata.bio}
)}
diff --git a/pages/_og/release.tsx b/pages/_og/release.tsx
index f4ce02167..025f4347b 100644
--- a/pages/_og/release.tsx
+++ b/pages/_og/release.tsx
@@ -6,6 +6,7 @@ import {
BASE_URL,
OG_IMAGE_BASE_URL,
OG_IMAGE_CACHE_VERSION,
+ TWEMOJI_OPTIONS,
} from "lib/constants";
import { correctAndUniqueLicenses } from "lib/licenses";
import { useRouter } from "next/router";
@@ -15,6 +16,7 @@ import {
VscExtensions,
VscVersions,
} from "react-icons/vsc";
+import Twemoji from "react-twemoji";
import { Heading, Text } from "tw-components";
import { z } from "zod";
@@ -23,8 +25,8 @@ const OGReleaseMetadataSchema = z.object({
description: z.string().optional(),
releaser: z.string(),
releaserAvatar: z.string().optional(),
- extension: z.array(z.string()).optional(),
- license: z.array(z.string()).optional(),
+ extension: z.array(z.string()).or(z.string()).optional(),
+ license: z.array(z.string()).or(z.string()).optional(),
releaseLogo: z.string().optional(),
version: z.string(),
releaseDate: z.string(),
@@ -50,7 +52,7 @@ export function createReleaseOGUrl(
url.searchParams.sort();
ogUrl.searchParams.append("url", url.toString());
- ogUrl.searchParams.append("version", OG_IMAGE_CACHE_VERSION);
+ ogUrl.searchParams.append("ogv", OG_IMAGE_CACHE_VERSION);
return ogUrl.toString();
}
@@ -58,11 +60,16 @@ export function createReleaseOGUrl(
export default function OGReleaseImage() {
const router = useRouter();
+ if (!router.isReady) {
+ return null;
+ }
+
let metadata;
try {
metadata = OGReleaseMetadataSchema.parse(router.query);
} catch (err) {
+ console.error("failed to render", err);
return null;
}
@@ -136,7 +143,7 @@ export default function OGReleaseImage() {
fontSize="64px"
fontWeight={700}
>
- {metadata.name}
+ {metadata.name}
{metadata.description && (
@@ -146,7 +153,9 @@ export default function OGReleaseImage() {
fontSize="32px"
lineHeight={1.5}
>
- {metadata.description}
+
+ {metadata.description}
+
)}
@@ -165,7 +174,9 @@ export default function OGReleaseImage() {
`https://source.boringavatars.com/marble/120/${metadata.releaser}?colors=264653,2a9d8f,e9c46a,f4a261,e76f51&square=true`
}
/>
- {metadata.releaser}
+
+ {metadata.releaser}
+
@@ -184,7 +195,9 @@ export default function OGReleaseImage() {
fontFamily="mono"
size="subtitle.lg"
>
- {metadata.extension.join(", ")}
+ {Array.isArray(metadata.extension)
+ ? metadata.extension.join(", ")
+ : metadata.extension}
)}
@@ -195,7 +208,13 @@ export default function OGReleaseImage() {
fontFamily="mono"
size="subtitle.lg"
>
- {correctAndUniqueLicenses(metadata.license).join(", ")}
+ {correctAndUniqueLicenses(
+ Array.isArray(metadata.license)
+ ? metadata.license
+ : metadata.license
+ ? [metadata.license]
+ : [],
+ ).join(", ")}
diff --git a/yarn.lock b/yarn.lock
index c96dc8996..2df1d9671 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2810,6 +2810,13 @@
dependencies:
"@types/react" "*"
+"@types/react-twemoji@^0.4.0":
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/@types/react-twemoji/-/react-twemoji-0.4.0.tgz#3f3ce96e273ec0aa4b4ddca2913951b168fd72ee"
+ integrity sha512-OVkDaNTg9WqqM2MBqL68FNPsn+5aabQIbL9KY+ofK/Q4ENOuaHOWsg/jRD9zQ+GX5L+7LC1Ztgr4iK0/qZd17w==
+ dependencies:
+ "@types/react" "*"
+
"@types/react-vis@^1.11.10":
version "1.11.11"
resolved "https://registry.yarnpkg.com/@types/react-vis/-/react-vis-1.11.11.tgz#2cc53acfb3a1f617572ac662982dc9fa3f985ba9"
@@ -6177,6 +6184,15 @@ fs-extra@^4.0.2:
jsonfile "^4.0.0"
universalify "^0.1.0"
+fs-extra@^8.0.1:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+ integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+ dependencies:
+ graceful-fs "^4.2.0"
+ jsonfile "^4.0.0"
+ universalify "^0.1.0"
+
fs-minipass@^1.2.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -6466,7 +6482,7 @@ got@^7.1.0:
url-parse-lax "^1.0.0"
url-to-options "^1.0.1"
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
version "4.2.10"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -7376,6 +7392,15 @@ jsonfile@^4.0.0:
optionalDependencies:
graceful-fs "^4.1.6"
+jsonfile@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-5.0.0.tgz#e6b718f73da420d612823996fdf14a03f6ff6922"
+ integrity sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==
+ dependencies:
+ universalify "^0.1.2"
+ optionalDependencies:
+ graceful-fs "^4.1.6"
+
jsonify@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -7549,6 +7574,11 @@ lodash.debounce@^4.0.8:
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
+lodash.isequal@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+ integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
lodash.merge@^4.6.2:
version "4.6.2"
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -9152,7 +9182,7 @@ progress@^2.0.3:
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-prop-types@^15.0.0, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.8.1:
+prop-types@^15.0.0, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -9479,6 +9509,15 @@ react-table@^7.7.0:
resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.8.0.tgz#07858c01c1718c09f7f1aed7034fcfd7bda907d2"
integrity sha512-hNaz4ygkZO4bESeFfnfOft73iBUj8K5oKi1EcSHPAibEydfsX2MyU6Z8KCr3mv3C9Kqqh71U+DhZkFvibbnPbA==
+react-twemoji@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/react-twemoji/-/react-twemoji-0.5.0.tgz#0565f8e427fc4c9ef3680977c4a88fbdef79f874"
+ integrity sha512-xz3NLWTFCfWOmPd559jcFX4f976ORIPpL9SwdBQO5BZwIYD1U1vpbY2E6k2vwPCVH78s2m1GbG5jpHKGUPZ+gw==
+ dependencies:
+ lodash.isequal "^4.5.0"
+ prop-types "^15.7.2"
+ twemoji "14.0.1"
+
react-vis@^1.11.7:
version "1.11.7"
resolved "https://registry.yarnpkg.com/react-vis/-/react-vis-1.11.7.tgz#909902af00158895d14da1adfe1d0dc0045228ff"
@@ -10688,6 +10727,21 @@ tweetnacl@^1.0.3:
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
+twemoji-parser@14.0.0:
+ version "14.0.0"
+ resolved "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-14.0.0.tgz#13dabcb6d3a261d9efbf58a1666b182033bf2b62"
+ integrity sha512-9DUOTGLOWs0pFWnh1p6NF+C3CkQ96PWmEFwhOVmT3WbecRC+68AIqpsnJXygfkFcp4aXbOp8Dwbhh/HQgvoRxA==
+
+twemoji@14.0.1:
+ version "14.0.1"
+ resolved "https://registry.yarnpkg.com/twemoji/-/twemoji-14.0.1.tgz#0640887ef149403ae577081cbc2480a026e55ed6"
+ integrity sha512-eoqhea0sUhmC10iTacksyp1v9O4BP1jKmVqtK+Nztw40/dzawSHkXL3/xCpyh+mukmEvJ0Gw9VLvwZfQ9HKXDw==
+ dependencies:
+ fs-extra "^8.0.1"
+ jsonfile "^5.0.0"
+ twemoji-parser "14.0.0"
+ universalify "^0.1.2"
+
type-check@^0.4.0, type-check@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -10842,7 +10896,7 @@ unist-util-visit@^4.0.0:
unist-util-is "^5.0.0"
unist-util-visit-parents "^5.1.1"
-universalify@^0.1.0:
+universalify@^0.1.0, universalify@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==