Merge pull request #185 from okgrow/release/v1.5.8

Release/v1.5.8
Urigo · Nov 14, 2018 · 48df137 · 48df137
2 parents 37bece6 + f1e9011
commit 48df137
Show file tree

Hide file tree

Showing 11 changed files with 3,526 additions and 2,862 deletions.
diff --git a/.babelrc b/.babelrc
@@ -2,30 +2,36 @@
   "env": {
     "build": {
       "presets": [
-        ["env", {
-          "targets": {
-            "node": "4.8.3"
-          },
-          "useBuiltIns": true,
-          "modules": false
-        }]
+        [
+          "@babel/preset-env",
+          {
+            "targets": {
+              "node": "4.8.3"
+            },
+            "useBuiltIns": "usage",
+            "modules": false
+          }
+        ]
       ],
       "plugins": [
-        "external-helpers",
-        "transform-object-rest-spread"
+        "@babel/plugin-external-helpers",
+        "@babel/plugin-proposal-object-rest-spread"
       ]
     },
     "test": {
       "presets": [
-        ["env", {
-          "targets": {
-            "node": "4.8.3"
-          },
-          "useBuiltIns": true,
-        }]
+        [
+          "@babel/preset-env",
+          {
+            "targets": {
+              "node": "4.8.3"
+            },
+            "useBuiltIns": "usage"
+          }
+        ]
       ],
       "plugins": [
-        "transform-object-rest-spread"
+        "@babel/plugin-proposal-object-rest-spread"
       ]
     }
   }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## [1.5.8]
 ### Fixed
 - Fix exception message when checking NamedType. [PR #178](https://github.com/okgrow/merge-graphql-schemas/pull/178) by [Fi1osof](https://github.com/Fi1osof).
 
+- Fix directives not being merged correctly. Closes [#156](https://github.com/okgrow/merge-graphql-schemas/issues/156), [#182](https://github.com/okgrow/merge-graphql-schemas/issues/182) [PR #183](https://github.com/okgrow/merge-graphql-schemas/pull/183) by [Fi1osof](https://github.com/Fi1osof).
+
 ## [1.5.7]
 ### Fixed
 - Typescript issue introduced in previous PR. [PR #168](https://github.com/okgrow/merge-graphql-schemas/pull/172) by [@koenpunt](https://github.com/koenpunt).