frontend api fix
This commit is contained in:
@@ -27,7 +27,9 @@ const runtimeApiBase =
|
|||||||
? window.__PAPERCRATE_API_BASE_URL
|
? window.__PAPERCRATE_API_BASE_URL
|
||||||
: '';
|
: '';
|
||||||
|
|
||||||
const API_ROOT = (runtimeApiBase || process.env.API_BASE_URL || '').replace(/\/$/, '');
|
const DEFAULT_DEV_API = 'http://127.0.0.1:3000';
|
||||||
|
|
||||||
|
const API_ROOT = (runtimeApiBase || process.env.API_BASE_URL || DEFAULT_DEV_API).replace(/\/$/, '');
|
||||||
|
|
||||||
const api = axios.create({
|
const api = axios.create({
|
||||||
baseURL: API_ROOT ? `${API_ROOT}/api` : '/api',
|
baseURL: API_ROOT ? `${API_ROOT}/api` : '/api',
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ const env = dotenv.config({ path: path.resolve(__dirname, '.env.local') }).parse
|
|||||||
|
|
||||||
const DEFAULT_DEV_API = 'http://127.0.0.1:3000';
|
const DEFAULT_DEV_API = 'http://127.0.0.1:3000';
|
||||||
|
|
||||||
const API_BASE_URL = env.API_BASE_URL || process.env.API_BASE_URL || '';
|
const API_BASE_URL = env.API_BASE_URL || process.env.API_BASE_URL || DEFAULT_DEV_API;
|
||||||
const devServerApiTarget = API_BASE_URL || DEFAULT_DEV_API;
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: './src/index.jsx',
|
entry: './src/index.jsx',
|
||||||
@@ -49,13 +48,6 @@ module.exports = {
|
|||||||
port: 5173,
|
port: 5173,
|
||||||
historyApiFallback: true,
|
historyApiFallback: true,
|
||||||
open: true,
|
open: true,
|
||||||
proxy: [
|
|
||||||
{
|
|
||||||
context: ['/api'],
|
|
||||||
target: devServerApiTarget,
|
|
||||||
changeOrigin: true,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
devtool: 'source-map',
|
devtool: 'source-map',
|
||||||
resolve: {
|
resolve: {
|
||||||
|
|||||||
Reference in New Issue
Block a user