Merge branch 'master' into release

js-data · Aug 18, 2017 · b22ef7b · b22ef7b
2 parents 0ff2452 + 7a40af5
commit b22ef7b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##### 1.0.1 - 18 August 2017
+
+###### Bug fixes
+- Remove `mysql` from dependencies
+
 ##### 1.0.0 - 17 August 2017
 
 Stable 1.0.0 release

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-sql",
   "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "https://github.com/js-data/js-data-sql",
   "repository": {
     "type": "git",
@@ -66,8 +66,7 @@
     "js-data-adapter": "1.0.0",
     "knex": ">=0.13.0",
     "lodash.snakecase": "4.1.1",
-    "lodash.tostring": "4.1.4",
-    "mysql": "^2.14.1"
+    "lodash.tostring": "4.1.4"
   },
   "peerDependencies": {
     "js-data": ">=3.0.0",

diff --git a/src/index.js b/src/index.js
@@ -734,7 +734,11 @@ export const version = '<%= version %>'
 /**
  * {@link SqlAdapter} class.
  *
- * @example
+ * @example <caption>CommonJS</caption>
+ * const SqlAdapter = require('js-data-sql').SqlAdapter;
+ * const adapter = new SqlAdapter();
+ *
+ * @example <caption>ES2015 Modules</caption>
  * import { SqlAdapter } from 'js-data-sql';
  * const adapter = new SqlAdapter();
  *
@@ -760,21 +764,6 @@ export const version = '<%= version %>'
  * @module js-data-sql
  */
 
-/**
- * {@link SqlAdapter} class.
- *
- * @example <caption>CommonJS</caption>
- * const SqlAdapter = require('js-data-sql').SqlAdapter;
- * const adapter = new SqlAdapter();
- *
- * @example <caption>ES2015 Modules</caption>
- * import { SqlAdapter } from 'js-data-sql';
- * const adapter = new SqlAdapter();
- *
- * @name module:js-data-sql.SqlAdapter
- * @see SqlAdapter
- */
-
 /**
  * Create a subclass of this SqlAdapter:
  * @example <caption>SqlAdapter.extend</caption>