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 urls from config file (#1151)

Browse Source 
* Set environment URLs in webpack config.

* Provide non NULL dev server

* QA env uses the pq TLD

* Include icons in qa env

* Move base configs to develop.

local configurations should be done in the `./config/local.json` file.

* Fix config override loading to default to development

* Standardize url formatting

* Limit QA settings to those set in production

* Set self hosted in a config

* Specify cloud instead of production

Self hosted and cloud are both production environments.
The ENV setting is used to specify the env type while
NODE_ENV specifies whether development error handling and services.

* Update config instructions

* Remove invalid json

* Change env `production` references to `cloud`

* Fix formatting
This commit is contained in:
Matt Gibson
2021-08-25 14:15:31 -04:00
committed by GitHub
parent 2cbe023a38
commit 66bd8be2c9
16 changed files with 75 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webpack.config.js
View File

@@ -13,7 +13,7 @@ const config = require('./config.js');
const ENV = process.env.ENV == null ? 'development' : process.env.ENV;
const NODE_ENV = process.env.NODE_ENV == null ? 'development' : process.env.NODE_ENV;
const envConfig = config.load(process.env.ENV);
const envConfig = config.load(ENV);
config.log(envConfig);
const moduleRules = [
@@ -141,9 +141,9 @@ const plugins = [
new webpack.EnvironmentPlugin({
'ENV': ENV,
'NODE_ENV': NODE_ENV === 'production' ? 'production' : 'development',
'SELF_HOST': process.env.SELF_HOST === 'true' ? true : false,
'APPLICATION_VERSION': pjson.version,
'CACHE_TAG': Math.random().toString(36).substring(7),
'URLS': envConfig['urls'] ?? {},
}),
new AngularCompilerPlugin({
tsConfigPath: 'tsconfig.json',
@@ -154,7 +154,7 @@ const plugins = [
// ref: https://webpack.js.org/configuration/dev-server/#devserver
let certSuffix = fs.existsSync('dev-server.local.pem') ? '.local' : '.shared';
const devServer = {
const devServer = ENV !== 'development' ? {} : {
https: {
key: fs.readFileSync('dev-server' + certSuffix + '.pem'),
cert: fs.readFileSync('dev-server' + certSuffix + '.pem'),
@@ -186,7 +186,7 @@ const devServer = {
changeOrigin: true
},
'/portal': {
target: envConfig['proxyPortal'],
target: envConfig['proxyEnterprise'],
pathRewrite: {'^/portal' : ''},
secure: false,
changeOrigin: true