Skip to content

Commit

Permalink
Merge pull request #12 from rocjs/fix/pre-transpile-universal-config
Browse files Browse the repository at this point in the history
fix(roc-package-web-app-react): Pre-transpile universal-config
  • Loading branch information
dlmr authored Nov 28, 2017
2 parents 8fd59f3 + ba63227 commit 41727d4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 25 deletions.
26 changes: 1 addition & 25 deletions packages/roc-package-web-app-react/app/shared/universal-config.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,25 +1 @@
/* globals window */
/**
* Universal Configuration Manager
*
* Manages both __application__ configuration and __Roc__ configuration.
* On the server the configurations will be fetched directly and on the client it's expected that the configuration
* is available on `window` as `ROC_CONFIG` and `APP_CONFIG`.
*
* appConfig will only contain what has been selected by `runtime.configWhitelistProperty`. That means if you want
* to read the full configuration on the server you will need to read it directly from node-config.
*/

export const rocConfig = (function getRocConfig() {
return typeof window !== 'undefined' ? window.ROC_CONFIG : require('roc').getSettings(); // eslint-disable-line
}());

const whiteListed = () => (
rocConfig.runtime.configWhitelistProperty ?
require('config')[rocConfig.runtime.configWhitelistProperty] : // eslint-disable-line
undefined
);

export const appConfig = (function getAppConfig() {
return typeof window !== 'undefined' ? window.APP_CONFIG : whiteListed();
}());
module.exports = require('../../lib/app/shared/universal-config');
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/* globals window */
/**
* Universal Configuration Manager
*
* Manages both __application__ configuration and __Roc__ configuration.
* On the server the configurations will be fetched directly and on the client it's expected that the configuration
* is available on `window` as `ROC_CONFIG` and `APP_CONFIG`.
*
* appConfig will only contain what has been selected by `runtime.configWhitelistProperty`. That means if you want
* to read the full configuration on the server you will need to read it directly from node-config.
*/

export const rocConfig = (function getRocConfig() {
return typeof window !== 'undefined' ? window.ROC_CONFIG : require('roc').getSettings(); // eslint-disable-line
}());

const whiteListed = () => (
rocConfig.runtime.configWhitelistProperty ?
require('config')[rocConfig.runtime.configWhitelistProperty] : // eslint-disable-line
undefined
);

export const appConfig = (function getAppConfig() {
return typeof window !== 'undefined' ? window.APP_CONFIG : whiteListed();
}());

0 comments on commit 41727d4

Please sign in to comment.