pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/hotfix/v9.2.0' into fix/admin-panel-bugs

Browse Source 
# Conflicts:
#	AdminPanel/client/src/App.js
#	AdminPanel/client/src/api/index.js
#	AdminPanel/client/src/components/AuthWrapper/AuthWrapper.js
#	AdminPanel/client/webpack.config.js
This commit is contained in:
Sergey Konovalov
2025-10-25 11:16:54 +03:00
parent 4660aeaab7 401283452a
commit 2af0f24db6
14 changed files with 466 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
AdminPanel/client/webpack.config.js
View File

@ -24,21 +24,25 @@ module.exports = (env, argv) => {
},
devServer: {
static: {
directory: path.join(__dirname, 'build'),
publicPath: ''
},
static: path.join(__dirname, 'public'),
port: 3000,
open: true,
historyApiFallback: true,
proxy: {
'/healthcheck-api': {
target: process.env.REACT_APP_DOCSERVICE_URL,
changeOrigin: true,
pathRewrite: {
'^/healthcheck-api': '/healthcheck'
open: '/admin/',
hot: true,
historyApiFallback: {
index: '/admin/index.html'
},
devMiddleware: {
publicPath: '/admin'
},
setupMiddlewares: (middlewares, devServer) => {
// Redirect /admin -> /admin/ (only exact match without trailing slash)
devServer.app.use((req, res, next) => {
if (req.path === '/admin' && !req.originalUrl.endsWith('/')) {
return res.redirect(302, '/admin/');
}
}
next();
});
return middlewares;
}
},
@ -82,8 +86,7 @@ module.exports = (env, argv) => {
]
}),
new webpack.DefinePlugin({
'process.env.REACT_APP_BACKEND_URL': JSON.stringify(process.env.REACT_APP_BACKEND_URL),
'process.env.REACT_APP_DOCSERVICE_URL': JSON.stringify(process.env.REACT_APP_DOCSERVICE_URL)
'process.env.REACT_APP_BACKEND_URL': JSON.stringify(process.env.REACT_APP_BACKEND_URL)
})
],