fomrat code

facebook · Mar 15, 2017 · dbdbfb1 · dbdbfb1
1 parent fd86bdd
commit dbdbfb1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 17 deletions.
diff --git a/packages/react-scripts/config/loadEnv.js b/packages/react-scripts/config/loadEnv.js
@@ -19,24 +19,24 @@ var fs = require('fs');
 var paths = require('./paths');
 
 var sequence = {
-  'development': [
+  development: [
     paths.dotenvDevelopmentLocal,
     paths.dotenvDevelopment,
     paths.dotenvLocal,
-    paths.dotenv
+    paths.dotenv,
   ],
-  'test': [
+  test: [
     paths.dotenvTestLocal,
     paths.dotenvTest,
     paths.dotenvLocal,
-    paths.dotenv
+    paths.dotenv,
   ],
-  'production': [
+  production: [
     paths.dotenvProductionLocal,
     paths.dotenvProduction,
     paths.dotenvLocal,
-    paths.dotenv
-  ]
+    paths.dotenv,
+  ],
 };
 
 var envConfigs = sequence[process.env.NODE_ENV];
@@ -46,7 +46,7 @@ if (envConfigs) {
     if (fs.existsSync(envConfig)) {
       require('dotenv').config({
         silent: true,
-        path: envConfig
+        path: envConfig,
       });
     }
   });

diff --git a/packages/react-scripts/fixtures/kitchensink/integration/env.test.js b/packages/react-scripts/fixtures/kitchensink/integration/env.test.js
@@ -15,15 +15,27 @@ describe('Integration', () => {
     it('file env variables', async () => {
       const doc = await initDOM('file-env-variables');
 
-      expect(doc.getElementById('feature-file-env-original-1').textContent).to.equal('from-original-env-1');
-      expect(doc.getElementById('feature-file-env-original-2').textContent).to.equal('override-from-original-local-env-2');
+      expect(
+        doc.getElementById('feature-file-env-original-1').textContent
+      ).to.equal('from-original-env-1');
+      expect(
+        doc.getElementById('feature-file-env-original-2').textContent
+      ).to.equal('override-from-original-local-env-2');
 
       if (process.env.NODE_ENV === 'production') {
-        expect(doc.getElementById('feature-file-env').textContent).to.equal('production')
-        expect(doc.getElementById('feature-file-env-x').textContent).to.equal('x-from-production-env')
+        expect(doc.getElementById('feature-file-env').textContent).to.equal(
+          'production'
+        );
+        expect(doc.getElementById('feature-file-env-x').textContent).to.equal(
+          'x-from-production-env'
+        );
       } else {
-        expect(doc.getElementById('feature-file-env').textContent).to.equal('development')
-        expect(doc.getElementById('feature-file-env-x').textContent).to.equal('x-from-development-env')
+        expect(doc.getElementById('feature-file-env').textContent).to.equal(
+          'development'
+        );
+        expect(doc.getElementById('feature-file-env-x').textContent).to.equal(
+          'x-from-development-env'
+        );
       }
     });
 

diff --git a/packages/react-scripts/fixtures/kitchensink/src/features/env/FileEnvVariables.js b/packages/react-scripts/fixtures/kitchensink/src/features/env/FileEnvVariables.js
@@ -11,9 +11,15 @@ import React from 'react';
 
 export default () => (
   <span>
-    <span id="feature-file-env-original-1">{process.env.REACT_APP_ORIGINAL_1}</span>
-    <span id="feature-file-env-original-2">{process.env.REACT_APP_ORIGINAL_2}</span>
-    <span id="feature-file-env">{process.env.REACT_APP_DEVELOPMENT}{process.env.REACT_APP_PRODUCTION}</span>
+    <span id="feature-file-env-original-1">
+      {process.env.REACT_APP_ORIGINAL_1}
+    </span>
+    <span id="feature-file-env-original-2">
+      {process.env.REACT_APP_ORIGINAL_2}
+    </span>
+    <span id="feature-file-env">
+      {process.env.REACT_APP_DEVELOPMENT}{process.env.REACT_APP_PRODUCTION}
+    </span>
     <span id="feature-file-env-x">{process.env.REACT_APP_X}</span>
   </span>
 );