Merge branch 'develop' into docs-docusaurus-setup

.prettierignore

@@ -3,6 +3,7 @@
 dist/
 config/
 CHANGELOG.md
+pnpm-lock.yaml
 
 # assets
 src/assets/

Dockerfile

@@ -16,7 +16,7 @@ RUN \
 
 RUN npm install --global pnpm
 
-COPY package.json pnpm-lock.yaml ./
+COPY package.json pnpm-lock.yaml postinstall-win.js ./
 RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
 
 COPY . ./

package.json

@@ -4,6 +4,7 @@
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
+    "postinstall": "node postinstall-win.js",
     "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
     "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json",
     "build:next": "next build",
@@ -46,7 +47,6 @@
     "axios-rate-limit": "1.3.0",
     "bcrypt": "5.1.0",
     "bowser": "2.11.0",
-    "cacheable-lookup": "^7.0.0",
     "connect-typeorm": "1.1.4",
     "cookie-parser": "1.4.6",
     "copy-to-clipboard": "3.3.3",

postinstall-win.js

@@ -0,0 +1,13 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+if (process.platform === 'win32') {
+  const typeormPath = path.resolve('node_modules/typeorm');
+
+  if (fs.existsSync(typeormPath)) {
+    process.stdout.write('> Installing [email protected] for Windows\n');
+    execSync('pnpm add [email protected]', { stdio: 'inherit' });
+  }
+}

server/index.ts

@@ -23,25 +23,19 @@ import imageproxy from '@server/routes/imageproxy';
 import { getAppVersion } from '@server/utils/appVersion';
 import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
-import type CacheableLookupType from 'cacheable-lookup';
 import { TypeormStore } from 'connect-typeorm/out';
 import cookieParser from 'cookie-parser';
 import csurf from 'csurf';
-import { lookup } from 'dns';
 import type { NextFunction, Request, Response } from 'express';
 import express from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
 import next from 'next';
-import http from 'node:http';
-import https from 'node:https';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';
 
-const _importDynamic = new Function('modulePath', 'return import(modulePath)');
-
 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
 
 logger.info(`Starting Overseerr version ${getAppVersion()}`);
@@ -52,25 +46,6 @@ const handle = app.getRequestHandler();
 app
   .prepare()
   .then(async () => {
-    const CacheableLookup = (await _importDynamic('cacheable-lookup'))
-      .default as typeof CacheableLookupType;
-    const cacheable = new CacheableLookup();
-
-    const originalLookup = cacheable.lookup;
-
-    // if hostname is localhost use dns.lookup instead of cacheable-lookup
-    cacheable.lookup = (...args: any) => {
-      const [hostname] = args;
-      if (hostname === 'localhost') {
-        lookup(...(args as Parameters<typeof lookup>));
-      } else {
-        originalLookup(...(args as Parameters<typeof originalLookup>));
-      }
-    };
-
-    cacheable.install(http.globalAgent);
-    cacheable.install(https.globalAgent);
-
     const dbConnection = await dataSource.initialize();
 
     // Run migrations in production

src/components/TvDetails/Season/index.tsx

@@ -56,12 +56,14 @@ const Season = ({ seasonNumber, tvId }: SeasonProps) => {
                   {episode.overview && <p>{episode.overview}</p>}
                 </div>
                 {episode.stillPath && (
-                  <Image
-                    className="h-auto w-full rounded-lg xl:h-32 xl:w-auto"
-                    src={`https://image.tmdb.org/t/p/original/${episode.stillPath}`}
-                    alt=""
-                    fill
-                  />
+                  <div className="relative aspect-video xl:h-32">
+                    <Image
+                      className="rounded-lg object-contain"
+                      src={`https://image.tmdb.org/t/p/original/${episode.stillPath}`}
+                      alt=""
+                      fill
+                    />
+                  </div>
                 )}
               </div>
             );

tailwind.config.js

@@ -63,6 +63,27 @@ module.exports = {
         },
       }),
     },
+    aspectRatio: {
+      auto: 'auto',
+      square: '1 / 1',
+      video: '16 / 9',
+      1: '1',
+      2: '2',
+      3: '3',
+      4: '4',
+      5: '5',
+      6: '6',
+      7: '7',
+      8: '8',
+      9: '9',
+      10: '10',
+      11: '11',
+      12: '12',
+      13: '13',
+      14: '14',
+      15: '15',
+      16: '16',
+    },
   },
   plugins: [
     require('@tailwindcss/forms'),