diff --git a/package.json b/package.json index 097d7cdc7c..3c98a9e718 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "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 84169e8b37..c53f2653c3 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-admin", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "description": "Strapi Admin", "homepage": "http://strapi.io", "keywords": [ @@ -14,7 +14,7 @@ "dependencies": { "fs-extra": "^0.30.0", "lodash": "^4.17.4", - "strapi-utils": "^3.0.0-alpha.5.3" + "strapi-utils": "3.0.0-alpha.5.4" }, "scripts": { "test": "cd files/public && npm run test", diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json index 4ce7e7edbe..352e2ffa5c 100644 --- a/packages/strapi-bookshelf/package.json +++ b/packages/strapi-bookshelf/package.json @@ -1,6 +1,6 @@ { "name": "strapi-bookshelf", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "description": "Bookshelf hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -19,8 +19,8 @@ "bookshelf": "^0.10.3", "lodash": "^4.17.4", "pluralize": "^6.0.0", - "strapi-bookshelf": "^3.0.0-alpha.5.3", - "strapi-utils": "^3.0.0-alpha.5.3" + "strapi-bookshelf": "3.0.0-alpha.5.4", + "strapi-utils": "3.0.0-alpha.5.4" }, "strapi": { "isHook": true, diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json index 4e9548d678..632462dccf 100644 --- a/packages/strapi-ejs/package.json +++ b/packages/strapi-ejs/package.json @@ -1,6 +1,6 @@ { "name": "strapi-ejs", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "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 c970639643..9e27aa4c58 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "description": "Generate the default admin panel for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ @@ -15,7 +15,7 @@ "dependencies": { "fs-extra": "^0.30.0", "lodash": "^4.17.4", - "strapi-admin": "^3.0.0-alpha.5.3" + "strapi-admin": "3.0.0-alpha.5.4" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index e00042aacc..34bdf98eea 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "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 d8f5665e55..3aa6ae2e02 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "description": "Generate a controller for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-migrations/package.json b/packages/strapi-generate-migrations/package.json index 594cc9235c..07130d0311 100644 --- a/packages/strapi-generate-migrations/package.json +++ b/packages/strapi-generate-migrations/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-migrations", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "description": "Generate migration files for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ @@ -24,8 +24,8 @@ "knex": "^0.13.0", "lodash": "^4.17.4", "pluralize": "^6.0.0", - "strapi-bookshelf": "^3.0.0-alpha.5.3", - "strapi-utils": "^3.0.0-alpha.5.3" + "strapi-bookshelf": "3.0.0-alpha.5.4", + "strapi-utils": "3.0.0-alpha.5.4" }, "scripts": { "prepublish": "npm prune" diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index 9c0d187e77..6adce8418b 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "description": "Generate a model for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-new/json/package.json.js b/packages/strapi-generate-new/json/package.json.js index 81ecb92e43..28f1a5bcf4 100755 --- a/packages/strapi-generate-new/json/package.json.js +++ b/packages/strapi-generate-new/json/package.json.js @@ -31,7 +31,7 @@ module.exports = scope => { 'dependencies': { 'lodash': '4.x.x', 'strapi': getDependencyVersion(cliPkg, 'strapi'), - 'strapi-mongoose': getDependencyVersion(cliPkg, 'strapi-mongoose') + 'strapi-mongoose': getDependencyVersion(cliPkg, 'strapi') }, 'main': './server.js', 'scripts': { diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index 10a988a89e..8b71ad019c 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "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.5.3" + "strapi-utils": "3.0.0-alpha.5.4" }, "scripts": { "prepublish": "npm prune" diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index ace3c2daa3..437aeeb50f 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "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 3a90ea3b5b..0967c7504a 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "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 ce81748920..1ae8b35a8a 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "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 eaeb4419ab..b1a414c990 100644 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "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.5.3" + "strapi-utils": "3.0.0-alpha.5.4" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 676ec1d824..386710e9bf 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "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 0bf16f72bb..dfbbadc493 100644 --- a/packages/strapi-knex/package.json +++ b/packages/strapi-knex/package.json @@ -1,6 +1,6 @@ { "name": "strapi-knex", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "description": "Knex hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json index 4e65e2b4bd..a9fe5db041 100644 --- a/packages/strapi-mongoose/package.json +++ b/packages/strapi-mongoose/package.json @@ -1,6 +1,6 @@ { "name": "strapi-mongoose", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "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.5.3" + "strapi-utils": "3.0.0-alpha.5.4" }, "strapi": { "isHook": true diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index 6c3e35f27e..6238d579ed 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "description": "A powerful UI to easily manage your data.", "engines": { "node": ">= 8.0.0", @@ -61,7 +61,7 @@ "plop": "^1.5.0", "prettier": "^1.5.3", "rimraf": "^2.5.4", - "strapi-helper-plugin": "^3.0.0-alpha.5.3", + "strapi-helper-plugin": "3.0.0-alpha.5.4", "webpack": "^2.1.0-beta.25" } } \ No newline at end of file diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json index 0201686f12..cf0af6b6cf 100644 --- 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.5.3", + "version": "3.0.0-alpha.5.4", "description": "Strapi plugin to manage settings.", "strapi": { "name": "Settings Manager", @@ -48,7 +48,7 @@ "plop": "^1.5.0", "prettier": "^1.5.3", "rimraf": "^2.5.4", - "strapi-helper-plugin": "^3.0.0-alpha.5.3", + "strapi-helper-plugin": "3.0.0-alpha.5.4", "webpack": "^2.1.0-beta.25" }, "author": { diff --git a/packages/strapi-redis/package.json b/packages/strapi-redis/package.json index d34da8069a..bc36d21cbf 100644 --- a/packages/strapi-redis/package.json +++ b/packages/strapi-redis/package.json @@ -1,6 +1,6 @@ { "name": "strapi-redis", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "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.5.3" + "strapi-utils": "3.0.0-alpha.5.4" }, "strapi": { "isHook": true diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json index 78ce1b4bfd..c2e9f32bcf 100644 --- a/packages/strapi-utils/package.json +++ b/packages/strapi-utils/package.json @@ -1,6 +1,6 @@ { "name": "strapi-utils", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "description": "Shared utilities for the Strapi packages", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-views/package.json b/packages/strapi-views/package.json index 670e3ef20c..e116712cea 100644 --- a/packages/strapi-views/package.json +++ b/packages/strapi-views/package.json @@ -1,6 +1,6 @@ { "name": "strapi-views", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "description": "Views hook to enable server-side rendering for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi/lib/core/middlewares.js b/packages/strapi/lib/core/middlewares.js index bed98c7243..bdf36e9690 100644 --- a/packages/strapi/lib/core/middlewares.js +++ b/packages/strapi/lib/core/middlewares.js @@ -100,11 +100,13 @@ const requireMiddlewares = function (files, cwd) { ); // Lazy loading. - Object.defineProperty(this.koaMiddlewares, name, { - configurable: false, - enumerable: true, - get: () => require(path.resolve(cwd, p)) - }); + if (!this.koaMiddlewares.hasOwnProperty(name)) { + Object.defineProperty(this.koaMiddlewares, name, { + configurable: false, + enumerable: true, + get: () => require(path.resolve(cwd, p)) + }); + } cb(); }), diff --git a/packages/strapi/package.json b/packages/strapi/package.json index 30dcd6710a..0244af57d5 100644 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -1,6 +1,6 @@ { "name": "strapi", - "version": "3.0.0-alpha.5.3", + "version": "3.0.0-alpha.5.4", "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": [ @@ -50,14 +50,13 @@ "koa-static": "^4.0.1", "lodash": "^4.16.5", "node-schedule": "^1.2.0", - "strapi-generate": "^3.0.0-alpha.5.3", - "strapi-generate-admin": "^3.0.0-alpha.5.3", - "strapi-generate-api": "^3.0.0-alpha.5.3", - "strapi-generate-new": "^3.0.0-alpha.5.3", - "strapi-generate-policy": "^3.0.0-alpha.5.3", - "strapi-generate-service": "^3.0.0-alpha.5.3", - "strapi-mongoose": "^3.0.0-alpha.5.3", - "strapi-utils": "^3.0.0-alpha.5.3" + "strapi-generate": "3.0.0-alpha.5.4", + "strapi-generate-admin": "3.0.0-alpha.5.4", + "strapi-generate-api": "3.0.0-alpha.5.4", + "strapi-generate-new": "3.0.0-alpha.5.4", + "strapi-generate-policy": "3.0.0-alpha.5.4", + "strapi-generate-service": "3.0.0-alpha.5.4", + "strapi-utils": "3.0.0-alpha.5.4" }, "author": { "email": "hi@strapi.io", diff --git a/scripts/removeSymlinkDependencies.js b/scripts/removeSymlinkDependencies.js index 8c5fbfedab..e5a5350f1c 100644 --- a/scripts/removeSymlinkDependencies.js +++ b/scripts/removeSymlinkDependencies.js @@ -11,12 +11,12 @@ try { packageJSON.version = pkgJSON.version; Object.keys(packageJSON.dependencies).filter(dependency => dependency.indexOf('strapi-') !== -1).forEach(dependency => { - packageJSON.dependencies[dependency] = '^' + pkgJSON.version; + packageJSON.dependencies[dependency] = pkgJSON.version; }); if (packageJSON.devDependencies) { Object.keys(packageJSON.devDependencies).filter(devDependency => devDependency.indexOf('strapi-') !== -1).forEach(devDependency => { - packageJSON.devDependencies[devDependency] = '^' + pkgJSON.version; + packageJSON.devDependencies[devDependency] = pkgJSON.version; }); } diff --git a/scripts/setup.js b/scripts/setup.js index e40170a26a..c109960476 100755 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -32,7 +32,7 @@ shell.exec('npm install ../strapi-utils'); shell.exec('npm link'); shell.cd('../strapi'); -shell.exec('npm install ../strapi-generate ../strapi-generate-admin ../strapi-generate-api ../strapi-generate-new ../strapi-generate-policy ../strapi-generate-service ../strapi-mongoose ../strapi-utils'); +shell.exec('npm install ../strapi-generate ../strapi-generate-admin ../strapi-generate-api ../strapi-generate-new ../strapi-generate-policy ../strapi-generate-service ../strapi-utils'); shell.exec('npm link'); shell.cd('../strapi-helper-plugin');