Merge pull request #186 from jamesplease/updates

Updates

Author: jamesplease

.babelrc

@@ -1,27 +1,43 @@
 {
   "env": {
     "build": {
-      "presets": [["env", { "modules": false }], "stage-3", "react"],
+      "presets": [
+        ["env", {
+          "modules": false
+        }], "stage-3", "react"
+      ],
       "plugins": ["external-helpers", "transform-class-properties"]
     },
     "buildProd": {
-      "presets": [["env", { "modules": false }], "stage-3", "react"],
+      "presets": [
+        ["env", {
+          "modules": false
+        }], "stage-3", "react"
+      ],
       "plugins": [
         "external-helpers",
-        "transform-class-properties",
-        [
+        "transform-class-properties", [
           "transform-react-remove-prop-types",
-          { "mode": "remove", "removeImport": true }
+          {
+            "mode": "remove",
+            "removeImport": true
+          }
         ]
       ]
     },
     "es": {
-      "presets": [["env", { "modules": false }], "stage-3", "react"],
+      "presets": [
+        ["env", {
+          "modules": false
+        }], "stage-3", "react"
+      ],
       "plugins": ["transform-class-properties"]
     },
     "commonjs": {
       "plugins": [
-        ["transform-es2015-modules-commonjs", { "loose": true }],
+        ["transform-es2015-modules-commonjs", {
+          "loose": true
+        }],
         "transform-class-properties"
       ],
       "presets": ["stage-3", "react"]
@@ -31,4 +47,4 @@
       "plugins": ["transform-class-properties"]
     }
   }
-}
+}

.eslintrc

@@ -22,4 +22,4 @@
     "Promise": true
   },
   "plugins": ["react"]
-}
+}

.prettierrc

@@ -2,4 +2,4 @@
   "singleQuote": true,
   "jsxBracketSameLine": true,
   "trailingComma": "es5"
-}
+}

examples/fetch-components/src/App.js

@@ -12,7 +12,7 @@ class App extends Component {
         components={[
           <ReadPost postId="1" />,
           <UpdatePost postId="1" />,
-          <DeletePost postId="1" />
+          <DeletePost postId="1" />,
         ]}>
         {([readPost, updatePost, deletePost]) => (
           <div>
@@ -30,8 +30,8 @@ class App extends Component {
                 onClick={() =>
                   updatePost.doFetch({
                     body: JSON.stringify({
-                      title: 'hello'
-                    })
+                      title: 'hello',
+                    }),
                   })
                 }
                 disabled={

examples/multiple-requests/src/App.js

@@ -12,7 +12,7 @@ class App extends Component {
           <Fetch
             url="https://jsonplaceholder.typicode.com/posts/1"
             method="delete"
-          />
+          />,
         ]}>
         {([readPostOne, readPostTwo, deletePostOne]) => (
           <div>

examples/response-caching/src/App.js

@@ -34,13 +34,13 @@ class App extends Component {
   }
 
   state = {
-    fetchAgain: false
+    fetchAgain: false,
   };
 
   componentDidMount() {
     setTimeout(() => {
       this.setState({
-        fetchAgain: true
+        fetchAgain: true,
       });
     }, 2000);
   }

jest.config.js

@@ -2,5 +2,5 @@ module.exports = {
   collectCoverage: true,
   collectCoverageFrom: ['src/**/*.{js,jsx}', '!**/node_modules/**'],
   coverageDirectory: 'coverage',
-  setupTestFrameworkScriptFile: './test/setup.js'
+  setupTestFrameworkScriptFile: './test/setup.js',
 };

rollup.config.js

@@ -10,27 +10,27 @@ var config = {
   moduleName: 'ReactRequest',
   external: ['react'],
   globals: {
-    react: 'React'
+    react: 'React',
   },
   context: 'this',
   plugins: [
     nodeResolve({
-      jsnext: true
+      jsnext: true,
     }),
     commonjs({
-      include: 'node_modules/**'
+      include: 'node_modules/**',
 
       // explicitly specify unresolvable named exports
       // (see below for more details)
       // namedExports: { './module.js': ['foo', 'bar' ] },  // Default: undefined
     }),
     babel({
-      exclude: 'node_modules/**'
+      exclude: 'node_modules/**',
     }),
     replace({
-      'process.env.NODE_ENV': JSON.stringify(env)
-    })
-  ]
+      'process.env.NODE_ENV': JSON.stringify(env),
+    }),
+  ],
 };
 
 if (env === 'production') {
@@ -40,8 +40,8 @@ if (env === 'production') {
         pure_getters: true,
         unsafe: true,
         unsafe_comps: true,
-        warnings: false
-      }
+        warnings: false,
+      },
     })
   );
 }

src/fetch.js

@@ -150,18 +150,13 @@ export class Fetch extends React.Component {
   };
 
   fetchRenderProp = options => {
-    // Heads up! This can _never_ be synchronous, as it causes the component to
-    // render, and a user may call it synchronously within the children function.
-    //
-    // tl;dr, the following code should never cause a React warning or error:
-    //
-    // `<Fetch children={({ doFetch }) => doFetch()} />
     return new Promise(resolve => {
-      // We originally wrapped this in a setTimeout so as to avoid calls to `setState`
+      // We wrap this in a setTimeout so as to avoid calls to `setState`
       // in render, which React does not allow.
-      // However, with the recent refactor to return a Promise, the `setTimeout` is not
-      // strictly necessary. At this time, the testing setup requires the timeout remain,
-      // but it will be refactored at a future time.
+      //
+      // tl;dr, the following code should never cause a React warning or error:
+      //
+      // `<Fetch children={({ doFetch }) => doFetch()} />
       setTimeout(() => {
         this.fetchData(options, true, resolve);
       });

src/index.js

@@ -3,7 +3,7 @@ import {
   fetchDedupe,
   getRequestKey,
   clearRequestCache,
-  isRequestInFlight
+  isRequestInFlight,
 } from 'fetch-dedupe';
 
 export {
@@ -12,5 +12,5 @@ export {
   getRequestKey,
   isRequestInFlight,
   clearRequestCache,
-  clearResponseCache
+  clearResponseCache,
 };