From daf3dbaa70ce7423e283eba35ddc88b915bd375e Mon Sep 17 00:00:00 2001
From: Prashant Shahi <prashant@dgraph.io>
Date: Fri, 31 Jan 2020 14:53:35 +0530
Subject: [PATCH] Updating changelog and package JSON files for v2.1.0 release
 (#104)

* Bumping version in package.json and package-lock.json
* Updating CHANGELOG for v2.1.0
* Adding reference to links of pr and issues in CHANGELOG

Signed-off-by: Prashant Shahi <coolboi567@gmail.com>
---
 CHANGELOG.md      | 38 +++++++++++++++++++++++++++++++++-----
 package-lock.json | 25 +++++++++++++++++--------
 package.json      |  2 +-
 3 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b4d5e8..78d96af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,20 +5,45 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v2.1.0] - 2020-01-30
+
+### Fixed
+
+- Resolved JSON parse issue of Payload response. Fixes [#43][] ([#94][])
+- Updating ACL tests to sync up changes with Dgraph v1.2 ([#103][])
+
+### Added
+
+- Adding tests for upsert with graphql variables ([#101][])
+
+### Changed
+
+- Synced proto files to the latest version ([#99][])
+
+[#43]: https://github.com/dgraph-io/dgraph-js/issues/43
+[#94]: https://github.com/dgraph-io/dgraph-js/issues/94
+[#103]: https://github.com/dgraph-io/dgraph-js/issues/103
+[#101]: https://github.com/dgraph-io/dgraph-js/issues/101
+[#99]: https://github.com/dgraph-io/dgraph-js/issues/99
+
 ## [v2.0.2] - 2019-10-01
 
 ### Changed
-- Upgrade google-protobuf dependency version to 3.8.0+ ([#80](https://github.com/dgraph-io/dgraph-js/issues/80))
+- Upgrade google-protobuf dependency version to 3.8.0+ ([#80][])
 
 ### Fixed
 - Added logic to catch exceptions when `dgraphClient` fails to be created
-  due to invalid gRPC address ([#71](https://github.com/dgraph-io/dgraph-js/issues/71))
+  due to invalid gRPC address ([#71][])
+
+[#80]: https://github.com/dgraph-io/dgraph-js/issues/80
+[#71]: https://github.com/dgraph-io/dgraph-js/issues/71
 
 ## [v2.0.1] - 2019-09-10
 
 ### Fixed
-- Added function to refresh JWT token if expired
-  ([#56](https://github.com/dgraph-io/dgraph-js/issues/56))
+- Added function to refresh JWT token if expired ([#56][])
+
+[#56]: https://github.com/dgraph-io/dgraph-js/issues/56
 
 ## [v2.0.0] - 2019-09-06
 
@@ -68,7 +93,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - Function `u8ToStr` which was leading to json parse errors
-  ([#17](https://github.com/dgraph-io/dgraph-js/issues/17))
+  ([#17][])
+
+[#17]: https://github.com/dgraph-io/dgraph-js/issues/17
 
 ## [v1.1.0] - 2018-02-06
 
@@ -111,6 +138,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Full compatibility with Dgraph v1.0.0
 
+[v2.1.0]: https://github.com/dgraph-io/dgraph-js/compare/v2.0.2...v2.1.0
 [v2.0.2]: https://github.com/dgraph-io/dgraph-js/compare/v2.0.1...v2.0.2
 [v2.0.1]: https://github.com/dgraph-io/dgraph-js/compare/v2.0.0...v2.0.1
 [v2.0.0]: https://github.com/dgraph-io/dgraph-js/compare/v1.2.1...v2.0.0
diff --git a/package-lock.json b/package-lock.json
index f8a0063..0b0bd4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dgraph-js",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3580,9 +3580,9 @@
       }
     },
     "handlebars": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
-      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.2.tgz",
+      "integrity": "sha512-4PwqDL2laXtTWZghzzCtunQUTLbo31pcCJrd/B/9JP8XbhVzpS5ZXuKqlOzsd1rtcaLo4KqAn8nl8mkknS4MHw==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.0",
@@ -6910,14 +6910,23 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
-      "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
+      "version": "3.7.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.6.tgz",
+      "integrity": "sha512-yYqjArOYSxvqeeiYH2VGjZOqq6SVmhxzaPjJC1W2F9e+bqvFL9QXQ2osQuKUFjM2hGjKG2YclQnRKWQSt/nOTQ==",
       "dev": true,
       "optional": true,
       "requires": {
-        "commander": "~2.20.0",
+        "commander": "~2.20.3",
         "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "union-value": {
diff --git a/package.json b/package.json
index 50e8037..484e5a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dgraph-js",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Official javascript client for Dgraph",
   "license": "Apache-2.0",
   "repository": {