Skip to content

Commit

Permalink
Merge branch 'admin-assets-fix' into immers-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
wmurphyrd committed Feb 12, 2022
2 parents 4e5e62f + 97bf411 commit 3d98ee3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion admin/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ module.exports = (env, argv) => {
RETICULUM_SERVER: process.env.RETICULUM_SERVER,
CORS_PROXY_SERVER: process.env.CORS_PROXY_SERVER,
POSTGREST_SERVER: process.env.POSTGREST_SERVER,
UPLOADS_HOST: process.env.UPLOADS_HOST
UPLOADS_HOST: process.env.UPLOADS_HOST,
BASE_ASSETS_PATH: process.env.BASE_ASSETS_PATH
})
})
]
Expand Down
1 change: 1 addition & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,7 @@ module.exports = async (env, argv) => {
IMMERS_SCOPE: process.env.IMMERS_SCOPE,
IMMERS_ALLOW_GUESTS: process.env.IMMERS_ALLOW_GUESTS,
UPLOADS_HOST: process.env.UPLOADS_HOST,
BASE_ASSETS_PATH: process.env.BASE_ASSETS_PATH,
APP_CONFIG: appConfig
})
})
Expand Down

0 comments on commit 3d98ee3

Please sign in to comment.