Skip to content

use window.location instead of environment vars to build hostUrl #167

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

Open
jedwards1211 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use window.location instead of environment vars to build hostUrl #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions src/universal/utils/fetching.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ export function parseJSON(response) {
}

export function hostUrl() {
const host = process.env.HOST;
const protocol = process.env.PROTOCOL;
const port = process.env.PORT;
return `${protocol}://${host}:${port}`;
if (typeof window !== 'undefined' && window.location) {
const {origin, protocol, host} = window.location;
return origin || `${protocol}//${host}`;
}
return 'http://localhost:3000';
}

export function postJSON(route, obj) {
Expand Down
5 changes: 0 additions & 5 deletions webpack/webpack.config.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ export default {
'__PRODUCTION__': false,
'process.env.NODE_ENV': JSON.stringify('development')
}),
new webpack.EnvironmentPlugin([
'PROTOCOL',
'HOST',
'PORT'
]),
new HappyPack({
loaders: ['babel'],
threads: 4
Expand Down
5 changes: 0 additions & 5 deletions webpack/webpack.config.prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,6 @@ export default {
'__PRODUCTION__': true,
'process.env.NODE_ENV': JSON.stringify('production')
}),
new webpack.EnvironmentPlugin([
'PROTOCOL',
'HOST',
'PORT'
]),
new HappyPack({
loaders: ['babel'],
threads: 4
Expand Down