release 1.2.0

thebigredgeek · May 9, 2018 · 0c778b5 · 0c778b5
1 parent 2c777e9
commit 0c778b5
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+1.2.0 / 2018-05-08
+==================
+
+  * Feature: Functional helpers for conditional resolvers (#25, @rynobax)
+
 1.1.0 / 2018-02-22
 ==================
 

diff --git a/README.md b/README.md
@@ -168,7 +168,7 @@ const resolvers = combineResolvers([
 export default resolvers;
 ```
 
-Conditional resovlers:
+Conditional resolvers:
 ```javascript
 import { and, or } from 'apollo-resolvers';
 

diff --git a/dist/context.js.map b/dist/context.js.map
diff --git a/dist/helper.js b/dist/helper.js
diff --git a/dist/helper.js.map b/dist/helper.js.map
diff --git a/dist/promise.js.map b/dist/promise.js.map
diff --git a/dist/resolver.js.map b/dist/resolver.js.map
diff --git a/dist/util.js.map b/dist/util.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-resolvers",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Expressive and composable resolvers for Apollostack's GraphQL server Edit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -48,6 +48,7 @@
     "rimraf": "^2.5.4",
     "sinon": "^1.17.7",
     "supertest": "^3.0.0",
+    "typescript": "^2.8.3",
     "typings": "^2.1.1"
   }
 }