提交 b75aa3e9 编写于 作者: A Alexandre Bodin

Merge branch 'master' into documentation

{
"name": "getstarted",
"private": true,
"version": "3.3.0",
"version": "3.3.2",
"description": "A Strapi application.",
"scripts": {
"develop": "strapi develop",
......@@ -17,22 +17,22 @@
"mysql": "^2.17.1",
"pg": "8.4.0",
"sqlite3": "^5.0.0",
"strapi": "3.3.0",
"strapi-admin": "3.3.0",
"strapi-connector-bookshelf": "3.3.0",
"strapi-connector-mongoose": "3.3.0",
"strapi-middleware-views": "3.3.0",
"strapi-plugin-content-manager": "3.3.0",
"strapi-plugin-content-type-builder": "3.3.0",
"strapi-plugin-documentation": "3.3.0",
"strapi-plugin-email": "3.3.0",
"strapi-plugin-graphql": "3.3.0",
"strapi-plugin-upload": "3.3.0",
"strapi-plugin-users-permissions": "3.3.0",
"strapi-provider-email-mailgun": "3.3.0",
"strapi-provider-upload-aws-s3": "3.3.0",
"strapi-provider-upload-cloudinary": "3.3.0",
"strapi-utils": "3.3.0"
"strapi": "3.3.2",
"strapi-admin": "3.3.2",
"strapi-connector-bookshelf": "3.3.2",
"strapi-connector-mongoose": "3.3.2",
"strapi-middleware-views": "3.3.2",
"strapi-plugin-content-manager": "3.3.2",
"strapi-plugin-content-type-builder": "3.3.2",
"strapi-plugin-documentation": "3.3.2",
"strapi-plugin-email": "3.3.2",
"strapi-plugin-graphql": "3.3.2",
"strapi-plugin-upload": "3.3.2",
"strapi-plugin-users-permissions": "3.3.2",
"strapi-provider-email-mailgun": "3.3.2",
"strapi-provider-upload-aws-s3": "3.3.2",
"strapi-provider-upload-cloudinary": "3.3.2",
"strapi-utils": "3.3.2"
},
"strapi": {
"uuid": "getstarted"
......
{
"version": "3.3.0",
"version": "3.3.2",
"packages": [
"packages/*",
"examples/*"
......
{
"name": "create-strapi-app",
"version": "3.3.0",
"version": "3.3.2",
"description": "Generate a new Strapi application.",
"license": "SEE LICENSE IN LICENSE",
"homepage": "http://strapi.io",
......@@ -21,7 +21,7 @@
],
"dependencies": {
"commander": "6.1.0",
"strapi-generate-new": "3.3.0"
"strapi-generate-new": "3.3.2"
},
"scripts": {
"test": "echo \"no tests yet\""
......
{
"name": "strapi-admin",
"version": "3.3.0",
"version": "3.3.2",
"description": "Strapi Admin",
"repository": {
"type": "git",
......@@ -13,7 +13,7 @@
},
"main": "index.js",
"dependencies": {
"@babel/core": "^7.11.6",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-async-generator-functions": "^7.10.5",
"@babel/plugin-proposal-class-properties": "^7.4.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
......@@ -93,8 +93,8 @@
"reselect": "^4.0.0",
"sanitize.css": "^4.1.0",
"sift": "13.1.10",
"strapi-helper-plugin": "3.3.0",
"strapi-utils": "3.3.0",
"strapi-helper-plugin": "3.3.2",
"strapi-utils": "3.3.2",
"style-loader": "^0.23.1",
"styled-components": "^5.0.0",
"terser-webpack-plugin": "^1.2.3",
......
......@@ -398,7 +398,10 @@ module.exports = async ({ models, target }, ctx, { selfFinalize = false } = {})
related: function() {
return this.morphTo(
name,
...association.related.map(morphModel => [morphModel, morphModel.collectionName])
...association.related.map(morphModel => [
GLOBALS[morphModel.globalId],
morphModel.collectionName,
])
);
},
};
......
{
"name": "strapi-connector-bookshelf",
"version": "3.3.0",
"version": "3.3.2",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
......@@ -23,7 +23,7 @@
"p-map": "4.0.0",
"pluralize": "^8.0.0",
"rimraf": "3.0.2",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"peerDependencies": {
"knex": "^0.20.0"
......
......@@ -241,7 +241,7 @@ module.exports = async ({ models, target }, ctx) => {
if (type === 'dynamiczone') {
if (returned[name]) {
returned[name] = returned[name].map(el => {
returned[name] = returned[name].filter(el => el && el.kind).map(el => {
return {
__component: findComponentByGlobalId(el.kind).uid,
...el.ref,
......
{
"name": "strapi-connector-mongoose",
"version": "3.3.0",
"version": "3.3.2",
"description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
......@@ -21,7 +21,7 @@
"mongoose-long": "^0.3.2",
"pluralize": "^8.0.0",
"semver": "^7.3.2",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"author": {
"email": "hi@strapi.io",
......
{
"name": "strapi-database",
"version": "3.3.0",
"version": "3.3.2",
"description": "Strapi's database layer",
"homepage": "http://strapi.io",
"main": "./lib/index.js",
......@@ -30,7 +30,7 @@
"dependencies": {
"lodash": "4.17.19",
"p-map": "4.0.0",
"strapi-utils": "3.3.0",
"strapi-utils": "3.3.2",
"verror": "^1.10.0"
},
"gitHead": "231263a3535658bab1e9492c6aaaed8692d62a53"
......
{
"name": "strapi-generate-api",
"version": "3.3.0",
"version": "3.3.2",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
......@@ -15,7 +15,7 @@
"dependencies": {
"lodash": "4.17.19",
"pluralize": "^8.0.0",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"scripts": {
"test": "echo \"no tests yet\""
......
{
"name": "strapi-generate-controller",
"version": "3.3.0",
"version": "3.3.2",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
......@@ -15,7 +15,7 @@
},
"dependencies": {
"lodash": "4.17.19",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"scripts": {
"test": "echo \"no tests yet\""
......
{
"name": "strapi-generate-model",
"version": "3.3.0",
"version": "3.3.2",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
......@@ -16,7 +16,7 @@
"dependencies": {
"lodash": "4.17.19",
"pluralize": "^8.0.0",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"scripts": {
"test": "echo \"no tests yet\""
......
{
"name": "strapi-generate-new",
"version": "3.3.0",
"version": "3.3.2",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
......
{
"name": "strapi-generate-plugin",
"version": "3.3.0",
"version": "3.3.2",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
......@@ -15,7 +15,7 @@
"dependencies": {
"fs-extra": "^9.0.1",
"lodash": "4.17.19",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"scripts": {
"test": "echo \"no tests yet\""
......
{
"name": "strapi-generate-policy",
"version": "3.3.0",
"version": "3.3.2",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
......@@ -15,7 +15,7 @@
},
"dependencies": {
"lodash": "4.17.19",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"scripts": {
"test": "echo \"no tests yet\""
......
{
"name": "strapi-generate-service",
"version": "3.3.0",
"version": "3.3.2",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
......@@ -15,7 +15,7 @@
},
"dependencies": {
"lodash": "4.17.19",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"scripts": {
"test": "echo \"no tests yet\""
......
{
"name": "strapi-generate",
"version": "3.3.0",
"version": "3.3.2",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
......@@ -20,7 +20,7 @@
"fs-extra": "^9.0.1",
"lodash": "4.17.19",
"reportback": "^2.0.2",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"author": {
"name": "Strapi team",
......
{
"name": "strapi-helper-plugin",
"version": "3.3.0",
"version": "3.3.2",
"description": "Helper for Strapi plugins development",
"files": [
"dist"
......@@ -32,7 +32,7 @@
"test": "echo \"no tests yet\""
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-class-properties": "^7.4.0",
"@babel/preset-env": "^7.9.5",
"@babel/preset-react": "^7.9.4",
......
{
"name": "strapi-hook-ejs",
"version": "3.3.0",
"version": "3.3.2",
"description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
......
{
"name": "strapi-hook-redis",
"version": "3.3.0",
"version": "3.3.2",
"description": "Redis hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
......@@ -19,7 +19,7 @@
"lodash": "4.17.19",
"rimraf": "3.0.2",
"stack-trace": "0.0.10",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"author": {
"email": "hi@strapi.io",
......
{
"name": "strapi-middleware-views",
"version": "3.3.0",
"version": "3.3.2",
"description": "Views middleware to enable server-side rendering for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
......
{
"name": "strapi-plugin-content-manager",
"version": "3.3.0",
"version": "3.3.2",
"description": "A powerful UI to easily manage your data.",
"strapi": {
"name": "Content Manager",
......@@ -45,8 +45,8 @@
"redux-immutable": "^4.0.0",
"reselect": "^4.0.0",
"sanitize-html": "2.1.1",
"strapi-helper-plugin": "3.3.0",
"strapi-utils": "3.3.0",
"strapi-helper-plugin": "3.3.2",
"strapi-utils": "3.3.2",
"yup": "^0.27.0"
},
"author": {
......
{
"name": "strapi-plugin-content-type-builder",
"version": "3.3.0",
"version": "3.3.2",
"description": "Strapi plugin to create content type (API).",
"strapi": {
"name": "Content Type Builder",
......@@ -29,10 +29,10 @@
"redux": "^4.0.1",
"redux-immutable": "^4.0.0",
"reselect": "^4.0.0",
"strapi-generate": "3.3.0",
"strapi-generate-api": "3.3.0",
"strapi-helper-plugin": "3.3.0",
"strapi-utils": "3.3.0",
"strapi-generate": "3.3.2",
"strapi-generate-api": "3.3.2",
"strapi-helper-plugin": "3.3.2",
"strapi-utils": "3.3.2",
"yup": "^0.27.0"
},
"author": {
......
{
"name": "strapi-plugin-documentation",
"version": "3.3.0",
"version": "3.3.2",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Documentation",
......@@ -35,7 +35,7 @@
"redux": "^4.0.1",
"redux-immutable": "^4.0.0",
"reselect": "^4.0.0",
"strapi-helper-plugin": "3.3.0",
"strapi-helper-plugin": "3.3.2",
"swagger-ui-dist": "3.35.0"
},
"author": {
......
{
"name": "strapi-plugin-email",
"version": "3.3.0",
"version": "3.3.2",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Email",
......@@ -13,12 +13,12 @@
},
"dependencies": {
"lodash": "4.17.19",
"strapi-provider-email-sendmail": "3.3.0",
"strapi-utils": "3.3.0"
"strapi-provider-email-sendmail": "3.3.2",
"strapi-utils": "3.3.2"
},
"devDependencies": {
"rimraf": "3.0.2",
"strapi-helper-plugin": "3.3.0"
"strapi-helper-plugin": "3.3.2"
},
"author": {
"name": "Strapi team",
......
{
"name": "strapi-plugin-graphql",
"version": "3.3.0",
"version": "3.3.2",
"description": "This is the description of the plugin.",
"strapi": {
"name": "graphql",
......@@ -26,7 +26,7 @@
"koa-compose": "^4.1.0",
"lodash": "4.17.20",
"pluralize": "^8.0.0",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"devDependencies": {
"cross-env": "^5.2.1",
......
{
"name": "strapi-plugin-upload",
"version": "3.3.0",
"version": "3.3.2",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Media Library",
......@@ -36,9 +36,9 @@
"react-router-dom": "^5.0.0",
"reactstrap": "8.4.1",
"sharp": "0.26.2",
"strapi-helper-plugin": "3.3.0",
"strapi-provider-upload-local": "3.3.0",
"strapi-utils": "3.3.0",
"strapi-helper-plugin": "3.3.2",
"strapi-provider-upload-local": "3.3.2",
"strapi-utils": "3.3.2",
"stream-to-array": "^2.3.0",
"uuid": "^3.2.1"
},
......
{
"name": "strapi-plugin-users-permissions",
"version": "3.3.0",
"version": "3.3.2",
"description": "Protect your API with a full-authentication process based on JWT",
"strapi": {
"name": "Roles & Permissions",
......@@ -35,8 +35,8 @@
"reactstrap": "8.4.1",
"redux-saga": "^0.16.0",
"request": "^2.83.0",
"strapi-helper-plugin": "3.3.0",
"strapi-utils": "3.3.0",
"strapi-helper-plugin": "3.3.2",
"strapi-utils": "3.3.2",
"uuid": "^3.1.0"
},
"devDependencies": {
......
{
"name": "strapi-provider-email-amazon-ses",
"version": "3.3.0",
"version": "3.3.2",
"description": "Amazon SES provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [
......@@ -15,7 +15,7 @@
"main": "./lib",
"dependencies": {
"node-ses": "^3.0.0",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"author": {
"email": "nikolay@tsenkov.net",
......
{
"name": "strapi-provider-email-mailgun",
"version": "3.3.0",
"version": "3.3.2",
"description": "Mailgun provider for strapi email plugin",
"homepage": "http://strapi.io",
"keywords": [
......@@ -14,7 +14,7 @@
"main": "./lib",
"dependencies": {
"mailgun-js": "0.22.0",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"strapi": {
"isProvider": true
......
{
"name": "strapi-provider-email-nodemailer",
"version": "3.3.0",
"version": "3.3.2",
"description": "Nodemailer provider for Strapi 3",
"homepage": "http://strapi.io",
"keywords": [
......
{
"name": "strapi-provider-email-sendgrid",
"version": "3.3.0",
"version": "3.3.2",
"description": "Sendgrid provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [
......@@ -14,7 +14,7 @@
"main": "./lib",
"dependencies": {
"@sendgrid/mail": "6.4.0",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"strapi": {
"isProvider": true
......
{
"name": "strapi-provider-email-sendmail",
"version": "3.3.0",
"version": "3.3.2",
"description": "Sendmail provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [
......@@ -13,7 +13,7 @@
"main": "./lib",
"dependencies": {
"sendmail": "^1.6.1",
"strapi-utils": "3.3.0"
"strapi-utils": "3.3.2"
},
"strapi": {
"isProvider": true
......
{
"name": "strapi-provider-upload-aws-s3",
"version": "3.3.0",
"version": "3.3.2",
"description": "AWS S3 provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [
......
......@@ -57,7 +57,7 @@ module.exports = {
...customConfig,
});
if (response.result !== 'ok') {
if (response.result !== 'ok' && response.result !== 'not found') {
throw errors.unknownError(`Error deleting on cloudinary: ${response.result}`);
}
} catch (error) {
......
{
"name": "strapi-provider-upload-cloudinary",
"version": "3.3.0",
"version": "3.3.2",
"description": "Cloudinary provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [
......