Merge pull request #12 from fabrix-app/v1.6

scott-wyatt · web-flow · commit 0a8eabe5b28e · 2019-04-13T08:02:46.000-05:00
[feat] pkg updates
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-express",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Spool Express - Binds the routes compiled in spool-router to a Express 4 Server.",
   "homepage": "https://fabrix.app",
   "author": {
@@ -49,57 +49,57 @@
   ],
   "dependencies": {
     "body-parser": "^1.18.2",
-    "compression": "^1.7.2",
+    "compression": "^1.7.4",
     "consolidate": "^0.15.0",
-    "cookie-parser": "^1.4.3",
-    "cors": "^2.8.4",
+    "cookie-parser": "^1.4.4",
+    "cors": "^2.8.5",
     "express-boom": "^2.0.0",
     "express-session": "^1.15.6",
-    "helmet": "^3.13.0",
-    "joi": "^13.7.0",
+    "helmet": "^3.16.0",
+    "joi": "^14.3.1",
     "lodash": "^4.17.11",
     "method-override": "^3.0.0",
     "methods": "^1.1.2"
   },
   "devDependencies": {
-    "@fabrix/fabrix": "^1.5.9",
+    "@fabrix/fabrix": "^1.6.0",
     "@fabrix/lint": "^1.0.0-alpha.3",
     "@fabrix/spool-i18n": "^1.5.1",
-    "@fabrix/spool-router": "^1.5.1",
-    "@fabrix/spool-sequelize": "^1.5.0",
-    "@fabrix/spool-tapestries": "^1.5.0",
+    "@fabrix/spool-router": "^1.6.2",
+    "@fabrix/spool-sequelize": "^1.6.10",
+    "@fabrix/spool-tapestries": "^1.6.0",
     "@types/body-parser": "^1.17.0",
     "@types/compression": "0.0.36",
     "@types/cookie-parser": "^1.4.1",
     "@types/cors": "^2.8.4",
-    "@types/express": "^4.16.0",
+    "@types/express": "^4.16.1",
     "@types/express-session": "^1.15.10",
     "@types/lodash": "^4.14.109",
     "@types/method-override": "0.0.31",
     "@types/methods": "^1.1.0",
     "@types/mkdirp": "^0.5.2",
     "@types/node": "~10.3.4",
     "boom": "^7.2.0",
-    "express": "^4.16.3",
+    "express": "^4.16.4",
     "npm": "^5.7.1",
     "mocha": "^5",
-    "nyc": "^12.0.2",
+    "nyc": "^13.3.0",
     "pg": "^6.4.2",
     "pre-commit": "^1.2.2",
     "pug": "^2.0.1",
     "smokesignals": "^3",
     "sqlite3": "^4.0.2",
-    "supertest": "^3.3.0",
+    "supertest": "^3.4.2",
     "tslib": "~1.9.0",
     "tslint": "~5.10.0",
     "tslint-microsoft-contrib": "~5.0.3",
     "tsutils": "~2.27.1",
     "typescript": "~2.8.1"
   },
   "peerDependencies": {
-    "@fabrix/fabrix": "^1.5.9",
-    "@fabrix/spool-router": "^1.5.1",
-    "@fabrix/spool-i18n": "^1.5.1"
+    "@fabrix/fabrix": "^1.6.0",
+    "@fabrix/spool-router": "^1.6.0",
+    "@fabrix/spool-i18n": "^1.6.0"
   },
   "engines": {
     "node": ">= 7.6.0"
diff --git a/test/fixtures/api/controllers/DefaultController.js b/test/fixtures/api/controllers/DefaultController.js
@@ -1,5 +1,5 @@
 'use strict'
-require('@fabrix/fabrix')
+const Controller = require('@fabrix/fabrix/dist/common').FabrixController
 /**
    * @module DefaultController
    *
diff --git a/test/fixtures/api/controllers/StandardController.js b/test/fixtures/api/controllers/StandardController.js
@@ -1,5 +1,5 @@
 'use strict'
-require('@fabrix/fabrix')
+const Controller = require('@fabrix/fabrix/dist/common').FabrixController
 
 /**
  * @module DefaultController
diff --git a/test/fixtures/api/controllers/ValidationController.js b/test/fixtures/api/controllers/ValidationController.js
@@ -1,5 +1,5 @@
 'use strict'
-require('@fabrix/fabrix')
+const Controller = require('@fabrix/fabrix/dist/common').FabrixController
 
 /**
    * @module DefaultController
diff --git a/test/fixtures/api/controllers/ViewController.js b/test/fixtures/api/controllers/ViewController.js
@@ -1,5 +1,5 @@
 'use strict'
-require('@fabrix/fabrix')
+const Controller = require('@fabrix/fabrix/dist/common').FabrixController
 
 module.exports = class ViewController extends Controller{
   helloWorld (req, res) {
diff --git a/test/fixtures/api/models/Role.js b/test/fixtures/api/models/Role.js
@@ -1,6 +1,6 @@
 'use strict'
 
-require('@fabrix/fabrix')
+const Model = require('@fabrix/fabrix/dist/common').FabrixModel
 const SequelizeResolver = require('@fabrix/spool-sequelize').SequelizeResolver
 /**
  * Pet
diff --git a/test/fixtures/api/models/User.js b/test/fixtures/api/models/User.js
@@ -1,6 +1,6 @@
 'use strict'
 
-require('@fabrix/fabrix')
+const Model = require('@fabrix/fabrix/dist/common').FabrixModel
 const SequelizeResolver = require('@fabrix/spool-sequelize').SequelizeResolver
 
 /**
diff --git a/test/fixtures/api/policies/Default.js b/test/fixtures/api/policies/Default.js
@@ -1,5 +1,5 @@
 'use strict'
-require('@fabrix/fabrix')
+const Policy = require('@fabrix/fabrix/dist/common').FabrixPolicy
 
 /**
  * @module Default
diff --git a/test/fixtures/api/policies/Standard.js b/test/fixtures/api/policies/Standard.js
@@ -1,5 +1,5 @@
 'use strict'
-require('@fabrix/fabrix')
+const Policy = require('@fabrix/fabrix/dist/common').FabrixPolicy
 
 const Boom = require('boom')
 /**
diff --git a/test/fixtures/api/services/DefaultService.js b/test/fixtures/api/services/DefaultService.js
@@ -1,5 +1,5 @@
 'use strict'
-require('@fabrix/fabrix')
+const Service = require('@fabrix/fabrix/dist/common').FabrixService
 /**
    * @module DefaultService
    *

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`'use strict'`
`2`		`-require('@fabrix/fabrix')`
	`2`	`+const Controller = require('@fabrix/fabrix/dist/common').FabrixController`
`3`	`3`	`/**`
`4`	`4`	`* @module DefaultController`
`5`	`5`	`*`