CORS problem solution
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
branch=
|
||||
VITE_CLOUD_API_URL=http://localhost:3101
|
||||
DEV_API_URL=http://localhost:3101
|
||||
VITE_DIAGRAM_API_URL=http://localhost:3002
|
||||
VITE_TOIR_LIGHT_ORIGIN=https://toir-light.greact.ru
|
||||
VITE_KEYCLOAK_URL=
|
||||
VITE_KEYCLOAK_REALM=
|
||||
VITE_KEYCLOAK_CLIENT_ID=
|
||||
VITE_KEYCLOAK_URL=https://sso.greact.ru
|
||||
VITE_KEYCLOAK_REALM=toir
|
||||
VITE_KEYCLOAK_CLIENT_ID=localhost
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
VITE_CLOUD_API_URL=http://localhost:3101
|
||||
VITE_DIAGRAM_API_URL=http://localhost:3002
|
||||
|
||||
# Если эти переменные не заданы, greact.drill.ui работает без SSO для локальной разработки.
|
||||
VITE_KEYCLOAK_URL=https://sso.greact.ru
|
||||
VITE_KEYCLOAK_REALM=toir
|
||||
VITE_KEYCLOAK_CLIENT_ID=drill-ui-frontend
|
||||
|
||||
# Origin встроенного ТОиР light. По умолчанию используется https://toir-light.greact.ru.
|
||||
VITE_TOIR_LIGHT_ORIGIN=https://toir-light.greact.ru
|
||||
@@ -7,13 +7,11 @@ FROM node:22-alpine AS build
|
||||
WORKDIR /app
|
||||
COPY --from=deps /app/node_modules ./node_modules
|
||||
COPY . .
|
||||
ARG VITE_CLOUD_API_URL
|
||||
ARG VITE_DIAGRAM_API_URL
|
||||
ARG VITE_TOIR_LIGHT_ORIGIN
|
||||
ARG VITE_KEYCLOAK_URL
|
||||
ARG VITE_KEYCLOAK_REALM
|
||||
ARG VITE_KEYCLOAK_CLIENT_ID
|
||||
ENV VITE_CLOUD_API_URL=$VITE_CLOUD_API_URL
|
||||
ENV VITE_DIAGRAM_API_URL=$VITE_DIAGRAM_API_URL
|
||||
ENV VITE_TOIR_LIGHT_ORIGIN=$VITE_TOIR_LIGHT_ORIGIN
|
||||
ENV VITE_KEYCLOAK_URL=$VITE_KEYCLOAK_URL
|
||||
|
||||
@@ -4,7 +4,6 @@ services:
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
VITE_CLOUD_API_URL: ${VITE_CLOUD_API_URL}
|
||||
VITE_DIAGRAM_API_URL: ${VITE_DIAGRAM_API_URL}
|
||||
VITE_TOIR_LIGHT_ORIGIN: ${VITE_TOIR_LIGHT_ORIGIN}
|
||||
VITE_KEYCLOAK_URL: ${VITE_KEYCLOAK_URL}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export const cloudApiUrl = import.meta.env.VITE_CLOUD_API_URL as string;
|
||||
/** Базовый путь cloud API; маршрутизация на бэкенд — на уровне реверс-прокси. */
|
||||
export const cloudApiUrl = '/api';
|
||||
export const diagramApiUrl = import.meta.env.VITE_DIAGRAM_API_URL as string;
|
||||
export const toirLightOrigin = import.meta.env.VITE_TOIR_LIGHT_ORIGIN as string;
|
||||
export const keycloakUrl = import.meta.env.VITE_KEYCLOAK_URL;
|
||||
|
||||
1
src/vite-env.d.ts
vendored
1
src/vite-env.d.ts
vendored
@@ -1,7 +1,6 @@
|
||||
/// <reference types="vite/client" />
|
||||
|
||||
interface ImportMetaEnv {
|
||||
readonly VITE_CLOUD_API_URL?: string;
|
||||
readonly VITE_DIAGRAM_API_URL?: string;
|
||||
readonly VITE_TOIR_LIGHT_ORIGIN?: string;
|
||||
readonly VITE_KEYCLOAK_URL?: string;
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
import react from '@vitejs/plugin-react';
|
||||
import { defineConfig } from 'vite';
|
||||
import { defineConfig, loadEnv } from 'vite';
|
||||
|
||||
export default defineConfig({
|
||||
export default defineConfig(({ mode }) => {
|
||||
const { DEV_API_URL } = loadEnv(mode, '.', '');
|
||||
|
||||
return {
|
||||
plugins: [react()],
|
||||
build: {
|
||||
chunkSizeWarningLimit: 700,
|
||||
@@ -10,10 +13,11 @@ export default defineConfig({
|
||||
port: 5173,
|
||||
proxy: {
|
||||
'/api': {
|
||||
target: 'https://beta.backend.drill.greact.ru',
|
||||
target: DEV_API_URL,
|
||||
changeOrigin: true,
|
||||
rewrite: (path) => path.replace(/^\/api/, ''),
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user