fix: feedbacks architecture

Author: jean-michelet

src/client/App.tsx renamed to client/App.tsx

@@ -1,8 +1,7 @@
 import { createRoot } from 'react-dom/client'
 import { App } from './App'
 
-const rootElement =
-  document.getElementById('root') || document.createElement('div')
+const rootElement = document.getElementById('root')!
 
 const root = createRoot(rootElement)
 root.render(<App />)

src/client/index.html renamed to client/index.html

@@ -20,5 +20,4 @@
     "noFallthroughCasesInSwitch": true
   },
   "include": ["**/*"],
-  "exclude": ["dist"]
 }

src/client/mount.tsx renamed to client/mount.tsx

@@ -16,7 +16,7 @@
     "dev:start": "fastify start --ignore-watch=.ts$ -l info -P dist/app.js",
     "test": "npm run db:seed && tap --jobs=1 test/**/*",
     "standalone": "node --env-file=.env dist/server.js",
-    "lint": "eslint src --ignore-pattern='src/client/dist'",
+    "lint": "eslint test src client vite.config.js",
     "lint:fix": "npm run lint -- --fix",
     "db:migrate": "node --env-file=.env scripts/migrate.js",
     "db:seed": "node --env-file=.env scripts/seed-database.js"

src/client/public/favicon.ico renamed to client/public/favicon.ico

@@ -20,7 +20,7 @@ export default async function serviceApp (
   fastify: FastifyInstance,
   opts: FastifyPluginOptions
 ) {
-  const { avoidViteRegistration = true } = opts
+  const { registerVite = true } = opts
 
   // This loads all external plugins defined in plugins/external
   // those should be registered first as your custom plugins might depend on them
@@ -93,38 +93,27 @@ export default async function serviceApp (
     }
   )
 
-  await handleVite(fastify, {
-    register: !avoidViteRegistration
-  })
-}
+  if (registerVite) {
+    /* c8 ignore start - We don't launch the spa tests with the api tests */
+    // We setup the SPA
+    await fastify.register(fastifyVite, function (fastify) {
+      return {
+        root: path.resolve(import.meta.dirname, '../'),
+        dev: fastify.config.FASTIFY_VITE_DEV_MODE,
+        spa: true
+      }
+    })
 
-async function handleVite (
-  fastify: FastifyInstance,
-  { register }: { register: boolean }
-) {
-  if (!register) {
     // Route must match vite "base": https://vitejs.dev/config/shared-options.html#base
+    fastify.get('/', (req, reply) => {
+      return reply.html()
+    })
+
+    await fastify.vite.ready()
+    /* c8 ignore end */
+  } else {
     fastify.get('/', () => {
       return 'Vite is not registered.'
     })
-
-    return
   }
-  /* c8 ignore start - We don't launch the spa tests with the api tests */
-  // We setup the SPA
-  await fastify.register(fastifyVite, function (fastify) {
-    return {
-      root: path.resolve(import.meta.dirname, '../'),
-      dev: fastify.config.FASTIFY_VITE_DEV_MODE,
-      spa: true
-    }
-  })
-
-  // Route must match vite "base": https://vitejs.dev/config/shared-options.html#base
-  fastify.get('/', (req, reply) => {
-    return reply.html()
-  })
-
-  await fastify.vite.ready()
-  /* c8 ignore end */
 }

src/client/tsconfig.json renamed to client/tsconfig.json

@@ -1,20 +1,20 @@
-import { it } from "node:test";
-import { build } from "../helper.js";
-import assert from "node:assert";
+import { it } from 'node:test'
+import { build } from '../helper.js'
+import assert from 'node:assert'
 
-it("should correctly handle CORS preflight requests", async (t) => {
-    const app = await build(t);
+it('should correctly handle CORS preflight requests', async (t) => {
+  const app = await build(t)
 
-    const res = await app.inject({
-        method: "OPTIONS",
-        url: "/",
-        headers: {
-            "Origin": "http://example.com",
-            "Access-Control-Request-Method": "GET",
-            "Access-Control-Request-Headers": "Content-Type"
-        }
-    });
+  const res = await app.inject({
+    method: 'OPTIONS',
+    url: '/',
+    headers: {
+      Origin: 'http://example.com',
+      'Access-Control-Request-Method': 'GET',
+      'Access-Control-Request-Headers': 'Content-Type'
+    }
+  })
 
-    assert.strictEqual(res.statusCode, 204);
-    assert.strictEqual(res.headers['access-control-allow-methods'], 'GET, POST, PUT, DELETE');
-});
+  assert.strictEqual(res.statusCode, 204)
+  assert.strictEqual(res.headers['access-control-allow-methods'], 'GET, POST, PUT, DELETE')
+})

src/client/vite-env.d.ts renamed to client/vite-env.d.ts

@@ -1,27 +1,27 @@
-import { it } from "node:test";
-import assert from "node:assert";
-import fastify from "fastify";
-import serviceApp from "../../src/app.ts";
-import fp from "fastify-plugin";
+import { it } from 'node:test'
+import assert from 'node:assert'
+import fastify from 'fastify'
+import serviceApp from '../../src/app.ts'
+import fp from 'fastify-plugin'
 
-it("should call errorHandler", async (t) => {
-  const app = fastify();
-  await app.register(fp(serviceApp));
+it('should call errorHandler', async (t) => {
+  const app = fastify()
+  await app.register(fp(serviceApp))
 
-  app.get("/error", () => {
-    throw new Error("Kaboom!");
-  });
+  app.get('/error', () => {
+    throw new Error('Kaboom!')
+  })
 
-  await app.ready();
+  await app.ready()
 
-  t.after(() => app.close());
+  t.after(() => app.close())
 
   const res = await app.inject({
-    method: "GET",
-    url: "/error"
-  });
+    method: 'GET',
+    url: '/error'
+  })
 
   assert.deepStrictEqual(JSON.parse(res.payload), {
-    message: "Internal Server Error"
-  });
-});
+    message: 'Internal Server Error'
+  })
+})