From dd955d5ce7707675b85f19a97daae9e15fb833f3 Mon Sep 17 00:00:00 2001 From: Mariusz Klochowicz Date: Thu, 11 Nov 2021 15:52:51 +1030 Subject: [PATCH] Align vite configuration of the new taker UI - use vitejs/plugin-react-refresh - proxy `/alive` path --- taker-frontend/package.json | 1 + taker-frontend/vite.config.ts | 11 +++++++++-- taker-frontend/yarn.lock | 15 +++++++++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/taker-frontend/package.json b/taker-frontend/package.json index 0853e84..ffda2d6 100644 --- a/taker-frontend/package.json +++ b/taker-frontend/package.json @@ -40,6 +40,7 @@ "@types/eslint": "^7", "@types/react": "^17.0.34", "@types/react-dom": "^17.0.11", + "@vitejs/plugin-react-refresh": "^1.3.1", "typescript": "^4.4.4", "vite": "^2.6.13" }, diff --git a/taker-frontend/vite.config.ts b/taker-frontend/vite.config.ts index 1dd36db..4ded139 100644 --- a/taker-frontend/vite.config.ts +++ b/taker-frontend/vite.config.ts @@ -1,10 +1,16 @@ -import react from "@vitejs/plugin-react"; +import reactRefresh from "@vitejs/plugin-react-refresh"; import { resolve } from "path"; import { defineConfig } from "vite"; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [react()], + plugins: [ + ( + process.env.NODE_ENV !== "test" + ? [reactRefresh()] + : [] + ), + ], build: { rollupOptions: { input: resolve(__dirname, `index.html`), @@ -14,6 +20,7 @@ export default defineConfig({ server: { proxy: { "/api": "http://localhost:8000", + "/alive": "http://localhost:8000", }, }, }); diff --git a/taker-frontend/yarn.lock b/taker-frontend/yarn.lock index 624a565..fe244e4 100644 --- a/taker-frontend/yarn.lock +++ b/taker-frontend/yarn.lock @@ -50,7 +50,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.7.5", "@babel/core@^7.8.4": +"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.14.8", "@babel/core@^7.15.5", "@babel/core@^7.7.5", "@babel/core@^7.8.4": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" integrity sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ== @@ -837,7 +837,7 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.16.0" -"@babel/plugin-transform-react-jsx-self@^7.12.1", "@babel/plugin-transform-react-jsx-self@^7.14.9": +"@babel/plugin-transform-react-jsx-self@^7.12.1", "@babel/plugin-transform-react-jsx-self@^7.14.5", "@babel/plugin-transform-react-jsx-self@^7.14.9": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.16.0.tgz#09202158abbc716a08330f392bfb98d6b9acfa0c" integrity sha512-97yCFY+2GvniqOThOSjPor8xUoDiQ0STVWAQMl3pjhJoFVe5DuXDLZCRSZxu9clx+oRCbTiXGgKEG/Yoyo6Y+w== @@ -2879,6 +2879,17 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" +"@vitejs/plugin-react-refresh@^1.3.1": + version "1.3.6" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-react-refresh/-/plugin-react-refresh-1.3.6.tgz#19818392db01e81746cfeb04e096ab3010e79fe3" + integrity sha512-iNR/UqhUOmFFxiezt0em9CgmiJBdWR+5jGxB2FihaoJfqGt76kiwaKoVOJVU5NYcDWMdN06LbyN2VIGIoYdsEA== + dependencies: + "@babel/core" "^7.14.8" + "@babel/plugin-transform-react-jsx-self" "^7.14.5" + "@babel/plugin-transform-react-jsx-source" "^7.14.5" + "@rollup/pluginutils" "^4.1.1" + react-refresh "^0.10.0" + "@vitejs/plugin-react@^1.0.0": version "1.0.7" resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-1.0.7.tgz#d542003afbae875f86fb89f3811a0f7c0c9479f5"