fix dependecies levels, fix gitingore, fix production build

.gitignore

@@ -1,4 +1,4 @@
 node_modules/
-assets/
-build/
+/assets/
+/build/
 .env

package.json

@@ -21,11 +21,22 @@
     "lint": "eslint src test"
   },
   "engines": {
-    "node": "4.2.1"
+    "node": "4.2.1",
+    "npm": "2.14.17"
   },
   "dependencies": {
+    "babel": "^6.3.26",
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
+    "babel-loader": "^6.2.1",
+    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-react-transform": "^2.0.0",
     "babel-polyfill": "^6.2.0",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
     "body-parser": "^1.14.1",
+    "brfs": "^1.4.3",
     "express": "^4.13.3",
     "mongodb": "^2.0.49",
     "react": "^0.14.0",
@@ -36,20 +47,12 @@
     "redux-persist": "^1.5.0",
     "redux-thunk": "^1.0.0",
     "superagent": "^1.4.0",
-    "superagent-jsonp": "0.0.6"
+    "superagent-jsonp": "0.0.6",
+    "transform-loader": "^0.2.3",
+    "webpack": "^1.12.2"
   },
   "devDependencies": {
-    "babel": "^6.3.26",
-    "babel-cli": "^6.4.0",
-    "babel-core": "^6.4.0",
     "babel-eslint": "^5.0.0-beta6",
-    "babel-loader": "^6.2.1",
-    "babel-plugin-add-module-exports": "^0.1.2",
-    "babel-plugin-react-transform": "^2.0.0",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
-    "brfs": "^1.4.3",
     "eslint": "^1.9.0",
     "eslint-plugin-react": "^3.8.0",
     "expect": "^1.13.0",
@@ -62,8 +65,6 @@
     "react-transform-catch-errors": "^1.0.0",
     "react-transform-hmr": "^1.0.1",
     "redbox-react": "^1.1.1",
-    "transform-loader": "^0.2.3",
-    "webpack": "^1.12.2",
     "webpack-dev-middleware": "^1.2.0",
     "webpack-dev-server": "^1.12.1",
     "webpack-hot-middleware": "^2.4.1"

src/config.js

@@ -2,20 +2,32 @@ import fs from 'fs';
 
 // @todo its a shameless plug. Find another way to store YOUTUBE_API when
 // running locally
-const dotEnvVars = fs.readFileSync('.env')
-  .toString()
-  .split("\n")
-  .reduce((p, str) => {
-    const [key, val] = str.split('=');
-    if (key) {
-      p[key] = val;
-    }
+let dotEnvVars = null;
 
-    return p;
-  }, {});
+function getVars() {
+  return fs.readFileSync('.env')
+    .toString()
+    .split("\n")
+    .reduce((p, str) => {
+      const [key, val] = str.split('=');
+      if (key) {
+        p[key] = val;
+      }
+
+      return p;
+    }, {});
+}
 
 function resolveVar(varName) {
-  return process.env[varName] || dotEnvVars[varName];
+  if (process.env[varName]) {
+    return process.env[varName];
+  }
+
+  if (!dotEnvVars) {
+    dotEnvVars = getVars();
+  }
+
+  return dotEnvVars[varName];
 }
 
 export const MONGO_URI = resolveVar('MONGO_URI');

webpack.config.prod.js

@@ -30,12 +30,12 @@ module.exports = {
     loaders: [
       {
         test: /\.js$/,
-        loaders: ['babel-loader'],
-        include: path.join(__dirname, 'src'),
+        loader: 'transform?brfs',
       },
       {
-        test: /\.svg$/,
-        loader: 'svg-inline-loader',
+        test: /\.js$/,
+        loaders: ['babel-loader'],
+        include: path.join(__dirname, 'src'),
       },
     ],
   },