milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add custom variable check for webpack dev server

Browse source
This commit is contained in:
Bill Thornton 2021-10-04 01:03:46 -04:00
parent fda52baed5
commit 3b4ff70709
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/scripts/settings/webSettings.js
View file

@ -72,9 +72,11 @@ export function getIncludeCorsCredentials() {
export function getMultiServer() {
return getConfig().then(config => {
// Enable multi-server support in development environments
return process.env.NODE_ENV === 'development' // eslint-disable-line no-undef
|| !!config.multiserver;
// Enable multi-server support when served by webpack
if (process.env.WEBPACK_SERVE) { // eslint-disable-line no-undef
return true;
}
return !!config.multiserver;
}).catch(error => {
console.log('cannot get web config:', error);
return false;

4
src/serviceworker.js
View file

@ -45,8 +45,8 @@ self.addEventListener('notificationclick', function (event) {
}, false);
// Do not precache files in development so live reload works as expected
/* eslint-disable-next-line no-undef -- NODE_ENV is replaced by webpack */
if (process.env.NODE_ENV === 'production') {
/* eslint-disable-next-line no-undef -- WEBPACK_SERVE is replaced by webpack */
if (process.env.WEBPACK_SERVE) {
// this is needed by the webpack Workbox plugin
/* eslint-disable-next-line no-restricted-globals,no-undef */
precacheAndRoute(self.__WB_MANIFEST);