diff --git a/config.js b/config.js index 410bef95..ac35cb59 100755 --- a/config.js +++ b/config.js @@ -1,8 +1,5 @@ const one_day = 1440; -import { loadEnv } from 'vite'; - -const env = loadEnv(process.cwd()); -const api_url = env.VITE_API_URL; +const api_url = import.meta.env.VITE_API_URL; const config = { title: "Project Mariupol", diff --git a/vite.config.js b/vite.config.js index 657e9854..81cfe29d 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,36 +1,66 @@ -import { defineConfig, loadEnv } from 'vite'; -import react from '@vitejs/plugin-react'; -import compressionPlugin from 'vite-plugin-compression'; +import { defineConfig, loadEnv } from "vite"; +import react from "@vitejs/plugin-react"; -export default defineConfig(({ mode }) => { - const env = loadEnv(mode, process.cwd()); - const api_url = env.VITE_API_URL; +//https://vitejs.dev/config/#using-environment-variables-in-config +const env = loadEnv('',''); +const api_url = JSON.stringify(env.VITE_API_URL); - return { - plugins: [ - react(), - compressionPlugin({ - disable: true, // Disable or configure appropriately - }) - ], - build: { - outDir: 'build', - sourcemap: true, - }, - server: { - proxy: { - '/api/': { - target: api_url, - changeOrigin: true, - rewrite: path => path.replace(/^\/api/, ''), - }, - } - }, - test: { - globals: true, - environment: 'jsdom', - setupFiles: './test/setup.js', - passWithNoTests: true - }, - }; + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [react()], + build: { + outDir: "build" + }, + server: { + proxy: { + "/api": { + target: api_url, + changeOrigin: true, + }, + } + }, + test: { + globals: true, + environment: "jsdom", + setupFiles: "./test/setup.js", + passWithNoTests: true + }, }); + +// import { defineConfig, loadEnv } from 'vite'; +// import react from '@vitejs/plugin-react'; +// import compressionPlugin from 'vite-plugin-compression'; +// +// export default defineConfig(({ mode }) => { +// const env = loadEnv(mode, process.cwd()); +// const api_url = env.VITE_API_URL; +// +// return { +// plugins: [ +// react(), +// compressionPlugin({ +// disable: true, // Disable or configure appropriately +// }) +// ], +// build: { +// outDir: 'build', +// sourcemap: true, +// }, +// server: { +// proxy: { +// '/api/': { +// target: api_url, +// changeOrigin: true, +// rewrite: path => path.replace(/^\/api/, ''), +// }, +// } +// }, +// test: { +// globals: true, +// environment: 'jsdom', +// setupFiles: './test/setup.js', +// passWithNoTests: true +// }, +// }; +// });