From 7005bd870a55b99e42181054388d52856abb9f01 Mon Sep 17 00:00:00 2001 From: Les Date: Fri, 17 May 2024 12:16:02 +0200 Subject: [PATCH 1/2] add mock test add dist serve option --- frontend/app/component/MockTest.tsx | 30 +++++++++++++++++++++++++++++ frontend/app/module/HomePage.tsx | 3 +++ frontend/index.html | 2 +- frontend/package.json | 3 ++- frontend/vite.config.ts | 7 ++++++- 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 frontend/app/component/MockTest.tsx diff --git a/frontend/app/component/MockTest.tsx b/frontend/app/component/MockTest.tsx new file mode 100644 index 000000000..6156ad592 --- /dev/null +++ b/frontend/app/component/MockTest.tsx @@ -0,0 +1,30 @@ +import * as React from "react"; + +export function MockTest() { + const [message, setMessage] = React.useState("..."); + + React.useEffect(() => { + const action = async () => { + const response = await fetch("/v1/ping", { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ ping: "ping" }), + }); + + const data = (await response.json()) as object; + setMessage(`Response: ${JSON.stringify(data)}`); + }; + + action().catch((err: unknown) => { + setMessage(`Error: ${err instanceof Error ? err.message : String(err)}`); + }); + }, []); + return ( +
+

Testing mockserver

+ {message &&

{message}

} +
+ ); +} diff --git a/frontend/app/module/HomePage.tsx b/frontend/app/module/HomePage.tsx index 93ebaaa61..aa8d9ab43 100644 --- a/frontend/app/module/HomePage.tsx +++ b/frontend/app/module/HomePage.tsx @@ -1,3 +1,4 @@ +import { MockTest } from "app/component/MockTest"; import { Link } from "react-router-dom"; export function HomePage() { @@ -11,6 +12,8 @@ export function HomePage() { Input module + + ); } diff --git a/frontend/index.html b/frontend/index.html index c47fad00a..8e56289df 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -3,7 +3,7 @@ TBD - + diff --git a/frontend/package.json b/frontend/package.json index 4b2a25ecf..2b92a4cc9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,7 +19,8 @@ "ladle": "ladle serve", "start:msw": "API_MODE=msw vite", "gen:icons": "node scripts/gen_icons.js", - "gen:openapi": "vite-node ./scripts/gen_openapi_types.ts" + "gen:openapi": "vite-node ./scripts/gen_openapi_types.ts", + "serve": "npm run build:msw && npx serve dist" }, "dependencies": { "react": "^18.2.0", diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index a38543b89..7623e4a04 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -13,7 +13,12 @@ export default defineConfig(() => ({ outDir: path.resolve(__dirname, "dist"), emptyOutDir: true, sourcemap: true, - // minify: false, // uncomment for debugging + minify: false, + rollupOptions: { + input: { + app: "index.html", + }, + }, }, define: { "process.env.MSW": apiMode === "mock", From d61ba2b1b2f5e8fcf992d205593732a7fd57f750 Mon Sep 17 00:00:00 2001 From: Les Date: Fri, 17 May 2024 13:38:11 +0200 Subject: [PATCH 2/2] fix build:msw correct env --- frontend/app/module/HomePage.tsx | 2 +- frontend/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/app/module/HomePage.tsx b/frontend/app/module/HomePage.tsx index aa8d9ab43..07846d1fa 100644 --- a/frontend/app/module/HomePage.tsx +++ b/frontend/app/module/HomePage.tsx @@ -13,7 +13,7 @@ export function HomePage() { - + {process.env.MSW && } ); } diff --git a/frontend/package.json b/frontend/package.json index 2b92a4cc9..b26249767 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,7 +10,7 @@ "dev": "API_MODE=mock vite", "dev:server": "API_MODE=local vite", "build": "tsc && vite build", - "build:msw": "API_MODE=msw vite build && cp mockServiceWorker.js dist/", + "build:msw": "API_MODE=mock vite build && cp mockServiceWorker.js dist/", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", "test": "vitest ",