Merge branch 'master' into fix/lodash-dependency

This commit is contained in:
Alexandre BODIN 2019-07-01 10:43:43 +02:00 committed by GitHub
commit 3bedc377be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 98 additions and 102 deletions

View File

@ -1,7 +1,7 @@
{
"name": "getstarted",
"private": true,
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "A Strapi application.",
"scripts": {
"develop": "strapi develop",
@ -14,23 +14,23 @@
"lodash": "^4.17.5",
"pg": "^7.10.0",
"sqlite3": "^4.0.6",
"strapi": "3.0.0-beta.7",
"strapi-admin": "3.0.0-beta.7",
"strapi-hook-bookshelf": "3.0.0-beta.7",
"strapi-hook-knex": "3.0.0-beta.7",
"strapi-hook-mongoose": "3.0.0-beta.7",
"strapi-middleware-views": "3.0.0-beta.7",
"strapi-plugin-content-manager": "3.0.0-beta.7",
"strapi-plugin-content-type-builder": "3.0.0-beta.7",
"strapi-plugin-documentation": "3.0.0-beta.7",
"strapi-plugin-email": "3.0.0-beta.7",
"strapi-plugin-graphql": "3.0.0-beta.7",
"strapi-plugin-settings-manager": "3.0.0-beta.7",
"strapi-plugin-upload": "3.0.0-beta.7",
"strapi-plugin-users-permissions": "3.0.0-beta.7",
"strapi-provider-email-mailgun": "3.0.0-beta.7",
"strapi-provider-upload-aws-s3": "3.0.0-beta.7",
"strapi-utils": "3.0.0-beta.7"
"strapi": "3.0.0-beta.8",
"strapi-admin": "3.0.0-beta.8",
"strapi-hook-bookshelf": "3.0.0-beta.8",
"strapi-hook-knex": "3.0.0-beta.8",
"strapi-hook-mongoose": "3.0.0-beta.8",
"strapi-middleware-views": "3.0.0-beta.8",
"strapi-plugin-content-manager": "3.0.0-beta.8",
"strapi-plugin-content-type-builder": "3.0.0-beta.8",
"strapi-plugin-documentation": "3.0.0-beta.8",
"strapi-plugin-email": "3.0.0-beta.8",
"strapi-plugin-graphql": "3.0.0-beta.8",
"strapi-plugin-settings-manager": "3.0.0-beta.8",
"strapi-plugin-upload": "3.0.0-beta.8",
"strapi-plugin-users-permissions": "3.0.0-beta.8",
"strapi-provider-email-mailgun": "3.0.0-beta.8",
"strapi-provider-upload-aws-s3": "3.0.0-beta.8",
"strapi-utils": "3.0.0-beta.8"
},
"strapi": {
"uuid": "getstarted"

View File

@ -1,5 +1,5 @@
{
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"packages": [
"packages/*",
"examples/*"

View File

@ -256,7 +256,7 @@ module.exports = {
);
}
const data = await adminQueries.update(ctx.params, values);
const data = await adminQueries.update(ctx.params, user);
// Send 200 `ok`
ctx.send(data);

View File

@ -1,6 +1,6 @@
{
"name": "strapi-admin",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -73,8 +73,8 @@
"sanitize.css": "^4.1.0",
"sass-loader": "^7.1.0",
"shelljs": "^0.7.8",
"strapi-helper-plugin": "3.0.0-beta.7",
"strapi-utils": "3.0.0-beta.7",
"strapi-helper-plugin": "3.0.0-beta.8",
"strapi-utils": "3.0.0-beta.8",
"style-loader": "^0.23.1",
"styled-components": "^4.2.0",
"terser-webpack-plugin": "^1.2.3",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
@ -20,7 +20,7 @@
"fs-extra": "^8.0.1",
"lodash": "^4.17.11",
"reportback": "^2.0.2",
"strapi-utils": "3.0.0-beta.7"
"strapi-utils": "3.0.0-beta.8"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-helper-plugin",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "Helper for Strapi plugins development",
"files": [
"dist"

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-bookshelf",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -21,8 +21,8 @@
"lodash": "^4.17.11",
"pluralize": "^7.0.0",
"rimraf": "^2.6.3",
"strapi-hook-knex": "3.0.0-beta.7",
"strapi-utils": "3.0.0-beta.7"
"strapi-hook-knex": "3.0.0-beta.8",
"strapi-utils": "3.0.0-beta.8"
},
"strapi": {
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-ejs",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -20,7 +20,7 @@
"mongoose-float": "^1.0.4",
"pluralize": "^7.0.0",
"rimraf": "^2.6.3",
"strapi-utils": "3.0.0-beta.7"
"strapi-utils": "3.0.0-beta.8"
},
"author": {
"email": "hi@strapi.io",

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "strapi-middleware-views",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"description": "A powerful UI to easily manage your data.",
"strapi": {
"name": "Content Manager",
@ -32,8 +32,8 @@
"redux-immutable": "^4.0.0",
"reselect": "^3.0.1",
"showdown": "^1.9.0",
"strapi-helper-plugin": "3.0.0-beta.7",
"strapi-utils": "3.0.0-beta.7",
"strapi-helper-plugin": "3.0.0-beta.8",
"strapi-utils": "3.0.0-beta.8",
"styled-components": "^4.2.0"
},
"author": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-type-builder",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "Strapi plugin to create content type (API).",
"strapi": {
"name": "Content Type Builder",
@ -28,9 +28,9 @@
"redux": "^4.0.1",
"redux-immutable": "^4.0.0",
"reselect": "^3.0.1",
"strapi-generate": "3.0.0-beta.7",
"strapi-generate-api": "3.0.0-beta.7",
"strapi-helper-plugin": "3.0.0-beta.7"
"strapi-generate": "3.0.0-beta.8",
"strapi-generate-api": "3.0.0-beta.8",
"strapi-helper-plugin": "3.0.0-beta.8"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-documentation",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Documentation",
@ -33,7 +33,7 @@
"redux": "^4.0.1",
"redux-immutable": "^4.0.0",
"reselect": "^4.0.0",
"strapi-helper-plugin": "3.0.0-beta.7",
"strapi-helper-plugin": "3.0.0-beta.8",
"swagger-ui-dist": "3.22.1"
},
"author": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-email",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Email",
@ -12,13 +12,13 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"strapi-provider-email-sendmail": "3.0.0-beta.7",
"strapi-utils": "3.0.0-beta.7"
"strapi-provider-email-sendmail": "3.0.0-beta.8",
"strapi-utils": "3.0.0-beta.8"
},
"devDependencies": {
"react-copy-to-clipboard": "5.0.1",
"rimraf": "^2.6.3",
"strapi-helper-plugin": "3.0.0-beta.7"
"strapi-helper-plugin": "3.0.0-beta.8"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-graphql",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "This is the description of the plugin.",
"strapi": {
"name": "graphql",
@ -23,7 +23,7 @@
"graphql-type-long": "^0.1.1",
"koa-compose": "^4.0.0",
"pluralize": "^7.0.0",
"strapi-utils": "3.0.0-beta.7"
"strapi-utils": "3.0.0-beta.8"
},
"devDependencies": {
"cross-env": "^5.2.0",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-settings-manager",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "Strapi plugin to manage settings.",
"strapi": {
"name": "Settings Manager",
@ -27,7 +27,7 @@
"redux": "^4.0.1",
"reselect": "^3.0.1",
"shelljs": "^0.7.8",
"strapi-helper-plugin": "3.0.0-beta.7"
"strapi-helper-plugin": "3.0.0-beta.8"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-upload",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Files Upload",
@ -23,9 +23,9 @@
"react-router-dom": "^5.0.0",
"react-transition-group": "^2.5.0",
"reactstrap": "^5.0.0",
"strapi-helper-plugin": "3.0.0-beta.7",
"strapi-provider-upload-local": "3.0.0-beta.7",
"strapi-utils": "3.0.0-beta.7",
"strapi-helper-plugin": "3.0.0-beta.8",
"strapi-provider-upload-local": "3.0.0-beta.8",
"strapi-utils": "3.0.0-beta.8",
"stream-to-array": "^2.3.0",
"uuid": "^3.2.1"
},

View File

@ -9,7 +9,7 @@
/* eslint-disable no-useless-escape */
const crypto = require('crypto');
const _ = require('lodash');
const compose = require('koa-compose');
const grant = require('grant-koa');
const emailRegExp = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@ -263,10 +263,7 @@ module.exports = {
return ctx.badRequest(null, 'This provider is disabled.');
}
const Grant = require('grant-koa');
const grant = new Grant(grantConfig);
return compose(grant.middleware)(ctx, next);
return grant(grantConfig)(ctx, next);
},
forgotPassword: async ctx => {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-users-permissions",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "Protect your API with a full-authentication process based on JWT",
"strapi": {
"name": "Roles & Permissions",
@ -14,11 +14,10 @@
"dependencies": {
"bcryptjs": "^2.4.3",
"classnames": "^2.2.6",
"grant-koa": "^4.2.0",
"grant-koa": "^4.6.0",
"immutable": "^3.8.2",
"invariant": "^2.2.1",
"jsonwebtoken": "^8.1.0",
"koa-compose": "^4.0.0",
"koa2-ratelimit": "^0.6.1",
"lodash": "^4.17.11",
"purest": "^2.0.1",
@ -32,8 +31,8 @@
"reactstrap": "^5.0.0",
"redux-saga": "^0.16.0",
"request": "^2.83.0",
"strapi-helper-plugin": "3.0.0-beta.7",
"strapi-utils": "3.0.0-beta.7",
"strapi-helper-plugin": "3.0.0-beta.8",
"strapi-utils": "3.0.0-beta.8",
"uuid": "^3.1.0"
},
"devDependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-amazon-ses",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"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-beta.7",
"version": "3.0.0-beta.8",
"description": "Rackspace provider for strapi upload",
"main": "./lib",
"keywords": [],

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "strapi",
"version": "3.0.0-beta.7",
"version": "3.0.0-beta.8",
"description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MongoDB, MySQL, MariaDB, PostgreSQL, SQLite",
"homepage": "http://strapi.io",
"directories": {
@ -47,15 +47,15 @@
"resolve-cwd": "^3.0.0",
"rimraf": "^2.6.2",
"shelljs": "^0.8.3",
"strapi-generate": "3.0.0-beta.7",
"strapi-generate-api": "3.0.0-beta.7",
"strapi-generate-controller": "3.0.0-beta.7",
"strapi-generate-model": "3.0.0-beta.7",
"strapi-generate-new": "3.0.0-beta.7",
"strapi-generate-plugin": "3.0.0-beta.7",
"strapi-generate-policy": "3.0.0-beta.7",
"strapi-generate-service": "3.0.0-beta.7",
"strapi-utils": "3.0.0-beta.7"
"strapi-generate": "3.0.0-beta.8",
"strapi-generate-api": "3.0.0-beta.8",
"strapi-generate-controller": "3.0.0-beta.8",
"strapi-generate-model": "3.0.0-beta.8",
"strapi-generate-new": "3.0.0-beta.8",
"strapi-generate-plugin": "3.0.0-beta.8",
"strapi-generate-policy": "3.0.0-beta.8",
"strapi-generate-service": "3.0.0-beta.8",
"strapi-utils": "3.0.0-beta.8"
},
"scripts": {
"test": "jest --verbose",

View File

@ -7934,17 +7934,17 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
grant-koa@^4.2.0:
version "4.5.2"
resolved "https://registry.yarnpkg.com/grant-koa/-/grant-koa-4.5.2.tgz#a02e49c5ff3e593253023f3b3115441b1d0f54c7"
integrity sha512-lbBE2LjQhf14nRJAlVv5P5ld1V6wQhRn107Db1R0oQ/AtLtJA5cNe0YqYJS2ofl9pDJj+x1apShYVRWK6i4k/w==
grant-koa@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/grant-koa/-/grant-koa-4.6.0.tgz#00ae29c66d1ad3b3b284bb9742cdbf934ba25fbf"
integrity sha512-zzSU+94m5kPN4Yb5gmRoJk34j50OBFCIczaUaB2n+o+NV84hTLXCRESZhp5BtvBDRY4ZTbsIKsgwCzsBHozQog==
dependencies:
grant "4.5.2"
grant "4.6.0"
grant@4.5.2:
version "4.5.2"
resolved "https://registry.yarnpkg.com/grant/-/grant-4.5.2.tgz#5401f119e6f119772386e5fb2e0eccf5d0d2c8b7"
integrity sha512-96hyS0ouJ5CaO30YWLb9zatc2r23aLKvaM+81qnZWCpmL3l4/KTdaRoNG4X/e93vlmryyJr5jus/jrqctT6iFw==
grant@4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/grant/-/grant-4.6.0.tgz#2704bdeb27f6f3cae03b2fbf6eecf1415bc77bc5"
integrity sha512-jAhKZssj5EMtC2XQSfUq/+wU0mbYYsUFWHb9cdV4XPdS6IINmEMIwI68Wj9MpLJTrUQJ48CzqfGpo4Mve11RvQ==
dependencies:
qs "^6.7.0"
request-compose "^1.2.0"