Update dependencies and migrate utils models into strapi-utils

packages/strapi-bookshelf/lib/index.js

@@ -13,7 +13,7 @@ const pluralize = require('pluralize');
 const utils = require('./utils/');
 
 // Strapi helpers for models.
-const utilsModels = require('strapi/lib/configuration/hooks/models/utils/');
+const utilsModels = require('strapi-utils').models;
 
 /**
  * Bookshelf hook

packages/strapi-bookshelf/package.json

@@ -17,13 +17,15 @@
   "main": "./lib",
   "dependencies": {
     "bookshelf": "~0.10.0",
-    "lodash": "~4.15.0",
+    "lodash": "^4.16.5",
     "pluralize": "~3.0.0",
-    "strapi": "~2.0.0"
+    "strapi-utils": "~2.0.0"
   },
   "strapi": {
     "isHook": true,
-    "nextTo": ["strapi-knex"]
+    "nextTo": [
+      "strapi-knex"
+    ]
   },
   "scripts": {
     "prepublish": "npm prune"

packages/strapi-generate-api/package.json

@@ -13,7 +13,7 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "lodash": "~4.15.0",
+    "lodash": "^4.16.5",
     "pluralize": "~3.0.0"
   },
   "scripts": {

packages/strapi-generate-controller/package.json

@@ -14,7 +14,7 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "lodash": "~4.15.0"
+    "lodash": "^4.16.5"
   },
   "scripts": {
     "prepublish": "npm prune"

packages/strapi-generate-migrations/lib/after.js

@@ -14,7 +14,7 @@ const path = require('path');
 const beautify = require('js-beautify').js_beautify;
 
 // Local utilities.
-const dictionary = require('strapi-utils/lib/dictionary');
+const dictionary = require('strapi-utils').dictionary;
 
 /**
  * Runs after this generator has finished

packages/strapi-generate-migrations/lib/builder/relations.js

@@ -13,7 +13,7 @@ const _ = require('lodash');
 const pluralize = require('pluralize');
 
 // Collections utils.
-const utilsModels = require('strapi/lib/configuration/hooks/models/utils/');
+const utilsModels = require('strapi-utils').models;
 const utilsBookShelf = require('strapi-bookshelf/lib/utils/');
 
 // Template builder.

packages/strapi-generate-migrations/package.json

@@ -17,13 +17,12 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "async": "~2.0.1",
-    "glob": "~7.0.3",
-    "js-beautify": "~1.6.2",
-    "knex": "~0.11.10",
-    "lodash": "~4.15.0",
-    "pluralize": "~3.0.0",
-    "strapi": "~2.0.0",
+    "async": "^2.1.2",
+    "glob": "^7.1.1",
+    "js-beautify": "^1.6.4",
+    "knex": "^0.12.6",
+    "lodash": "^4.16.5",
+    "pluralize": "^3.0.0",
     "strapi-bookshelf": "~2.0.0",
     "strapi-utils": "~2.0.0"
   },

packages/strapi-generate-model/package.json

@@ -14,7 +14,7 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "lodash": "~4.15.0"
+    "lodash": "^4.16.5"
   },
   "scripts": {
     "prepublish": "npm prune"

packages/strapi-generate-new/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "fs-extra": "~0.30.0",
-    "lodash": "~4.15.0",
+    "lodash": "^4.16.5",
     "strapi-utils": "~2.0.0"
   },
   "scripts": {

packages/strapi-generate-policy/package.json

@@ -14,7 +14,7 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "lodash": "~4.15.0"
+    "lodash": "^4.16.5"
   },
   "scripts": {
     "prepublish": "npm prune"

packages/strapi-generate-service/package.json

@@ -14,7 +14,7 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "lodash": "~4.15.0"
+    "lodash": "^4.16.5"
   },
   "scripts": {
     "prepublish": "npm prune"

packages/strapi-generate/package.json

@@ -13,10 +13,10 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "async": "~2.0.1",
+    "async": "^2.1.2",
     "fs-extra": "~0.30.0",
-    "lodash": "~4.15.0",
-    "reportback": "~0.1.9",
+    "lodash": "^4.16.5",
+    "reportback": "^2.0.1",
     "strapi-utils": "~2.0.0"
   },
   "scripts": {

packages/strapi-knex/package.json

@@ -16,9 +16,9 @@
   },
   "main": "./lib",
   "dependencies": {
-    "knex": "~0.11.10",
-    "lodash": "~4.15.0",
-    "sqlite3": "~3.1.1"
+    "knex": "^0.12.6",
+    "lodash": "^4.16.5",
+    "sqlite3": "^3.1.8"
   },
   "strapi": {
     "isHook": true

packages/strapi-mongoose/lib/index.js

@@ -14,7 +14,7 @@ const pluralize = require('pluralize');
 const utils = require('./utils/');
 
 // Strapi helpers for models.
-const utilsModels = require('strapi/lib/configuration/hooks/models/utils/');
+const utilsModels = require('strapi-utils').models;
 
 /**
  * Bookshelf hook

packages/strapi-mongoose/package.json

@@ -15,12 +15,12 @@
   },
   "main": "./lib",
   "dependencies": {
-    "lodash": "~4.15.0",
-    "mongoose": "~4.5.4",
+    "lodash": "^4.16.5",
+    "mongoose": "^4.6.5",
     "mongoose-double": "0.0.1",
     "mongoose-float": "^1.0.2",
     "pluralize": "~3.0.0",
-    "strapi": "~2.0.0"
+    "strapi-utils": "~2.0.0"
   },
   "strapi": {
     "isHook": true

packages/strapi-utils/lib/index.js

@@ -5,12 +5,13 @@
  */
 
 module.exports = {
-  finder: require('./finder'),
   commander: require('./commander'),
   dictionary: require('./dictionary'),
+  finder: require('./finder'),
+  joijson: require('./joi-json'),
   json: require('./json'),
   knex: require('./knex'),
-  regex: require('./regex'),
   logger: require('./winston'),
-  joijson: require('./joi-json')
+  models: require('./models'),
+  regex: require('./regex')
 };

packages/strapi-utils/package.json

@@ -17,10 +17,10 @@
   "main": "./lib",
   "dependencies": {
     "commander": "~2.9.0",
-    "include-all": "~0.1.6",
+    "include-all": "^1.0.7",
     "joi-json": "^2.0.1",
-    "knex": "~0.11.10",
-    "lodash": "~4.15.0",
+    "knex": "^0.12.6",
+    "lodash": "^4.16.5",
     "winston": "~2.2.0"
   },
   "scripts": {

packages/strapi/package.json

@@ -35,11 +35,8 @@
     "strapi": "./bin/strapi.js"
   },
   "dependencies": {
-    "async": "~2.0.1",
-    "co": "~4.6.0",
+    "async": "^2.1.2",
     "consolidate": "~0.14.0",
-    "fs-extra": "~0.30.0",
-    "graphql": "~0.7.2",
     "herd": "~1.0.0",
     "koa": "~1.2.0",
     "koa-bodyparser": "~2.2.0",
@@ -61,9 +58,9 @@
     "koa-sslify": "^1.1.0",
     "koa-static": "~2.0.0",
     "koa-views": "^4.1.0",
-    "lodash": "~4.15.0",
-    "node-schedule": "~1.1.0",
-    "socket.io": "~1.4.5",
+    "lodash": "^4.16.5",
+    "node-schedule": "^1.2.0",
+    "socket.io": "^1.5.1",
     "strapi-generate": "~2.0.0",
     "strapi-generate-api": "~2.0.0",
     "strapi-generate-new": "~2.0.0",