lint tsx

tex0l · Mar 5, 2024 · faa775c · faa775c
1 parent 7de7d19
commit faa775c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -47,15 +47,15 @@ module.exports = {
       }
     },
     {
-      files: ['*.ts'],
+      files: ['*.ts', '*.tsx'],
       extends: 'standard-with-typescript',
       env: {
         es2020: true,
         node: true
       }
     },
     {
-      files: ['*.mjs', '*.cjs', '*.js'],
+      files: ['*.mjs', '*.cjs', '*.js', '*.jsx'],
       extends: 'standard',
       env: {
         es2020: true,

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.1",
   "scripts": {
     "prelint": "rm -rf dist .astro && astro sync",
-    "lint": "eslint . --ext .js,.ts,.cjs,.mjs,.astro && astro check",
+    "lint": "eslint . --ext .js,.ts,.cjs,.mjs,.astro,.jsx,.tsx && astro check",
     "prestart": "node encryptAssets.js && DUMMY=true node encryptAssets.js",
     "dev": "astro dev",
     "start": "astro dev",

diff --git a/src/components/og-image.tsx b/src/components/og-image.tsx
@@ -1,4 +1,4 @@
-import {Buffer} from 'node:buffer'
+import { Buffer } from 'node:buffer'
 import sharp from 'sharp'
 import { findLargestUsableFontSize } from '@altano/satori-fit-text'
 import roboto400Normal from '@fontsource/roboto/files/roboto-latin-400-normal.woff?arraybuffer'
@@ -19,11 +19,11 @@ export default waterfall(async ({ image, title, description, author, date, width
     .toBuffer()
 
   const b64ImageSrc = `data:image/png;base64,${resizedImage.toString('base64')}`
-  const dateString = date ?
-    dateFormat === 'en' ?
-      `${(date.getMonth() + 1).toString().padStart(2, '0')}/${date.getDate().toString().padStart(2, '0')}/${date.getFullYear().toString().padStart(4, '0')}` :
-      `${date.getDate().toString().padStart(2, '0')}/${(date.getMonth() + 1).toString().padStart(2, '0')}/${date.getFullYear().toString().padStart(4, '0')}` :
-    undefined
+  const dateString = date != null
+    ? dateFormat === 'en'
+      ? `${(date.getMonth() + 1).toString().padStart(2, '0')}/${date.getDate().toString().padStart(2, '0')}/${date.getFullYear().toString().padStart(4, '0')}`
+      : `${date.getDate().toString().padStart(2, '0')}/${(date.getMonth() + 1).toString().padStart(2, '0')}/${date.getFullYear().toString().padStart(4, '0')}`
+    : undefined
 
   const frameWidth = 48
   const imageMargin = 20
@@ -38,7 +38,7 @@ export default waterfall(async ({ image, title, description, author, date, width
     text: title,
     minFontSize: 65,
     maxWidth: contentWidth,
-    maxHeight: titleMaxHeight,
+    maxHeight: titleMaxHeight
   })
 
   const descriptionFontSize = await findLargestUsableFontSize({
@@ -47,17 +47,17 @@ export default waterfall(async ({ image, title, description, author, date, width
     text: description,
     maxFontSize: 50,
     maxWidth: contentWidth,
-    maxHeight: height - 2 * frameWidth - 30 - titleMaxHeight - imageMargin - /* space between author line and description */ 3 * imageMargin,
+    maxHeight: height - 2 * frameWidth - 30 - titleMaxHeight - imageMargin - /* space between author line and description */ 3 * imageMargin
   })
 
-  return <div style={{ display: 'flex', padding: frameWidth, width, height}}>
-    <div style={{ display: 'flex', maxWidth: '100%', maxHeight: '100%', flexDirection: 'column', backgroundColor: 'white', justifyContent: 'center', borderRadius: 16, paddingRight: imageMargin, boxShadow: '0 25px 50px -12px rgb(0 0 0 / 0.25)', width, height}}>
+  return <div style={{ display: 'flex', padding: frameWidth, width, height }}>
+    <div style={{ display: 'flex', maxWidth: '100%', maxHeight: '100%', flexDirection: 'column', backgroundColor: 'white', justifyContent: 'center', borderRadius: 16, paddingRight: imageMargin, boxShadow: '0 25px 50px -12px rgb(0 0 0 / 0.25)', width, height }}>
       <div style={{ display: 'flex', maxWidth: '100%', maxHeight: '100%', width: width - 2 * frameWidth, height: height - 2 * frameWidth }}>
         <img style={{ margin: imageMargin }} src={b64ImageSrc} width={Math.floor(width / 3)}/>
         <div style={{ display: 'flex', flexDirection: 'column', width: contentWidth, height: height - 2 * frameWidth }}>
           <h1 style={{ display: 'block', position: 'absolute', left: 0, top: 0, fontSize: titleFontSize, fontWeight: 700, maxWidth: contentWidth, lineClamp: 2, lineHeight: 1.3 }}>{title}</h1>
-          <span style={{ display: 'block', position: 'absolute', left: 0, top: titleMaxHeight + imageMargin, fontSize: descriptionFontSize, fontWeight: 400, maxWidth: contentWidth, lineClamp: 3, lineHeight: 1.3}}>{description}</span>
-          {author != null ? <span style={{ position: 'absolute', bottom: 0, left: 0, fontSize: 30, marginBottom: imageMargin}}>{author}</span> : <></>}
+          <span style={{ display: 'block', position: 'absolute', left: 0, top: titleMaxHeight + imageMargin, fontSize: descriptionFontSize, fontWeight: 400, maxWidth: contentWidth, lineClamp: 3, lineHeight: 1.3 }}>{description}</span>
+          {author != null ? <span style={{ position: 'absolute', bottom: 0, left: 0, fontSize: 30, marginBottom: imageMargin }}>{author}</span> : <></>}
           {dateString != null ? <span style={{ position: 'absolute', bottom: imageMargin, right: 0, fontSize: 30 }}>{dateString}</span> : <></>}
         </div>
       </div>