Merge branch 'hotfix/1.1.1'

CodeTanzania · Dec 17, 2018 · 9767b3d · 9767b3d
2 parents 3ddae1c + b4494e3
commit 9767b3d
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.1.0 / 16-12-2018
+- Remove unused mongoose-schema-jsonschema
+- Build latest apidoc
+- Reorganize dependencies
+
 # 1.1.0 / 16-12-2018
 - Build latest apidoc
 - Force latest dependencies & audit fix

diff --git a/docs/api_project.js b/docs/api_project.js
@@ -13,7 +13,7 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2018-12-16T14:58:05.218Z",
+    "time": "2018-12-17T06:40:05.030Z",
     "url": "http://apidocjs.com",
     "version": "0.17.6"
   }

diff --git a/docs/api_project.json b/docs/api_project.json
@@ -13,7 +13,7 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2018-12-16T14:58:05.218Z",
+    "time": "2018-12-17T06:40:05.030Z",
     "url": "http://apidocjs.com",
     "version": "0.17.6"
   }

diff --git a/index.js b/index.js
@@ -26,12 +26,11 @@
 /* dependencies */
 const path = require('path');
 const _ = require('lodash');
+const { include } = require('@lykmapipo/include');
 const app = require('@lykmapipo/express-common');
-const mongoose = require('mongoose');
-const pkg = require(path.join(__dirname, 'package.json'));
-require('mongoose-schema-jsonschema')(mongoose);
 const { Permission, permissionRouter } = require('@lykmapipo/permission');
-const roleRouter = require(path.join(__dirname, 'lib', 'role.http.router'));
+const pkg = include(__dirname, 'package.json');
+const roleRouter = include(__dirname, 'lib', 'role.http.router');
 
 
 /**

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codetanzania/emis-role",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A representation on how a party(or stakeholder) acts or, in other words, what role party(or stakeholder) plays in event of emergency(or disaster).",
   "main": "index.js",
   "scripts": {
@@ -89,6 +89,7 @@
   "devDependencies": {
     "@benmaruchu/faker": "^4.2.1",
     "@codetanzania/majifix-common": "^0.11.1",
+    "@lykmapipo/mongoose-test-helpers": ">=0.2.3",
     "chai": "^4.2.0",
     "grunt": "^1.0.3",
     "grunt-apidoc": "^0.11.0",
@@ -109,10 +110,11 @@
   "dependencies": {
     "@lykmapipo/env": ">=0.3.2",
     "@lykmapipo/express-common": ">=0.9.4",
+    "@lykmapipo/include": ">=0.1.0",
     "@lykmapipo/permission": ">=0.6.0",
     "async": ">=2.6.1",
     "lodash": ">=4.17.11",
-    "mongoose-rest-actions": ">=0.22.1"
+    "mongoose-rest-actions": ">=0.22.2"
   },
   "engines": {
     "node": ">=8.11.1",