yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-26 23:51:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into develop

Browse Source
This commit is contained in:
Rémi de Juvigny 2025-07-16 17:59:48 +02:00
commit 2d97100ef7
50 changed files with 501 additions and 726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/check-pr-status/package.json vendored
View File

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

6
packages/admin-test-utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/admin-test-utils",
"version": "5.18.0",
"version": "5.18.1",
"private": true,
"description": "Test utilities for the Strapi administration panel",
"license": "MIT",
@ -84,10 +84,10 @@
"devDependencies": {
"@reduxjs/toolkit": "1.9.7",
"@testing-library/jest-dom": "6.4.5",
"eslint-config-custom": "5.18.0",
"eslint-config-custom": "5.18.1",
"jest-environment-jsdom": "29.6.1",
"styled-components": "6.1.8",
"tsconfig": "5.18.0"
"tsconfig": "5.18.1"
},
"peerDependencies": {
"@reduxjs/toolkit": "^1.9.7",

8
packages/cli/cloud/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/cloud-cli",
"version": "5.18.0",
"version": "5.18.1",
"description": "Commands to interact with the Strapi Cloud",
"keywords": [
"strapi",
@ -47,7 +47,7 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"axios": "1.8.4",
"boxen": "5.1.2",
"chalk": "4.1.2",
@ -72,8 +72,8 @@
"@types/cli-progress": "3.11.5",
"@types/eventsource": "1.1.15",
"@types/lodash": "^4.14.191",
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "create-strapi-app",
"version": "5.18.0",
"version": "5.18.1",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-app",
@ -50,7 +50,7 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/cloud-cli": "5.18.0",
"@strapi/cloud-cli": "5.18.1",
"async-retry": "1.3.3",
"chalk": "4.1.2",
"commander": "8.3.0",
@ -69,8 +69,8 @@
"@types/async-retry": "^1",
"@types/fs-extra": "11.0.4",
"@types/inquirer": "8.2.5",
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "create-strapi",
"version": "5.18.0",
"version": "5.18.1",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi",
@ -36,7 +36,7 @@
"bin/"
],
"dependencies": {
"create-strapi-app": "5.18.0"
"create-strapi-app": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/admin",
"version": "5.18.0",
"version": "5.18.1",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -86,10 +86,10 @@
"@reduxjs/toolkit": "1.9.7",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/permissions": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/typescript-utils": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/permissions": "5.18.1",
"@strapi/types": "5.18.1",
"@strapi/typescript-utils": "5.18.1",
"@strapi/utils": "5.18.1",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
@ -144,8 +144,8 @@
"zod": "3.24.2"
},
"devDependencies": {
"@strapi/admin-test-utils": "5.18.0",
"@strapi/data-transfer": "5.18.0",
"@strapi/admin-test-utils": "5.18.1",
"@strapi/data-transfer": "5.18.1",
"@types/codemirror5": "npm:@types/codemirror@^5.60.15",
"@types/fs-extra": "11.0.4",
"@types/invariant": "2.2.36",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/content-manager",
"version": "5.18.0",
"version": "5.18.1",
"description": "A powerful UI to easily manage your data.",
"repository": {
"type": "git",
@ -69,8 +69,8 @@
"@sindresorhus/slugify": "1.1.0",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/types": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/types": "5.18.1",
"@strapi/utils": "5.18.1",
"codemirror5": "npm:codemirror@^5.65.11",
"date-fns": "2.30.0",
"fractional-indexing": "3.2.0",
@ -105,8 +105,8 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.18.0",
"@strapi/database": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/database": "5.18.1",
"@testing-library/react": "15.0.7",
"@types/jest": "29.5.2",
"@types/lodash": "^4.14.191",

14
packages/core/content-releases/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/content-releases",
"version": "5.18.0",
"version": "5.18.1",
"description": "Strapi plugin for organizing and releasing content",
"repository": {
"type": "git",
@ -59,11 +59,11 @@
},
"dependencies": {
"@reduxjs/toolkit": "1.9.7",
"@strapi/database": "5.18.0",
"@strapi/database": "5.18.1",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/types": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/types": "5.18.1",
"@strapi/utils": "5.18.1",
"date-fns": "2.30.0",
"date-fns-tz": "2.0.1",
"formik": "2.4.5",
@ -75,9 +75,9 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.18.0",
"@strapi/admin-test-utils": "5.18.0",
"@strapi/content-manager": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/admin-test-utils": "5.18.1",
"@strapi/content-manager": "5.18.1",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/content-type-builder",
"version": "5.18.0",
"version": "5.18.1",
"description": "Create and manage content types",
"repository": {
"type": "git",
@ -67,9 +67,9 @@
"@reduxjs/toolkit": "1.9.7",
"@sindresorhus/slugify": "1.1.0",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/generators": "5.18.0",
"@strapi/generators": "5.18.1",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"date-fns": "2.30.0",
"fs-extra": "11.2.0",
"immer": "9.0.21",
@ -82,8 +82,8 @@
"zod": "3.24.2"
},
"devDependencies": {
"@strapi/admin": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/types": "5.18.1",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",

22
packages/core/core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/core",
"version": "5.18.0",
"version": "5.18.1",
"description": "Core of Strapi",
"homepage": "https://strapi.io",
"bugs": {
@ -56,14 +56,14 @@
"@koa/cors": "5.0.0",
"@koa/router": "12.0.2",
"@paralleldrive/cuid2": "2.2.2",
"@strapi/admin": "5.18.0",
"@strapi/database": "5.18.0",
"@strapi/generators": "5.18.0",
"@strapi/logger": "5.18.0",
"@strapi/permissions": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/typescript-utils": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/database": "5.18.1",
"@strapi/generators": "5.18.1",
"@strapi/logger": "5.18.1",
"@strapi/permissions": "5.18.1",
"@strapi/types": "5.18.1",
"@strapi/typescript-utils": "5.18.1",
"@strapi/utils": "5.18.1",
"bcryptjs": "2.4.3",
"boxen": "5.1.2",
"chalk": "4.1.2",
@ -128,9 +128,9 @@
"@types/node": "18.19.24",
"@types/node-schedule": "2.1.7",
"@types/statuses": "2.0.1",
"eslint-config-custom": "5.18.0",
"eslint-config-custom": "5.18.1",
"supertest": "6.3.3",
"tsconfig": "5.18.0"
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

10
packages/core/data-transfer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/data-transfer",
"version": "5.18.0",
"version": "5.18.1",
"description": "Data transfer capabilities for Strapi",
"keywords": [
"strapi",
@ -42,9 +42,9 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/logger": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/logger": "5.18.1",
"@strapi/types": "5.18.1",
"@strapi/utils": "5.18.1",
"chalk": "4.1.2",
"cli-table3": "0.6.5",
"commander": "8.3.0",
@ -61,7 +61,7 @@
"ws": "8.17.1"
},
"devDependencies": {
"@strapi/database": "5.18.0",
"@strapi/database": "5.18.1",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.2",
"@types/koa": "2.13.4",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/database",
"version": "5.18.0",
"version": "5.18.1",
"description": "Strapi's database layer",
"homepage": "https://strapi.io",
"bugs": {
@ -42,7 +42,7 @@
},
"dependencies": {
"@paralleldrive/cuid2": "2.2.2",
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"ajv": "8.16.0",
"date-fns": "2.30.0",
"debug": "4.3.4",
@ -54,8 +54,8 @@
},
"devDependencies": {
"@types/fs-extra": "11.0.4",
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/email",
"version": "5.18.0",
"version": "5.18.1",
"description": "Easily configure your Strapi application to send emails.",
"repository": {
"type": "git",
@ -58,8 +58,8 @@
"dependencies": {
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/provider-email-sendmail": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/provider-email-sendmail": "5.18.1",
"@strapi/utils": "5.18.1",
"koa2-ratelimit": "^1.1.3",
"lodash": "4.17.21",
"react-intl": "6.6.2",
@ -67,8 +67,8 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/types": "5.18.1",
"@testing-library/react": "15.0.7",
"@types/koa": "2.13.4",
"@types/lodash": "^4.14.191",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/permissions",
"version": "5.18.0",
"version": "5.18.1",
"description": "Strapi's permission layer.",
"repository": {
"type": "git",
@ -39,14 +39,14 @@
},
"dependencies": {
"@casl/ability": "6.5.0",
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"lodash": "4.17.21",
"qs": "6.11.1",
"sift": "16.0.1"
},
"devDependencies": {
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

10
packages/core/review-workflows/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/review-workflows",
"version": "5.18.0",
"version": "5.18.1",
"description": "Review workflows for your content",
"repository": {
"type": "git",
@ -59,7 +59,7 @@
"@reduxjs/toolkit": "1.9.7",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"fractional-indexing": "3.2.0",
"react-dnd": "16.0.1",
"react-dnd-html5-backend": "16.0.1",
@ -69,9 +69,9 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.18.0",
"@strapi/content-manager": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/content-manager": "5.18.1",
"@strapi/types": "5.18.1",
"@testing-library/react": "15.0.7",
"msw": "1.3.0",
"react": "18.3.1",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/strapi",
"version": "5.18.0",
"version": "5.18.1",
"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",
@ -110,24 +110,24 @@
},
"dependencies": {
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@strapi/admin": "5.18.0",
"@strapi/cloud-cli": "5.18.0",
"@strapi/content-manager": "5.18.0",
"@strapi/content-releases": "5.18.0",
"@strapi/content-type-builder": "5.18.0",
"@strapi/core": "5.18.0",
"@strapi/data-transfer": "5.18.0",
"@strapi/database": "5.18.0",
"@strapi/email": "5.18.0",
"@strapi/generators": "5.18.0",
"@strapi/i18n": "5.18.0",
"@strapi/logger": "5.18.0",
"@strapi/permissions": "5.18.0",
"@strapi/review-workflows": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/typescript-utils": "5.18.0",
"@strapi/upload": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/cloud-cli": "5.18.1",
"@strapi/content-manager": "5.18.1",
"@strapi/content-releases": "5.18.1",
"@strapi/content-type-builder": "5.18.1",
"@strapi/core": "5.18.1",
"@strapi/data-transfer": "5.18.1",
"@strapi/database": "5.18.1",
"@strapi/email": "5.18.1",
"@strapi/generators": "5.18.1",
"@strapi/i18n": "5.18.1",
"@strapi/logger": "5.18.1",
"@strapi/permissions": "5.18.1",
"@strapi/review-workflows": "5.18.1",
"@strapi/types": "5.18.1",
"@strapi/typescript-utils": "5.18.1",
"@strapi/upload": "5.18.1",
"@strapi/utils": "5.18.1",
"@types/nodemon": "1.19.6",
"@vitejs/plugin-react-swc": "3.6.0",
"boxen": "5.1.2",
@ -181,11 +181,11 @@
"@types/node": "18.19.24",
"@types/webpack-bundle-analyzer": "4.7.0",
"@types/webpack-hot-middleware": "2.25.9",
"eslint-config-custom": "5.18.0",
"eslint-config-custom": "5.18.1",
"jest": "29.6.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"tsconfig": "5.18.0"
"tsconfig": "5.18.1"
},
"peerDependencies": {
"react": "^17.0.0 || ^18.0.0",

14
packages/core/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/types",
"version": "5.18.0",
"version": "5.18.1",
"description": "Shared typescript types for Strapi internal use",
"keywords": [
"strapi"
@ -46,10 +46,10 @@
"@casl/ability": "6.5.0",
"@koa/cors": "5.0.0",
"@koa/router": "12.0.2",
"@strapi/database": "5.18.0",
"@strapi/logger": "5.18.0",
"@strapi/permissions": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/database": "5.18.1",
"@strapi/logger": "5.18.1",
"@strapi/permissions": "5.18.1",
"@strapi/utils": "5.18.1",
"commander": "8.3.0",
"json-logic-js": "2.0.5",
"koa": "2.16.1",
@ -66,9 +66,9 @@
"@types/koa": "2.13.4",
"@types/koa__router": "12.0.0",
"@types/node-schedule": "2.1.7",
"eslint-config-custom": "5.18.0",
"eslint-config-custom": "5.18.1",
"lodash": "4.17.21",
"tsconfig": "5.18.0",
"tsconfig": "5.18.1",
"typescript": "5.4.4",
"undici": "6.21.2"
},

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

@ -1,6 +1,6 @@
{
"name": "@strapi/upload",
"version": "5.18.0",
"version": "5.18.1",
"description": "Makes it easy to upload images and files to your Strapi Application.",
"license": "SEE LICENSE IN LICENSE",
"author": {
@ -63,8 +63,8 @@
"@mux/mux-player-react": "3.1.0",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/provider-upload-local": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/provider-upload-local": "5.18.1",
"@strapi/utils": "5.18.1",
"byte-size": "8.1.1",
"cropperjs": "1.6.1",
"date-fns": "2.30.0",
@ -86,8 +86,8 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/types": "5.18.1",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/utils",
"version": "5.18.0",
"version": "5.18.1",
"description": "Shared utilities for the Strapi packages",
"keywords": [
"strapi",
@ -61,10 +61,10 @@
"@types/http-errors": "2.0.4",
"@types/koa": "2.13.4",
"@types/node": "18.19.24",
"eslint-config-custom": "5.18.0",
"eslint-config-custom": "5.18.1",
"koa": "2.16.1",
"koa-body": "6.0.1",
"tsconfig": "5.18.0"
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

12
packages/generators/generators/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/generators",
"version": "5.18.0",
"version": "5.18.1",
"description": "Interactive API generator.",
"keywords": [
"strapi",
@ -49,19 +49,19 @@
},
"dependencies": {
"@sindresorhus/slugify": "1.1.0",
"@strapi/typescript-utils": "5.18.0",
"@strapi/utils": "5.18.0",
"@strapi/typescript-utils": "5.18.1",
"@strapi/utils": "5.18.1",
"chalk": "4.1.2",
"copyfiles": "2.4.1",
"fs-extra": "11.2.0",
"node-plop": "0.26.3",
"handlebars": "4.7.7",
"plop": "4.0.1",
"pluralize": "8.0.0"
},
"devDependencies": {
"@types/fs-extra": "11.0.4",
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

112
packages/generators/generators/src/index.ts
View File

@ -1,5 +1,6 @@
import { join } from 'node:path';
import nodePlop from 'node-plop';
import { join, dirname } from 'node:path';
import handlebars from 'handlebars';
import fs from 'fs-extra';
// Starts the Plop CLI programmatically
export const runCLI = async () => {
@ -22,21 +23,104 @@ export const runCLI = async () => {
);
};
// Runs a generator programmatically without prompts
type GenerateOptions = {
dir?: string;
plopFile?: string;
};
type GeneratorAction = {
type: 'add' | 'modify';
path: string;
templateFile?: string;
data?: Record<string, any>;
transform?: (content: string) => string;
};
export const generate = async <T extends Record<string, any>>(
generatorName: string,
options: T,
{ dir = process.cwd(), plopFile = 'plopfile.js' } = {}
{ dir = process.cwd(), plopFile = 'plopfile.js' }: GenerateOptions = {}
) => {
const plop = nodePlop(join(__dirname, plopFile), {
destBasePath: join(dir, 'src'),
force: false,
});
// Resolve the absolute path to the plopfile (generator definitions)
const plopfilePath = join(__dirname, plopFile);
// Dynamically require the plopfile module.
// Note: This allows loading either CommonJS or transpiled ESM plopfiles.
// eslint-disable-next-line @typescript-eslint/no-var-requires
const plopModule = require(plopfilePath);
const generator = plop.getGenerator(generatorName);
await generator.runActions(options satisfies T, {
onSuccess() {},
onFailure() {},
onComment() {},
});
// Internal objects to store registered generators and helpers.
// These will be populated by the plopfile when it is executed.
const generators: Record<string, any> = {};
const helpers: Record<string, any> = {};
// Minimal mock Plop API implementation, exposing only the methods needed by our plopfile.
// This allows the plopfile to register generators and helpers as it would in a real Plop environment.
const plopApi = {
setGenerator(name: string, config: any) {
generators[name] = config;
},
setHelper(name: string, fn: any) {
helpers[name] = fn;
},
getDestBasePath() {
return join(dir, 'src');
},
setWelcomeMessage() {}, // no-op
};
// Execute the plopfile, passing in our API.
// This will populate the `generators` and `helpers` objects.
// Support both CommonJS and ESM default exports.
if (typeof plopModule.default === 'function') {
plopModule.default(plopApi);
} else {
plopModule(plopApi);
}
const generator = generators[generatorName];
if (!generator) {
throw new Error(`Generator "${generatorName}" not found`);
}
registerHandlebarsHelpers(helpers);
const actions: GeneratorAction[] =
typeof generator.actions === 'function' ? generator.actions(options) : generator.actions || [];
await executeActions(actions, options, dir);
return { success: true };
};
const registerHandlebarsHelpers = (helpers: Record<string, any>) => {
Object.entries(helpers).forEach(([name, fn]) => handlebars.registerHelper(name, fn));
};
// Executes generator actions: add or modify files as specified
const executeActions = async (
actions: GeneratorAction[],
options: Record<string, any>,
dir: string
) => {
for (const action of actions) {
const outputPath = handlebars.compile(action.path)(options);
const fullPath = join(dir, 'src', outputPath);
if (action.type === 'add' && action.templateFile) {
const templatePath = join(__dirname, action.templateFile);
const templateContent = await fs.readFile(templatePath, 'utf8');
const compiled = handlebars.compile(templateContent);
const output = compiled({ ...options, ...action.data });
await fs.ensureDir(dirname(fullPath));
await fs.writeFile(fullPath, output);
}
if (action.type === 'modify') {
if (await fs.pathExists(fullPath)) {
const content = await fs.readFile(fullPath, 'utf8');
const modified = action.transform ? action.transform(content) : content;
await fs.writeFile(fullPath, modified);
}
}
}
};

1
packages/generators/generators/src/plops/content-type.ts
View File

@ -18,7 +18,6 @@ export default (plop: NodePlopAPI) => {
description: 'Generate a content type for an API',
async prompts(inquirer) {
const config = await inquirer.prompt([...ctNamesPrompts, ...kindPrompts]);
// @ts-expect-error issue with deprecated inquirer.prompts attribute to fix with ugprade to inquirer
const attributes = await getAttributesPrompts(inquirer);
const api = await inquirer.prompt([

4
packages/generators/generators/src/plops/prompts/bootstrap-api-prompts.ts
View File

@ -1,6 +1,4 @@
import type { PromptQuestion } from 'node-plop';
const questions: Array<PromptQuestion> = [
const questions = [
{
type: 'confirm',
name: 'bootstrapApi',

6
packages/generators/generators/src/plops/prompts/ct-names-prompts.ts
View File

@ -2,15 +2,13 @@ import pluralize from 'pluralize';
import slugify from '@sindresorhus/slugify';
import { strings } from '@strapi/utils';
import type { PromptQuestion } from 'node-plop';
interface Answers {
displayName: string;
singularName: string;
pluralName: string;
}
const questions: Array<PromptQuestion> = [
const questions = [
{
type: 'input',
name: 'displayName',
@ -22,7 +20,7 @@ const questions: Array<PromptQuestion> = [
name: 'singularName',
message: 'Content type singular name',
default: (answers: Answers) => slugify(answers.displayName),
validate(input) {
validate(input: string) {
if (!strings.isKebabCase(input)) {
return 'Value must be in kebab-case';
}

12
packages/generators/generators/src/plops/prompts/get-attributes-prompts.ts
View File

@ -1,10 +1,8 @@
import type { DynamicPromptsFunction } from 'node-plop';
import validateAttributeInput from '../utils/validate-attribute-input';
interface AttributeAnswer {
attributeName: string;
attributeType: typeof DEFAULT_TYPES;
attributeType: (typeof DEFAULT_TYPES)[number];
enum?: string;
multiple?: boolean;
}
@ -32,7 +30,7 @@ const DEFAULT_TYPES = [
'boolean',
] as const;
const getAttributesPrompts: DynamicPromptsFunction = async (inquirer) => {
const getAttributesPrompts = async (inquirer: any) => {
const { addAttributes } = await inquirer.prompt([
{
type: 'confirm',
@ -47,7 +45,7 @@ const getAttributesPrompts: DynamicPromptsFunction = async (inquirer) => {
* @param {import('inquirer').Inquirer} inquirer
* @returns {Promise<void>}
*/
const createNewAttributes = async (inquirer: Parameters<DynamicPromptsFunction>[0]) => {
const createNewAttributes = async (inquirer: any) => {
const answers = await inquirer.prompt([
{
type: 'input',
@ -65,13 +63,13 @@ const getAttributesPrompts: DynamicPromptsFunction = async (inquirer) => {
}),
},
{
when: (answers) => answers.attributeType === 'enumeration',
when: (answers: AttributeAnswer) => answers.attributeType === 'enumeration',
type: 'input',
name: 'enum',
message: 'Add values separated by a comma',
},
{
when: (answers) => answers.attributeType === 'media',
when: (answers: AttributeAnswer) => answers.attributeType === 'media',
type: 'list',
name: 'multiple',
message: 'Choose media type',

12
packages/generators/generators/src/plops/prompts/get-destination-prompts.ts
View File

@ -1,13 +1,7 @@
import { join } from 'path';
import fs from 'fs-extra';
import type { PromptQuestion } from 'node-plop';
export default (
action: string,
basePath: string,
{ rootFolder = false } = {}
): Array<PromptQuestion> => {
export default (action: string, basePath: string, { rootFolder = false } = {}) => {
return [
{
type: 'list',
@ -32,7 +26,7 @@ export default (
],
},
{
when: (answers) => answers.destination === 'api',
when: (answers: any) => answers.destination === 'api',
type: 'list',
message: 'Which API is this for?',
name: 'api',
@ -55,7 +49,7 @@ export default (
},
},
{
when: (answers) => answers.destination === 'plugin',
when: (answers: any) => answers.destination === 'plugin',
type: 'list',
message: 'Which plugin is this for?',
name: 'plugin',

4
packages/generators/generators/src/plops/prompts/kind-prompts.ts
View File

@ -1,8 +1,6 @@
import type { PromptQuestion } from 'node-plop';
import validateInput from '../utils/validate-input';
const questions: Array<PromptQuestion> = [
const questions = [
{
type: 'list',
name: 'kind',

10
packages/plugins/cloud/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-cloud",
"version": "5.18.0",
"version": "5.18.1",
"description": "Instructions to deploy your local project to Strapi Cloud",
"license": "MIT",
"author": {
@ -45,14 +45,14 @@
"react-intl": "6.6.2"
},
"devDependencies": {
"@strapi/admin": "5.18.0",
"@strapi/strapi": "5.18.0",
"eslint-config-custom": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/strapi": "5.18.1",
"eslint-config-custom": "5.18.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.22.3",
"styled-components": "6.1.8",
"tsconfig": "5.18.0",
"tsconfig": "5.18.1",
"typescript": "5.4.4"
},
"peerDependencies": {

4
packages/plugins/color-picker/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-color-picker",
"version": "5.18.0",
"version": "5.18.1",
"description": "Strapi maintained Custom Fields",
"repository": {
"type": "git",
@ -63,7 +63,7 @@
"react-intl": "6.6.2"
},
"devDependencies": {
"@strapi/strapi": "5.18.0",
"@strapi/strapi": "5.18.1",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
"react": "18.3.1",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-documentation",
"version": "5.18.0",
"version": "5.18.1",
"description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.",
"repository": {
"type": "git",
@ -59,10 +59,10 @@
},
"dependencies": {
"@reduxjs/toolkit": "1.9.7",
"@strapi/admin": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"bcryptjs": "2.4.3",
"cheerio": "^1.0.0",
"formik": "2.4.5",
@ -78,9 +78,9 @@
},
"devDependencies": {
"@apidevtools/swagger-parser": "^10.1.0",
"@strapi/admin-test-utils": "5.18.0",
"@strapi/strapi": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/admin-test-utils": "5.18.1",
"@strapi/strapi": "5.18.1",
"@strapi/types": "5.18.1",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
"@types/fs-extra": "11.0.4",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-graphql",
"version": "5.18.0",
"version": "5.18.1",
"description": "Adds GraphQL endpoint with default API methods.",
"repository": {
"type": "git",
@ -61,7 +61,7 @@
"@koa/cors": "5.0.0",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"graphql": "^16.8.1",
"graphql-depth-limit": "^1.1.0",
"graphql-playground-middleware-koa": "^1.6.21",
@ -73,19 +73,19 @@
"pluralize": "8.0.0"
},
"devDependencies": {
"@strapi/strapi": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/strapi": "5.18.1",
"@strapi/types": "5.18.1",
"@types/graphql-depth-limit": "1.1.5",
"@types/koa-bodyparser": "4.3.12",
"@types/koa__cors": "5.0.0",
"cross-env": "^7.0.3",
"eslint-config-custom": "5.18.0",
"eslint-config-custom": "5.18.1",
"koa": "2.16.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.22.3",
"styled-components": "6.1.8",
"tsconfig": "5.18.0",
"tsconfig": "5.18.1",
"typescript": "5.4.4"
},
"peerDependencies": {

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

@ -1,6 +1,6 @@
{
"name": "@strapi/i18n",
"version": "5.18.0",
"version": "5.18.1",
"description": "Create read and update content in different languages, both from the Admin Panel and from the API",
"repository": {
"type": "git",
@ -59,7 +59,7 @@
"@reduxjs/toolkit": "1.9.7",
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"lodash": "4.17.21",
"qs": "6.11.1",
"react-intl": "6.6.2",
@ -67,10 +67,10 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.18.0",
"@strapi/admin-test-utils": "5.18.0",
"@strapi/content-manager": "5.18.0",
"@strapi/types": "5.18.0",
"@strapi/admin": "5.18.1",
"@strapi/admin-test-utils": "5.18.1",
"@strapi/content-manager": "5.18.1",
"@strapi/types": "5.18.1",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
"msw": "1.3.0",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-sentry",
"version": "5.18.0",
"version": "5.18.1",
"description": "Send Strapi error events to Sentry",
"repository": {
"type": "git",
@ -58,7 +58,7 @@
"@strapi/icons": "2.0.0-rc.29"
},
"devDependencies": {
"@strapi/strapi": "5.18.0",
"@strapi/strapi": "5.18.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.22.3",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-users-permissions",
"version": "5.18.0",
"version": "5.18.1",
"description": "Protect your API with a full-authentication process based on JWT",
"repository": {
"type": "git",
@ -50,7 +50,7 @@
"dependencies": {
"@strapi/design-system": "2.0.0-rc.29",
"@strapi/icons": "2.0.0-rc.29",
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"bcryptjs": "2.4.3",
"formik": "2.4.5",
"grant": "^5.4.8",
@ -69,7 +69,7 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/strapi": "5.18.0",
"@strapi/strapi": "5.18.1",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-amazon-ses",
"version": "5.18.0",
"version": "5.18.1",
"description": "Amazon SES provider for strapi email",
"keywords": [
"email",
@ -44,12 +44,12 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"node-ses": "^3.0.3"
},
"devDependencies": {
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-mailgun",
"version": "5.18.0",
"version": "5.18.1",
"description": "Mailgun provider for strapi email plugin",
"keywords": [
"email",
@ -46,13 +46,13 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"form-data": "^4.0.0",
"mailgun.js": "10.2.1"
},
"devDependencies": {
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-nodemailer",
"version": "5.18.0",
"version": "5.18.1",
"description": "Nodemailer provider for Strapi 3",
"keywords": [
"strapi",
@ -62,8 +62,8 @@
},
"devDependencies": {
"@types/nodemailer": "6.4.7",
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-sendgrid",
"version": "5.18.0",
"version": "5.18.1",
"description": "Sendgrid provider for strapi email",
"keywords": [
"email",
@ -45,11 +45,11 @@
},
"dependencies": {
"@sendgrid/mail": "8.1.3",
"@strapi/utils": "5.18.0"
"@strapi/utils": "5.18.1"
},
"devDependencies": {
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-sendmail",
"version": "5.18.0",
"version": "5.18.1",
"description": "Sendmail provider for strapi email",
"keywords": [
"email",
@ -43,13 +43,13 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"sendmail": "^1.6.1"
},
"devDependencies": {
"@types/sendmail": "1.4.4",
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-aws-s3",
"version": "5.18.0",
"version": "5.18.1",
"description": "AWS S3 provider for strapi upload",
"keywords": [
"upload",
@ -55,8 +55,8 @@
},
"devDependencies": {
"@types/jest": "29.5.2",
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-cloudinary",
"version": "5.18.0",
"version": "5.18.1",
"description": "Cloudinary provider for strapi upload",
"keywords": [
"upload",
@ -44,13 +44,13 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"cloudinary": "^1.41.0",
"into-stream": "^5.1.0"
},
"devDependencies": {
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-local",
"version": "5.18.0",
"version": "5.18.1",
"description": "Local provider for strapi upload",
"keywords": [
"upload",
@ -45,16 +45,16 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"fs-extra": "11.2.0"
},
"devDependencies": {
"@strapi/types": "5.18.0",
"@strapi/types": "5.18.1",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.2",
"eslint-config-custom": "5.18.0",
"eslint-config-custom": "5.18.1",
"memfs": "4.6.0",
"tsconfig": "5.18.0"
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

2
packages/utils/api-tests/package.json
View File

@ -1,6 +1,6 @@
{
"name": "api-tests",
"version": "5.18.0",
"version": "5.18.1",
"private": true,
"dependencies": {
"dotenv": "16.4.5",

2
packages/utils/eslint-config-custom/package.json
View File

@ -1,6 +1,6 @@
{
"name": "eslint-config-custom",
"version": "5.18.0",
"version": "5.18.1",
"private": true,
"main": "index.js"
}

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

@ -1,6 +1,6 @@
{
"name": "@strapi/logger",
"version": "5.18.0",
"version": "5.18.1",
"description": "Strapi's logger",
"homepage": "https://strapi.io",
"bugs": {
@ -44,8 +44,8 @@
"winston": "3.10.0"
},
"devDependencies": {
"eslint-config-custom": "5.18.0",
"tsconfig": "5.18.0"
"eslint-config-custom": "5.18.1",
"tsconfig": "5.18.1"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",

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

@ -1,6 +1,6 @@
{
"name": "tsconfig",
"version": "5.18.0",
"version": "5.18.1",
"private": true,
"devDependencies": {
"@tsconfig/node18": "18.2.2"

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

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

8
packages/utils/upgrade/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@strapi/upgrade",
"version": "5.18.0",
"version": "5.18.1",
"description": "CLI to upgrade Strapi applications effortless",
"keywords": [
"strapi",
@ -61,7 +61,7 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/utils": "5.18.0",
"@strapi/utils": "5.18.1",
"chalk": "4.1.2",
"cli-table3": "0.6.2",
"commander": "8.3.0",
@ -78,10 +78,10 @@
"undici": "6.21.2"
},
"devDependencies": {
"@strapi/types": "5.18.0",
"@strapi/types": "5.18.1",
"@types/fs-extra": "11.0.4",
"@types/jscodeshift": "0.12.0",
"eslint-config-custom": "5.18.0",
"eslint-config-custom": "5.18.1",
"rimraf": "5.0.5"
},
"engines": {

2
scripts/front/package.json
View File

@ -1,6 +1,6 @@
{
"name": "scripts-front",
"version": "5.18.0",
"version": "5.18.1",
"private": true,
"scripts": {
"test:front": "jest --config jest.config.front.js"

702
yarn.lock
View File

File diff suppressed because it is too large Load Diff