Merge branch 'master' into removeWarningLogs

This commit is contained in:
Jim LAURIE 2019-01-24 12:16:11 +01:00 committed by GitHub
commit ce7acb24db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 132 additions and 73 deletions

View File

@ -26,3 +26,4 @@
- [Migration guide from alpha.17 to alpha.18](migration-guide-alpha.17-to-alpha.18.md)
- [Migration guide from alpha.18 to alpha.19](migration-guide-alpha.18-to-alpha.19.md)
- [Migration guide from alpha.19 to alpha.20](migration-guide-alpha.19-to-alpha.20.md)
- [Migration guide from alpha.20 to alpha.21](migration-guide-alpha.20-to-alpha.21.md)

View File

@ -0,0 +1,58 @@
# Migration guide from alpha.20 to alpha.21
**Here are the major changes:**
- Fix timestamps issue about update data in MySQL
- Fix production start
**Useful links:**
- Changelog: [https://github.com/strapi/strapi/releases/tag/v3.0.0-alpha.21](https://github.com/strapi/strapi/releases/tag/v3.0.0-alpha.21)
- GitHub diff: [https://github.com/strapi/strapi/compare/v3.0.0-alpha.20...v3.0.0-alpha.21](https://github.com/strapi/strapi/compare/v3.0.0-alpha.20...v3.0.0-alpha.21)
<br>
::: note
Feel free to [join us on Slack](http://slack.strapi.io) and ask questions about the migration process.
:::
<br>
## Getting started
Install Strapi `alpha.21` globally on your computer. To do so run `npm install strapi@3.0.0-alpha.21 -g`.
When it's done, generate a new empty project `strapi new myNewProject` (don't pay attention to the database configuration).
<br>
## Update node modules
Update the Strapi's dependencies version (move Strapi's dependencies to `3.0.0-alpha.21` version) of your project.
Run `npm install strapi@3.0.0-alpha.21 --save` to update your strapi version.
<br>
## Update the Admin
::: note
If you performed updates in the Admin, you will have to manually migrate your changes.
:::
Delete your old admin folder and replace it with the new one.
<br>
## Update the Plugins
::: note
If you did a custom update on one of the plugins, you will have to manually migrate your update.
:::
Copy the fields and relations you had in your `/plugins/users-permissions/models/User.settings.json` and `/plugins/users-permissions/config/jwt.json` file in the new one.
Then, delete your old `plugins` folder and replace it with the new one.
<br>
That's all, you have now upgraded to Strapi `alpha.21`.

View File

@ -1,6 +1,6 @@
{
"private": true,
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"dependencies": {},
"devDependencies": {
"assert": "~1.3.0",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-admin",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -31,8 +31,8 @@
},
"devDependencies": {
"sanitize.css": "^4.1.0",
"strapi-helper-plugin": "3.0.0-alpha.20",
"strapi-utils": "3.0.0-alpha.20"
"strapi-helper-plugin": "3.0.0-alpha.21",
"strapi-utils": "3.0.0-alpha.21"
},
"author": {
"name": "Strapi",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-admin",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Generate the default admin panel for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -15,8 +15,8 @@
"dependencies": {
"fs-extra": "^4.0.1",
"lodash": "^4.17.5",
"strapi-admin": "3.0.0-alpha.20",
"strapi-utils": "3.0.0-alpha.20"
"strapi-admin": "3.0.0-alpha.21",
"strapi-utils": "3.0.0-alpha.21"
},
"author": {
"email": "hi@strapi.io",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-controller",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -20,7 +20,7 @@
"lodash": "^4.17.5",
"ora": "^2.1.0",
"request": "^2.88.0",
"strapi-utils": "3.0.0-alpha.20",
"strapi-utils": "3.0.0-alpha.21",
"uuid": "^3.1.0"
},
"scripts": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-service",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"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.5",
"reportback": "^2.0.1",
"strapi-utils": "3.0.0-alpha.20"
"strapi-utils": "3.0.0-alpha.21"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-helper-plugin",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Helper for Strapi plugins development",
"engines": {
"node": ">= 10.0.0",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-bookshelf",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -21,8 +21,8 @@
"lodash": "^4.17.5",
"pluralize": "^6.0.0",
"rimraf": "^2.6.2",
"strapi-hook-knex": "3.0.0-alpha.20",
"strapi-utils": "3.0.0-alpha.20"
"strapi-hook-knex": "3.0.0-alpha.21",
"strapi-utils": "3.0.0-alpha.21"
},
"strapi": {
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-ejs",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-knex",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Knex hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-mongoose",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -20,7 +20,7 @@
"mongoose-float": "^1.0.3",
"pluralize": "^6.0.0",
"rimraf": "^2.6.2",
"strapi-utils": "3.0.0-alpha.20"
"strapi-utils": "3.0.0-alpha.21"
},
"author": {
"email": "hi@strapi.io",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-redis",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Redis hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -19,7 +19,7 @@
"lodash": "^4.17.5",
"rimraf": "^2.6.2",
"stack-trace": "0.0.10",
"strapi-utils": "3.0.0-alpha.20"
"strapi-utils": "3.0.0-alpha.21"
},
"author": {
"email": "hi@strapi.io",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-lint",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Strapi eslint and prettier configurations",
"directories": {
"lib": "lib"

View File

@ -1,6 +1,6 @@
{
"name": "strapi-middleware-views",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Views middleware to enable server-side rendering for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-manager",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "A powerful UI to easily manage your data.",
"strapi": {
"name": "Content Manager",
@ -26,7 +26,7 @@
"draft-js": "^0.10.5",
"react-select": "^1.2.1",
"showdown": "^1.8.6",
"strapi-helper-plugin": "3.0.0-alpha.20"
"strapi-helper-plugin": "3.0.0-alpha.21"
},
"dependencies": {
"pluralize": "^7.0.0"

View File

@ -10,7 +10,7 @@ module.exports = {
fetchAll: async (params, query) => {
const { limit, skip, sort, query : request, queryAttribute, source, populate = [] } = query;
const filters = strapi.utils.models.convertParams(params.model, query);
const where = !_.isEmpty(request) ? request : filters.where;
const { where = {} } = !_.isEmpty(request) ? strapi.utils.models.convertParams(params.model, request) : filters;
// Find entries using `queries` system
return await strapi.query(params.model, source).find({

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-type-builder",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Strapi plugin to create content type (API).",
"strapi": {
"name": "Content Type Builder",
@ -24,11 +24,11 @@
"dependencies": {
"immutable": "^3.8.2",
"pluralize": "^7.0.0",
"strapi-generate": "3.0.0-alpha.20",
"strapi-generate-api": "3.0.0-alpha.20"
"strapi-generate": "3.0.0-alpha.21",
"strapi-generate-api": "3.0.0-alpha.21"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.20"
"strapi-helper-plugin": "3.0.0-alpha.21"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-documentation",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Documentation",
@ -29,7 +29,7 @@
"swagger-ui-dist": "^3.18.3-republish2"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.20"
"strapi-helper-plugin": "3.0.0-alpha.21"
},
"author": {
"name": "soupette",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-email",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Email",
@ -22,11 +22,11 @@
"prepublishOnly": "IS_MONOREPO=true npm run build"
},
"dependencies": {
"strapi-provider-email-sendmail": "3.0.0-alpha.20"
"strapi-provider-email-sendmail": "3.0.0-alpha.21"
},
"devDependencies": {
"react-copy-to-clipboard": "5.0.1",
"strapi-helper-plugin": "3.0.0-alpha.20"
"strapi-helper-plugin": "3.0.0-alpha.21"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-graphql",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "This is the description of the plugin.",
"strapi": {
"name": "graphql",
@ -31,7 +31,7 @@
"graphql-type-datetime": "^0.2.2",
"graphql-type-json": "^0.2.1",
"pluralize": "^7.0.0",
"strapi-utils": "3.0.0-alpha.20"
"strapi-utils": "3.0.0-alpha.21"
},
"author": {
"name": "A Strapi developer",

View File

@ -143,7 +143,7 @@ module.exports = {
limit: 100,
};
params.query[query.alias] = _.uniq(query.ids.filter(x => !_.isEmpty(x)).map(x => x.toString()));
params.query[query.alias] = _.uniq(query.ids.filter(x => !_.isEmpty(x) || _.isInteger(x)).map(x => x.toString()));
if (['id', '_id'].includes(query.alias)) {
// However, we're applying a limit based on the number of entries we've to fetch.

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-settings-manager",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Strapi plugin to manage settings.",
"strapi": {
"name": "Settings Manager",
@ -25,7 +25,7 @@
"devDependencies": {
"flag-icon-css": "^2.8.0",
"react-select": "^1.0.0-rc.5",
"strapi-helper-plugin": "3.0.0-alpha.20"
"strapi-helper-plugin": "3.0.0-alpha.21"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-upload",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Files Upload",
@ -22,12 +22,12 @@
"prepublishOnly": "IS_MONOREPO=true npm run build"
},
"dependencies": {
"strapi-provider-upload-local": "3.0.0-alpha.20",
"strapi-provider-upload-local": "3.0.0-alpha.21",
"stream-to-array": "^2.3.0",
"uuid": "^3.2.1"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.20"
"strapi-helper-plugin": "3.0.0-alpha.21"
},
"author": {
"name": "A Strapi developer",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-users-permissions",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Protect your API with a full-authentication process based on JWT",
"strapi": {
"name": "Roles & Permissions",
@ -29,11 +29,11 @@
"koa2-ratelimit": "^0.6.1",
"purest": "^2.0.1",
"request": "^2.83.0",
"strapi-utils": "3.0.0-alpha.20",
"strapi-utils": "3.0.0-alpha.21",
"uuid": "^3.1.0"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.20"
"strapi-helper-plugin": "3.0.0-alpha.21"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-amazon-ses",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Amazon SES provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-mailgun",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Mailgun provider for strapi email plugin",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-sendgrid",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Sendgrid provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-sendmail",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Sendmail provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-aws-s3",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "AWS S3 provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-cloudinary",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Cloudinary provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-local",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Local provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-rackspace",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Rackspace provider for strapi upload",
"main": "./lib",
"scripts": {

View File

@ -486,7 +486,7 @@ module.exports = {
const suffix = key.split('_');
// Mysql stores boolean as 1 or 0
if (client === 'mysql' && _.get(models, [model, 'attributes', suffix, 'type']) === 'boolean') {
formattedValue = value === 'true' ? '1' : '0';
formattedValue = value.toString() === 'true' ? '1' : '0';
}
let type;

View File

@ -1,6 +1,6 @@
{
"name": "strapi-utils",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"description": "Shared utilities for the Strapi packages",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi",
"version": "3.0.0-alpha.20",
"version": "3.0.0-alpha.21",
"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": [
@ -60,16 +60,16 @@
"rimraf": "^2.6.2",
"semver": "^5.4.1",
"stack-trace": "0.0.10",
"strapi-generate": "3.0.0-alpha.20",
"strapi-generate-admin": "3.0.0-alpha.20",
"strapi-generate-api": "3.0.0-alpha.20",
"strapi-generate-controller": "3.0.0-alpha.20",
"strapi-generate-model": "3.0.0-alpha.20",
"strapi-generate-new": "3.0.0-alpha.20",
"strapi-generate-plugin": "3.0.0-alpha.20",
"strapi-generate-policy": "3.0.0-alpha.20",
"strapi-generate-service": "3.0.0-alpha.20",
"strapi-utils": "3.0.0-alpha.20"
"strapi-generate": "3.0.0-alpha.21",
"strapi-generate-admin": "3.0.0-alpha.21",
"strapi-generate-api": "3.0.0-alpha.21",
"strapi-generate-controller": "3.0.0-alpha.21",
"strapi-generate-model": "3.0.0-alpha.21",
"strapi-generate-new": "3.0.0-alpha.21",
"strapi-generate-plugin": "3.0.0-alpha.21",
"strapi-generate-policy": "3.0.0-alpha.21",
"strapi-generate-service": "3.0.0-alpha.21",
"strapi-utils": "3.0.0-alpha.21"
},
"author": {
"email": "hi@strapi.io",