Merge branch 'feature/nx'

JoosepAlviste · Jul 16, 2023 · 08088de · 08088de
2 parents 68e634d + f987118
commit 08088de
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 15 deletions.
diff --git a/apps/webapp/public/apple-touch-icon-180x180.png b/apps/webapp/public/apple-touch-icon-180x180.png
diff --git a/apps/webapp/src/renderer/favicon.ico → apps/webapp/public/favicon.ico b/apps/webapp/src/renderer/favicon.ico → apps/webapp/public/favicon.ico
diff --git a/apps/webapp/public/favicon.svg b/apps/webapp/public/favicon.svg
diff --git a/apps/webapp/public/maskable-icon-512x512.png b/apps/webapp/public/maskable-icon-512x512.png
diff --git a/apps/webapp/src/renderer/_default.page.client.tsx b/apps/webapp/src/renderer/_default.page.client.tsx
@@ -11,10 +11,6 @@ import type { PageContextClient } from './types'
 
 import '#/lib/initSentry'
 
-// A dummy import of the favicon to make sure that it is copied into the
-// `dist/client` folder. It's only actually used in the server default page.
-import './favicon.ico'
-
 let root: Root | undefined
 /**
  * Keep track of the Apollo client instance used in the client-side so that we

diff --git a/apps/webapp/src/renderer/_default.page.server.tsx b/apps/webapp/src/renderer/_default.page.server.tsx
@@ -5,7 +5,6 @@ import { escapeInject, dangerouslySkipEscape } from 'vite-plugin-ssr/server'
 import { darkThemeClass, lightThemeClass } from '#/styles/theme.css'
 import { THEME } from '#/utils/theme'
 
-import favicon from './favicon.ico'
 import { PageShell } from './PageShell'
 import type { PageContextServer } from './types'
 
@@ -37,15 +36,21 @@ export async function render(pageContext: PageContextServer) {
   // See https://vite-plugin-ssr.com/head
   const { documentProps } = pageContext.exports
   const title = documentProps?.title ?? 'Serieslist'
-  const desc = documentProps?.description ?? 'App using Vite + vite-plugin-ssr'
+  const desc =
+    documentProps?.description ??
+    'Always know which episode to watch next. Keep track of your series and seen episodes.'
 
   const themeClass = theme == THEME.DARK ? darkThemeClass : lightThemeClass
 
   const documentHtml = escapeInject`<!DOCTYPE html>
     <html lang="en">
       <head>
         <meta charset="UTF-8" />
-        <link rel="icon" href="${favicon}" />
+        <link rel="icon" href="/favicon.ico" sizes="any">
+        <link rel="icon" href="/favicon.svg" type="image/svg+xml">
+        <link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" sizes="180x180">
+        <link rel="mask-icon" href="/maskable-icon-512x512.png" color="#FFFFFF">
+        <meta name="theme-color" content="#6366f1">
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="description" content="${desc}" />
         <title>${title}</title>

diff --git a/apps/webapp/src/server/server.ts b/apps/webapp/src/server/server.ts
@@ -33,10 +33,12 @@ async function startServer() {
   await app.register(fastifyCookie)
 
   if (isProduction) {
-    const distPath = join(root, '/dist/client/assets')
     await app.register(fastifyStatic, {
-      root: distPath,
-      prefix: '/assets/',
+      root: join(root, '/dist/client'),
+      prefix: '/',
+      decorateReply: false,
+      index: false,
+      wildcard: false,
     })
   } else {
     const vite = await import('vite')

diff --git a/package.json b/package.json
@@ -14,13 +14,14 @@
     "start": "nx run-many -t start,start:jobs",
     "lint": "nx affected -t lint",
     "tsc": "nx affected -t tsc",
-    "test:coverage": "nx affected -t test:coverage",
+    "test:coverage": "dotenv -e .env.test -- nx affected -t test:coverage --verbose",
     "build": "nx affected -t build",
     "migrate": "pnpm -F api migrate",
-    "migrate:test": "pnpm -F api migrate:test",
-    "test:e2e": "pnpm -F webapp test:e2e"
+    "migrate:test": "dotenv -e .env.test -- pnpm -F api migrate:test",
+    "test:e2e": "dotenv -e .env.e2e -- pnpm -F webapp test:e2e"
   },
   "devDependencies": {
+    "dotenv-cli": "^7.1.0",
     "nx": "^16.5.2"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml