bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

Set baseUrl in QA cloud environment (#994)

Browse Source 
* Set baseUrl if not deployed to prod server

* Add env variable TARGET and use to set baseUrl

* remove webPlatformUtilsService.isProdServer

* passing the ENV through to the Angular app

* switching the value of SELF_HOST back to true

* fixing some webpack.config variables

* fixing the selfhost angular process.env

* removing unecessary code

Co-authored-by: Joseph Flinn <joseph.s.flinn@gmail.com>
This commit is contained in:
Thomas Rittson
2021-05-28 02:46:26 +10:00
committed by GitHub
parent 6586af71f8
commit da0df3a73b
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webpack.config.js
View File

@@ -8,15 +8,13 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const TerserPlugin = require('terser-webpack-plugin');
const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin;
const pjson = require('./package.json');
const config = require('./config.js')
const config = require('./config.js');
if (process.env.NODE_ENV == null) {
process.env.NODE_ENV = 'development';
}
const ENV = process.env.ENV == null ? 'development' : process.env.ENV;
const NODE_ENV = process.env.NODE_ENV == null ? 'development' : process.env.NODE_ENV;
const NODE_ENV = process.env.NODE_ENV;
const envConfig = config.load(process.env.ENV)
config.log(envConfig)
const envConfig = config.load(process.env.ENV);
config.log(envConfig);
const moduleRules = [
{
@@ -131,7 +129,7 @@ const plugins = [
}),
new webpack.DefinePlugin({
'process.env': {
'ENV': JSON.stringify(NODE_ENV),
'ENV': JSON.stringify(ENV),
'SELF_HOST': JSON.stringify(process.env.SELF_HOST === 'true' ? true : false),
'APPLICATION_VERSION': JSON.stringify(pjson.version),
'CACHE_TAG': JSON.stringify(Math.random().toString(36).substring(7)),