Merge pull request #43 from kouhin/release/v1.3.0

Release/v1.3.0
kouhin · Nov 14, 2017 · 76f1285 · 76f1285
2 parents 90f7d66 + bc09385
commit 76f1285
Show file tree

Hide file tree

Showing 9 changed files with 4,948 additions and 135 deletions.
diff --git a/API.md b/API.md
@@ -108,7 +108,7 @@ You can use `createDataLoaderMiddleware(loaders, args)` to add extra objects to
 
 `options` provides following optional values:
 
-1. `ttl`: Provides a value in millisecond to cache the loader in order to prevent duplicated requests. (_default: 10000_)
+1. `ttl`: Provides a value in millisecond to cache the loader in order to prevent duplicated requests. (_default: 10000_, n/a to server side applications)
 2. `retryTimes`: Total try times when fetching failed. (_default: 1_)
 3. `retryWait`: Wait stategy that sleeps before retrying: (_default: fixedWait(0)_), see [wait-strategies.js](/src/wait-strategies.js) for detail.
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Redux Data Loader
 
-[![Build Status](https://travis-ci.org/kouhin/redux-dataloader.svg?branch=master)](https://travis-ci.org/kouhin/redux-dataloader)
+[![CircleCI](https://circleci.com/gh/kouhin/redux-dataloader.svg?style=svg)](https://circleci.com/gh/kouhin/redux-dataloader)
 [![npm](https://img.shields.io/npm/v/redux-dataloader.svg)](https://npmjs.org/package/redux-dataloader)
 
 Loads async data for Redux apps focusing on preventing duplicated requests and dealing with async dependencies.

diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 7
+    version: 8
 dependencies:
   override:
     - sudo apt-get install jq

diff --git a/mocha.opts b/mocha.opts
@@ -1,4 +1,4 @@
 --recursive
---compilers js:babel-core/register
 --reporter spec
+--require babel-core/register
 --require babel-polyfill