Move dictionary and update dependencies

packages/strapi-bookshelf/package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "bookshelf": "^0.10.3",
     "lodash": "^4.17.4",
-    "pluralize": "^3.1.0",
+    "pluralize": "^6.0.0",
     "strapi-utils": "^3.0.0-alpha.4.8"
   },
   "strapi": {

packages/strapi-ejs/package.json

@@ -14,7 +14,7 @@
   "main": "./lib",
   "dependencies": {
     "co": "^4.6.0",
-    "koa-ejs": "^3.0.0"
+    "koa-ejs": "^4.1.0"
   },
   "strapi": {
     "isHook": true

packages/strapi-generate-api/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "lodash": "^4.17.4",
-    "pluralize": "^3.1.0"
+    "pluralize": "^6.0.0"
   },
   "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').dictionary;
+const dictionary = require('./utils/dictionary');
 
 /**
  * Runs after this generator has finished

packages/strapi-generate-migrations/package.json

@@ -18,11 +18,12 @@
   },
   "dependencies": {
     "async": "^2.5.0",
+    "include-all": "^4.0.3",
     "glob": "^7.1.2",
     "js-beautify": "^1.6.14",
-    "knex": "^0.12.9",
+    "knex": "^0.13.0",
     "lodash": "^4.17.4",
-    "pluralize": "^3.1.0",
+    "pluralize": "^6.0.0",
     "strapi-bookshelf": "^3.0.0-alpha.4.8",
     "strapi-utils": "^3.0.0-alpha.4.8"
   },

packages/strapi-generate-new/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "enpeem": "^2.2.0",
-    "fs-extra": "^1.0.0",
+    "fs-extra": "^4.0.0",
     "lodash": "^4.17.4",
     "strapi-utils": "^3.0.0-alpha.4.8"
   },

packages/strapi-generate-plugin/package.json

@@ -13,9 +13,9 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "fs-extra": "^0.30.0",
+    "fs-extra": "^4.0.0",
     "lodash": "^4.17.4",
-    "pluralize": "^3.1.0"
+    "pluralize": "^6.0.0"
   },
   "scripts": {
     "prepublish": "npm prune"

packages/strapi-generate/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "async": "^2.5.0",
-    "fs-extra": "^1.0.0",
+    "fs-extra": "^4.0.0",
     "lodash": "^4.17.4",
     "reportback": "^2.0.1",
     "strapi-utils": "^3.0.0-alpha.4.8"

packages/strapi-knex/package.json

@@ -16,7 +16,7 @@
   },
   "main": "./lib",
   "dependencies": {
-    "knex": "^0.12.9",
+    "knex": "^0.13.0",
     "lodash": "^4.17.4",
     "sqlite3": "^3.1.8"
   },

packages/strapi-mongoose/package.json

@@ -19,7 +19,7 @@
     "mongoose": "^4.11.3",
     "mongoose-double": "0.0.1",
     "mongoose-float": "^1.0.2",
-    "pluralize": "^3.1.0",
+    "pluralize": "^6.0.0",
     "strapi-utils": "^3.0.0-alpha.4.8"
   },
   "strapi": {

packages/strapi-redis/package.json

@@ -15,9 +15,9 @@
   },
   "main": "./lib",
   "dependencies": {
-    "ioredis": "^2.5.0",
+    "ioredis": "^3.1.2",
     "lodash": "^4.17.4",
-    "stack-trace": "0.0.9",
+    "stack-trace": "0.0.10",
     "strapi-utils": "^3.0.0-alpha.4.8"
   },
   "strapi": {

packages/strapi-utils/lib/cli.js

@@ -1,31 +0,0 @@
-'use strict';
-
-/**
- * Module dependencies
- */
-
-// Node.js core.
-const path = require('path');
-
-/**
- * Check that we're in a valid Strapi project.
- *
- * @returns {boolean}
- */
-
-const isStrapiApp = () => {
-  const pathToPackageJSON = path.resolve(process.cwd(), 'package.json');
-  let validPackageJSON = true;
-
-  try {
-    require(pathToPackageJSON);
-  } catch (e) {
-    validPackageJSON = false;
-  }
-
-  return validPackageJSON;
-};
-
-module.exports = {
-  isStrapiApp
-};

packages/strapi-utils/lib/index.js

@@ -5,7 +5,6 @@
  */
 
 module.exports = {
-  cli: require('./cli'),
   commander: require('./commander'),
   finder: require('./finder'),
   joijson: require('./joi-json'),

packages/strapi-utils/package.json

@@ -4,7 +4,6 @@
   "description": "Shared utilities for the Strapi packages",
   "homepage": "http://strapi.io",
   "keywords": [
-    "dictionary",
     "knex",
     "strapi",
     "utilities",
@@ -17,9 +16,8 @@
   "main": "./lib",
   "dependencies": {
     "commander": "^2.11.0",
-    "include-all": "^2.0.0",
     "joi-json": "^2.0.1",
-    "knex": "^0.12.9",
+    "knex": "^0.13.0",
     "lodash": "^4.17.4",
     "winston": "^2.3.1"
   },

packages/strapi/lib/middlewares/public/index.js

@@ -50,7 +50,7 @@ module.exports = strapi => {
         )
       );
 
-      // Mount static to a specific path (pattern: `/plugins/xXx`)
+      // Mount static to a specific path (pattern: `/plugins/aBc`)
       _.forEach(strapi.plugins, (value, plugin) => {
         // Create koa sub-app
         const app = new Koa();

packages/strapi/package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "async": "^2.1.2",
-    "boom": "^4.2.0",
+    "boom": "^5.2.0",
     "consolidate": "~0.14.0",
     "delegates": "^1.0.0",
     "forever-monitor": "^1.7.1",
@@ -40,22 +40,22 @@
     "koa": "^2.1.0",
     "koa-better-static": "^1.0.5",
     "koa-body": "^2.3.0",
-    "koa-compose": "^3.2.1",
+    "koa-compose": "^4.0.0",
     "koa-compress": "^2.0.0",
     "koa-convert": "^1.2.0",
     "koa-favicon": "^2.0.0",
-    "koa-generic-session": "^1.11.6",
+    "koa-generic-session": "^2.0.0",
-    "koa-i18n": "^1.2.0",
+    "koa-i18n": "^2.1.0",
     "koa-ip": "^0.1.0",
     "koa-joi-router": "^5.0.0",
-    "koa-locale": "~1.2.0",
+    "koa-locale": "~1.3.0",
     "koa-lusca": "~2.2.0",
-    "koa-mount": "^2.0.0",
+    "koa-mount": "^3.0.0",
-    "koa-proxy": "^0.7.0",
+    "koa-proxy": "^0.8.0",
     "koa-response-time": "^2.0.0",
-    "koa-send": "^3.3.0",
+    "koa-send": "^4.1.0",
     "koa-sslify": "^2.1.0",
-    "koa-views": "^5.0.2",
+    "koa-views": "^6.0.2",
     "lodash": "^4.16.5",
     "node-schedule": "^1.2.0",
     "strapi-generate": "^3.0.0-alpha.4.8",