mirror of
https://github.com/bitwarden/browser
synced 2025-12-17 08:43:33 +00:00
Conflict resolution
This commit is contained in:
@@ -171,6 +171,7 @@ const plugins = [
|
||||
PAYPAL_CONFIG: envConfig["paypal"] ?? {},
|
||||
FLAGS: envConfig["flags"] ?? {},
|
||||
DEV_FLAGS: NODE_ENV === "development" ? envConfig["devFlags"] : {},
|
||||
ADDITIONAL_REGIONS: envConfig["additionalRegions"] ?? [],
|
||||
}),
|
||||
new AngularWebpackPlugin({
|
||||
tsConfigPath: "tsconfig.json",
|
||||
@@ -193,39 +194,44 @@ const devServer =
|
||||
},
|
||||
},
|
||||
// host: '192.168.1.9',
|
||||
proxy: {
|
||||
"/api": {
|
||||
proxy: [
|
||||
{
|
||||
context: ["/api"],
|
||||
target: envConfig.dev?.proxyApi,
|
||||
pathRewrite: { "^/api": "" },
|
||||
secure: false,
|
||||
changeOrigin: true,
|
||||
},
|
||||
"/identity": {
|
||||
{
|
||||
context: ["/identity"],
|
||||
target: envConfig.dev?.proxyIdentity,
|
||||
pathRewrite: { "^/identity": "" },
|
||||
secure: false,
|
||||
changeOrigin: true,
|
||||
},
|
||||
"/events": {
|
||||
{
|
||||
context: ["/events"],
|
||||
target: envConfig.dev?.proxyEvents,
|
||||
pathRewrite: { "^/events": "" },
|
||||
secure: false,
|
||||
changeOrigin: true,
|
||||
},
|
||||
"/notifications": {
|
||||
{
|
||||
context: ["/notifications"],
|
||||
target: envConfig.dev?.proxyNotifications,
|
||||
pathRewrite: { "^/notifications": "" },
|
||||
secure: false,
|
||||
changeOrigin: true,
|
||||
ws: true,
|
||||
},
|
||||
"/icons": {
|
||||
{
|
||||
context: ["/icons"],
|
||||
target: envConfig.dev?.proxyIcons,
|
||||
pathRewrite: { "^/icons": "" },
|
||||
secure: false,
|
||||
changeOrigin: true,
|
||||
},
|
||||
},
|
||||
],
|
||||
headers: (req) => {
|
||||
if (!req.originalUrl.includes("connector.html")) {
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user