Skip to content

Fix/285 #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veeramarni merged 4 commits into from
Nov 10, 2022
Merged

Fix/285 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
456a0cf
version
veeramarni Nov 4, 2022
69436c0
Merge branch 'develop'
veeramarni Nov 4, 2022
ae97815
Merge branch 'develop'
veeramarni Nov 5, 2022
f46bae0
add fix #285
veeramarni Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sample-stack",
"version": "0.11.1",
"version": "0.11.2",
"private": true,
"homepage": "https://github.com/cdmbase/fullstack-pro#readme",
"bugs": {
Expand Down
15 changes: 5 additions & 10 deletions servers/frontend-server/src/config/public-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,14 @@ import { lowerCase } from 'lodash';
* This file opens up in public site, so make sure it is
* not dependent on any other file that compromises the security.
*/
const publicEnv = [
'NODE_ENV',
'GRAPHQL_URL',
'FACEBOOK_APP_ID',
'GA_ID',
'LOG_LEVEL',
];
const publicEnv = ['NODE_ENV', 'GRAPHQL_URL', 'FACEBOOK_APP_ID', 'GA_ID', 'LOG_LEVEL'];

const isBrowser = typeof window !== 'undefined';

if (!isBrowser) {
process.env.ENV_FILE !== null && require('dotenv').config({ path: process.env.ENV_FILE });
}
const base = (isBrowser ? ( window.__ENV__ || __ENV__) : process.env) || {};
const base = (isBrowser ? window.__ENV__ || (typeof __ENV__ !== 'undefined' && __ENV__) : process.env) || {};
const env: any = {};
for (const v of publicEnv) {
env[v] = base[v];
Expand All @@ -37,8 +31,9 @@ try {
logger.info('Process Update Success!');
} catch (e) {
logger.warn(e);
logger.info('Encountered above issue while running "global.process = process", will automatically try again in next render');

logger.info(
'Encountered above issue while running "global.process = process", will automatically try again in next render',
);
}
export const PUBLIC_SETTINGS: __PUBLIC_SETTINGS__ = {
apolloLogging: false,
Expand Down