yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-11 16:13:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4/backend' into pluginAPI/loadPlugin

Browse Source
This commit is contained in:
Alexandre Bodin 2021-08-19 23:29:55 +02:00
commit c3642a4f10
47 changed files with 121 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
examples/getstarted/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "getstarted", "name": "getstarted",
"private": true, "private": true,
"version": "3.6.6", "version": "3.6.7",
"description": "A Strapi application.", "description": "A Strapi application.",
"scripts": { "scripts": {
"develop": "strapi develop", "develop": "strapi develop",
@ -12,25 +12,25 @@
"strapi": "strapi" "strapi": "strapi"
}, },
"dependencies": { "dependencies": {
"@strapi/admin": "3.6.6", "@strapi/admin": "3.6.7",
"@strapi/plugin-content-manager": "3.6.6", "@strapi/plugin-content-manager": "3.6.7",
"@strapi/plugin-content-type-builder": "3.6.6", "@strapi/plugin-content-type-builder": "3.6.7",
"@strapi/plugin-documentation": "3.6.6", "@strapi/plugin-documentation": "3.6.7",
"@strapi/plugin-email": "3.6.6", "@strapi/plugin-email": "3.6.7",
"@strapi/plugin-graphql": "3.6.6", "@strapi/plugin-graphql": "3.6.7",
"@strapi/plugin-i18n": "3.6.6", "@strapi/plugin-i18n": "3.6.7",
"@strapi/plugin-upload": "3.6.6", "@strapi/plugin-upload": "3.6.7",
"@strapi/plugin-users-permissions": "3.6.6", "@strapi/plugin-users-permissions": "3.6.7",
"@strapi/provider-email-mailgun": "3.6.6", "@strapi/provider-email-mailgun": "3.6.7",
"@strapi/provider-upload-aws-s3": "3.6.6", "@strapi/provider-upload-aws-s3": "3.6.7",
"@strapi/provider-upload-cloudinary": "3.6.6", "@strapi/provider-upload-cloudinary": "3.6.7",
"@strapi/strapi": "3.6.6", "@strapi/strapi": "3.6.7",
"@strapi/utils": "3.6.6", "@strapi/utils": "3.6.7",
"lodash": "4.17.21", "lodash": "4.17.21",
"mysql": "2.18.1", "mysql": "2.18.1",
"pg": "8.6.0", "pg": "8.6.0",
"sqlite3": "5.0.2", "sqlite3": "5.0.2",
"strapi-middleware-views": "3.6.6" "strapi-middleware-views": "3.6.7"
}, },
"strapi": { "strapi": {
"uuid": "getstarted" "uuid": "getstarted"

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "3.6.6", "version": "3.6.7",
"packages": [ "packages": [
"packages/*", "packages/*",
"examples/*" "examples/*"

4
packages/cli/create-strapi-app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "create-strapi-app", "name": "create-strapi-app",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate a new Strapi application.", "description": "Generate a new Strapi application.",
"license": "SEE LICENSE IN LICENSE", "license": "SEE LICENSE IN LICENSE",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
@ -21,7 +21,7 @@
"inquirer": "8.1.0", "inquirer": "8.1.0",
"js-yaml": "4.1.0", "js-yaml": "4.1.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"@strapi/generate-new": "3.6.6" "@strapi/generate-new": "3.6.7"
}, },
"scripts": { "scripts": {
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""

4
packages/cli/create-strapi-starter/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "create-strapi-starter", "name": "create-strapi-starter",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate a new Strapi application.", "description": "Generate a new Strapi application.",
"license": "SEE LICENSE IN LICENSE", "license": "SEE LICENSE IN LICENSE",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
@ -26,7 +26,7 @@
"js-yaml": "4.1.0", "js-yaml": "4.1.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"ora": "5.4.0", "ora": "5.4.0",
"@strapi/generate-new": "3.6.6", "@strapi/generate-new": "3.6.7",
"tar": "6.1.4" "tar": "6.1.4"
}, },
"scripts": { "scripts": {

0
packages/core/admin/admin/src/pages/MarketplacePage/PluginBanner/Wrapper.js → packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/Wrapper.js
View File

13
packages/core/admin/admin/src/pages/MarketplacePage/PluginBanner/index.js → packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/index.js
View File

@ -1,29 +1,32 @@
import React from 'react'; import React from 'react';
import { FormattedMessage, useIntl } from 'react-intl'; import { FormattedMessage, useIntl } from 'react-intl';
import { useTracking } from '@strapi/helper-plugin';
import Wrapper from './Wrapper'; import Wrapper from './Wrapper';
import LogoStrapi from '../../../assets/images/banner_strapi-rocket.png'; import LogoStrapi from '../../../assets/images/banner_strapi-rocket.png';
const PluginBanner = () => { const MarketplaceBanner = () => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const { trackUsage } = useTracking();
return ( return (
<Wrapper> <Wrapper>
<img <img
className="bannerImage" className="bannerImage"
src={LogoStrapi} src={LogoStrapi}
alt={formatMessage({ id: 'app.components.PluginBanner.image.alt' })} alt={formatMessage({ id: 'app.components.MarketplaceBanner.image.alt' })}
/> />
<div> <div>
<div> <div>
<FormattedMessage id="app.components.PluginBanner" /> <FormattedMessage id="app.components.MarketplaceBanner" />
</div> </div>
<a <a
href="https://github.com/strapi/awesome-strapi" href="https://github.com/strapi/awesome-strapi"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
className="bannerLink" className="bannerLink"
onClick={() => trackUsage('didGoToStrapiAwesome')}
> >
<FormattedMessage id="app.components.PluginBanner.link" /> <FormattedMessage id="app.components.MarketplaceBanner.link" />
<i className="fa fa-external-link-alt" /> <i className="fa fa-external-link-alt" />
</a> </a>
</div> </div>
@ -31,4 +34,4 @@ const PluginBanner = () => {
); );
}; };
export default PluginBanner; export default MarketplaceBanner;

4
packages/core/admin/admin/src/pages/MarketplacePage/index.js
View File

@ -15,7 +15,7 @@ import { useFetchPluginsFromMarketPlace } from '../../hooks';
import PageTitle from '../../components/PageTitle'; import PageTitle from '../../components/PageTitle';
import PluginCard from './PluginCard'; import PluginCard from './PluginCard';
import Wrapper from './Wrapper'; import Wrapper from './Wrapper';
import PluginBanner from './PluginBanner'; import MarketplaceBanner from './MarketplaceBanner';
const MarketPlacePage = () => { const MarketPlacePage = () => {
const toggleNotification = useNotification(); const toggleNotification = useNotification();
@ -91,7 +91,7 @@ const MarketPlacePage = () => {
id: 'app.components.InstallPluginPage.description', id: 'app.components.InstallPluginPage.description',
})} })}
/> />
<PluginBanner /> <MarketplaceBanner />
<div className="row" style={{ paddingTop: '4.1rem' }}> <div className="row" style={{ paddingTop: '4.1rem' }}>
{data.map(plugin => { {data.map(plugin => {
return ( return (

6
packages/core/admin/admin/src/translations/en.json
View File

@ -231,9 +231,9 @@
"app.components.Official": "Official", "app.components.Official": "Official",
"app.components.Onboarding.label.completed": "% completed", "app.components.Onboarding.label.completed": "% completed",
"app.components.Onboarding.title": "Get Started Videos", "app.components.Onboarding.title": "Get Started Videos",
"app.components.PluginBanner": "Discover plugins built by the community, and many more awesome things to kickstart your project, on Strapi Awesome.", "app.components.MarketplaceBanner": "Discover plugins built by the community, and many more awesome things to kickstart your project, on Strapi Awesome.",
"app.components.PluginBanner.image.alt": "a strapi rocket logo", "app.components.MarketplaceBanner.image.alt": "a strapi rocket logo",
"app.components.PluginBanner.link": "Check it out now", "app.components.MarketplaceBanner.link": "Check it out now",
"app.components.PluginCard.Button.label.download": "Download", "app.components.PluginCard.Button.label.download": "Download",
"app.components.PluginCard.Button.label.install": "Already installed", "app.components.PluginCard.Button.label.install": "Already installed",
"app.components.PluginCard.PopUpWarning.install.impossible.autoReload.needed": "The autoReload feature needs to be enabled. Please start your app with `yarn develop`.", "app.components.PluginCard.PopUpWarning.install.impossible.autoReload.needed": "The autoReload feature needs to be enabled. Please start your app with `yarn develop`.",

5
packages/core/admin/ee/middlewares/features-routes/routes.js
View File

@ -12,6 +12,11 @@ module.exports = {
path: '/connect/:provider', path: '/connect/:provider',
handler: 'authentication.providerLogin', handler: 'authentication.providerLogin',
}, },
{
method: 'POST',
path: '/connect/:provider',
handler: 'authentication.providerLogin',
},
{ {
method: 'GET', method: 'GET',
path: '/providers/options', path: '/providers/options',

6
packages/core/admin/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/admin", "name": "@strapi/admin",
"version": "3.6.6", "version": "3.6.7",
"description": "Strapi Admin", "description": "Strapi Admin",
"repository": { "repository": {
"type": "git", "type": "git",
@ -39,8 +39,8 @@
"@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14", "@fortawesome/react-fontawesome": "^0.1.14",
"@strapi/babel-plugin-switch-ee-ce": "1.0.0", "@strapi/babel-plugin-switch-ee-ce": "1.0.0",
"@strapi/helper-plugin": "3.6.6", "@strapi/helper-plugin": "3.6.7",
"@strapi/utils": "3.6.6", "@strapi/utils": "3.6.7",
"axios": "^0.21.1", "axios": "^0.21.1",
"babel-loader": "8.2.2", "babel-loader": "8.2.2",
"babel-plugin-styled-components": "1.12.0", "babel-plugin-styled-components": "1.12.0",

6
packages/core/content-manager/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-content-manager", "name": "@strapi/plugin-content-manager",
"version": "3.6.6", "version": "3.6.7",
"description": "A powerful UI to easily manage your data.", "description": "A powerful UI to easily manage your data.",
"strapi": { "strapi": {
"icon": "plug", "icon": "plug",
@ -12,8 +12,8 @@
}, },
"dependencies": { "dependencies": {
"@sindresorhus/slugify": "1.1.0", "@sindresorhus/slugify": "1.1.0",
"@strapi/helper-plugin": "3.6.6", "@strapi/helper-plugin": "3.6.7",
"@strapi/utils": "3.6.6", "@strapi/utils": "3.6.7",
"lodash": "4.17.21", "lodash": "4.17.21",
"pluralize": "^8.0.0", "pluralize": "^8.0.0",
"yup": "^0.32.9" "yup": "^0.32.9"

10
packages/core/content-type-builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-content-type-builder", "name": "@strapi/plugin-content-type-builder",
"version": "3.6.6", "version": "3.6.7",
"description": "Strapi plugin to create content type (API).", "description": "Strapi plugin to create content type (API).",
"strapi": { "strapi": {
"name": "Content Type Builder", "name": "Content Type Builder",
@ -10,10 +10,10 @@
}, },
"dependencies": { "dependencies": {
"@sindresorhus/slugify": "1.1.0", "@sindresorhus/slugify": "1.1.0",
"@strapi/generate": "3.6.6", "@strapi/generate": "3.6.7",
"@strapi/generate-api": "3.6.6", "@strapi/generate-api": "3.6.7",
"@strapi/helper-plugin": "3.6.6", "@strapi/helper-plugin": "3.6.7",
"@strapi/utils": "3.6.6", "@strapi/utils": "3.6.7",
"fs-extra": "^9.1.0", "fs-extra": "^9.1.0",
"lodash": "4.17.21", "lodash": "4.17.21",
"pluralize": "^8.0.0", "pluralize": "^8.0.0",

2
packages/core/database/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/database", "name": "@strapi/database",
"version": "3.6.6", "version": "3.6.7",
"description": "Strapi's database layer", "description": "Strapi's database layer",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"main": "./lib/index.js", "main": "./lib/index.js",

8
packages/core/email/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-email", "name": "@strapi/plugin-email",
"version": "3.6.6", "version": "3.6.7",
"description": "Easily configure your Strapi application to send emails.", "description": "Easily configure your Strapi application to send emails.",
"strapi": { "strapi": {
"name": "Email", "name": "Email",
@ -14,12 +14,12 @@
}, },
"dependencies": { "dependencies": {
"lodash": "4.17.21", "lodash": "4.17.21",
"@strapi/provider-email-sendmail": "3.6.6", "@strapi/provider-email-sendmail": "3.6.7",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"devDependencies": { "devDependencies": {
"rimraf": "3.0.2", "rimraf": "3.0.2",
"@strapi/helper-plugin": "3.6.6" "@strapi/helper-plugin": "3.6.7"
}, },
"author": { "author": {
"name": "Strapi team", "name": "Strapi team",

2
packages/core/helper-plugin/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/helper-plugin", "name": "@strapi/helper-plugin",
"version": "3.6.6", "version": "3.6.7",
"description": "Helper for Strapi plugins development", "description": "Helper for Strapi plugins development",
"main": "build/index.js", "main": "build/index.js",
"module": "build/index.esm.js", "module": "build/index.esm.js",

3
packages/core/strapi/lib/services/entity-service/index.js
View File

@ -68,9 +68,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
const query = transformParamsToQuery(uid, params); const query = transformParamsToQuery(uid, params);
// return first element and ignore filters
if (kind === 'singleType') { if (kind === 'singleType') {
return db.query(uid).findOne({}); return db.query(uid).findOne(query);
} }
return db.query(uid).findMany(query); return db.query(uid).findMany(query);

26
packages/core/strapi/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/strapi", "name": "@strapi/strapi",
"version": "3.6.6", "version": "3.6.7",
"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: MySQL, MariaDB, PostgreSQL, SQLite", "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: MySQL, MariaDB, PostgreSQL, SQLite",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"directories": { "directories": {
@ -13,18 +13,18 @@
}, },
"dependencies": { "dependencies": {
"@koa/cors": "^3.0.0", "@koa/cors": "^3.0.0",
"@strapi/admin": "3.6.6", "@strapi/admin": "3.6.7",
"@strapi/database": "3.6.6", "@strapi/database": "3.6.7",
"@strapi/generate": "3.6.6", "@strapi/generate": "3.6.7",
"@strapi/generate-api": "3.6.6", "@strapi/generate-api": "3.6.7",
"@strapi/generate-controller": "3.6.6", "@strapi/generate-controller": "3.6.7",
"@strapi/generate-model": "3.6.6", "@strapi/generate-model": "3.6.7",
"@strapi/generate-new": "3.6.6", "@strapi/generate-new": "3.6.7",
"@strapi/generate-plugin": "3.6.6", "@strapi/generate-plugin": "3.6.7",
"@strapi/generate-policy": "3.6.6", "@strapi/generate-policy": "3.6.7",
"@strapi/generate-service": "3.6.6", "@strapi/generate-service": "3.6.7",
"@strapi/logger": "3.6.6", "@strapi/logger": "3.6.7",
"@strapi/utils": "3.6.6", "@strapi/utils": "3.6.7",
"async": "^2.1.2", "async": "^2.1.2",
"boom": "^7.3.0", "boom": "^7.3.0",
"boxen": "4.2.0", "boxen": "4.2.0",

8
packages/core/upload/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-upload", "name": "@strapi/plugin-upload",
"version": "3.6.6", "version": "3.6.7",
"description": "Makes it easy to upload images and files to your Strapi Application.", "description": "Makes it easy to upload images and files to your Strapi Application.",
"strapi": { "strapi": {
"displayName": "Media Library", "displayName": "Media Library",
@ -14,9 +14,9 @@
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""
}, },
"dependencies": { "dependencies": {
"@strapi/helper-plugin": "3.6.6", "@strapi/helper-plugin": "3.6.7",
"@strapi/provider-upload-local": "3.6.6", "@strapi/provider-upload-local": "3.6.7",
"@strapi/utils": "3.6.6", "@strapi/utils": "3.6.7",
"byte-size": "^7.0.1", "byte-size": "^7.0.1",
"cropperjs": "^1.5.11", "cropperjs": "^1.5.11",
"immer": "9.0.5", "immer": "9.0.5",

2
packages/core/utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/utils", "name": "@strapi/utils",
"version": "3.6.6", "version": "3.6.7",
"description": "Shared utilities for the Strapi packages", "description": "Shared utilities for the Strapi packages",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [

4
packages/generators/api/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/generate-api", "name": "@strapi/generate-api",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate an API for a Strapi application.", "description": "Generate an API for a Strapi application.",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -15,7 +15,7 @@
"dependencies": { "dependencies": {
"lodash": "4.17.21", "lodash": "4.17.21",
"pluralize": "^8.0.0", "pluralize": "^8.0.0",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"scripts": { "scripts": {
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""

2
packages/generators/app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/generate-new", "name": "@strapi/generate-new",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate a new Strapi application.", "description": "Generate a new Strapi application.",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [

4
packages/generators/controller/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/generate-controller", "name": "@strapi/generate-controller",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate a controller for a Strapi API.", "description": "Generate a controller for a Strapi API.",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -15,7 +15,7 @@
}, },
"dependencies": { "dependencies": {
"lodash": "4.17.21", "lodash": "4.17.21",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"scripts": { "scripts": {
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""

4
packages/generators/generate/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/generate", "name": "@strapi/generate",
"version": "3.6.6", "version": "3.6.7",
"description": "Master of ceremonies for the Strapi generators.", "description": "Master of ceremonies for the Strapi generators.",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -20,7 +20,7 @@
"fs-extra": "^9.1.0", "fs-extra": "^9.1.0",
"lodash": "4.17.21", "lodash": "4.17.21",
"reportback": "^2.0.2", "reportback": "^2.0.2",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"author": { "author": {
"name": "Strapi team", "name": "Strapi team",

4
packages/generators/model/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/generate-model", "name": "@strapi/generate-model",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate a model for a Strapi API.", "description": "Generate a model for a Strapi API.",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -16,7 +16,7 @@
"dependencies": { "dependencies": {
"lodash": "4.17.21", "lodash": "4.17.21",
"pluralize": "^8.0.0", "pluralize": "^8.0.0",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"scripts": { "scripts": {
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""

4
packages/generators/plugin/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/generate-plugin", "name": "@strapi/generate-plugin",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate an plugin for a Strapi application.", "description": "Generate an plugin for a Strapi application.",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -15,7 +15,7 @@
"dependencies": { "dependencies": {
"fs-extra": "^9.1.0", "fs-extra": "^9.1.0",
"lodash": "4.17.21", "lodash": "4.17.21",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"scripts": { "scripts": {
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""

4
packages/generators/policy/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/generate-policy", "name": "@strapi/generate-policy",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate a policy for a Strapi API.", "description": "Generate a policy for a Strapi API.",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -15,7 +15,7 @@
}, },
"dependencies": { "dependencies": {
"lodash": "4.17.21", "lodash": "4.17.21",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"scripts": { "scripts": {
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""

4
packages/generators/service/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/generate-service", "name": "@strapi/generate-service",
"version": "3.6.6", "version": "3.6.7",
"description": "Generate a service for a Strapi API.", "description": "Generate a service for a Strapi API.",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -15,7 +15,7 @@
}, },
"dependencies": { "dependencies": {
"lodash": "4.17.21", "lodash": "4.17.21",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"scripts": { "scripts": {
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""

4
packages/plugins/documentation/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-documentation", "name": "@strapi/plugin-documentation",
"version": "3.6.6", "version": "3.6.7",
"description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.", "description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.",
"strapi": { "strapi": {
"displayName": "Documentation", "displayName": "Documentation",
@ -13,7 +13,7 @@
"test": "echo \"no tests yet\"" "test": "echo \"no tests yet\""
}, },
"dependencies": { "dependencies": {
"@strapi/helper-plugin": "3.6.6", "@strapi/helper-plugin": "3.6.7",
"cheerio": "^1.0.0-rc.5", "cheerio": "^1.0.0-rc.5",
"fs-extra": "^9.1.0", "fs-extra": "^9.1.0",
"koa-static": "^5.0.0", "koa-static": "^5.0.0",

4
packages/plugins/graphql/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-graphql", "name": "@strapi/plugin-graphql",
"version": "3.6.6", "version": "3.6.7",
"description": "Adds GraphQL endpoint with default API methods.", "description": "Adds GraphQL endpoint with default API methods.",
"strapi": { "strapi": {
"displayName": "GraphQL", "displayName": "GraphQL",
@ -29,7 +29,7 @@
"koa-compose": "^4.1.0", "koa-compose": "^4.1.0",
"lodash": "4.17.21", "lodash": "4.17.21",
"pluralize": "^8.0.0", "pluralize": "^8.0.0",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^7.0.3", "cross-env": "^7.0.3",

4
packages/plugins/i18n/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-i18n", "name": "@strapi/plugin-i18n",
"version": "3.6.6", "version": "3.6.7",
"description": "This plugin enables to create, to read and to update content in different languages, both from the Admin Panel and from the API", "description": "This plugin enables to create, to read and to update content in different languages, both from the Admin Panel and from the API",
"strapi": { "strapi": {
"displayName": "Internationalization", "displayName": "Internationalization",
@ -14,7 +14,7 @@
"lodash": "4.17.20", "lodash": "4.17.20",
"p-map": "4.0.0", "p-map": "4.0.0",
"pluralize": "8.0.0", "pluralize": "8.0.0",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"author": { "author": {
"name": "A Strapi developer", "name": "A Strapi developer",

6
packages/plugins/i18n/server/services/__tests__/localizations.test.js
View File

@ -173,9 +173,7 @@ describe('localizations service', () => {
setGlobalStrapi(); setGlobalStrapi();
const update = jest.fn(); const update = jest.fn();
global.strapi.query = () => { global.strapi.entityService = { update };
return { update };
};
const entry = { const entry = {
id: 1, id: 1,
@ -188,7 +186,7 @@ describe('localizations service', () => {
await syncNonLocalizedAttributes(entry, { model }); await syncNonLocalizedAttributes(entry, { model });
expect(update).toHaveBeenCalledTimes(1); expect(update).toHaveBeenCalledTimes(1);
expect(update).toHaveBeenCalledWith({ where: { id: 2 }, data: { stars: 1 } }); expect(update).toHaveBeenCalledWith(model.uid, 2, { data: { stars: 1 } });
}); });
}); });
}); });

2
packages/plugins/i18n/server/services/localizations.js
View File

@ -53,7 +53,7 @@ const syncNonLocalizedAttributes = async (entry, { model }) => {
} }
const updateLocalization = id => { const updateLocalization = id => {
return strapi.query(model.uid).update({ where: { id }, data: nonLocalizedAttributes }); return strapi.entityService.update(model.uid, id, { data: nonLocalizedAttributes });
}; };
await Promise.all(entry.localizations.map(({ id }) => updateLocalization(id))); await Promise.all(entry.localizations.map(({ id }) => updateLocalization(id)));

2
packages/plugins/sentry/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-sentry", "name": "@strapi/plugin-sentry",
"version": "3.6.6", "version": "3.6.7",
"description": "Send Strapi error events to Sentry", "description": "Send Strapi error events to Sentry",
"strapi": { "strapi": {
"name": "Sentry", "name": "Sentry",

6
packages/plugins/users-permissions/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/plugin-users-permissions", "name": "@strapi/plugin-users-permissions",
"version": "3.6.6", "version": "3.6.7",
"description": "Protect your API with a full-authentication process based on JWT", "description": "Protect your API with a full-authentication process based on JWT",
"strapi": { "strapi": {
"displayName": "Roles & Permissions", "displayName": "Roles & Permissions",
@ -15,8 +15,8 @@
}, },
"dependencies": { "dependencies": {
"@purest/providers": "^1.0.2", "@purest/providers": "^1.0.2",
"@strapi/helper-plugin": "3.6.6", "@strapi/helper-plugin": "3.6.7",
"@strapi/utils": "3.6.6", "@strapi/utils": "3.6.7",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"grant-koa": "5.4.8", "grant-koa": "5.4.8",
"jsonwebtoken": "^8.1.0", "jsonwebtoken": "^8.1.0",

4
packages/providers/email-amazon-ses/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-email-amazon-ses", "name": "@strapi/provider-email-amazon-ses",
"version": "3.6.6", "version": "3.6.7",
"description": "Amazon SES provider for strapi email", "description": "Amazon SES provider for strapi email",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -15,7 +15,7 @@
"main": "./lib", "main": "./lib",
"dependencies": { "dependencies": {
"node-ses": "^3.0.3", "node-ses": "^3.0.3",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"author": { "author": {
"email": "nikolay@tsenkov.net", "email": "nikolay@tsenkov.net",

4
packages/providers/email-mailgun/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-email-mailgun", "name": "@strapi/provider-email-mailgun",
"version": "3.6.6", "version": "3.6.7",
"description": "Mailgun provider for strapi email plugin", "description": "Mailgun provider for strapi email plugin",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -14,7 +14,7 @@
"main": "./lib", "main": "./lib",
"dependencies": { "dependencies": {
"mailgun-js": "0.22.0", "mailgun-js": "0.22.0",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"strapi": { "strapi": {
"isProvider": true "isProvider": true

2
packages/providers/email-nodemailer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-email-nodemailer", "name": "@strapi/provider-email-nodemailer",
"version": "3.6.6", "version": "3.6.7",
"description": "Nodemailer provider for Strapi 3", "description": "Nodemailer provider for Strapi 3",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [

4
packages/providers/email-sendgrid/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-email-sendgrid", "name": "@strapi/provider-email-sendgrid",
"version": "3.6.6", "version": "3.6.7",
"description": "Sendgrid provider for strapi email", "description": "Sendgrid provider for strapi email",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -14,7 +14,7 @@
"main": "./lib", "main": "./lib",
"dependencies": { "dependencies": {
"@sendgrid/mail": "6.4.0", "@sendgrid/mail": "6.4.0",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"strapi": { "strapi": {
"isProvider": true "isProvider": true

4
packages/providers/email-sendmail/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-email-sendmail", "name": "@strapi/provider-email-sendmail",
"version": "3.6.6", "version": "3.6.7",
"description": "Sendmail provider for strapi email", "description": "Sendmail provider for strapi email",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -13,7 +13,7 @@
"main": "./lib", "main": "./lib",
"dependencies": { "dependencies": {
"sendmail": "^1.6.1", "sendmail": "^1.6.1",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"strapi": { "strapi": {
"isProvider": true "isProvider": true

2
packages/providers/upload-aws-s3/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-upload-aws-s3", "name": "@strapi/provider-upload-aws-s3",
"version": "3.6.6", "version": "3.6.7",
"description": "AWS S3 provider for strapi upload", "description": "AWS S3 provider for strapi upload",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [

2
packages/providers/upload-cloudinary/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-upload-cloudinary", "name": "@strapi/provider-upload-cloudinary",
"version": "3.6.6", "version": "3.6.7",
"description": "Cloudinary provider for strapi upload", "description": "Cloudinary provider for strapi upload",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [

2
packages/providers/upload-local/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-upload-local", "name": "@strapi/provider-upload-local",
"version": "3.6.6", "version": "3.6.7",
"description": "Local provider for strapi upload", "description": "Local provider for strapi upload",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [

2
packages/providers/upload-rackspace/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/provider-upload-rackspace", "name": "@strapi/provider-upload-rackspace",
"version": "3.6.6", "version": "3.6.7",
"description": "Rackspace provider for strapi upload", "description": "Rackspace provider for strapi upload",
"main": "./lib", "main": "./lib",
"keywords": [], "keywords": [],

2
packages/strapi-hook-ejs/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "strapi-hook-ejs", "name": "strapi-hook-ejs",
"version": "3.6.6", "version": "3.6.7",
"description": "EJS hook for the Strapi framework", "description": "EJS hook for the Strapi framework",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [

4
packages/strapi-hook-redis/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "strapi-hook-redis", "name": "strapi-hook-redis",
"version": "3.6.6", "version": "3.6.7",
"description": "Redis hook for the Strapi framework", "description": "Redis hook for the Strapi framework",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [
@ -19,7 +19,7 @@
"lodash": "4.17.21", "lodash": "4.17.21",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"stack-trace": "0.0.10", "stack-trace": "0.0.10",
"@strapi/utils": "3.6.6" "@strapi/utils": "3.6.7"
}, },
"author": { "author": {
"email": "hi@strapi.io", "email": "hi@strapi.io",

2
packages/strapi-middleware-views/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "strapi-middleware-views", "name": "strapi-middleware-views",
"version": "3.6.6", "version": "3.6.7",
"description": "Views middleware to enable server-side rendering for the Strapi framework", "description": "Views middleware to enable server-side rendering for the Strapi framework",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"keywords": [ "keywords": [

2
packages/utils/logger/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strapi/logger", "name": "@strapi/logger",
"version": "3.6.6", "version": "3.6.7",
"description": "Strapi's logger", "description": "Strapi's logger",
"homepage": "https://strapi.io", "homepage": "https://strapi.io",
"main": "./lib/index.js", "main": "./lib/index.js",