Merge branch 'master' into fix/counting-when-deep-filtering

This commit is contained in:
Bassel Kanso 2022-08-02 12:14:45 +03:00
commit fca84ede09
43 changed files with 433 additions and 150 deletions

View File

@ -1,6 +1,6 @@
{
"name": "check-pr-status",
"version": "4.3.0",
"version": "4.3.2",
"main": "dist/index.js",
"license": "MIT",
"private": true,

View File

@ -1,8 +1,9 @@
{
"name": "admin-development",
"version": "4.3.0",
"version": "4.3.2",
"main": "index.js",
"license": "MIT",
"private": true,
"devDependencies": {
"@babel/core": "^7.16.7",
"@babel/plugin-proposal-class-properties": "7.16.7",

View File

@ -1,7 +1,7 @@
{
"name": "getstarted",
"private": true,
"version": "4.3.0",
"version": "4.3.2",
"description": "A Strapi application.",
"scripts": {
"develop": "strapi develop",
@ -12,17 +12,17 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/admin": "4.3.0",
"@strapi/plugin-documentation": "4.3.0",
"@strapi/plugin-graphql": "4.3.0",
"@strapi/plugin-i18n": "4.3.0",
"@strapi/plugin-sentry": "4.3.0",
"@strapi/plugin-users-permissions": "4.3.0",
"@strapi/provider-email-mailgun": "4.3.0",
"@strapi/provider-upload-aws-s3": "4.3.0",
"@strapi/provider-upload-cloudinary": "4.3.0",
"@strapi/strapi": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/admin": "4.3.2",
"@strapi/plugin-documentation": "4.3.2",
"@strapi/plugin-graphql": "4.3.2",
"@strapi/plugin-i18n": "4.3.2",
"@strapi/plugin-sentry": "4.3.2",
"@strapi/plugin-users-permissions": "4.3.2",
"@strapi/provider-email-mailgun": "4.3.2",
"@strapi/provider-upload-aws-s3": "4.3.2",
"@strapi/provider-upload-cloudinary": "4.3.2",
"@strapi/strapi": "4.3.2",
"@strapi/utils": "4.3.2",
"@vscode/sqlite3": "5.0.8",
"better-sqlite3": "7.4.6",
"lodash": "4.17.21",

View File

@ -1,7 +1,7 @@
{
"name": "kitchensink-ts",
"private": true,
"version": "4.3.0",
"version": "4.3.2",
"description": "A Strapi application",
"scripts": {
"develop": "strapi develop",

View File

@ -1,7 +1,7 @@
{
"name": "kitchensink",
"private": true,
"version": "4.3.0",
"version": "4.3.2",
"description": "A Strapi application.",
"scripts": {
"develop": "strapi develop",
@ -12,12 +12,12 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/admin": "4.3.0",
"@strapi/provider-email-mailgun": "4.3.0",
"@strapi/provider-upload-aws-s3": "4.3.0",
"@strapi/provider-upload-cloudinary": "4.3.0",
"@strapi/strapi": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/admin": "4.3.2",
"@strapi/provider-email-mailgun": "4.3.2",
"@strapi/provider-upload-aws-s3": "4.3.2",
"@strapi/provider-upload-cloudinary": "4.3.2",
"@strapi/strapi": "4.3.2",
"@strapi/utils": "4.3.2",
"lodash": "4.17.21",
"mysql": "2.18.1",
"passport-google-oauth2": "0.2.0",

View File

@ -1,5 +1,5 @@
{
"version": "4.3.0",
"version": "4.3.2",
"packages": [
"packages/*",
"examples/*"

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/admin-test-utils",
"version": "4.3.0",
"version": "4.3.2",
"private": true,
"description": "Test utilities for the Strapi administration panel",
"license": "MIT",

View File

@ -1,6 +1,6 @@
{
"name": "create-strapi-app",
"version": "4.3.0",
"version": "4.3.2",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-app",
@ -38,7 +38,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/generate-new": "4.3.0",
"@strapi/generate-new": "4.3.2",
"commander": "6.1.0",
"inquirer": "8.2.4"
},

View File

@ -1,6 +1,6 @@
{
"name": "create-strapi-starter",
"version": "4.3.0",
"version": "4.3.2",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-starter",
@ -38,14 +38,14 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/generate-new": "4.3.0",
"@strapi/generate-new": "4.3.2",
"chalk": "4.1.1",
"ci-info": "3.1.1",
"commander": "7.1.0",
"execa": "5.1.1",
"fs-extra": "10.0.0",
"inquirer": "8.2.4",
"ora": "5.4.0"
"ora": "5.4.1"
},
"engines": {
"node": ">=14.19.1 <=16.x.x",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/admin",
"version": "4.3.0",
"version": "4.3.2",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -51,12 +51,12 @@
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.2.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
"@strapi/babel-plugin-switch-ee-ce": "4.3.0",
"@strapi/babel-plugin-switch-ee-ce": "4.3.2",
"@strapi/design-system": "1.2.0",
"@strapi/helper-plugin": "4.3.0",
"@strapi/helper-plugin": "4.3.2",
"@strapi/icons": "1.2.0",
"@strapi/typescript-utils": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/typescript-utils": "4.3.2",
"@strapi/utils": "4.3.2",
"axios": "0.24.0",
"babel-loader": "8.2.5",
"babel-plugin-styled-components": "2.0.2",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-content-manager",
"version": "4.3.0",
"version": "4.3.2",
"description": "A powerful UI to easily manage your data.",
"repository": {
"type": "git",
@ -24,7 +24,7 @@
},
"dependencies": {
"@sindresorhus/slugify": "1.1.0",
"@strapi/utils": "4.3.0",
"@strapi/utils": "4.3.2",
"lodash": "4.17.21"
},
"engines": {

View File

@ -47,7 +47,7 @@ const productWithDz = {
collectionName: '',
};
describe('Core API - Basic + dz', () => {
describe('CM API - Basic + dz', () => {
beforeAll(async () => {
await builder
.addComponent(compo)

View File

@ -0,0 +1,173 @@
'use strict';
const { createTestBuilder } = require('../../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
let rq;
let data = {
productsWithDz: [],
categories: [],
};
const compo1 = {
displayName: 'compo1',
attributes: {
title: {
type: 'string',
},
category: {
type: 'relation',
relation: 'oneToOne',
target: 'api::category.category',
},
},
};
const compo2 = {
displayName: 'compo2',
attributes: {
name: {
type: 'string',
},
category_diff: {
type: 'relation',
relation: 'oneToOne',
target: 'api::category.category',
},
},
};
const compoA = {
displayName: 'compoA',
attributes: {
items: {
type: 'component',
repeatable: false,
component: 'default.compo1',
},
},
};
const compoB = {
displayName: 'compoB',
attributes: {
items: {
type: 'component',
repeatable: false,
component: 'default.compo2',
},
},
};
const category = {
attributes: {
name: {
type: 'string',
},
},
displayName: 'Category',
singularName: 'category',
pluralName: 'categories',
description: '',
collectionName: '',
};
const productWithDz = {
attributes: {
name: {
type: 'string',
},
dz: {
components: ['default.compo-a', 'default.compo-b'],
type: 'dynamiczone',
required: true,
},
},
displayName: 'Product with dz',
singularName: 'product-with-dz',
pluralName: 'product-with-dzs',
description: '',
collectionName: '',
};
describe('CM API - Populate dz', () => {
beforeAll(async () => {
await builder
.addContentType(category)
.addComponent(compo1)
.addComponent(compo2)
.addComponent(compoA)
.addComponent(compoB)
.addContentType(productWithDz)
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
});
afterAll(async () => {
await strapi.destroy();
await builder.cleanup();
});
test('Populate works in dz even with same names in different components', async () => {
const categoryRes = await rq({
method: 'POST',
url: '/content-manager/collection-types/api::category.category',
body: { name: 'name' },
});
expect(categoryRes.status).toBe(200);
data.categories.push(categoryRes.body);
const productRes = await rq({
method: 'POST',
url: '/content-manager/collection-types/api::product-with-dz.product-with-dz',
body: {
name: 'name',
dz: [
{
__component: 'default.compo-a',
items: { id: 2, title: 'AAAA', category: data.categories[0].id },
},
{
__component: 'default.compo-b',
items: { id: 2, name: 'BBBB', category_diff: data.categories[0].id },
},
],
},
});
expect(productRes.status).toBe(200);
data.productsWithDz.push(productRes.body);
expect(productRes.body).toMatchObject({
name: 'name',
dz: [
{
__component: 'default.compo-a',
items: {
title: 'AAAA',
category: {
name: 'name',
},
},
},
{
__component: 'default.compo-b',
items: {
name: 'BBBB',
category_diff: {
name: 'name',
},
},
},
],
});
});
});

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-content-type-builder",
"version": "4.3.0",
"version": "4.3.2",
"description": "Strapi plugin to create content type",
"repository": {
"type": "git",
@ -28,9 +28,9 @@
},
"dependencies": {
"@sindresorhus/slugify": "1.1.0",
"@strapi/generators": "4.3.0",
"@strapi/helper-plugin": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/generators": "4.3.2",
"@strapi/helper-plugin": "4.3.2",
"@strapi/utils": "4.3.2",
"fs-extra": "10.0.0",
"lodash": "4.17.21",
"pluralize": "^8.0.0",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/database",
"version": "4.3.0",
"version": "4.3.2",
"description": "Strapi's database layer",
"homepage": "https://strapi.io",
"bugs": {
@ -34,7 +34,7 @@
"date-fns": "2.28.0",
"debug": "4.3.1",
"fs-extra": "10.0.0",
"knex": "1.0.4",
"knex": "1.0.7",
"lodash": "4.17.21",
"umzug": "3.1.1"
},

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-email",
"version": "4.3.0",
"version": "4.3.2",
"description": "Easily configure your Strapi application to send emails.",
"repository": {
"type": "git",
@ -26,12 +26,12 @@
"test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
},
"dependencies": {
"@strapi/provider-email-sendmail": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/provider-email-sendmail": "4.3.2",
"@strapi/utils": "4.3.2",
"lodash": "4.17.21"
},
"devDependencies": {
"@strapi/helper-plugin": "4.3.0"
"@strapi/helper-plugin": "4.3.2"
},
"engines": {
"node": ">=14.19.1 <=16.x.x",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/helper-plugin",
"version": "4.3.0",
"version": "4.3.2",
"description": "Helper for Strapi plugins development",
"repository": {
"type": "git",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/strapi",
"version": "4.3.0",
"version": "4.3.2",
"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",
"keywords": [
"strapi",
@ -80,17 +80,17 @@
"dependencies": {
"@koa/cors": "3.1.0",
"@koa/router": "10.1.1",
"@strapi/admin": "4.3.0",
"@strapi/database": "4.3.0",
"@strapi/generate-new": "4.3.0",
"@strapi/generators": "4.3.0",
"@strapi/logger": "4.3.0",
"@strapi/plugin-content-manager": "4.3.0",
"@strapi/plugin-content-type-builder": "4.3.0",
"@strapi/plugin-email": "4.3.0",
"@strapi/plugin-upload": "4.3.0",
"@strapi/typescript-utils": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/admin": "4.3.2",
"@strapi/database": "4.3.2",
"@strapi/generate-new": "4.3.2",
"@strapi/generators": "4.3.2",
"@strapi/logger": "4.3.2",
"@strapi/plugin-content-manager": "4.3.2",
"@strapi/plugin-content-type-builder": "4.3.2",
"@strapi/plugin-email": "4.3.2",
"@strapi/plugin-upload": "4.3.2",
"@strapi/typescript-utils": "4.3.2",
"@strapi/utils": "4.3.2",
"bcryptjs": "2.4.3",
"boxen": "5.1.2",
"chalk": "4.1.2",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-upload",
"version": "4.3.0",
"version": "4.3.2",
"description": "Makes it easy to upload images and files to your Strapi Application.",
"license": "SEE LICENSE IN LICENSE",
"author": {
@ -23,9 +23,9 @@
"test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
},
"dependencies": {
"@strapi/helper-plugin": "4.3.0",
"@strapi/provider-upload-local": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/helper-plugin": "4.3.2",
"@strapi/provider-upload-local": "4.3.2",
"@strapi/utils": "4.3.2",
"byte-size": "7.0.1",
"cropperjs": "1.5.12",
"date-fns": "2.28.0",

View File

@ -4,7 +4,7 @@
* Converts the standard Strapi REST query params to a more usable format for querying
* You can read more here: https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest-api.html#filters
*/
const { has, isEmpty, isObject, isPlainObject, cloneDeep, get } = require('lodash/fp');
const { has, isEmpty, isObject, isPlainObject, cloneDeep, get, mergeAll } = require('lodash/fp');
const _ = require('lodash');
const parseType = require('./parse-type');
const contentTypesUtils = require('./content-types');
@ -170,17 +170,13 @@ const convertPopulateObject = (populate, schema) => {
// FIXME: This is a temporary solution for dynamic zones that should be
// fixed when we'll implement a more accurate way to query them
if (attribute.type === 'dynamiczone') {
const generatedFakeDynamicZoneSchema = {
uid: `${schema.uid}.${key}`,
attributes: attribute.components
.sort()
.map(uid => strapi.getModel(uid).attributes)
.reduce((acc, componentAttributes) => ({ ...acc, ...componentAttributes }), {}),
};
const populates = attribute.components
.map(uid => strapi.getModel(uid))
.map(schema => convertNestedPopulate(subPopulate, schema));
return {
...acc,
[key]: convertNestedPopulate(subPopulate, generatedFakeDynamicZoneSchema),
[key]: mergeAll(populates),
};
}

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/utils",
"version": "4.3.0",
"version": "4.3.2",
"description": "Shared utilities for the Strapi packages",
"keywords": [
"strapi",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/generate-new",
"version": "4.3.0",
"version": "4.3.2",
"description": "Generate a new Strapi application.",
"keywords": [
"generate",
@ -44,7 +44,7 @@
"lodash": "4.17.21",
"node-fetch": "^2.6.1",
"node-machine-id": "^1.1.10",
"ora": "^5.4.0",
"ora": "^5.4.1",
"tar": "6.1.11",
"uuid": "^8.3.2"
},

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/generators",
"version": "4.3.0",
"version": "4.3.2",
"description": "Interactive API generator.",
"keywords": [
"strapi",
@ -30,8 +30,8 @@
"main": "lib/index.js",
"dependencies": {
"@sindresorhus/slugify": "1.1.0",
"@strapi/typescript-utils": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/typescript-utils": "4.3.2",
"@strapi/utils": "4.3.2",
"chalk": "4.1.2",
"fs-extra": "10.0.0",
"node-plop": "0.26.3",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-documentation",
"version": "4.3.0",
"version": "4.3.2",
"description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.",
"repository": {
"type": "git",
@ -24,8 +24,8 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/helper-plugin": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/helper-plugin": "4.3.2",
"@strapi/utils": "4.3.2",
"bcryptjs": "2.4.3",
"cheerio": "^1.0.0-rc.12",
"fs-extra": "10.0.0",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-graphql",
"version": "4.3.0",
"version": "4.3.2",
"description": "Adds GraphQL endpoint with default API methods.",
"repository": {
"type": "git",
@ -30,9 +30,9 @@
"@apollo/federation": "^0.28.0",
"@graphql-tools/schema": "8.1.2",
"@graphql-tools/utils": "^8.0.2",
"@strapi/utils": "4.3.0",
"@strapi/utils": "4.3.2",
"apollo-server-core": "3.1.2",
"apollo-server-koa": "3.1.2",
"apollo-server-koa": "3.10.0",
"glob": "^7.1.7",
"graphql": "^15.5.1",
"graphql-depth-limit": "^1.1.0",

View File

@ -61,6 +61,8 @@ module.exports = async ({ strapi }) => {
? ApolloServerPluginLandingPageDisabled()
: ApolloServerPluginLandingPageGraphQLPlayground(),
],
cache: 'bounded'
};
const serverConfig = merge(defaultServerConfig, config('apolloServer'));

View File

@ -3,7 +3,7 @@
const { Kind, valueFromASTUntyped } = require('graphql');
const { omit } = require('lodash/fp');
const { unionType, scalarType } = require('nexus');
const { ApplicationError } = require('@strapi/utils');
const { ApplicationError } = require('@strapi/utils').errors;
module.exports = ({ strapi }) => {
const buildTypeDefinition = (name, components) => {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-i18n",
"version": "4.3.0",
"version": "4.3.2",
"description": "This plugin enables to create, to read and to update content in different languages, both from the Admin Panel and from the API",
"repository": {
"type": "git",
@ -24,7 +24,7 @@
"test:unit": "jest --verbose"
},
"dependencies": {
"@strapi/utils": "4.3.0",
"@strapi/utils": "4.3.2",
"lodash": "4.17.21"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-sentry",
"version": "4.3.0",
"version": "4.3.2",
"description": "Send Strapi error events to Sentry",
"repository": {
"type": "git",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-users-permissions",
"version": "4.3.0",
"version": "4.3.2",
"description": "Protect your API with a full-authentication process based on JWT",
"repository": {
"type": "git",
@ -27,8 +27,8 @@
"test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
},
"dependencies": {
"@strapi/helper-plugin": "4.3.0",
"@strapi/utils": "4.3.0",
"@strapi/helper-plugin": "4.3.2",
"@strapi/utils": "4.3.2",
"bcryptjs": "2.4.3",
"grant-koa": "5.4.8",
"jsonwebtoken": "^8.1.0",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-amazon-ses",
"version": "4.3.0",
"version": "4.3.2",
"description": "Amazon SES provider for strapi email",
"keywords": [
"email",
@ -36,7 +36,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.3.0",
"@strapi/utils": "4.3.2",
"node-ses": "^3.0.3"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-mailgun",
"version": "4.3.0",
"version": "4.3.2",
"description": "Mailgun provider for strapi email plugin",
"keywords": [
"email",
@ -36,7 +36,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.3.0",
"@strapi/utils": "4.3.2",
"form-data": "^4.0.0",
"mailgun.js": "5.0.2"
},

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-nodemailer",
"version": "4.3.0",
"version": "4.3.2",
"description": "Nodemailer provider for Strapi 3",
"keywords": [
"strapi",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-sendgrid",
"version": "4.3.0",
"version": "4.3.2",
"description": "Sendgrid provider for strapi email",
"keywords": [
"email",
@ -37,7 +37,7 @@
},
"dependencies": {
"@sendgrid/mail": "7.4.7",
"@strapi/utils": "4.3.0"
"@strapi/utils": "4.3.2"
},
"engines": {
"node": ">=14.19.1 <=16.x.x",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-sendmail",
"version": "4.3.0",
"version": "4.3.2",
"description": "Sendmail provider for strapi email",
"keywords": [
"email",
@ -35,7 +35,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.3.0",
"@strapi/utils": "4.3.2",
"sendmail": "^1.6.1"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-aws-s3",
"version": "4.3.0",
"version": "4.3.2",
"description": "AWS S3 provider for strapi upload",
"keywords": [
"upload",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-cloudinary",
"version": "4.3.0",
"version": "4.3.2",
"description": "Cloudinary provider for strapi upload",
"keywords": [
"upload",
@ -36,7 +36,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.3.0",
"@strapi/utils": "4.3.2",
"cloudinary": "^1.25.1",
"into-stream": "^5.1.0"
},

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-local",
"version": "4.3.0",
"version": "4.3.2",
"description": "Local provider for strapi upload",
"keywords": [
"upload",
@ -35,7 +35,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.3.0",
"@strapi/utils": "4.3.2",
"fs-extra": "10.0.0"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-rackspace",
"version": "4.3.0",
"version": "4.3.2",
"description": "Rackspace provider for strapi upload",
"repository": {
"type": "git",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/babel-plugin-switch-ee-ce",
"version": "4.3.0",
"version": "4.3.2",
"private": false,
"description": "Babel plugin to switch from CE to EE at runtime",
"repository": "git://github.com/strapi/strapi.git",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/logger",
"version": "4.3.0",
"version": "4.3.2",
"description": "Strapi's logger",
"homepage": "https://strapi.io",
"bugs": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/typescript-utils",
"version": "4.3.0",
"version": "4.3.2",
"description": "Typescript support for Strapi",
"keywords": [
"strapi",

191
yarn.lock
View File

@ -68,6 +68,77 @@
"@types/node" "^10.1.0"
long "^4.0.0"
"@apollo/protobufjs@1.2.4":
version "1.2.4"
resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.4.tgz#d913e7627210ec5efd758ceeb751c776c68ba133"
integrity sha512-npVJ9NVU/pynj+SCU+fambvTneJDyCnif738DnZ7pCxdDtzeEz7WkpSIq5wNUmWm5Td55N+S2xfqZ+WP4hDLng==
dependencies:
"@protobufjs/aspromise" "^1.1.2"
"@protobufjs/base64" "^1.1.2"
"@protobufjs/codegen" "^2.0.4"
"@protobufjs/eventemitter" "^1.1.0"
"@protobufjs/fetch" "^1.1.0"
"@protobufjs/float" "^1.0.2"
"@protobufjs/inquire" "^1.1.0"
"@protobufjs/path" "^1.1.2"
"@protobufjs/pool" "^1.1.0"
"@protobufjs/utf8" "^1.1.0"
"@types/long" "^4.0.0"
"@types/node" "^10.1.0"
long "^4.0.0"
"@apollo/utils.dropunuseddefinitions@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929"
integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg==
"@apollo/utils.keyvaluecache@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.1.tgz#46f310f859067efe9fa126156c6954f8381080d2"
integrity sha512-nLgYLomqjVimEzQ4cdvVQkcryi970NDvcRVPfd0OPeXhBfda38WjBq+WhQFk+czSHrmrSp34YHBxpat0EtiowA==
dependencies:
"@apollo/utils.logger" "^1.0.0"
lru-cache "^7.10.1"
"@apollo/utils.logger@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.0.tgz#6e3460a2250c2ef7c2c3b0be6b5e148a1596f12b"
integrity sha512-dx9XrjyisD2pOa+KsB5RcDbWIAdgC91gJfeyLCgy0ctJMjQe7yZK5kdWaWlaOoCeX0z6YI9iYlg7vMPyMpQF3Q==
"@apollo/utils.printwithreducedwhitespace@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz#c466299a4766eef8577a2a64c8f27712e8bd7e30"
integrity sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q==
"@apollo/utils.removealiases@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz#75f6d83098af1fcae2d3beb4f515ad4a8452a8c1"
integrity sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A==
"@apollo/utils.sortast@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz#93218c7008daf3e2a0725196085a33f5aab5ad07"
integrity sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA==
dependencies:
lodash.sortby "^4.7.0"
"@apollo/utils.stripsensitiveliterals@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz#4920651f36beee8e260e12031a0c5863ad0c7b28"
integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w==
"@apollo/utils.usagereporting@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.0.tgz#b81df180f4ca78b91a22cb49105174a7f070db1e"
integrity sha512-5PL7hJMkTPmdo3oxPtigRrIyPxDk/ddrUryHPDaezL1lSFExpNzsDd2f1j0XJoHOg350GRd3LyD64caLA2PU1w==
dependencies:
"@apollo/utils.dropunuseddefinitions" "^1.1.0"
"@apollo/utils.printwithreducedwhitespace" "^1.1.0"
"@apollo/utils.removealiases" "1.0.0"
"@apollo/utils.sortast" "^1.1.0"
"@apollo/utils.stripsensitiveliterals" "^1.2.0"
apollo-reporting-protobuf "^3.3.1"
"@apollographql/apollo-tools@^0.5.1", "@apollographql/apollo-tools@^0.5.3":
version "0.5.3"
resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.3.tgz#ba241d50f0849150ca0de54fd2927160033bc0bc"
@ -8039,7 +8110,7 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
normalize-path "^3.0.0"
picomatch "^2.0.4"
apollo-datasource@^3.0.3, apollo-datasource@^3.3.1:
apollo-datasource@^3.0.3:
version "3.3.1"
resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.1.tgz#a1168dd68371930de3ed4245ad12fa8600efe2cc"
integrity sha512-Z3a8rEUXVPIZ1p8xrFL8bcNhWmhOmovgDArvwIwmJOBnh093ZpRfO+ESJEDAN4KswmyzCLDAwjsW4zQOONdRUw==
@ -8047,6 +8118,14 @@ apollo-datasource@^3.0.3, apollo-datasource@^3.3.1:
apollo-server-caching "^3.3.0"
apollo-server-env "^4.2.1"
apollo-datasource@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.2.tgz#5711f8b38d4b7b53fb788cb4dbd4a6a526ea74c8"
integrity sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg==
dependencies:
"@apollo/utils.keyvaluecache" "^1.0.1"
apollo-server-env "^4.2.1"
apollo-graphql@^0.9.0, apollo-graphql@^0.9.3:
version "0.9.6"
resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.9.6.tgz#756312a92685b0547f82cceb04f5b2d6e9f0df5c"
@ -8063,6 +8142,13 @@ apollo-reporting-protobuf@^3.0.0, apollo-reporting-protobuf@^3.3.1:
dependencies:
"@apollo/protobufjs" "1.2.2"
apollo-reporting-protobuf@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.2.tgz#2078c53d3140bc6221c6040c5326623e0c21c8d4"
integrity sha512-j1tx9tmkVdsLt1UPzBrvz90PdjAeKW157WxGn+aXlnnGfVjZLIRXX3x5t1NWtXvB7rVaAsLLILLtDHW382TSoQ==
dependencies:
"@apollo/protobufjs" "1.2.4"
apollo-server-caching@^3.0.1, apollo-server-caching@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-3.3.0.tgz#f501cbeb820a4201d98c2b768c085f22848d9dc5"
@ -8097,31 +8183,33 @@ apollo-server-core@3.1.2:
sha.js "^2.4.11"
uuid "^8.0.0"
apollo-server-core@^3.1.2:
version "3.6.7"
resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.6.7.tgz#6a52ce48fe1a79da9691c3fff4ea1031e9225602"
integrity sha512-OnZ9vu7LrYy2rvEu+nbgqucw6VyTSIPAEjK87c4rkzlVOxpwtGUaQ4FMWD9zBIj7yLq9q22b638E8LdYoaTAjQ==
apollo-server-core@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.10.0.tgz#6680b4eb4699829ed50d8a592721ee5e5e11e041"
integrity sha512-ln5drIk3oW/ycYhcYL9TvM7vRf7OZwJrgHWlnjnMakozBQIBSumdMi4pN001DhU9mVBWTfnmBv3CdcxJdGXIvA==
dependencies:
"@apollo/utils.keyvaluecache" "^1.0.1"
"@apollo/utils.logger" "^1.0.0"
"@apollo/utils.usagereporting" "^1.0.0"
"@apollographql/apollo-tools" "^0.5.3"
"@apollographql/graphql-playground-html" "1.6.29"
"@graphql-tools/mock" "^8.1.2"
"@graphql-tools/schema" "^8.0.0"
"@josephg/resolvable" "^1.0.0"
apollo-datasource "^3.3.1"
apollo-reporting-protobuf "^3.3.1"
apollo-server-caching "^3.3.0"
apollo-datasource "^3.3.2"
apollo-reporting-protobuf "^3.3.2"
apollo-server-env "^4.2.1"
apollo-server-errors "^3.3.1"
apollo-server-plugin-base "^3.5.2"
apollo-server-types "^3.5.2"
apollo-server-plugin-base "^3.6.2"
apollo-server-types "^3.6.2"
async-retry "^1.2.1"
fast-json-stable-stringify "^2.1.0"
graphql-tag "^2.11.0"
lodash.sortby "^4.7.0"
loglevel "^1.6.8"
lru-cache "^6.0.0"
sha.js "^2.4.11"
uuid "^8.0.0"
whatwg-mimetype "^3.0.0"
apollo-server-env@^4.0.3, apollo-server-env@^4.2.1:
version "4.2.1"
@ -8135,10 +8223,10 @@ apollo-server-errors@^3.0.1, apollo-server-errors@^3.3.1:
resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655"
integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==
apollo-server-koa@3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/apollo-server-koa/-/apollo-server-koa-3.1.2.tgz#dac33a32e07e744da48c74be26a59503b302b099"
integrity sha512-mR7qm0xYm5jCBelKeodcBqNqGnFnPPRDCGXyOSOshv8vYLkg58IctjVGFgad9m8Az6ZOqrYYO1clF/sXHo0gJQ==
apollo-server-koa@3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/apollo-server-koa/-/apollo-server-koa-3.10.0.tgz#6f5cf0d23ca9dc6d6c020322ded5ea213747889d"
integrity sha512-OHaQRz0vvsALT2q+j4uWnCLRrUl1sM0H6JZvB2PfQwANsjTdwm2Eo6FO5etVByvrU4K1iXD6wBWid0Fjk0/OMQ==
dependencies:
"@koa/cors" "^3.1.0"
"@types/accepts" "^1.3.5"
@ -8147,25 +8235,33 @@ apollo-server-koa@3.1.2:
"@types/koa-compose" "^3.2.5"
"@types/koa__cors" "^3.0.1"
accepts "^1.3.7"
apollo-server-core "^3.1.2"
apollo-server-types "^3.1.1"
apollo-server-core "^3.10.0"
apollo-server-types "^3.6.2"
koa-bodyparser "^4.3.0"
koa-compose "^4.1.0"
apollo-server-plugin-base@^3.1.1, apollo-server-plugin-base@^3.5.2:
apollo-server-plugin-base@^3.1.1:
version "3.5.2"
resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.5.2.tgz#18a08353f5ea207a07f2c1e66dd7ef2335ce8c84"
integrity sha512-SwIf1waDmNDb0kmn57QR++InwK6Iv/X2slpm/aFIoqFBe91r6uJfakJvQZuh8dLEgk68gxqFsT8zHRpxBclE+g==
dependencies:
apollo-server-types "^3.5.2"
apollo-server-types@^3.0.2, apollo-server-types@^3.1.1, apollo-server-types@^3.5.2:
version "3.5.2"
resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.5.2.tgz#903d499a70b9010764cbab4d704ddb8c086aa06f"
integrity sha512-vhcbIWsBkoNibABOym4AAPBoNDjokhjUQokKYdwZMeqrb850PMQdNJFrGyXT5onP408Ghv4O8PfgBuPQmeJhVQ==
apollo-server-plugin-base@^3.6.2:
version "3.6.2"
resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.6.2.tgz#f256e1f274c8fee0d7267b6944f402da71788fb3"
integrity sha512-erWXjLOO1u7fxQkbxJ2cwSO7p0tYzNied91I1SJ9tikXZ/2eZUyDyvrpI+4g70kOdEi+AmJ5Fo8ahEXKJ75zdg==
dependencies:
apollo-reporting-protobuf "^3.3.1"
apollo-server-caching "^3.3.0"
apollo-server-types "^3.6.2"
apollo-server-types@^3.0.2, apollo-server-types@^3.1.1, apollo-server-types@^3.5.2, apollo-server-types@^3.6.2:
version "3.6.2"
resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.6.2.tgz#34bb0c335fcce3057cbdf72b3b63da182de6fc84"
integrity sha512-9Z54S7NB+qW1VV+kmiqwU2Q6jxWfX89HlSGCGOo3zrkrperh85LrzABgN9S92+qyeHYd72noMDg2aI039sF3dg==
dependencies:
"@apollo/utils.keyvaluecache" "^1.0.1"
"@apollo/utils.logger" "^1.0.0"
apollo-reporting-protobuf "^3.3.2"
apollo-server-env "^4.2.1"
app-root-dir@^1.0.2:
@ -10277,6 +10373,11 @@ commander@^8.3.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
commander@^9.1.0:
version "9.4.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c"
integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==
comment-parser@1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760"
@ -11091,7 +11192,7 @@ debug@3.1.0:
dependencies:
ms "2.0.0"
debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@ -16967,6 +17068,26 @@ knex@1.0.4:
tarn "^3.0.2"
tildify "2.0.0"
knex@1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/knex/-/knex-1.0.7.tgz#965f4490efc451b140aac4c5c6efa39fd877597b"
integrity sha512-89jxuRATt4qJMb9ZyyaKBy0pQ4d5h7eOFRqiNFnUvsgU+9WZ2eIaZKrAPG1+F3mgu5UloPUnkVE5Yo2sKZUs6Q==
dependencies:
colorette "2.0.16"
commander "^9.1.0"
debug "4.3.4"
escalade "^3.1.1"
esm "^3.2.25"
get-package-type "^0.1.0"
getopts "2.3.0"
interpret "^2.2.0"
lodash "^4.17.21"
pg-connection-string "2.5.0"
rechoir "^0.8.0"
resolve-from "^5.0.0"
tarn "^3.0.2"
tildify "2.0.0"
known-css-properties@^0.21.0:
version "0.21.0"
resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.21.0.tgz#15fbd0bbb83447f3ce09d8af247ed47c68ede80d"
@ -17675,6 +17796,11 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
lru-cache@^7.10.1:
version "7.13.0"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.0.tgz#c8178692969fb680cad948db4aad54066590a65a"
integrity sha512-SNFKDOORR41fkWP3DXiIUvXvfzDRPg3bxD1+29iRyP2ZW+Njp2o6zhx9YkEpq1tbP0AEDNW2VBUedzDIxmNhdg==
lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
version "7.12.0"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.12.0.tgz#be2649a992c8a9116efda5c487538dcf715f3476"
@ -19704,21 +19830,6 @@ optionator@^0.9.1:
type-check "^0.4.0"
word-wrap "^1.2.3"
ora@5.4.0:
version "5.4.0"
resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.0.tgz#42eda4855835b9cd14d33864c97a3c95a3f56bf4"
integrity sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==
dependencies:
bl "^4.1.0"
chalk "^4.1.0"
cli-cursor "^3.1.0"
cli-spinners "^2.5.0"
is-interactive "^1.0.0"
is-unicode-supported "^0.1.0"
log-symbols "^4.1.0"
strip-ansi "^6.0.0"
wcwidth "^1.0.1"
ora@5.4.1, ora@^5.4.0, ora@^5.4.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"