Merge pull request #793 from sharetribe/cra-fork-to-1.1.2

Update our CRA fork to 1.1.2

package.json

@@ -13,6 +13,8 @@
     "compression": "^1.7.2",
     "cookie-parser": "^1.4.3",
     "decimal.js": "7.2.4",
+    "dotenv": "4.0.0",
+    "dotenv-expand": "4.0.1",
     "express": "^4.16.3",
     "express-enforces-ssl": "^1.1.0",
     "express-sitemap": "^1.8.0",
@@ -40,7 +42,7 @@
     "redux-form": "^6.8.0",
     "redux-thunk": "^2.2.0",
     "sanitize.css": "^5.0.0",
-    "sharetribe-scripts": "1.0.14",
+    "sharetribe-scripts": "1.1.2",
     "sharetribe-sdk": "git+ssh://git@github.com/sharetribe/sharetribe-sdk-js#7e4d6258b057a36a1249f9cdde8f3cb4fd208ec6",
     "smoothscroll-polyfill": "^0.4.0",
     "source-map-support": "^0.5.4",

server/env.js

@@ -31,7 +31,11 @@ const configureEnv = () => {
   dotenvFiles.forEach(dotenvFile => {
     if (fs.existsSync(dotenvFile)) {
       console.log('Loading env from file:' + dotenvFile);
-      require('dotenv').config({ path: dotenvFile });
+      require('dotenv-expand')(
+        require('dotenv').config({
+          path: dotenvFile,
+        })
+      );
     }
   });
 };