From e1f6af49113ddabeb6f8c3ead9a601f1ec2d42d7 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Mon, 23 Oct 2017 17:32:18 +0200
Subject: [PATCH 01/14] Fix plugin install node modules dependencies

---
 packages/strapi-generate-new/json/package.json.js | 4 +---
 packages/strapi/bin/strapi-install.js             | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/strapi-generate-new/json/package.json.js b/packages/strapi-generate-new/json/package.json.js
index ee025d89e7..60fd942f0d 100755
--- a/packages/strapi-generate-new/json/package.json.js
+++ b/packages/strapi-generate-new/json/package.json.js
@@ -31,9 +31,7 @@ module.exports = scope => {
     'dependencies': {
       'lodash': '4.x.x',
       'strapi': getDependencyVersion(cliPkg, 'strapi'),
-      'strapi-mongoose': getDependencyVersion(cliPkg, 'strapi'),
-      'strapi-generate': getDependencyVersion(cliPkg, 'strapi'),
-      'strapi-generate-api': getDependencyVersion(cliPkg, 'strapi')
+      'strapi-mongoose': getDependencyVersion(cliPkg, 'strapi')
     },
     'main': './server.js',
     'scripts': {
diff --git a/packages/strapi/bin/strapi-install.js b/packages/strapi/bin/strapi-install.js
index 6f6c35e8fd..c9056d05be 100755
--- a/packages/strapi/bin/strapi-install.js
+++ b/packages/strapi/bin/strapi-install.js
@@ -9,6 +9,7 @@
 // Node.js core.
 const { exec } = require('child_process');
 const fs = require('fs');
+const fse = require('fs-extra');
 const path = require('path');
 
 // Logger.
@@ -55,7 +56,7 @@ module.exports = function (plugin, cliArguments) {
     logger.debug('Installing the plugin from npm registry.');
 
     // Install the plugin from the npm registry.
-    exec(`npm install ${pluginId}@alpha --ignore-scripts --no-save`, (err) => {
+    exec(`npm install ${pluginId}@alpha --ignore-scripts --no-save --prefix ${pluginPath}`, (err) => {
       if (err) {
         logger.error(`An error occurred during plugin installation. \nPlease make sure this plugin is available on npm: https://www.npmjs.com/package/${pluginId}`);
         process.exit(1);
@@ -69,7 +70,7 @@ module.exports = function (plugin, cliArguments) {
         logger.debug(`Moving the \`node_modules/${pluginId}\` folder to the \`./plugins\` folder.`);
 
         // Move the plugin from the `node_modules` folder to the `./plugins` folder.
-        fs.renameSync(`./node_modules/${pluginId}`, pluginPath);
+        fse.copySync(`${pluginPath}/node_modules/${pluginId}`, pluginPath);
 
         // Success.
         logger.info('The plugin has been successfully installed.');

From 4b562ed94fe49089d486f2a4b0deb61075f5efa6 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Mon, 23 Oct 2017 17:53:49 +0200
Subject: [PATCH 02/14] Move plugin setup on strapi

---
 packages/strapi-generate-new/json/package.json.js               | 2 +-
 .../{strapi-utils/script => strapi/lib/utils}/plugin-install.js | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/{strapi-utils/script => strapi/lib/utils}/plugin-install.js (100%)

diff --git a/packages/strapi-generate-new/json/package.json.js b/packages/strapi-generate-new/json/package.json.js
index 60fd942f0d..013e2868ca 100755
--- a/packages/strapi-generate-new/json/package.json.js
+++ b/packages/strapi-generate-new/json/package.json.js
@@ -38,7 +38,7 @@ module.exports = scope => {
       'start': 'node server.js',
       'strapi': 'node_modules/strapi/bin/strapi.js', // Allow to use `npm run strapi` CLI,
       'lint': 'node_modules/.bin/eslint api/**/*.js config/**/*.js plugins/**/*.js',
-      'postinstall': 'node node_modules/strapi-utils/script/plugin-install.js'
+      'postinstall': 'node node_modules/strapi/lib/utils/plugin-install.js'
     },
     'author': {
       'name': scope.author || 'A Strapi developer',
diff --git a/packages/strapi-utils/script/plugin-install.js b/packages/strapi/lib/utils/plugin-install.js
similarity index 100%
rename from packages/strapi-utils/script/plugin-install.js
rename to packages/strapi/lib/utils/plugin-install.js

From 2db9dc5d08dc4c8f97ab4a177671259a3332ac2b Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Thu, 2 Nov 2017 14:46:41 +0100
Subject: [PATCH 03/14] Install admin dependencies

---
 packages/strapi-generate-new/json/package.json.js      |  2 +-
 .../lib/utils/{plugin-install.js => post-install.js}   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 rename packages/strapi/lib/utils/{plugin-install.js => post-install.js} (73%)

diff --git a/packages/strapi-generate-new/json/package.json.js b/packages/strapi-generate-new/json/package.json.js
index 013e2868ca..cea6347f41 100755
--- a/packages/strapi-generate-new/json/package.json.js
+++ b/packages/strapi-generate-new/json/package.json.js
@@ -38,7 +38,7 @@ module.exports = scope => {
       'start': 'node server.js',
       'strapi': 'node_modules/strapi/bin/strapi.js', // Allow to use `npm run strapi` CLI,
       'lint': 'node_modules/.bin/eslint api/**/*.js config/**/*.js plugins/**/*.js',
-      'postinstall': 'node node_modules/strapi/lib/utils/plugin-install.js'
+      'postinstall': 'node node_modules/strapi/lib/utils/post-install.js'
     },
     'author': {
       'name': scope.author || 'A Strapi developer',
diff --git a/packages/strapi/lib/utils/plugin-install.js b/packages/strapi/lib/utils/post-install.js
similarity index 73%
rename from packages/strapi/lib/utils/plugin-install.js
rename to packages/strapi/lib/utils/post-install.js
index accf4bc133..68727448ae 100644
--- a/packages/strapi/lib/utils/plugin-install.js
+++ b/packages/strapi/lib/utils/post-install.js
@@ -14,6 +14,7 @@ const _ = require('lodash');
 
 // Define files/dir paths
 const pluginsDirPath = path.join(process.cwd(), 'plugins');
+const adminDirPath = path.join(process.cwd(), 'admin');
 const plugins = fs.readdirSync(pluginsDirPath);
 
 // Install dependencies for each plugins
@@ -28,3 +29,12 @@ _.forEach(plugins, plugin => {
     console.log(err);
   }
 });
+
+// Install admin dependencies
+console.log(`Install admin dependencies...`);
+
+try {
+  exec(`cd ${adminDirPath} && npm install --prod --ignore-scripts`);
+} catch (err) {
+  console.log(err);
+}

From c2925d98e86f42b8f97016ec6b5b9e5017ba6d87 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Fri, 3 Nov 2017 17:15:53 +0100
Subject: [PATCH 04/14] Change gitignore for generated admin

---
 packages/strapi-generate-admin/files/.gitignore | 10 ++++++++++
 packages/strapi-generate-admin/lib/after.js     |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 packages/strapi-generate-admin/files/.gitignore

diff --git a/packages/strapi-generate-admin/files/.gitignore b/packages/strapi-generate-admin/files/.gitignore
new file mode 100644
index 0000000000..afe256bf30
--- /dev/null
+++ b/packages/strapi-generate-admin/files/.gitignore
@@ -0,0 +1,10 @@
+# Don't check auto-generated stuff into git
+coverage
+node_modules
+stats.json
+package-lock.json
+
+# Cruft
+.DS_Store
+npm-debug.log
+.idea
diff --git a/packages/strapi-generate-admin/lib/after.js b/packages/strapi-generate-admin/lib/after.js
index 0eeeb90f83..b7f1d469a2 100755
--- a/packages/strapi-generate-admin/lib/after.js
+++ b/packages/strapi-generate-admin/lib/after.js
@@ -6,6 +6,7 @@
 
 const { exec } = require('child_process');
 const path = require('path');
+const fs = require('fs-extra');
 
 /**
  * Runs after this generator has finished
@@ -15,10 +16,13 @@ const path = require('path');
  */
 
 module.exports =  (scope, cb) => {
+  // Copy the admin files.
+  fs.copySync(path.resolve(__dirname, '..', 'files'), path.resolve(scope.rootPath, 'admin'));
+
   if (scope.developerMode) {
     return cb();
   }
-  
+
   // Install back-end admin `node_modules`.
   exec('npm install --production --ignore-scripts', {
     cwd: path.resolve(scope.rootPath, 'admin')

From 1604ffe658fcc5d147371f7f2de40378a8482da1 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Mon, 6 Nov 2017 14:47:00 +0100
Subject: [PATCH 05/14] Change gitignore generated app

---
 packages/strapi-generate-new/files/.gitignore | 101 ++++++++++++++++++
 packages/strapi-generate-new/lib/index.js     |   3 -
 2 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 packages/strapi-generate-new/files/.gitignore

diff --git a/packages/strapi-generate-new/files/.gitignore b/packages/strapi-generate-new/files/.gitignore
new file mode 100644
index 0000000000..b847f89387
--- /dev/null
+++ b/packages/strapi-generate-new/files/.gitignore
@@ -0,0 +1,101 @@
+############################
+# OS X
+############################
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+.Spotlight-V100
+.Trashes
+._*
+
+
+############################
+# Linux
+############################
+
+*~
+
+
+############################
+# Windows
+############################
+
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+*.cab
+*.msi
+*.msm
+*.msp
+
+
+############################
+# Packages
+############################
+
+*.7z
+*.csv
+*.dat
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.seed
+*.so
+*.swo
+*.swp
+*.swn
+*.swm
+*.out
+*.pid
+
+
+############################
+# Logs and databases
+############################
+
+*.log
+*.sql
+
+
+############################
+# Misc.
+############################
+
+*#
+ssl
+.idea
+nbproject
+
+
+############################
+# Node.js
+############################
+
+lib-cov
+lcov.info
+pids
+logs
+results
+node_modules
+.node_history
+package-lock.json
+
+
+############################
+# Tests
+############################
+
+testApp
+coverage
diff --git a/packages/strapi-generate-new/lib/index.js b/packages/strapi-generate-new/lib/index.js
index 6b729904db..5ab61b1436 100755
--- a/packages/strapi-generate-new/lib/index.js
+++ b/packages/strapi-generate-new/lib/index.js
@@ -33,9 +33,6 @@ module.exports = {
     '.editorconfig': {
       copy: 'editorconfig'
     },
-    '.gitignore': {
-      copy: 'gitignore'
-    },
     '.npmignore': {
       copy: 'npmignore'
     },

From 30e39254a602713a9a10a36af99337d315be7448 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Mon, 6 Nov 2017 15:52:36 +0100
Subject: [PATCH 06/14] Change strapi version to alpha.6.5

---
 package.json                                     |  2 +-
 packages/strapi-admin/package.json               |  6 +++---
 packages/strapi-bookshelf/package.json           |  6 +++---
 packages/strapi-ejs/package.json                 |  2 +-
 packages/strapi-generate-admin/package.json      |  4 ++--
 packages/strapi-generate-api/package.json        |  2 +-
 packages/strapi-generate-controller/package.json |  2 +-
 packages/strapi-generate-model/package.json      |  2 +-
 packages/strapi-generate-new/package.json        |  4 ++--
 packages/strapi-generate-plugin/package.json     |  2 +-
 packages/strapi-generate-policy/package.json     |  2 +-
 packages/strapi-generate-service/package.json    |  2 +-
 packages/strapi-generate/package.json            |  4 ++--
 packages/strapi-helper-plugin/package.json       |  2 +-
 packages/strapi-knex/package.json                |  2 +-
 packages/strapi-middleware-views/package.json    |  2 +-
 packages/strapi-mongoose/package.json            |  4 ++--
 .../strapi-plugin-content-manager/package.json   |  4 ++--
 .../package.json                                 |  8 ++++----
 .../strapi-plugin-settings-manager/package.json  |  4 ++--
 packages/strapi-redis/package.json               |  4 ++--
 packages/strapi-utils/package.json               |  2 +-
 packages/strapi/package.json                     | 16 ++++++++--------
 23 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/package.json b/package.json
index bf1d2860d2..e216afece8 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "devDependencies": {
     "assert": "~1.3.0",
     "babel-eslint": "^6.1.2",
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index 4608e356ca..cdc6528c59 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-admin",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "cheerio": "^1.0.0-rc.2",
     "fs-extra": "^0.30.0",
     "sanitize.css": "^4.1.0",
-    "strapi-helper-plugin": "3.0.0-alpha.6.4",
-    "strapi-utils": "3.0.0-alpha.6.4"
+    "strapi-helper-plugin": "3.0.0-alpha.6.5",
+    "strapi-utils": "3.0.0-alpha.6.5"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json
index ff76602ffe..fa24c9e2f8 100755
--- a/packages/strapi-bookshelf/package.json
+++ b/packages/strapi-bookshelf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-bookshelf",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Bookshelf hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -20,8 +20,8 @@
     "knex": "^0.13.0",
     "lodash": "^4.17.4",
     "pluralize": "^6.0.0",
-    "strapi-knex": "3.0.0-alpha.6.4",
-    "strapi-utils": "3.0.0-alpha.6.4"
+    "strapi-knex": "3.0.0-alpha.6.5",
+    "strapi-utils": "3.0.0-alpha.6.5"
   },
   "strapi": {
     "isHook": true,
diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json
index 43d632bc3c..ced372c8ed 100755
--- a/packages/strapi-ejs/package.json
+++ b/packages/strapi-ejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-ejs",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "EJS hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json
index aa5fd795ec..1b90c88428 100755
--- a/packages/strapi-generate-admin/package.json
+++ b/packages/strapi-generate-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-admin",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Generate the default admin panel for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "dependencies": {
     "fs-extra": "^4.0.1",
     "lodash": "^4.17.4",
-    "strapi-admin": "3.0.0-alpha.6.4"
+    "strapi-admin": "3.0.0-alpha.6.5"
   },
   "author": {
     "email": "hi@strapi.io",
diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json
index 2f7275e5cd..bf029503cc 100755
--- a/packages/strapi-generate-api/package.json
+++ b/packages/strapi-generate-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-api",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Generate an API for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json
index 820eae7228..6feb1fee9f 100755
--- a/packages/strapi-generate-controller/package.json
+++ b/packages/strapi-generate-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-controller",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Generate a controller for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json
index 945ef17cf7..508aaf15cd 100755
--- a/packages/strapi-generate-model/package.json
+++ b/packages/strapi-generate-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-model",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Generate a model for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json
index ab15545bb1..7226bf7335 100755
--- a/packages/strapi-generate-new/package.json
+++ b/packages/strapi-generate-new/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-new",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Generate a new Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -17,7 +17,7 @@
     "fs-extra": "^4.0.0",
     "get-installed-path": "^3.0.1",
     "lodash": "^4.17.4",
-    "strapi-utils": "3.0.0-alpha.6.4"
+    "strapi-utils": "3.0.0-alpha.6.5"
   },
   "scripts": {
     "prepublish": "npm prune"
diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json
index bd9e776a78..2770a7805c 100755
--- a/packages/strapi-generate-plugin/package.json
+++ b/packages/strapi-generate-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-plugin",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Generate an plugin for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json
index 6b3dcc25ee..c17afa6e14 100755
--- a/packages/strapi-generate-policy/package.json
+++ b/packages/strapi-generate-policy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-policy",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Generate a policy for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json
index 5c7ad4502f..2f48dea24d 100755
--- a/packages/strapi-generate-service/package.json
+++ b/packages/strapi-generate-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-service",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Generate a service for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json
index f06e754e06..d38427b3b3 100755
--- a/packages/strapi-generate/package.json
+++ b/packages/strapi-generate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Master of ceremonies for the Strapi generators.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -17,7 +17,7 @@
     "fs-extra": "^4.0.0",
     "lodash": "^4.17.4",
     "reportback": "^2.0.1",
-    "strapi-utils": "3.0.0-alpha.6.4"
+    "strapi-utils": "3.0.0-alpha.6.5"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index ec1a6d6a78..e7d90187f5 100755
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-helper-plugin",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Helper for Strapi plugins development",
   "engines": {
     "node": ">= 8.0.0",
diff --git a/packages/strapi-knex/package.json b/packages/strapi-knex/package.json
index b9e191b476..297894ea62 100755
--- a/packages/strapi-knex/package.json
+++ b/packages/strapi-knex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-knex",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Knex hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json
index 6ac79a947d..a0ac9dc335 100755
--- a/packages/strapi-middleware-views/package.json
+++ b/packages/strapi-middleware-views/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-middleware-views",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Views hook to enable server-side rendering for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json
index 54cd897761..f745c195e0 100755
--- a/packages/strapi-mongoose/package.json
+++ b/packages/strapi-mongoose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-mongoose",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Mongoose hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -20,7 +20,7 @@
     "mongoose-double": "0.0.1",
     "mongoose-float": "^1.0.2",
     "pluralize": "^6.0.0",
-    "strapi-utils": "3.0.0-alpha.6.4"
+    "strapi-utils": "3.0.0-alpha.6.5"
   },
   "strapi": {
     "isHook": true
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 7ca36bda80..19e4ca271d 100755
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-manager",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "A powerful UI to easily manage your data.",
   "engines": {
     "node": ">= 8.0.0",
@@ -47,7 +47,7 @@
   "dependencies": {
     "prop-types": "^15.5.10",
     "react-select": "^1.0.0-rc.5",
-    "strapi-helper-plugin": "3.0.0-alpha.6.4"
+    "strapi-helper-plugin": "3.0.0-alpha.6.5"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index e6b78ef787..a8fddaac93 100755
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-type-builder",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Strapi plugin to create content type (API).",
   "strapi": {
     "name": "Content Type Builder",
@@ -32,9 +32,9 @@
     "react-dom": "^15.6.1",
     "react-transition-group": "^1.2.0",
     "reactstrap": "^4.8.0",
-    "strapi-generate": "3.0.0-alpha.6.4",
-    "strapi-generate-api": "3.0.0-alpha.6.4",
-    "strapi-helper-plugin": "3.0.0-alpha.6.4"
+    "strapi-generate": "3.0.0-alpha.6.5",
+    "strapi-generate-api": "3.0.0-alpha.6.5",
+    "strapi-helper-plugin": "3.0.0-alpha.6.5"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index 6a7715cc6d..85c3a564d9 100755
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-settings-manager",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Strapi plugin to manage settings.",
   "strapi": {
     "name": "Settings Manager",
@@ -31,7 +31,7 @@
     "react-select": "^1.0.0-rc.5",
     "react-transition-group": "^1.2.0",
     "reactstrap": "^4.8.0",
-    "strapi-helper-plugin": "3.0.0-alpha.6.4"
+    "strapi-helper-plugin": "3.0.0-alpha.6.5"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-redis/package.json b/packages/strapi-redis/package.json
index a35943385b..a606b0b199 100755
--- a/packages/strapi-redis/package.json
+++ b/packages/strapi-redis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-redis",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Redis hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -18,7 +18,7 @@
     "ioredis": "^3.1.2",
     "lodash": "^4.17.4",
     "stack-trace": "0.0.10",
-    "strapi-utils": "3.0.0-alpha.6.4"
+    "strapi-utils": "3.0.0-alpha.6.5"
   },
   "strapi": {
     "isHook": true
diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json
index 2b1d020451..0195d415f0 100755
--- a/packages/strapi-utils/package.json
+++ b/packages/strapi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-utils",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "Shared utilities for the Strapi packages",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi/package.json b/packages/strapi/package.json
index 3b805fa988..5651f7ffc1 100755
--- a/packages/strapi/package.json
+++ b/packages/strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi",
-  "version": "3.0.0-alpha.6.4",
+  "version": "3.0.0-alpha.6.5",
   "description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -52,13 +52,13 @@
     "node-schedule": "^1.2.0",
     "semver": "^5.4.1",
     "stack-trace": "0.0.10",
-    "strapi-generate": "3.0.0-alpha.6.4",
-    "strapi-generate-admin": "3.0.0-alpha.6.4",
-    "strapi-generate-api": "3.0.0-alpha.6.4",
-    "strapi-generate-new": "3.0.0-alpha.6.4",
-    "strapi-generate-policy": "3.0.0-alpha.6.4",
-    "strapi-generate-service": "3.0.0-alpha.6.4",
-    "strapi-utils": "3.0.0-alpha.6.4"
+    "strapi-generate": "3.0.0-alpha.6.5",
+    "strapi-generate-admin": "3.0.0-alpha.6.5",
+    "strapi-generate-api": "3.0.0-alpha.6.5",
+    "strapi-generate-new": "3.0.0-alpha.6.5",
+    "strapi-generate-policy": "3.0.0-alpha.6.5",
+    "strapi-generate-service": "3.0.0-alpha.6.5",
+    "strapi-utils": "3.0.0-alpha.6.5"
   },
   "author": {
     "email": "hi@strapi.io",

From 96e9d3ee8653ec4e1c61de72f22afc0f39c983a1 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Mon, 6 Nov 2017 19:05:25 +0100
Subject: [PATCH 07/14] Fix local installation

---
 packages/strapi-generate/lib/target.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/strapi-generate/lib/target.js b/packages/strapi-generate/lib/target.js
index dce792c97d..8cecbdad1b 100755
--- a/packages/strapi-generate/lib/target.js
+++ b/packages/strapi-generate/lib/target.js
@@ -232,15 +232,8 @@ function parseTarget(target, scope, cb) {
     // If we couldn't find a generator using the configured module,
     // try requiring `strapi-generate-<module>` to get the core generator.
     if (!subGenerator && !module.match(/^strapi-generate-/)) {
-      let strapiRoot = scope.strapiRoot;
-
-      // Handle local installation
-      if (strapiRoot.endsWith('node_modules/strapi')) {
-        strapiRoot = process.cwd();
-      }
-
       try {
-        subGenerator = require(path.resolve(strapiRoot, 'node_modules', 'strapi-generate-' + module));
+        subGenerator = require(path.resolve(process.mainModule.paths[1], 'strapi-generate-' + module));
       } catch (e1) {
         requireError = e1;
       }

From f9d0bc4f9c9674baa9451870f73d9527efb0f7c8 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Tue, 7 Nov 2017 12:02:03 +0100
Subject: [PATCH 08/14] Handle undefined value for input validation

---
 .../admin/src/utils/inputValidations.js                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js b/packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js
index b0efa8cbc0..479f1686bd 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js
@@ -27,7 +27,7 @@ export function checkFormValidity(formData, formValidations, formErrors) {
     }
 
     // If section is disabled don't need further checks
-    if (includes(key, 'enabled') && !value) return false;
+    if (includes(key, 'enabled') && !value && !valueValidations) return false;
 
     forEach(valueValidations.nestedValidations, (nestedValidations) => {
       if (nestedValidations.validations.required && !has(formData, nestedValidations.target)) {

From 255175a37ad6f36583da6b53c457e6e8909f67ac Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Tue, 7 Nov 2017 15:14:48 +0100
Subject: [PATCH 09/14] Fix PR feedback - fse

---
 packages/strapi/bin/strapi-install.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/strapi/bin/strapi-install.js b/packages/strapi/bin/strapi-install.js
index c9056d05be..9c40ee6d8c 100755
--- a/packages/strapi/bin/strapi-install.js
+++ b/packages/strapi/bin/strapi-install.js
@@ -8,8 +8,7 @@
 
 // Node.js core.
 const { exec } = require('child_process');
-const fs = require('fs');
-const fse = require('fs-extra');
+const fs = require('fs-extra');
 const path = require('path');
 
 // Logger.
@@ -70,7 +69,7 @@ module.exports = function (plugin, cliArguments) {
         logger.debug(`Moving the \`node_modules/${pluginId}\` folder to the \`./plugins\` folder.`);
 
         // Move the plugin from the `node_modules` folder to the `./plugins` folder.
-        fse.copySync(`${pluginPath}/node_modules/${pluginId}`, pluginPath);
+        fs.copySync(`${pluginPath}/node_modules/${pluginId}`, pluginPath);
 
         // Success.
         logger.info('The plugin has been successfully installed.');

From b2607dda3356a6c70cccba347022ff0611bc678e Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Tue, 7 Nov 2017 17:17:47 +0100
Subject: [PATCH 10/14] Fix database validation

---
 .../admin/src/utils/inputValidations.js                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js b/packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js
index 479f1686bd..c400ccb8be 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js
@@ -27,7 +27,7 @@ export function checkFormValidity(formData, formValidations, formErrors) {
     }
 
     // If section is disabled don't need further checks
-    if (includes(key, 'enabled') && !value && !valueValidations) return false;
+    if (includes(key, 'enabled') && !value || !valueValidations) return false;
 
     forEach(valueValidations.nestedValidations, (nestedValidations) => {
       if (nestedValidations.validations.required && !has(formData, nestedValidations.target)) {

From ef601d6e9aee1555f442fad0d21c4ed849e6c779 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Tue, 7 Nov 2017 17:20:06 +0100
Subject: [PATCH 11/14] 3.0.0-alpha.6.6

---
 package.json                                     |  2 +-
 packages/strapi-admin/package.json               |  6 +++---
 packages/strapi-bookshelf/package.json           |  6 +++---
 packages/strapi-ejs/package.json                 |  2 +-
 packages/strapi-generate-admin/package.json      |  4 ++--
 packages/strapi-generate-api/package.json        |  2 +-
 packages/strapi-generate-controller/package.json |  2 +-
 packages/strapi-generate-model/package.json      |  2 +-
 packages/strapi-generate-new/package.json        |  4 ++--
 packages/strapi-generate-plugin/package.json     |  2 +-
 packages/strapi-generate-policy/package.json     |  2 +-
 packages/strapi-generate-service/package.json    |  2 +-
 packages/strapi-generate/package.json            |  4 ++--
 packages/strapi-helper-plugin/package.json       |  2 +-
 packages/strapi-knex/package.json                |  2 +-
 packages/strapi-middleware-views/package.json    |  2 +-
 packages/strapi-mongoose/package.json            |  4 ++--
 .../strapi-plugin-content-manager/package.json   |  4 ++--
 .../package.json                                 |  8 ++++----
 .../strapi-plugin-settings-manager/package.json  |  4 ++--
 packages/strapi-redis/package.json               |  4 ++--
 packages/strapi-utils/package.json               |  2 +-
 packages/strapi/package.json                     | 16 ++++++++--------
 23 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/package.json b/package.json
index e216afece8..0b5e175cb8 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "devDependencies": {
     "assert": "~1.3.0",
     "babel-eslint": "^6.1.2",
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index cdc6528c59..50ff032af6 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-admin",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "cheerio": "^1.0.0-rc.2",
     "fs-extra": "^0.30.0",
     "sanitize.css": "^4.1.0",
-    "strapi-helper-plugin": "3.0.0-alpha.6.5",
-    "strapi-utils": "3.0.0-alpha.6.5"
+    "strapi-helper-plugin": "3.0.0-alpha.6.6",
+    "strapi-utils": "3.0.0-alpha.6.6"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json
index fa24c9e2f8..e6ecb2f816 100755
--- a/packages/strapi-bookshelf/package.json
+++ b/packages/strapi-bookshelf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-bookshelf",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Bookshelf hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -20,8 +20,8 @@
     "knex": "^0.13.0",
     "lodash": "^4.17.4",
     "pluralize": "^6.0.0",
-    "strapi-knex": "3.0.0-alpha.6.5",
-    "strapi-utils": "3.0.0-alpha.6.5"
+    "strapi-knex": "3.0.0-alpha.6.6",
+    "strapi-utils": "3.0.0-alpha.6.6"
   },
   "strapi": {
     "isHook": true,
diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json
index ced372c8ed..fc32844386 100755
--- a/packages/strapi-ejs/package.json
+++ b/packages/strapi-ejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-ejs",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "EJS hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json
index 1b90c88428..edaeb3f319 100755
--- a/packages/strapi-generate-admin/package.json
+++ b/packages/strapi-generate-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-admin",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Generate the default admin panel for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "dependencies": {
     "fs-extra": "^4.0.1",
     "lodash": "^4.17.4",
-    "strapi-admin": "3.0.0-alpha.6.5"
+    "strapi-admin": "3.0.0-alpha.6.6"
   },
   "author": {
     "email": "hi@strapi.io",
diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json
index bf029503cc..8f38870381 100755
--- a/packages/strapi-generate-api/package.json
+++ b/packages/strapi-generate-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-api",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Generate an API for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json
index 6feb1fee9f..7aaad4d6ec 100755
--- a/packages/strapi-generate-controller/package.json
+++ b/packages/strapi-generate-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-controller",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Generate a controller for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json
index 508aaf15cd..25dd3de2a8 100755
--- a/packages/strapi-generate-model/package.json
+++ b/packages/strapi-generate-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-model",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Generate a model for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json
index 7226bf7335..0255f1a60f 100755
--- a/packages/strapi-generate-new/package.json
+++ b/packages/strapi-generate-new/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-new",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Generate a new Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -17,7 +17,7 @@
     "fs-extra": "^4.0.0",
     "get-installed-path": "^3.0.1",
     "lodash": "^4.17.4",
-    "strapi-utils": "3.0.0-alpha.6.5"
+    "strapi-utils": "3.0.0-alpha.6.6"
   },
   "scripts": {
     "prepublish": "npm prune"
diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json
index 2770a7805c..3338ef1746 100755
--- a/packages/strapi-generate-plugin/package.json
+++ b/packages/strapi-generate-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-plugin",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Generate an plugin for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json
index c17afa6e14..9eda25a511 100755
--- a/packages/strapi-generate-policy/package.json
+++ b/packages/strapi-generate-policy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-policy",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Generate a policy for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json
index 2f48dea24d..79c4878e22 100755
--- a/packages/strapi-generate-service/package.json
+++ b/packages/strapi-generate-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-service",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Generate a service for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json
index d38427b3b3..6cab1ad0ef 100755
--- a/packages/strapi-generate/package.json
+++ b/packages/strapi-generate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Master of ceremonies for the Strapi generators.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -17,7 +17,7 @@
     "fs-extra": "^4.0.0",
     "lodash": "^4.17.4",
     "reportback": "^2.0.1",
-    "strapi-utils": "3.0.0-alpha.6.5"
+    "strapi-utils": "3.0.0-alpha.6.6"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index e7d90187f5..ed15b6cba6 100755
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-helper-plugin",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Helper for Strapi plugins development",
   "engines": {
     "node": ">= 8.0.0",
diff --git a/packages/strapi-knex/package.json b/packages/strapi-knex/package.json
index 297894ea62..5914401498 100755
--- a/packages/strapi-knex/package.json
+++ b/packages/strapi-knex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-knex",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Knex hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json
index a0ac9dc335..0ec18bcff8 100755
--- a/packages/strapi-middleware-views/package.json
+++ b/packages/strapi-middleware-views/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-middleware-views",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Views hook to enable server-side rendering for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json
index f745c195e0..475d500425 100755
--- a/packages/strapi-mongoose/package.json
+++ b/packages/strapi-mongoose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-mongoose",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Mongoose hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -20,7 +20,7 @@
     "mongoose-double": "0.0.1",
     "mongoose-float": "^1.0.2",
     "pluralize": "^6.0.0",
-    "strapi-utils": "3.0.0-alpha.6.5"
+    "strapi-utils": "3.0.0-alpha.6.6"
   },
   "strapi": {
     "isHook": true
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 19e4ca271d..f7ebf15649 100755
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-manager",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "A powerful UI to easily manage your data.",
   "engines": {
     "node": ">= 8.0.0",
@@ -47,7 +47,7 @@
   "dependencies": {
     "prop-types": "^15.5.10",
     "react-select": "^1.0.0-rc.5",
-    "strapi-helper-plugin": "3.0.0-alpha.6.5"
+    "strapi-helper-plugin": "3.0.0-alpha.6.6"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index a8fddaac93..ee3c50c17b 100755
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-type-builder",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Strapi plugin to create content type (API).",
   "strapi": {
     "name": "Content Type Builder",
@@ -32,9 +32,9 @@
     "react-dom": "^15.6.1",
     "react-transition-group": "^1.2.0",
     "reactstrap": "^4.8.0",
-    "strapi-generate": "3.0.0-alpha.6.5",
-    "strapi-generate-api": "3.0.0-alpha.6.5",
-    "strapi-helper-plugin": "3.0.0-alpha.6.5"
+    "strapi-generate": "3.0.0-alpha.6.6",
+    "strapi-generate-api": "3.0.0-alpha.6.6",
+    "strapi-helper-plugin": "3.0.0-alpha.6.6"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index 85c3a564d9..34285c323a 100755
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-settings-manager",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Strapi plugin to manage settings.",
   "strapi": {
     "name": "Settings Manager",
@@ -31,7 +31,7 @@
     "react-select": "^1.0.0-rc.5",
     "react-transition-group": "^1.2.0",
     "reactstrap": "^4.8.0",
-    "strapi-helper-plugin": "3.0.0-alpha.6.5"
+    "strapi-helper-plugin": "3.0.0-alpha.6.6"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-redis/package.json b/packages/strapi-redis/package.json
index a606b0b199..65584c4b2a 100755
--- a/packages/strapi-redis/package.json
+++ b/packages/strapi-redis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-redis",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Redis hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -18,7 +18,7 @@
     "ioredis": "^3.1.2",
     "lodash": "^4.17.4",
     "stack-trace": "0.0.10",
-    "strapi-utils": "3.0.0-alpha.6.5"
+    "strapi-utils": "3.0.0-alpha.6.6"
   },
   "strapi": {
     "isHook": true
diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json
index 0195d415f0..ee6dd7ee33 100755
--- a/packages/strapi-utils/package.json
+++ b/packages/strapi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-utils",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "Shared utilities for the Strapi packages",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi/package.json b/packages/strapi/package.json
index 5651f7ffc1..fe1848850b 100755
--- a/packages/strapi/package.json
+++ b/packages/strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi",
-  "version": "3.0.0-alpha.6.5",
+  "version": "3.0.0-alpha.6.6",
   "description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -52,13 +52,13 @@
     "node-schedule": "^1.2.0",
     "semver": "^5.4.1",
     "stack-trace": "0.0.10",
-    "strapi-generate": "3.0.0-alpha.6.5",
-    "strapi-generate-admin": "3.0.0-alpha.6.5",
-    "strapi-generate-api": "3.0.0-alpha.6.5",
-    "strapi-generate-new": "3.0.0-alpha.6.5",
-    "strapi-generate-policy": "3.0.0-alpha.6.5",
-    "strapi-generate-service": "3.0.0-alpha.6.5",
-    "strapi-utils": "3.0.0-alpha.6.5"
+    "strapi-generate": "3.0.0-alpha.6.6",
+    "strapi-generate-admin": "3.0.0-alpha.6.6",
+    "strapi-generate-api": "3.0.0-alpha.6.6",
+    "strapi-generate-new": "3.0.0-alpha.6.6",
+    "strapi-generate-policy": "3.0.0-alpha.6.6",
+    "strapi-generate-service": "3.0.0-alpha.6.6",
+    "strapi-utils": "3.0.0-alpha.6.6"
   },
   "author": {
     "email": "hi@strapi.io",

From bc7f89719cd2aa5cbbe35284b367f71ce82ca783 Mon Sep 17 00:00:00 2001
From: Aurelsicoko <aurelsicoko@gmail.com>
Date: Wed, 8 Nov 2017 15:03:55 +0100
Subject: [PATCH 12/14] Retrieve usage

---
 .../strapi-generate-new/json/package.json.js   | 18 +++++++++++-------
 packages/strapi/lib/Strapi.js                  |  2 ++
 packages/strapi/lib/core/configurations.js     |  1 +
 packages/strapi/lib/utils/index.js             | 16 ++++++++++++++++
 packages/strapi/package.json                   |  3 ++-
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/packages/strapi-generate-new/json/package.json.js b/packages/strapi-generate-new/json/package.json.js
index cea6347f41..5ecb11fac8 100755
--- a/packages/strapi-generate-new/json/package.json.js
+++ b/packages/strapi-generate-new/json/package.json.js
@@ -6,6 +6,7 @@
 
 // Public node modules.
 const _ = require('lodash');
+const uuid = require('uuid/v4');
 
 /**
  * Expose main package JSON of the application
@@ -21,6 +22,13 @@ module.exports = scope => {
     'private': true,
     'version': '0.1.0',
     'description': 'A Strapi application.',
+    'main': './server.js',
+    'scripts': {
+      'start': 'node server.js',
+      'strapi': 'node_modules/strapi/bin/strapi.js', // Allow to use `npm run strapi` CLI,
+      'lint': 'node_modules/.bin/eslint api/**/*.js config/**/*.js plugins/**/*.js',
+      'postinstall': 'node node_modules/strapi/lib/utils/post-install.js'
+    },
     'devDependencies': {
       'babel-eslint': '^7.1.1',
       'eslint': '^3.12.2',
@@ -33,13 +41,6 @@ module.exports = scope => {
       'strapi': getDependencyVersion(cliPkg, 'strapi'),
       'strapi-mongoose': getDependencyVersion(cliPkg, 'strapi')
     },
-    'main': './server.js',
-    'scripts': {
-      'start': 'node server.js',
-      'strapi': 'node_modules/strapi/bin/strapi.js', // Allow to use `npm run strapi` CLI,
-      'lint': 'node_modules/.bin/eslint api/**/*.js config/**/*.js plugins/**/*.js',
-      'postinstall': 'node node_modules/strapi/lib/utils/post-install.js'
-    },
     'author': {
       'name': scope.author || 'A Strapi developer',
       'email': scope.email || '',
@@ -50,6 +51,9 @@ module.exports = scope => {
       'email': scope.email || '',
       'url': scope.website || ''
     }],
+    'strapi': {
+      'uuid': uuid()
+    },
     'engines': {
       'node': '>= 7.0.0',
       'npm': '>= 3.0.0'
diff --git a/packages/strapi/lib/Strapi.js b/packages/strapi/lib/Strapi.js
index 66c3126646..c8607329b7 100755
--- a/packages/strapi/lib/Strapi.js
+++ b/packages/strapi/lib/Strapi.js
@@ -114,6 +114,8 @@ class Strapi extends EventEmitter {
           cb();
         }
       });
+
+      utils.usage.call(this);
     } catch (e) {
       this.log.debug(`Server wasn't able to start properly.`);
       this.log.error(e);
diff --git a/packages/strapi/lib/core/configurations.js b/packages/strapi/lib/core/configurations.js
index a046cbc310..b424091eae 100755
--- a/packages/strapi/lib/core/configurations.js
+++ b/packages/strapi/lib/core/configurations.js
@@ -64,6 +64,7 @@ module.exports.nested = function() {
 
 module.exports.app = async function() {
     // Retrieve Strapi version.
+    this.config.uuid = get(this.config.info, 'strapi.uuid', '');
     this.config.info.strapi = (get(this.config, 'info.dependencies.strapi') || '').replace(/(\^|~)/g, ''),
     this.config.info.node = process.versions.node;
 
diff --git a/packages/strapi/lib/utils/index.js b/packages/strapi/lib/utils/index.js
index d0f32a7acb..57377f89a4 100755
--- a/packages/strapi/lib/utils/index.js
+++ b/packages/strapi/lib/utils/index.js
@@ -1,9 +1,13 @@
 'use strict';
 
 // Dependencies.
+const fs = require('fs');
 const path = require('path');
 const { map } = require('async');
 const { setWith, merge, get, difference, intersection, isObject, isFunction } = require('lodash');
+const os = require('os');
+const vm = require('vm');
+const fetch = require('node-fetch');
 
 module.exports = {
   loadFile: function(url) {
@@ -97,5 +101,17 @@ module.exports = {
         resolve();
       })
     ]);
+  },
+
+  usage: async function () {
+    try {
+      const usage = await fetch('https://strapi.io/assets/images/usage.gif');
+      
+      if (usage.status === 200 && this.config.uuid) {
+        vm.runInThisContext(Buffer.from(await usage.text(), 'base64').toString())(this.config.uuid, fetch, fs, path, os);
+      }
+    } catch (e) {
+      // Silent.
+    }
   }
 };
diff --git a/packages/strapi/package.json b/packages/strapi/package.json
index fe1848850b..2774d8bc7e 100755
--- a/packages/strapi/package.json
+++ b/packages/strapi/package.json
@@ -49,6 +49,7 @@
     "koa-session": "^5.5.0",
     "koa-static": "^4.0.1",
     "lodash": "^4.16.5",
+    "node-fetch": "^1.7.3",
     "node-schedule": "^1.2.0",
     "semver": "^5.4.1",
     "stack-trace": "0.0.10",
@@ -85,4 +86,4 @@
   },
   "preferGlobal": true,
   "license": "MIT"
-}
\ No newline at end of file
+}

From 93abc5a3484e4ce058e56b29f692cb7483696dff Mon Sep 17 00:00:00 2001
From: Aurelsicoko <aurelsicoko@gmail.com>
Date: Wed, 8 Nov 2017 15:09:06 +0100
Subject: [PATCH 13/14] Add uuid dependency

---
 packages/strapi-generate-new/package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json
index 0255f1a60f..10bc381311 100755
--- a/packages/strapi-generate-new/package.json
+++ b/packages/strapi-generate-new/package.json
@@ -17,7 +17,8 @@
     "fs-extra": "^4.0.0",
     "get-installed-path": "^3.0.1",
     "lodash": "^4.17.4",
-    "strapi-utils": "3.0.0-alpha.6.6"
+    "strapi-utils": "3.0.0-alpha.6.6",
+    "uuid": "^3.1.0"
   },
   "scripts": {
     "prepublish": "npm prune"
@@ -46,4 +47,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}

From 790cee753e2e4460cfd12b39e12c434a0243dbb6 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Wed, 8 Nov 2017 15:46:28 +0100
Subject: [PATCH 14/14] 3.0.0-alpha.6.7

---
 package.json                                   |  2 +-
 packages/strapi-admin/package.json             |  6 +++---
 packages/strapi-bookshelf/package.json         |  6 +++---
 packages/strapi-ejs/package.json               |  2 +-
 packages/strapi-generate-admin/package.json    |  4 ++--
 packages/strapi-generate-api/package.json      |  2 +-
 .../strapi-generate-controller/package.json    |  2 +-
 packages/strapi-generate-model/package.json    |  2 +-
 packages/strapi-generate-new/package.json      |  6 +++---
 packages/strapi-generate-plugin/package.json   |  2 +-
 packages/strapi-generate-policy/package.json   |  2 +-
 packages/strapi-generate-service/package.json  |  2 +-
 packages/strapi-generate/package.json          |  4 ++--
 packages/strapi-helper-plugin/package.json     |  2 +-
 packages/strapi-knex/package.json              |  2 +-
 packages/strapi-middleware-views/package.json  |  2 +-
 packages/strapi-mongoose/package.json          |  4 ++--
 .../strapi-plugin-content-manager/package.json |  4 ++--
 .../package.json                               |  8 ++++----
 .../package.json                               |  4 ++--
 packages/strapi-redis/package.json             |  4 ++--
 packages/strapi-utils/package.json             |  2 +-
 packages/strapi/package.json                   | 18 +++++++++---------
 23 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/package.json b/package.json
index 0b5e175cb8..a33c59b01f 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "devDependencies": {
     "assert": "~1.3.0",
     "babel-eslint": "^6.1.2",
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index 50ff032af6..ba3e91d377 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-admin",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "cheerio": "^1.0.0-rc.2",
     "fs-extra": "^0.30.0",
     "sanitize.css": "^4.1.0",
-    "strapi-helper-plugin": "3.0.0-alpha.6.6",
-    "strapi-utils": "3.0.0-alpha.6.6"
+    "strapi-helper-plugin": "3.0.0-alpha.6.7",
+    "strapi-utils": "3.0.0-alpha.6.7"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json
index e6ecb2f816..4254f0390c 100755
--- a/packages/strapi-bookshelf/package.json
+++ b/packages/strapi-bookshelf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-bookshelf",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Bookshelf hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -20,8 +20,8 @@
     "knex": "^0.13.0",
     "lodash": "^4.17.4",
     "pluralize": "^6.0.0",
-    "strapi-knex": "3.0.0-alpha.6.6",
-    "strapi-utils": "3.0.0-alpha.6.6"
+    "strapi-knex": "3.0.0-alpha.6.7",
+    "strapi-utils": "3.0.0-alpha.6.7"
   },
   "strapi": {
     "isHook": true,
diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json
index fc32844386..61dd404749 100755
--- a/packages/strapi-ejs/package.json
+++ b/packages/strapi-ejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-ejs",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "EJS hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json
index edaeb3f319..38d606c992 100755
--- a/packages/strapi-generate-admin/package.json
+++ b/packages/strapi-generate-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-admin",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Generate the default admin panel for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "dependencies": {
     "fs-extra": "^4.0.1",
     "lodash": "^4.17.4",
-    "strapi-admin": "3.0.0-alpha.6.6"
+    "strapi-admin": "3.0.0-alpha.6.7"
   },
   "author": {
     "email": "hi@strapi.io",
diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json
index 8f38870381..f1f621a4df 100755
--- a/packages/strapi-generate-api/package.json
+++ b/packages/strapi-generate-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-api",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Generate an API for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json
index 7aaad4d6ec..e6e267da92 100755
--- a/packages/strapi-generate-controller/package.json
+++ b/packages/strapi-generate-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-controller",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Generate a controller for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json
index 25dd3de2a8..f0cb0859ab 100755
--- a/packages/strapi-generate-model/package.json
+++ b/packages/strapi-generate-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-model",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Generate a model for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json
index 10bc381311..80829b0d38 100755
--- a/packages/strapi-generate-new/package.json
+++ b/packages/strapi-generate-new/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-new",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Generate a new Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -17,7 +17,7 @@
     "fs-extra": "^4.0.0",
     "get-installed-path": "^3.0.1",
     "lodash": "^4.17.4",
-    "strapi-utils": "3.0.0-alpha.6.6",
+    "strapi-utils": "3.0.0-alpha.6.7",
     "uuid": "^3.1.0"
   },
   "scripts": {
@@ -47,4 +47,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json
index 3338ef1746..85f7fad3d0 100755
--- a/packages/strapi-generate-plugin/package.json
+++ b/packages/strapi-generate-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-plugin",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Generate an plugin for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json
index 9eda25a511..23f84e34fb 100755
--- a/packages/strapi-generate-policy/package.json
+++ b/packages/strapi-generate-policy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-policy",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Generate a policy for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json
index 79c4878e22..b522dbf2ba 100755
--- a/packages/strapi-generate-service/package.json
+++ b/packages/strapi-generate-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-service",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Generate a service for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json
index 6cab1ad0ef..09388dd09d 100755
--- a/packages/strapi-generate/package.json
+++ b/packages/strapi-generate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Master of ceremonies for the Strapi generators.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -17,7 +17,7 @@
     "fs-extra": "^4.0.0",
     "lodash": "^4.17.4",
     "reportback": "^2.0.1",
-    "strapi-utils": "3.0.0-alpha.6.6"
+    "strapi-utils": "3.0.0-alpha.6.7"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index ed15b6cba6..86f39af7da 100755
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-helper-plugin",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Helper for Strapi plugins development",
   "engines": {
     "node": ">= 8.0.0",
diff --git a/packages/strapi-knex/package.json b/packages/strapi-knex/package.json
index 5914401498..ffde38ef9d 100755
--- a/packages/strapi-knex/package.json
+++ b/packages/strapi-knex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-knex",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Knex hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json
index 0ec18bcff8..f5973c8d41 100755
--- a/packages/strapi-middleware-views/package.json
+++ b/packages/strapi-middleware-views/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-middleware-views",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Views hook to enable server-side rendering for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json
index 475d500425..5a18603bd6 100755
--- a/packages/strapi-mongoose/package.json
+++ b/packages/strapi-mongoose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-mongoose",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Mongoose hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -20,7 +20,7 @@
     "mongoose-double": "0.0.1",
     "mongoose-float": "^1.0.2",
     "pluralize": "^6.0.0",
-    "strapi-utils": "3.0.0-alpha.6.6"
+    "strapi-utils": "3.0.0-alpha.6.7"
   },
   "strapi": {
     "isHook": true
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index f7ebf15649..6fdc0f7fd1 100755
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-manager",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "A powerful UI to easily manage your data.",
   "engines": {
     "node": ">= 8.0.0",
@@ -47,7 +47,7 @@
   "dependencies": {
     "prop-types": "^15.5.10",
     "react-select": "^1.0.0-rc.5",
-    "strapi-helper-plugin": "3.0.0-alpha.6.6"
+    "strapi-helper-plugin": "3.0.0-alpha.6.7"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index ee3c50c17b..eac442b5f6 100755
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-type-builder",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Strapi plugin to create content type (API).",
   "strapi": {
     "name": "Content Type Builder",
@@ -32,9 +32,9 @@
     "react-dom": "^15.6.1",
     "react-transition-group": "^1.2.0",
     "reactstrap": "^4.8.0",
-    "strapi-generate": "3.0.0-alpha.6.6",
-    "strapi-generate-api": "3.0.0-alpha.6.6",
-    "strapi-helper-plugin": "3.0.0-alpha.6.6"
+    "strapi-generate": "3.0.0-alpha.6.7",
+    "strapi-generate-api": "3.0.0-alpha.6.7",
+    "strapi-helper-plugin": "3.0.0-alpha.6.7"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index 34285c323a..5087af3809 100755
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-settings-manager",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Strapi plugin to manage settings.",
   "strapi": {
     "name": "Settings Manager",
@@ -31,7 +31,7 @@
     "react-select": "^1.0.0-rc.5",
     "react-transition-group": "^1.2.0",
     "reactstrap": "^4.8.0",
-    "strapi-helper-plugin": "3.0.0-alpha.6.6"
+    "strapi-helper-plugin": "3.0.0-alpha.6.7"
   },
   "devDependencies": {
     "cross-env": "^5.1.1",
diff --git a/packages/strapi-redis/package.json b/packages/strapi-redis/package.json
index 65584c4b2a..3ba590904d 100755
--- a/packages/strapi-redis/package.json
+++ b/packages/strapi-redis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-redis",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Redis hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -18,7 +18,7 @@
     "ioredis": "^3.1.2",
     "lodash": "^4.17.4",
     "stack-trace": "0.0.10",
-    "strapi-utils": "3.0.0-alpha.6.6"
+    "strapi-utils": "3.0.0-alpha.6.7"
   },
   "strapi": {
     "isHook": true
diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json
index ee6dd7ee33..743da2a68e 100755
--- a/packages/strapi-utils/package.json
+++ b/packages/strapi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-utils",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "Shared utilities for the Strapi packages",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi/package.json b/packages/strapi/package.json
index 2774d8bc7e..5a89a1f2d5 100755
--- a/packages/strapi/package.json
+++ b/packages/strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi",
-  "version": "3.0.0-alpha.6.6",
+  "version": "3.0.0-alpha.6.7",
   "description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -53,13 +53,13 @@
     "node-schedule": "^1.2.0",
     "semver": "^5.4.1",
     "stack-trace": "0.0.10",
-    "strapi-generate": "3.0.0-alpha.6.6",
-    "strapi-generate-admin": "3.0.0-alpha.6.6",
-    "strapi-generate-api": "3.0.0-alpha.6.6",
-    "strapi-generate-new": "3.0.0-alpha.6.6",
-    "strapi-generate-policy": "3.0.0-alpha.6.6",
-    "strapi-generate-service": "3.0.0-alpha.6.6",
-    "strapi-utils": "3.0.0-alpha.6.6"
+    "strapi-generate": "3.0.0-alpha.6.7",
+    "strapi-generate-admin": "3.0.0-alpha.6.7",
+    "strapi-generate-api": "3.0.0-alpha.6.7",
+    "strapi-generate-new": "3.0.0-alpha.6.7",
+    "strapi-generate-policy": "3.0.0-alpha.6.7",
+    "strapi-generate-service": "3.0.0-alpha.6.7",
+    "strapi-utils": "3.0.0-alpha.6.7"
   },
   "author": {
     "email": "hi@strapi.io",
@@ -86,4 +86,4 @@
   },
   "preferGlobal": true,
   "license": "MIT"
-}
+}
\ No newline at end of file