Merge pull request #1 from dlebedynskyi/next

Next

Author: dlebedynskyi

.editorconfig

@@ -0,0 +1,13 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true

.env

@@ -1,7 +1,7 @@
 PORT=5001
 DEV_ASSETS_PORT=5000
 PROTOCOL=http
-WEBSITE_HOSTNAME=localhost:5001
+HOSTNAME=localhost
 
 STATIC_CACHE_DURATION=2592000000
 DYNAMIC_CACHE_DURATION=5

src/config/README.md renamed to config/README.md

@@ -11,7 +11,6 @@ module.exports = () => {
   const stylesheet = [];
   const file = fs.readFileSync(WEBPACK_ASSET_FILE_PATH, 'utf8');
   const assets = file ? JSON.parse(file) : null;
-  log('assets', assets);
   if (!file || !assets) {
     log('Assets file was not found. Expected ', file);
     return {javascript, stylesheet};
@@ -28,8 +27,8 @@ module.exports = () => {
       stylesheet.push(assets[k].css);
     }
   });
-  
+
   const result = {javascript, stylesheet};
-  log(result);
+  log('building assets set', result);
   return result;
 };

src/config/assets.js renamed to config/assets.js

@@ -19,10 +19,10 @@ if (configValue.environment === 'development') {
 
 configValue.port = getEnvOrDefault('PORT', 5001);
 configValue.protocol = getEnvOrDefault('PROTOCOL', 'http');
-configValue.host = getEnvOrDefault('WEBSITE_HOSTNAME');
+configValue.hostname = getEnvOrDefault('HOSTNAME', 'localhost');
 
 configValue.staticAssetsCache = getEnvOrDefault('STATIC_CACHE_DURATION', 1000 * 60 * 60 * 24 * 30); // 30 days
-configValue.dynamicCache = getEnvOrDefault('DYNAMIC_CACHE_DURATION', 0); // 0 sec
+configValue.dynamicCache = getEnvOrDefault('DYNAMIC_CACHE_DURATION', 0); // 0 ms
 
 configValue.contentDir =
   configValue.environment === 'development' ?
@@ -31,9 +31,6 @@ configValue.contentDir =
 
 debug.enable(process.env.DEBUG);
 
-const log = debug('react-playground:Environment:');
-log(configValue);
-
 module.exports = configValue;
 
 function getEnvOrDefault(key, defaultValue) {