From 68608fc04067132c2e87c5c75ae1ad4ba36096d4 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Tue, 31 Oct 2023 08:24:43 +0000 Subject: [PATCH 01/10] chore(admin): add index files to files list --- packages/core/admin/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index fa6c2fc486..16afed4993 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -52,7 +52,9 @@ "strapi-server.js", "server", "ee/strapi-server.js", - "ee/server/**" + "ee/server/**", + "index.js", + "index.d.ts" ], "scripts": { "build": "pack-up build", From b06a72a02d782efad2a22511763629f1e919fb69 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Tue, 31 Oct 2023 08:40:09 +0000 Subject: [PATCH 02/10] chore: incl. additional deps with quickstart projects --- packages/cli/create-strapi-app/src/index.d.ts | 1 - packages/generators/app/src/create-quickstart-project.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 packages/cli/create-strapi-app/src/index.d.ts diff --git a/packages/cli/create-strapi-app/src/index.d.ts b/packages/cli/create-strapi-app/src/index.d.ts deleted file mode 100644 index 00494af403..0000000000 --- a/packages/cli/create-strapi-app/src/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare module '@strapi/generate-new'; diff --git a/packages/generators/app/src/create-quickstart-project.ts b/packages/generators/app/src/create-quickstart-project.ts index 7df14e0e96..142cf523bd 100644 --- a/packages/generators/app/src/create-quickstart-project.ts +++ b/packages/generators/app/src/create-quickstart-project.ts @@ -14,7 +14,7 @@ export default async function createQuickStartProject(scope: Scope) { const configuration: Configuration = { client, connection: defaultConfigs[client], - dependencies: clientDependencies({ client }), + dependencies: { ...clientDependencies({ client }), ...scope.additionalsDependencies }, }; await createProject(scope, configuration); From 56d93b4478ff454ccc95198a5b830d260c9033a3 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Tue, 31 Oct 2023 17:19:47 +0100 Subject: [PATCH 03/10] Update node engine of cloud plugin --- packages/plugins/cloud/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugins/cloud/package.json b/packages/plugins/cloud/package.json index 14f17348a1..a6de2a4a1f 100644 --- a/packages/plugins/cloud/package.json +++ b/packages/plugins/cloud/package.json @@ -66,7 +66,7 @@ "styled-components": "^5.3.6" }, "engines": { - "node": ">=14.19.1 <=18.x.x", + "node": ">=18.0.0 <=20.x.x", "npm": ">=6.0.0" }, "strapi": { From b6c085052f108fcfe47d22972a664dfa85aa0358 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Thu, 2 Nov 2023 15:26:58 +0100 Subject: [PATCH 04/10] v4.15.1 --- .github/actions/check-pr-status/package.json | 2 +- examples/getstarted/package.json | 22 +- examples/kitchensink-ts/package.json | 8 +- examples/kitchensink/package.json | 10 +- lerna.json | 2 +- packages/admin-test-utils/package.json | 6 +- packages/cli/create-strapi-app/package.json | 8 +- .../cli/create-strapi-starter/package.json | 8 +- packages/core/admin/package.json | 16 +- packages/core/content-manager/package.json | 4 +- .../core/content-type-builder/package.json | 10 +- packages/core/data-transfer/package.json | 10 +- packages/core/database/package.json | 8 +- packages/core/email/package.json | 8 +- packages/core/helper-plugin/package.json | 8 +- packages/core/permissions/package.json | 8 +- packages/core/strapi/package.json | 36 +- packages/core/types/package.json | 14 +- packages/core/upload/package.json | 8 +- packages/core/utils/package.json | 6 +- packages/generators/app/package.json | 2 +- packages/generators/generators/package.json | 10 +- packages/plugins/cloud/package.json | 10 +- packages/plugins/color-picker/package.json | 6 +- packages/plugins/documentation/package.json | 6 +- packages/plugins/graphql/package.json | 6 +- packages/plugins/i18n/package.json | 6 +- packages/plugins/sentry/package.json | 4 +- .../plugins/users-permissions/package.json | 6 +- .../providers/audit-logs-local/package.json | 8 +- .../providers/email-amazon-ses/package.json | 8 +- packages/providers/email-mailgun/package.json | 8 +- .../providers/email-nodemailer/package.json | 6 +- .../providers/email-sendgrid/package.json | 8 +- .../providers/email-sendmail/package.json | 8 +- packages/providers/upload-aws-s3/package.json | 6 +- .../providers/upload-cloudinary/package.json | 8 +- packages/providers/upload-local/package.json | 8 +- packages/utils/api-tests/package.json | 2 +- .../utils/eslint-config-custom/package.json | 2 +- packages/utils/logger/package.json | 6 +- packages/utils/pack-up/package.json | 2 +- packages/utils/tsconfig/package.json | 2 +- packages/utils/typescript/package.json | 2 +- scripts/front/package.json | 2 +- yarn.lock | 314 +++++++++--------- 46 files changed, 329 insertions(+), 329 deletions(-) diff --git a/.github/actions/check-pr-status/package.json b/.github/actions/check-pr-status/package.json index dedf8b4287..2b760a419b 100644 --- a/.github/actions/check-pr-status/package.json +++ b/.github/actions/check-pr-status/package.json @@ -1,6 +1,6 @@ { "name": "check-pr-status", - "version": "4.15.0", + "version": "4.15.1", "private": true, "license": "MIT", "main": "dist/index.js", diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index 8e99f4f225..64398e1b70 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -1,6 +1,6 @@ { "name": "getstarted", - "version": "4.15.0", + "version": "4.15.1", "private": true, "description": "A Strapi application.", "license": "SEE LICENSE IN LICENSE", @@ -14,16 +14,16 @@ }, "dependencies": { "@strapi/icons": "1.11.0", - "@strapi/plugin-color-picker": "4.15.0", - "@strapi/plugin-documentation": "4.15.0", - "@strapi/plugin-graphql": "4.15.0", - "@strapi/plugin-i18n": "4.15.0", - "@strapi/plugin-sentry": "4.15.0", - "@strapi/plugin-users-permissions": "4.15.0", - "@strapi/provider-email-mailgun": "4.15.0", - "@strapi/provider-upload-aws-s3": "4.15.0", - "@strapi/provider-upload-cloudinary": "4.15.0", - "@strapi/strapi": "4.15.0", + "@strapi/plugin-color-picker": "4.15.1", + "@strapi/plugin-documentation": "4.15.1", + "@strapi/plugin-graphql": "4.15.1", + "@strapi/plugin-i18n": "4.15.1", + "@strapi/plugin-sentry": "4.15.1", + "@strapi/plugin-users-permissions": "4.15.1", + "@strapi/provider-email-mailgun": "4.15.1", + "@strapi/provider-upload-aws-s3": "4.15.1", + "@strapi/provider-upload-cloudinary": "4.15.1", + "@strapi/strapi": "4.15.1", "better-sqlite3": "8.6.0", "lodash": "4.17.21", "mysql": "2.18.1", diff --git a/examples/kitchensink-ts/package.json b/examples/kitchensink-ts/package.json index a1d48c1f62..3d0579f860 100644 --- a/examples/kitchensink-ts/package.json +++ b/examples/kitchensink-ts/package.json @@ -1,6 +1,6 @@ { "name": "kitchensink-ts", - "version": "4.15.0", + "version": "4.15.1", "private": true, "description": "A Strapi application", "license": "MIT", @@ -14,9 +14,9 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/plugin-i18n": "4.15.0", - "@strapi/plugin-users-permissions": "4.15.0", - "@strapi/strapi": "4.15.0", + "@strapi/plugin-i18n": "4.15.1", + "@strapi/plugin-users-permissions": "4.15.1", + "@strapi/strapi": "4.15.1", "better-sqlite3": "8.6.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/kitchensink/package.json b/examples/kitchensink/package.json index d705fd5615..7eabb55af0 100644 --- a/examples/kitchensink/package.json +++ b/examples/kitchensink/package.json @@ -1,6 +1,6 @@ { "name": "kitchensink", - "version": "4.15.0", + "version": "4.15.1", "private": true, "description": "A Strapi application.", "license": "SEE LICENSE IN LICENSE", @@ -13,10 +13,10 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/provider-email-mailgun": "4.15.0", - "@strapi/provider-upload-aws-s3": "4.15.0", - "@strapi/provider-upload-cloudinary": "4.15.0", - "@strapi/strapi": "4.15.0", + "@strapi/provider-email-mailgun": "4.15.1", + "@strapi/provider-upload-aws-s3": "4.15.1", + "@strapi/provider-upload-cloudinary": "4.15.1", + "@strapi/strapi": "4.15.1", "lodash": "4.17.21", "mysql": "2.18.1", "mysql2": "3.6.0", diff --git a/lerna.json b/lerna.json index eb0c8d21f6..df58dad05e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.15.0", + "version": "4.15.1", "packages": ["packages/*", "examples/*"], "npmClient": "yarn", "useWorkspaces": true, diff --git a/packages/admin-test-utils/package.json b/packages/admin-test-utils/package.json index be7de921e2..e11505b2d8 100644 --- a/packages/admin-test-utils/package.json +++ b/packages/admin-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/admin-test-utils", - "version": "4.15.0", + "version": "4.15.1", "private": true, "description": "Test utilities for the Strapi administration panel", "license": "MIT", @@ -74,8 +74,8 @@ "@reduxjs/toolkit": "1.9.7", "@strapi/pack-up": "workspace:*", "@testing-library/jest-dom": "5.16.5", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "peerDependencies": { "@reduxjs/toolkit": "^1.9.7", diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json index 0461348b83..4420dd061d 100644 --- a/packages/cli/create-strapi-app/package.json +++ b/packages/cli/create-strapi-app/package.json @@ -1,6 +1,6 @@ { "name": "create-strapi-app", - "version": "4.15.0", + "version": "4.15.1", "description": "Generate a new Strapi application.", "keywords": [ "create-strapi-app", @@ -44,14 +44,14 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/generate-new": "4.15.0", + "@strapi/generate-new": "4.15.1", "commander": "8.3.0", "inquirer": "8.2.5" }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json index 9d6f169603..aeb0cae9f9 100644 --- a/packages/cli/create-strapi-starter/package.json +++ b/packages/cli/create-strapi-starter/package.json @@ -1,6 +1,6 @@ { "name": "create-strapi-starter", - "version": "4.15.0", + "version": "4.15.1", "description": "Generate a new Strapi application.", "keywords": [ "create-strapi-starter", @@ -44,7 +44,7 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/generate-new": "4.15.0", + "@strapi/generate-new": "4.15.1", "chalk": "4.1.2", "ci-info": "3.8.0", "commander": "8.3.0", @@ -55,8 +55,8 @@ }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 16afed4993..5d7f97a639 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/admin", - "version": "4.15.0", + "version": "4.15.1", "description": "Strapi Admin", "repository": { "type": "git", @@ -75,15 +75,15 @@ "@radix-ui/react-context": "1.0.1", "@radix-ui/react-toolbar": "1.0.4", "@reduxjs/toolkit": "1.9.7", - "@strapi/data-transfer": "4.15.0", + "@strapi/data-transfer": "4.15.1", "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", - "@strapi/permissions": "4.15.0", - "@strapi/provider-audit-logs-local": "4.15.0", + "@strapi/permissions": "4.15.1", + "@strapi/provider-audit-logs-local": "4.15.1", "@strapi/types": "workspace:*", - "@strapi/typescript-utils": "4.15.0", - "@strapi/utils": "4.15.0", + "@strapi/typescript-utils": "4.15.1", + "@strapi/utils": "4.15.1", "axios": "1.5.0", "bcryptjs": "2.4.3", "boxen": "5.1.2", @@ -171,7 +171,7 @@ "yup": "0.32.9" }, "devDependencies": { - "@strapi/admin-test-utils": "4.15.0", + "@strapi/admin-test-utils": "4.15.1", "@strapi/pack-up": "workspace:*", "@testing-library/dom": "9.2.0", "@testing-library/react": "14.0.0", diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json index 447f90d099..e775e44fbc 100644 --- a/packages/core/content-manager/package.json +++ b/packages/core/content-manager/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-content-manager", - "version": "4.15.0", + "version": "4.15.1", "description": "A powerful UI to easily manage your data.", "repository": { "type": "git", @@ -26,7 +26,7 @@ }, "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "lodash": "4.17.21", "qs": "6.11.1" }, diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index ed5a28d731..c10caf2e0a 100644 --- a/packages/core/content-type-builder/package.json +++ b/packages/core/content-type-builder/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-content-type-builder", - "version": "4.15.0", + "version": "4.15.1", "description": "Strapi plugin to create content type", "repository": { "type": "git", @@ -31,10 +31,10 @@ "dependencies": { "@sindresorhus/slugify": "1.1.0", "@strapi/design-system": "1.13.0", - "@strapi/generators": "4.15.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/generators": "4.15.1", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "fs-extra": "10.0.0", "immer": "9.0.19", "lodash": "4.17.21", @@ -47,7 +47,7 @@ "yup": "0.32.9" }, "devDependencies": { - "@strapi/admin": "4.15.0", + "@strapi/admin": "4.15.1", "@testing-library/react": "14.0.0", "history": "^4.9.0", "react": "^18.2.0", diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json index f075c0d081..c5354a0a4f 100644 --- a/packages/core/data-transfer/package.json +++ b/packages/core/data-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/data-transfer", - "version": "4.15.0", + "version": "4.15.1", "description": "Data transfer capabilities for Strapi", "keywords": [ "strapi", @@ -41,10 +41,10 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/logger": "4.15.0", - "@strapi/strapi": "4.15.0", - "@strapi/types": "4.15.0", - "@strapi/utils": "4.15.0", + "@strapi/logger": "4.15.1", + "@strapi/strapi": "4.15.1", + "@strapi/types": "4.15.1", + "@strapi/utils": "4.15.1", "chalk": "4.1.2", "cli-table3": "0.6.2", "commander": "8.3.0", diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 9587bf9e03..ae283a4558 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/database", - "version": "4.15.0", + "version": "4.15.1", "description": "Strapi's database layer", "homepage": "https://strapi.io", "bugs": { @@ -40,7 +40,7 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "date-fns": "2.30.0", "debug": "4.3.4", "fs-extra": "10.0.0", @@ -51,8 +51,8 @@ }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/core/email/package.json b/packages/core/email/package.json index 61e7318970..b4bac7c6e0 100644 --- a/packages/core/email/package.json +++ b/packages/core/email/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-email", - "version": "4.15.0", + "version": "4.15.1", "description": "Easily configure your Strapi application to send emails.", "repository": { "type": "git", @@ -54,10 +54,10 @@ }, "dependencies": { "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", - "@strapi/provider-email-sendmail": "4.15.0", - "@strapi/utils": "4.15.0", + "@strapi/provider-email-sendmail": "4.15.1", + "@strapi/utils": "4.15.1", "lodash": "4.17.21", "prop-types": "^15.8.1", "react-intl": "6.4.1", diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index 790cfa03f4..a2efc46f9c 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/helper-plugin", - "version": "4.15.0", + "version": "4.15.1", "description": "Helper for Strapi plugins development", "repository": { "type": "git", @@ -69,11 +69,11 @@ "@storybook/addon-mdx-gfm": "7.4.0", "@storybook/builder-vite": "7.4.0", "@storybook/react-vite": "7.4.0", - "@strapi/admin-test-utils": "4.15.0", + "@strapi/admin-test-utils": "4.15.1", "@strapi/design-system": "1.13.0", "@strapi/icons": "1.13.0", "@strapi/pack-up": "workspace:*", - "@strapi/types": "4.15.0", + "@strapi/types": "4.15.1", "@testing-library/react": "14.0.0", "@testing-library/user-event": "14.4.3", "@types/react": "18.2.7", @@ -82,7 +82,7 @@ "@types/react-router-dom": "5.3.3", "@types/styled-components": "5.1.26", "cross-env": "^7.0.3", - "eslint-config-custom": "4.15.0", + "eslint-config-custom": "4.15.1", "eslint-plugin-storybook": "0.6.14", "msw": "1.3.0", "react": "^18.2.0", diff --git a/packages/core/permissions/package.json b/packages/core/permissions/package.json index 485aa61167..15f35dc19d 100644 --- a/packages/core/permissions/package.json +++ b/packages/core/permissions/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/permissions", - "version": "4.15.0", + "version": "4.15.1", "description": "Strapi's permission layer.", "repository": { "type": "git", @@ -38,15 +38,15 @@ }, "dependencies": { "@casl/ability": "6.5.0", - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "lodash": "4.17.21", "qs": "6.11.1", "sift": "16.0.1" }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index 4952a8b521..be42150880 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/strapi", - "version": "4.15.0", + "version": "4.15.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", @@ -90,21 +90,21 @@ "dependencies": { "@koa/cors": "3.4.3", "@koa/router": "10.1.1", - "@strapi/admin": "4.15.0", - "@strapi/data-transfer": "4.15.0", - "@strapi/database": "4.15.0", - "@strapi/generate-new": "4.15.0", - "@strapi/generators": "4.15.0", - "@strapi/logger": "4.15.0", - "@strapi/pack-up": "4.15.0", - "@strapi/permissions": "4.15.0", - "@strapi/plugin-content-manager": "4.15.0", - "@strapi/plugin-content-type-builder": "4.15.0", - "@strapi/plugin-email": "4.15.0", - "@strapi/plugin-upload": "4.15.0", - "@strapi/types": "4.15.0", - "@strapi/typescript-utils": "4.15.0", - "@strapi/utils": "4.15.0", + "@strapi/admin": "4.15.1", + "@strapi/data-transfer": "4.15.1", + "@strapi/database": "4.15.1", + "@strapi/generate-new": "4.15.1", + "@strapi/generators": "4.15.1", + "@strapi/logger": "4.15.1", + "@strapi/pack-up": "4.15.1", + "@strapi/permissions": "4.15.1", + "@strapi/plugin-content-manager": "4.15.1", + "@strapi/plugin-content-type-builder": "4.15.1", + "@strapi/plugin-email": "4.15.1", + "@strapi/plugin-upload": "4.15.1", + "@strapi/types": "4.15.1", + "@strapi/typescript-utils": "4.15.1", + "@strapi/utils": "4.15.1", "bcryptjs": "2.4.3", "boxen": "5.1.2", "chalk": "4.1.2", @@ -164,9 +164,9 @@ "@types/node": "18.18.4", "@types/node-schedule": "2.1.0", "@types/statuses": "2.0.1", - "eslint-config-custom": "4.15.0", + "eslint-config-custom": "4.15.1", "supertest": "6.3.3", - "tsconfig": "4.15.0" + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/core/types/package.json b/packages/core/types/package.json index 1f773d8d2e..517fa096ac 100644 --- a/packages/core/types/package.json +++ b/packages/core/types/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/types", - "version": "4.15.0", + "version": "4.15.1", "description": "Shared typescript types for Strapi internal use", "keywords": [ "strapi" @@ -46,10 +46,10 @@ "dependencies": { "@koa/cors": "3.4.3", "@koa/router": "10.1.1", - "@strapi/database": "4.15.0", - "@strapi/logger": "4.15.0", - "@strapi/permissions": "4.15.0", - "@strapi/utils": "4.15.0", + "@strapi/database": "4.15.1", + "@strapi/logger": "4.15.1", + "@strapi/permissions": "4.15.1", + "@strapi/utils": "4.15.1", "commander": "8.3.0", "https-proxy-agent": "5.0.1", "koa": "2.13.4", @@ -63,8 +63,8 @@ "@types/koa": "2.13.4", "@types/koa__router": "12.0.0", "@types/node-schedule": "2.1.0", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0", + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1", "typescript": "5.2.2" }, "engines": { diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json index 03b3df3c83..72303f1ee1 100644 --- a/packages/core/upload/package.json +++ b/packages/core/upload/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-upload", - "version": "4.15.0", + "version": "4.15.1", "description": "Makes it easy to upload images and files to your Strapi Application.", "license": "SEE LICENSE IN LICENSE", "author": { @@ -26,10 +26,10 @@ }, "dependencies": { "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", - "@strapi/provider-upload-local": "4.15.0", - "@strapi/utils": "4.15.0", + "@strapi/provider-upload-local": "4.15.1", + "@strapi/utils": "4.15.1", "axios": "1.5.0", "byte-size": "7.0.1", "cropperjs": "1.6.0", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index e2a8c59ea1..07dc10ccd1 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/utils", - "version": "4.15.0", + "version": "4.15.1", "description": "Shared utilities for the Strapi packages", "keywords": [ "strapi", @@ -56,10 +56,10 @@ "@strapi/pack-up": "workspace:*", "@types/koa": "2.13.4", "@types/node": "18.18.4", - "eslint-config-custom": "4.15.0", + "eslint-config-custom": "4.15.1", "koa": "2.13.4", "koa-body": "4.2.0", - "tsconfig": "4.15.0" + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/generators/app/package.json b/packages/generators/app/package.json index 658abe4bbc..4eeebe35c4 100644 --- a/packages/generators/app/package.json +++ b/packages/generators/app/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/generate-new", - "version": "4.15.0", + "version": "4.15.1", "description": "Generate a new Strapi application.", "keywords": [ "generate", diff --git a/packages/generators/generators/package.json b/packages/generators/generators/package.json index 85171cfeb4..0cfd7c411e 100644 --- a/packages/generators/generators/package.json +++ b/packages/generators/generators/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/generators", - "version": "4.15.0", + "version": "4.15.1", "description": "Interactive API generator.", "keywords": [ "strapi", @@ -47,8 +47,8 @@ }, "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/typescript-utils": "4.15.0", - "@strapi/utils": "4.15.0", + "@strapi/typescript-utils": "4.15.1", + "@strapi/utils": "4.15.1", "chalk": "4.1.2", "copyfiles": "2.4.1", "fs-extra": "10.0.0", @@ -58,8 +58,8 @@ }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/plugins/cloud/package.json b/packages/plugins/cloud/package.json index a6de2a4a1f..7bc755c0f0 100644 --- a/packages/plugins/cloud/package.json +++ b/packages/plugins/cloud/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-cloud", - "version": "4.15.0", + "version": "4.15.1", "description": "Instructions to deploy your local project to Strapi Cloud", "license": "MIT", "author": { @@ -40,22 +40,22 @@ }, "dependencies": { "@strapi/design-system": "^1.12.0", - "@strapi/helper-plugin": "^4.14.3", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "^1.12.0", "react-intl": "6.4.1" }, "devDependencies": { - "@strapi/strapi": "4.15.0", + "@strapi/strapi": "4.15.1", "@types/react": "^18.2.7", "@types/react-dom": "^18.2.12", "@types/react-router-dom": "^5.3.3", "@types/styled-components": "5.1.26", - "eslint-config-custom": "4.15.0", + "eslint-config-custom": "4.15.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^5.3.4", "styled-components": "^5.3.3", - "tsconfig": "4.15.0", + "tsconfig": "4.15.1", "typescript": "5.2.2" }, "peerDependencies": { diff --git a/packages/plugins/color-picker/package.json b/packages/plugins/color-picker/package.json index f725cdfaa5..62a0bbe93c 100644 --- a/packages/plugins/color-picker/package.json +++ b/packages/plugins/color-picker/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-color-picker", - "version": "4.15.0", + "version": "4.15.1", "description": "Strapi maintained Custom Fields", "repository": { "type": "git", @@ -58,14 +58,14 @@ }, "dependencies": { "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", "prop-types": "^15.8.1", "react-colorful": "5.6.1", "react-intl": "6.4.1" }, "devDependencies": { - "@strapi/strapi": "4.15.0", + "@strapi/strapi": "4.15.1", "@testing-library/react": "14.0.0", "@testing-library/user-event": "14.4.3", "@types/styled-components": "5.1.26", diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json index 0593b2ab72..5755a661ff 100644 --- a/packages/plugins/documentation/package.json +++ b/packages/plugins/documentation/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-documentation", - "version": "4.15.0", + "version": "4.15.1", "description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.", "repository": { "type": "git", @@ -29,9 +29,9 @@ }, "dependencies": { "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "bcryptjs": "2.4.3", "cheerio": "^1.0.0-rc.12", "formik": "2.4.0", diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json index 0fbae5f712..1d851ad457 100644 --- a/packages/plugins/graphql/package.json +++ b/packages/plugins/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-graphql", - "version": "4.15.0", + "version": "4.15.1", "description": "Adds GraphQL endpoint with default API methods.", "repository": { "type": "git", @@ -27,9 +27,9 @@ "@graphql-tools/schema": "8.5.1", "@graphql-tools/utils": "^8.13.1", "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "apollo-server-core": "3.12.1", "apollo-server-koa": "3.10.0", "graphql": "^15.5.1", diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json index 9d6fb8ee37..2dfdf49c51 100644 --- a/packages/plugins/i18n/package.json +++ b/packages/plugins/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-i18n", - "version": "4.15.0", + "version": "4.15.1", "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", @@ -32,9 +32,9 @@ "dependencies": { "@reduxjs/toolkit": "1.9.7", "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "formik": "2.4.0", "immer": "9.0.19", "lodash": "4.17.21", diff --git a/packages/plugins/sentry/package.json b/packages/plugins/sentry/package.json index 5087710d01..e47c05220b 100644 --- a/packages/plugins/sentry/package.json +++ b/packages/plugins/sentry/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-sentry", - "version": "4.15.0", + "version": "4.15.1", "description": "Send Strapi error events to Sentry", "repository": { "type": "git", @@ -28,7 +28,7 @@ "dependencies": { "@sentry/node": "6.19.7", "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0" }, "devDependencies": { diff --git a/packages/plugins/users-permissions/package.json b/packages/plugins/users-permissions/package.json index 3b2e0f853d..2783662bba 100644 --- a/packages/plugins/users-permissions/package.json +++ b/packages/plugins/users-permissions/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-users-permissions", - "version": "4.15.0", + "version": "4.15.1", "description": "Protect your API with a full-authentication process based on JWT", "repository": { "type": "git", @@ -30,9 +30,9 @@ }, "dependencies": { "@strapi/design-system": "1.13.0", - "@strapi/helper-plugin": "4.15.0", + "@strapi/helper-plugin": "4.15.1", "@strapi/icons": "1.13.0", - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "bcryptjs": "2.4.3", "formik": "2.4.0", "grant-koa": "5.4.8", diff --git a/packages/providers/audit-logs-local/package.json b/packages/providers/audit-logs-local/package.json index aafa9a2d62..d96ae23de5 100644 --- a/packages/providers/audit-logs-local/package.json +++ b/packages/providers/audit-logs-local/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-audit-logs-local", - "version": "4.15.0", + "version": "4.15.1", "description": "Local provider for strapi audit logs", "keywords": [ "audit-logs", @@ -43,9 +43,9 @@ }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "@strapi/types": "4.15.0", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "@strapi/types": "4.15.1", + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/providers/email-amazon-ses/package.json b/packages/providers/email-amazon-ses/package.json index 32512591e1..00fadcffd9 100644 --- a/packages/providers/email-amazon-ses/package.json +++ b/packages/providers/email-amazon-ses/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-amazon-ses", - "version": "4.15.0", + "version": "4.15.1", "description": "Amazon SES provider for strapi email", "keywords": [ "email", @@ -43,13 +43,13 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "node-ses": "^3.0.3" }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/providers/email-mailgun/package.json b/packages/providers/email-mailgun/package.json index 9bb300e083..5031594d5b 100644 --- a/packages/providers/email-mailgun/package.json +++ b/packages/providers/email-mailgun/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-mailgun", - "version": "4.15.0", + "version": "4.15.1", "description": "Mailgun provider for strapi email plugin", "keywords": [ "email", @@ -45,14 +45,14 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "form-data": "^4.0.0", "mailgun.js": "8.2.1" }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/providers/email-nodemailer/package.json b/packages/providers/email-nodemailer/package.json index 939cff25b4..0473592e1c 100644 --- a/packages/providers/email-nodemailer/package.json +++ b/packages/providers/email-nodemailer/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-nodemailer", - "version": "4.15.0", + "version": "4.15.1", "description": "Nodemailer provider for Strapi 3", "keywords": [ "strapi", @@ -62,8 +62,8 @@ "devDependencies": { "@strapi/pack-up": "workspace:*", "@types/nodemailer": "6.4.7", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/providers/email-sendgrid/package.json b/packages/providers/email-sendgrid/package.json index c8f35f1e58..6f7a3c251f 100644 --- a/packages/providers/email-sendgrid/package.json +++ b/packages/providers/email-sendgrid/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-sendgrid", - "version": "4.15.0", + "version": "4.15.1", "description": "Sendgrid provider for strapi email", "keywords": [ "email", @@ -44,12 +44,12 @@ }, "dependencies": { "@sendgrid/mail": "7.7.0", - "@strapi/utils": "4.15.0" + "@strapi/utils": "4.15.1" }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/providers/email-sendmail/package.json b/packages/providers/email-sendmail/package.json index a8c65a3911..b079aa52bf 100644 --- a/packages/providers/email-sendmail/package.json +++ b/packages/providers/email-sendmail/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-sendmail", - "version": "4.15.0", + "version": "4.15.1", "description": "Sendmail provider for strapi email", "keywords": [ "email", @@ -42,14 +42,14 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "sendmail": "^1.6.1" }, "devDependencies": { "@strapi/pack-up": "workspace:*", "@types/sendmail": "1.4.4", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/providers/upload-aws-s3/package.json b/packages/providers/upload-aws-s3/package.json index 6a99a756bf..0ed1b561d8 100644 --- a/packages/providers/upload-aws-s3/package.json +++ b/packages/providers/upload-aws-s3/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-upload-aws-s3", - "version": "4.15.0", + "version": "4.15.1", "description": "AWS S3 provider for strapi upload", "keywords": [ "upload", @@ -52,8 +52,8 @@ "devDependencies": { "@strapi/pack-up": "workspace:*", "@types/jest": "29.5.2", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/providers/upload-cloudinary/package.json b/packages/providers/upload-cloudinary/package.json index 0575fd3638..4d2b00dc5a 100644 --- a/packages/providers/upload-cloudinary/package.json +++ b/packages/providers/upload-cloudinary/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-upload-cloudinary", - "version": "4.15.0", + "version": "4.15.1", "description": "Cloudinary provider for strapi upload", "keywords": [ "upload", @@ -43,14 +43,14 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "cloudinary": "^1.41.0", "into-stream": "^5.1.0" }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/providers/upload-local/package.json b/packages/providers/upload-local/package.json index 4cf44af952..7a38e670b3 100644 --- a/packages/providers/upload-local/package.json +++ b/packages/providers/upload-local/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-upload-local", - "version": "4.15.0", + "version": "4.15.1", "description": "Local provider for strapi upload", "keywords": [ "upload", @@ -44,14 +44,14 @@ "watch": "pack-up watch" }, "dependencies": { - "@strapi/utils": "4.15.0", + "@strapi/utils": "4.15.1", "fs-extra": "10.0.0" }, "devDependencies": { "@strapi/pack-up": "workspace:*", "@types/jest": "29.5.2", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/utils/api-tests/package.json b/packages/utils/api-tests/package.json index 8562b6bf90..1c5e7c7dca 100644 --- a/packages/utils/api-tests/package.json +++ b/packages/utils/api-tests/package.json @@ -1,6 +1,6 @@ { "name": "api-tests", - "version": "4.15.0", + "version": "4.15.1", "private": true, "dependencies": { "dotenv": "14.2.0", diff --git a/packages/utils/eslint-config-custom/package.json b/packages/utils/eslint-config-custom/package.json index 4d20f3b6f6..99a63dff94 100644 --- a/packages/utils/eslint-config-custom/package.json +++ b/packages/utils/eslint-config-custom/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-custom", - "version": "4.15.0", + "version": "4.15.1", "private": true, "main": "index.js" } diff --git a/packages/utils/logger/package.json b/packages/utils/logger/package.json index bba7723a11..fcd2635e22 100644 --- a/packages/utils/logger/package.json +++ b/packages/utils/logger/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/logger", - "version": "4.15.0", + "version": "4.15.1", "description": "Strapi's logger", "homepage": "https://strapi.io", "bugs": { @@ -44,8 +44,8 @@ }, "devDependencies": { "@strapi/pack-up": "workspace:*", - "eslint-config-custom": "4.15.0", - "tsconfig": "4.15.0" + "eslint-config-custom": "4.15.1", + "tsconfig": "4.15.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/utils/pack-up/package.json b/packages/utils/pack-up/package.json index d4c27a3689..e4e68733af 100644 --- a/packages/utils/pack-up/package.json +++ b/packages/utils/pack-up/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/pack-up", - "version": "4.15.0", + "version": "4.15.1", "description": "Simple tools for creating interoperable CJS & ESM packages.", "keywords": [ "strapi", diff --git a/packages/utils/tsconfig/package.json b/packages/utils/tsconfig/package.json index 9f83b04aa5..d3e442dede 100644 --- a/packages/utils/tsconfig/package.json +++ b/packages/utils/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "tsconfig", - "version": "4.15.0", + "version": "4.15.1", "private": true, "devDependencies": { "@tsconfig/node18": "18.2.2" diff --git a/packages/utils/typescript/package.json b/packages/utils/typescript/package.json index e5b7ef268b..9f299757af 100644 --- a/packages/utils/typescript/package.json +++ b/packages/utils/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/typescript-utils", - "version": "4.15.0", + "version": "4.15.1", "description": "Typescript support for Strapi", "keywords": [ "strapi", diff --git a/scripts/front/package.json b/scripts/front/package.json index e2f3ac7d49..f7cb153388 100644 --- a/scripts/front/package.json +++ b/scripts/front/package.json @@ -1,6 +1,6 @@ { "name": "scripts-front", - "version": "4.15.0", + "version": "4.15.1", "private": true, "scripts": { "test:front": "jest --config jest.config.front.js" diff --git a/yarn.lock b/yarn.lock index 0709af7fe3..4eea839607 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7409,7 +7409,7 @@ __metadata: languageName: node linkType: hard -"@strapi/admin-test-utils@npm:4.15.0, @strapi/admin-test-utils@workspace:*, @strapi/admin-test-utils@workspace:packages/admin-test-utils": +"@strapi/admin-test-utils@npm:4.15.1, @strapi/admin-test-utils@workspace:*, @strapi/admin-test-utils@workspace:packages/admin-test-utils": version: 0.0.0-use.local resolution: "@strapi/admin-test-utils@workspace:packages/admin-test-utils" dependencies: @@ -7417,9 +7417,9 @@ __metadata: "@reduxjs/toolkit": "npm:1.9.7" "@strapi/pack-up": "workspace:*" "@testing-library/jest-dom": "npm:5.16.5" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" jest-styled-components: "npm:7.1.1" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" whatwg-fetch: "npm:3.6.2" peerDependencies: "@reduxjs/toolkit": ^1.9.7 @@ -7427,7 +7427,7 @@ __metadata: languageName: unknown linkType: soft -"@strapi/admin@npm:4.15.0, @strapi/admin@workspace:packages/core/admin": +"@strapi/admin@npm:4.15.1, @strapi/admin@workspace:packages/core/admin": version: 0.0.0-use.local resolution: "@strapi/admin@workspace:packages/core/admin" dependencies: @@ -7436,17 +7436,17 @@ __metadata: "@radix-ui/react-context": "npm:1.0.1" "@radix-ui/react-toolbar": "npm:1.0.4" "@reduxjs/toolkit": "npm:1.9.7" - "@strapi/admin-test-utils": "npm:4.15.0" - "@strapi/data-transfer": "npm:4.15.0" + "@strapi/admin-test-utils": "npm:4.15.1" + "@strapi/data-transfer": "npm:4.15.1" "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" "@strapi/pack-up": "workspace:*" - "@strapi/permissions": "npm:4.15.0" - "@strapi/provider-audit-logs-local": "npm:4.15.0" + "@strapi/permissions": "npm:4.15.1" + "@strapi/provider-audit-logs-local": "npm:4.15.1" "@strapi/types": "workspace:*" - "@strapi/typescript-utils": "npm:4.15.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/typescript-utils": "npm:4.15.1" + "@strapi/utils": "npm:4.15.1" "@testing-library/dom": "npm:9.2.0" "@testing-library/react": "npm:14.0.0" "@testing-library/user-event": "npm:14.4.3" @@ -7547,15 +7547,15 @@ __metadata: languageName: unknown linkType: soft -"@strapi/data-transfer@npm:4.15.0, @strapi/data-transfer@workspace:packages/core/data-transfer": +"@strapi/data-transfer@npm:4.15.1, @strapi/data-transfer@workspace:packages/core/data-transfer": version: 0.0.0-use.local resolution: "@strapi/data-transfer@workspace:packages/core/data-transfer" dependencies: - "@strapi/logger": "npm:4.15.0" + "@strapi/logger": "npm:4.15.1" "@strapi/pack-up": "workspace:*" - "@strapi/strapi": "npm:4.15.0" - "@strapi/types": "npm:4.15.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/strapi": "npm:4.15.1" + "@strapi/types": "npm:4.15.1" + "@strapi/utils": "npm:4.15.1" "@types/fs-extra": "npm:9.0.13" "@types/jest": "npm:29.5.2" "@types/koa": "npm:2.13.4" @@ -7590,20 +7590,20 @@ __metadata: languageName: unknown linkType: soft -"@strapi/database@npm:4.15.0, @strapi/database@workspace:packages/core/database": +"@strapi/database@npm:4.15.1, @strapi/database@workspace:packages/core/database": version: 0.0.0-use.local resolution: "@strapi/database@workspace:packages/core/database" dependencies: "@strapi/pack-up": "workspace:*" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" date-fns: "npm:2.30.0" debug: "npm:4.3.4" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" fs-extra: "npm:10.0.0" knex: "npm:2.5.0" lodash: "npm:4.17.21" semver: "npm:7.5.4" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" umzug: "npm:3.2.1" languageName: unknown linkType: soft @@ -7666,7 +7666,7 @@ __metadata: languageName: node linkType: hard -"@strapi/generate-new@npm:4.15.0, @strapi/generate-new@workspace:packages/generators/app": +"@strapi/generate-new@npm:4.15.1, @strapi/generate-new@workspace:packages/generators/app": version: 0.0.0-use.local resolution: "@strapi/generate-new@workspace:packages/generators/app" dependencies: @@ -7686,26 +7686,26 @@ __metadata: languageName: unknown linkType: soft -"@strapi/generators@npm:4.15.0, @strapi/generators@workspace:packages/generators/generators": +"@strapi/generators@npm:4.15.1, @strapi/generators@workspace:packages/generators/generators": version: 0.0.0-use.local resolution: "@strapi/generators@workspace:packages/generators/generators" dependencies: "@sindresorhus/slugify": "npm:1.1.0" "@strapi/pack-up": "workspace:*" - "@strapi/typescript-utils": "npm:4.15.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/typescript-utils": "npm:4.15.1" + "@strapi/utils": "npm:4.15.1" chalk: "npm:4.1.2" copyfiles: "npm:2.4.1" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" fs-extra: "npm:10.0.0" node-plop: "npm:0.26.3" plop: "npm:2.7.6" pluralize: "npm:8.0.0" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft -"@strapi/helper-plugin@npm:4.15.0, @strapi/helper-plugin@npm:^4.14.3, @strapi/helper-plugin@workspace:packages/core/helper-plugin": +"@strapi/helper-plugin@npm:4.15.1, @strapi/helper-plugin@workspace:packages/core/helper-plugin": version: 0.0.0-use.local resolution: "@strapi/helper-plugin@workspace:packages/core/helper-plugin" dependencies: @@ -7715,11 +7715,11 @@ __metadata: "@storybook/addon-mdx-gfm": "npm:7.4.0" "@storybook/builder-vite": "npm:7.4.0" "@storybook/react-vite": "npm:7.4.0" - "@strapi/admin-test-utils": "npm:4.15.0" + "@strapi/admin-test-utils": "npm:4.15.1" "@strapi/design-system": "npm:1.13.0" "@strapi/icons": "npm:1.13.0" "@strapi/pack-up": "workspace:*" - "@strapi/types": "npm:4.15.0" + "@strapi/types": "npm:4.15.1" "@testing-library/react": "npm:14.0.0" "@testing-library/user-event": "npm:14.4.3" "@types/react": "npm:18.2.7" @@ -7730,7 +7730,7 @@ __metadata: axios: "npm:1.5.0" cross-env: "npm:^7.0.3" date-fns: "npm:2.30.0" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" eslint-plugin-storybook: "npm:0.6.14" formik: "npm:2.4.0" immer: "npm:9.0.19" @@ -7790,14 +7790,14 @@ __metadata: languageName: node linkType: hard -"@strapi/logger@npm:4.15.0, @strapi/logger@workspace:packages/utils/logger": +"@strapi/logger@npm:4.15.1, @strapi/logger@workspace:packages/utils/logger": version: 0.0.0-use.local resolution: "@strapi/logger@workspace:packages/utils/logger" dependencies: "@strapi/pack-up": "workspace:*" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" lodash: "npm:4.17.21" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" winston: "npm:3.10.0" languageName: unknown linkType: soft @@ -7838,18 +7838,18 @@ __metadata: languageName: unknown linkType: soft -"@strapi/permissions@npm:4.15.0, @strapi/permissions@workspace:packages/core/permissions": +"@strapi/permissions@npm:4.15.1, @strapi/permissions@workspace:packages/core/permissions": version: 0.0.0-use.local resolution: "@strapi/permissions@workspace:packages/core/permissions" dependencies: "@casl/ability": "npm:6.5.0" "@strapi/pack-up": "workspace:*" - "@strapi/utils": "npm:4.15.0" - eslint-config-custom: "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" + eslint-config-custom: "npm:4.15.1" lodash: "npm:4.17.21" qs: "npm:6.11.1" sift: "npm:16.0.1" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft @@ -7858,20 +7858,20 @@ __metadata: resolution: "@strapi/plugin-cloud@workspace:packages/plugins/cloud" dependencies: "@strapi/design-system": "npm:^1.12.0" - "@strapi/helper-plugin": "npm:^4.14.3" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:^1.12.0" - "@strapi/strapi": "npm:4.15.0" + "@strapi/strapi": "npm:4.15.1" "@types/react": "npm:^18.2.7" "@types/react-dom": "npm:^18.2.12" "@types/react-router-dom": "npm:^5.3.3" "@types/styled-components": "npm:5.1.26" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" react-intl: "npm:6.4.1" react-router-dom: "npm:^5.3.4" styled-components: "npm:^5.3.3" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" typescript: "npm:5.2.2" peerDependencies: "@strapi/strapi": ^4.4.0 @@ -7882,14 +7882,14 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-color-picker@npm:4.15.0, @strapi/plugin-color-picker@workspace:packages/plugins/color-picker": +"@strapi/plugin-color-picker@npm:4.15.1, @strapi/plugin-color-picker@workspace:packages/plugins/color-picker": version: 0.0.0-use.local resolution: "@strapi/plugin-color-picker@workspace:packages/plugins/color-picker" dependencies: "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" - "@strapi/strapi": "npm:4.15.0" + "@strapi/strapi": "npm:4.15.1" "@testing-library/react": "npm:14.0.0" "@testing-library/user-event": "npm:14.4.3" "@types/styled-components": "npm:5.1.26" @@ -7910,28 +7910,28 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-content-manager@npm:4.15.0, @strapi/plugin-content-manager@workspace:packages/core/content-manager": +"@strapi/plugin-content-manager@npm:4.15.1, @strapi/plugin-content-manager@workspace:packages/core/content-manager": version: 0.0.0-use.local resolution: "@strapi/plugin-content-manager@workspace:packages/core/content-manager" dependencies: "@sindresorhus/slugify": "npm:1.1.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" lodash: "npm:4.17.21" qs: "npm:6.11.1" languageName: unknown linkType: soft -"@strapi/plugin-content-type-builder@npm:4.15.0, @strapi/plugin-content-type-builder@workspace:packages/core/content-type-builder": +"@strapi/plugin-content-type-builder@npm:4.15.1, @strapi/plugin-content-type-builder@workspace:packages/core/content-type-builder": version: 0.0.0-use.local resolution: "@strapi/plugin-content-type-builder@workspace:packages/core/content-type-builder" dependencies: "@sindresorhus/slugify": "npm:1.1.0" - "@strapi/admin": "npm:4.15.0" + "@strapi/admin": "npm:4.15.1" "@strapi/design-system": "npm:1.13.0" - "@strapi/generators": "npm:4.15.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/generators": "npm:4.15.1" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" "@testing-library/react": "npm:14.0.0" fs-extra: "npm:10.0.0" history: "npm:^4.9.0" @@ -7956,15 +7956,15 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-documentation@npm:4.15.0, @strapi/plugin-documentation@workspace:packages/plugins/documentation": +"@strapi/plugin-documentation@npm:4.15.1, @strapi/plugin-documentation@workspace:packages/plugins/documentation": version: 0.0.0-use.local resolution: "@strapi/plugin-documentation@workspace:packages/plugins/documentation" dependencies: "@apidevtools/swagger-parser": "npm:^10.1.0" "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" "@testing-library/react": "npm:14.0.0" "@testing-library/user-event": "npm:14.4.3" bcryptjs: "npm:2.4.3" @@ -7995,17 +7995,17 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-email@npm:4.15.0, @strapi/plugin-email@workspace:packages/core/email": +"@strapi/plugin-email@npm:4.15.1, @strapi/plugin-email@workspace:packages/core/email": version: 0.0.0-use.local resolution: "@strapi/plugin-email@workspace:packages/core/email" dependencies: "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" "@strapi/pack-up": "workspace:*" - "@strapi/provider-email-sendmail": "npm:4.15.0" + "@strapi/provider-email-sendmail": "npm:4.15.1" "@strapi/types": "workspace:*" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" "@testing-library/react": "npm:14.0.0" "@types/koa": "npm:2.13.4" "@types/lodash": "npm:^4.14.191" @@ -8029,16 +8029,16 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-graphql@npm:4.15.0, @strapi/plugin-graphql@workspace:packages/plugins/graphql": +"@strapi/plugin-graphql@npm:4.15.1, @strapi/plugin-graphql@workspace:packages/plugins/graphql": version: 0.0.0-use.local resolution: "@strapi/plugin-graphql@workspace:packages/plugins/graphql" dependencies: "@graphql-tools/schema": "npm:8.5.1" "@graphql-tools/utils": "npm:^8.13.1" "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" apollo-server-core: "npm:3.12.1" apollo-server-koa: "npm:3.10.0" cross-env: "npm:^7.0.3" @@ -8065,15 +8065,15 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-i18n@npm:4.15.0, @strapi/plugin-i18n@workspace:packages/plugins/i18n": +"@strapi/plugin-i18n@npm:4.15.1, @strapi/plugin-i18n@workspace:packages/plugins/i18n": version: 0.0.0-use.local resolution: "@strapi/plugin-i18n@workspace:packages/plugins/i18n" dependencies: "@reduxjs/toolkit": "npm:1.9.7" "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" "@testing-library/react": "npm:14.0.0" formik: "npm:2.4.0" immer: "npm:9.0.19" @@ -8097,13 +8097,13 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-sentry@npm:4.15.0, @strapi/plugin-sentry@workspace:packages/plugins/sentry": +"@strapi/plugin-sentry@npm:4.15.1, @strapi/plugin-sentry@workspace:packages/plugins/sentry": version: 0.0.0-use.local resolution: "@strapi/plugin-sentry@workspace:packages/plugins/sentry" dependencies: "@sentry/node": "npm:6.19.7" "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -8118,15 +8118,15 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-upload@npm:4.15.0, @strapi/plugin-upload@workspace:packages/core/upload": +"@strapi/plugin-upload@npm:4.15.1, @strapi/plugin-upload@workspace:packages/core/upload": version: 0.0.0-use.local resolution: "@strapi/plugin-upload@workspace:packages/core/upload" dependencies: "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" - "@strapi/provider-upload-local": "npm:4.15.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/provider-upload-local": "npm:4.15.1" + "@strapi/utils": "npm:4.15.1" "@testing-library/dom": "npm:9.2.0" "@testing-library/react": "npm:14.0.0" "@testing-library/user-event": "npm:14.4.3" @@ -8164,14 +8164,14 @@ __metadata: languageName: unknown linkType: soft -"@strapi/plugin-users-permissions@npm:4.15.0, @strapi/plugin-users-permissions@workspace:packages/plugins/users-permissions": +"@strapi/plugin-users-permissions@npm:4.15.1, @strapi/plugin-users-permissions@workspace:packages/plugins/users-permissions": version: 0.0.0-use.local resolution: "@strapi/plugin-users-permissions@workspace:packages/plugins/users-permissions" dependencies: "@strapi/design-system": "npm:1.13.0" - "@strapi/helper-plugin": "npm:4.15.0" + "@strapi/helper-plugin": "npm:4.15.1" "@strapi/icons": "npm:1.13.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" "@testing-library/dom": "npm:9.2.0" "@testing-library/react": "npm:14.0.0" "@testing-library/user-event": "npm:14.4.3" @@ -8204,14 +8204,14 @@ __metadata: languageName: unknown linkType: soft -"@strapi/provider-audit-logs-local@npm:4.15.0, @strapi/provider-audit-logs-local@workspace:packages/providers/audit-logs-local": +"@strapi/provider-audit-logs-local@npm:4.15.1, @strapi/provider-audit-logs-local@workspace:packages/providers/audit-logs-local": version: 0.0.0-use.local resolution: "@strapi/provider-audit-logs-local@workspace:packages/providers/audit-logs-local" dependencies: "@strapi/pack-up": "workspace:*" - "@strapi/types": "npm:4.15.0" - eslint-config-custom: "npm:4.15.0" - tsconfig: "npm:4.15.0" + "@strapi/types": "npm:4.15.1" + eslint-config-custom: "npm:4.15.1" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft @@ -8220,23 +8220,23 @@ __metadata: resolution: "@strapi/provider-email-amazon-ses@workspace:packages/providers/email-amazon-ses" dependencies: "@strapi/pack-up": "workspace:*" - "@strapi/utils": "npm:4.15.0" - eslint-config-custom: "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" + eslint-config-custom: "npm:4.15.1" node-ses: "npm:^3.0.3" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft -"@strapi/provider-email-mailgun@npm:4.15.0, @strapi/provider-email-mailgun@workspace:packages/providers/email-mailgun": +"@strapi/provider-email-mailgun@npm:4.15.1, @strapi/provider-email-mailgun@workspace:packages/providers/email-mailgun": version: 0.0.0-use.local resolution: "@strapi/provider-email-mailgun@workspace:packages/providers/email-mailgun" dependencies: "@strapi/pack-up": "workspace:*" - "@strapi/utils": "npm:4.15.0" - eslint-config-custom: "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" + eslint-config-custom: "npm:4.15.1" form-data: "npm:^4.0.0" mailgun.js: "npm:8.2.1" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft @@ -8246,10 +8246,10 @@ __metadata: dependencies: "@strapi/pack-up": "workspace:*" "@types/nodemailer": "npm:6.4.7" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" lodash: "npm:4.17.21" nodemailer: "npm:6.9.1" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft @@ -8259,86 +8259,86 @@ __metadata: dependencies: "@sendgrid/mail": "npm:7.7.0" "@strapi/pack-up": "workspace:*" - "@strapi/utils": "npm:4.15.0" - eslint-config-custom: "npm:4.15.0" - tsconfig: "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" + eslint-config-custom: "npm:4.15.1" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft -"@strapi/provider-email-sendmail@npm:4.15.0, @strapi/provider-email-sendmail@workspace:packages/providers/email-sendmail": +"@strapi/provider-email-sendmail@npm:4.15.1, @strapi/provider-email-sendmail@workspace:packages/providers/email-sendmail": version: 0.0.0-use.local resolution: "@strapi/provider-email-sendmail@workspace:packages/providers/email-sendmail" dependencies: "@strapi/pack-up": "workspace:*" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" "@types/sendmail": "npm:1.4.4" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" sendmail: "npm:^1.6.1" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft -"@strapi/provider-upload-aws-s3@npm:4.15.0, @strapi/provider-upload-aws-s3@workspace:packages/providers/upload-aws-s3": +"@strapi/provider-upload-aws-s3@npm:4.15.1, @strapi/provider-upload-aws-s3@workspace:packages/providers/upload-aws-s3": version: 0.0.0-use.local resolution: "@strapi/provider-upload-aws-s3@workspace:packages/providers/upload-aws-s3" dependencies: "@strapi/pack-up": "workspace:*" "@types/jest": "npm:29.5.2" aws-sdk: "npm:2.1472.0" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" lodash: "npm:4.17.21" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft -"@strapi/provider-upload-cloudinary@npm:4.15.0, @strapi/provider-upload-cloudinary@workspace:packages/providers/upload-cloudinary": +"@strapi/provider-upload-cloudinary@npm:4.15.1, @strapi/provider-upload-cloudinary@workspace:packages/providers/upload-cloudinary": version: 0.0.0-use.local resolution: "@strapi/provider-upload-cloudinary@workspace:packages/providers/upload-cloudinary" dependencies: "@strapi/pack-up": "workspace:*" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" cloudinary: "npm:^1.41.0" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" into-stream: "npm:^5.1.0" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft -"@strapi/provider-upload-local@npm:4.15.0, @strapi/provider-upload-local@workspace:packages/providers/upload-local": +"@strapi/provider-upload-local@npm:4.15.1, @strapi/provider-upload-local@workspace:packages/providers/upload-local": version: 0.0.0-use.local resolution: "@strapi/provider-upload-local@workspace:packages/providers/upload-local" dependencies: "@strapi/pack-up": "workspace:*" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" "@types/jest": "npm:29.5.2" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" fs-extra: "npm:10.0.0" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" languageName: unknown linkType: soft -"@strapi/strapi@npm:4.15.0, @strapi/strapi@workspace:packages/core/strapi": +"@strapi/strapi@npm:4.15.1, @strapi/strapi@workspace:packages/core/strapi": version: 0.0.0-use.local resolution: "@strapi/strapi@workspace:packages/core/strapi" dependencies: "@koa/cors": "npm:3.4.3" "@koa/router": "npm:10.1.1" - "@strapi/admin": "npm:4.15.0" - "@strapi/data-transfer": "npm:4.15.0" - "@strapi/database": "npm:4.15.0" - "@strapi/generate-new": "npm:4.15.0" - "@strapi/generators": "npm:4.15.0" - "@strapi/logger": "npm:4.15.0" + "@strapi/admin": "npm:4.15.1" + "@strapi/data-transfer": "npm:4.15.1" + "@strapi/database": "npm:4.15.1" + "@strapi/generate-new": "npm:4.15.1" + "@strapi/generators": "npm:4.15.1" + "@strapi/logger": "npm:4.15.1" "@strapi/pack-up": "workspace:*" - "@strapi/permissions": "npm:4.15.0" - "@strapi/plugin-content-manager": "npm:4.15.0" - "@strapi/plugin-content-type-builder": "npm:4.15.0" - "@strapi/plugin-email": "npm:4.15.0" - "@strapi/plugin-upload": "npm:4.15.0" + "@strapi/permissions": "npm:4.15.1" + "@strapi/plugin-content-manager": "npm:4.15.1" + "@strapi/plugin-content-type-builder": "npm:4.15.1" + "@strapi/plugin-email": "npm:4.15.1" + "@strapi/plugin-upload": "npm:4.15.1" "@strapi/ts-zen": "npm:^0.2.0" - "@strapi/types": "npm:4.15.0" - "@strapi/typescript-utils": "npm:4.15.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/types": "npm:4.15.1" + "@strapi/typescript-utils": "npm:4.15.1" + "@strapi/utils": "npm:4.15.1" "@types/bcryptjs": "npm:2.4.3" "@types/configstore": "npm:5.0.1" "@types/delegates": "npm:1.0.0" @@ -8364,7 +8364,7 @@ __metadata: debug: "npm:4.3.4" delegates: "npm:1.0.0" dotenv: "npm:14.2.0" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" execa: "npm:5.1.1" fs-extra: "npm:10.0.0" glob: "npm:7.2.3" @@ -8394,7 +8394,7 @@ __metadata: semver: "npm:7.5.4" statuses: "npm:2.0.1" supertest: "npm:6.3.3" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" typescript: "npm:5.2.2" yup: "npm:0.32.9" bin: @@ -8412,34 +8412,34 @@ __metadata: languageName: node linkType: hard -"@strapi/types@npm:4.15.0, @strapi/types@workspace:*, @strapi/types@workspace:packages/core/types": +"@strapi/types@npm:4.15.1, @strapi/types@workspace:*, @strapi/types@workspace:packages/core/types": version: 0.0.0-use.local resolution: "@strapi/types@workspace:packages/core/types" dependencies: "@koa/cors": "npm:3.4.3" "@koa/router": "npm:10.1.1" - "@strapi/database": "npm:4.15.0" - "@strapi/logger": "npm:4.15.0" + "@strapi/database": "npm:4.15.1" + "@strapi/logger": "npm:4.15.1" "@strapi/pack-up": "workspace:*" - "@strapi/permissions": "npm:4.15.0" + "@strapi/permissions": "npm:4.15.1" "@strapi/ts-zen": "npm:^0.2.0" - "@strapi/utils": "npm:4.15.0" + "@strapi/utils": "npm:4.15.1" "@types/jest": "npm:29.5.2" "@types/koa": "npm:2.13.4" "@types/koa__router": "npm:12.0.0" "@types/node-schedule": "npm:2.1.0" commander: "npm:8.3.0" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" https-proxy-agent: "npm:5.0.1" koa: "npm:2.13.4" node-fetch: "npm:2.7.0" node-schedule: "npm:2.1.0" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" typescript: "npm:5.2.2" languageName: unknown linkType: soft -"@strapi/typescript-utils@npm:4.15.0, @strapi/typescript-utils@workspace:packages/utils/typescript": +"@strapi/typescript-utils@npm:4.15.1, @strapi/typescript-utils@workspace:packages/utils/typescript": version: 0.0.0-use.local resolution: "@strapi/typescript-utils@workspace:packages/utils/typescript" dependencies: @@ -8484,7 +8484,7 @@ __metadata: languageName: node linkType: hard -"@strapi/utils@npm:4.15.0, @strapi/utils@workspace:packages/core/utils": +"@strapi/utils@npm:4.15.1, @strapi/utils@workspace:packages/core/utils": version: 0.0.0-use.local resolution: "@strapi/utils@workspace:packages/core/utils" dependencies: @@ -8493,13 +8493,13 @@ __metadata: "@types/koa": "npm:2.13.4" "@types/node": "npm:18.18.4" date-fns: "npm:2.30.0" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" http-errors: "npm:1.8.1" koa: "npm:2.13.4" koa-body: "npm:4.2.0" lodash: "npm:4.17.21" p-map: "npm:4.0.0" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" yup: "npm:0.32.9" languageName: unknown linkType: soft @@ -13892,12 +13892,12 @@ __metadata: version: 0.0.0-use.local resolution: "create-strapi-app@workspace:packages/cli/create-strapi-app" dependencies: - "@strapi/generate-new": "npm:4.15.0" + "@strapi/generate-new": "npm:4.15.1" "@strapi/pack-up": "workspace:*" commander: "npm:8.3.0" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" inquirer: "npm:8.2.5" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" bin: create-strapi-app: ./bin/index.js languageName: unknown @@ -13907,17 +13907,17 @@ __metadata: version: 0.0.0-use.local resolution: "create-strapi-starter@workspace:packages/cli/create-strapi-starter" dependencies: - "@strapi/generate-new": "npm:4.15.0" + "@strapi/generate-new": "npm:4.15.1" "@strapi/pack-up": "workspace:*" chalk: "npm:4.1.2" ci-info: "npm:3.8.0" commander: "npm:8.3.0" - eslint-config-custom: "npm:4.15.0" + eslint-config-custom: "npm:4.15.1" execa: "npm:5.1.1" fs-extra: "npm:10.0.0" inquirer: "npm:8.2.5" ora: "npm:5.4.1" - tsconfig: "npm:4.15.0" + tsconfig: "npm:4.15.1" bin: create-strapi-starter: ./bin/index.js languageName: unknown @@ -15820,7 +15820,7 @@ __metadata: languageName: node linkType: hard -"eslint-config-custom@npm:4.15.0, eslint-config-custom@workspace:*, eslint-config-custom@workspace:packages/utils/eslint-config-custom": +"eslint-config-custom@npm:4.15.1, eslint-config-custom@workspace:*, eslint-config-custom@workspace:packages/utils/eslint-config-custom": version: 0.0.0-use.local resolution: "eslint-config-custom@workspace:packages/utils/eslint-config-custom" languageName: unknown @@ -17744,16 +17744,16 @@ __metadata: resolution: "getstarted@workspace:examples/getstarted" dependencies: "@strapi/icons": "npm:1.11.0" - "@strapi/plugin-color-picker": "npm:4.15.0" - "@strapi/plugin-documentation": "npm:4.15.0" - "@strapi/plugin-graphql": "npm:4.15.0" - "@strapi/plugin-i18n": "npm:4.15.0" - "@strapi/plugin-sentry": "npm:4.15.0" - "@strapi/plugin-users-permissions": "npm:4.15.0" - "@strapi/provider-email-mailgun": "npm:4.15.0" - "@strapi/provider-upload-aws-s3": "npm:4.15.0" - "@strapi/provider-upload-cloudinary": "npm:4.15.0" - "@strapi/strapi": "npm:4.15.0" + "@strapi/plugin-color-picker": "npm:4.15.1" + "@strapi/plugin-documentation": "npm:4.15.1" + "@strapi/plugin-graphql": "npm:4.15.1" + "@strapi/plugin-i18n": "npm:4.15.1" + "@strapi/plugin-sentry": "npm:4.15.1" + "@strapi/plugin-users-permissions": "npm:4.15.1" + "@strapi/provider-email-mailgun": "npm:4.15.1" + "@strapi/provider-upload-aws-s3": "npm:4.15.1" + "@strapi/provider-upload-cloudinary": "npm:4.15.1" + "@strapi/strapi": "npm:4.15.1" better-sqlite3: "npm:8.6.0" lodash: "npm:4.17.21" mysql: "npm:2.18.1" @@ -21285,9 +21285,9 @@ __metadata: version: 0.0.0-use.local resolution: "kitchensink-ts@workspace:examples/kitchensink-ts" dependencies: - "@strapi/plugin-i18n": "npm:4.15.0" - "@strapi/plugin-users-permissions": "npm:4.15.0" - "@strapi/strapi": "npm:4.15.0" + "@strapi/plugin-i18n": "npm:4.15.1" + "@strapi/plugin-users-permissions": "npm:4.15.1" + "@strapi/strapi": "npm:4.15.1" better-sqlite3: "npm:8.6.0" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -21300,10 +21300,10 @@ __metadata: version: 0.0.0-use.local resolution: "kitchensink@workspace:examples/kitchensink" dependencies: - "@strapi/provider-email-mailgun": "npm:4.15.0" - "@strapi/provider-upload-aws-s3": "npm:4.15.0" - "@strapi/provider-upload-cloudinary": "npm:4.15.0" - "@strapi/strapi": "npm:4.15.0" + "@strapi/provider-email-mailgun": "npm:4.15.1" + "@strapi/provider-upload-aws-s3": "npm:4.15.1" + "@strapi/provider-upload-cloudinary": "npm:4.15.1" + "@strapi/strapi": "npm:4.15.1" lodash: "npm:4.17.21" mysql: "npm:2.18.1" mysql2: "npm:3.6.0" @@ -30260,7 +30260,7 @@ __metadata: languageName: node linkType: hard -"tsconfig@npm:4.15.0, tsconfig@workspace:packages/utils/tsconfig": +"tsconfig@npm:4.15.1, tsconfig@workspace:packages/utils/tsconfig": version: 0.0.0-use.local resolution: "tsconfig@workspace:packages/utils/tsconfig" dependencies: From 5f65fd6451f1d729b3c96ecb2fadc01878e2f8a7 Mon Sep 17 00:00:00 2001 From: Alexandre BODIN Date: Fri, 3 Nov 2023 09:52:55 +0100 Subject: [PATCH 05/10] fix(admin): missing env utilities (#18657) --- packages/core/admin/_internal/node/core/plugins.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/admin/_internal/node/core/plugins.ts b/packages/core/admin/_internal/node/core/plugins.ts index cfd0d06188..fa2d9584a5 100644 --- a/packages/core/admin/_internal/node/core/plugins.ts +++ b/packages/core/admin/_internal/node/core/plugins.ts @@ -1,5 +1,6 @@ import os from 'node:os'; import path from 'node:path'; +import { env } from '@strapi/utils'; import { getModule, PackageJson } from './dependencies'; import { loadFile } from './files'; import { BuildContext, CreateBuildContextArgs } from '../createBuildContext'; @@ -128,7 +129,7 @@ const loadUserPluginsFile = async (root: string): Promise /** * Configs can be a function or they can be just an object! */ - return typeof configFile === 'function' ? configFile() : configFile; + return typeof configFile === 'function' ? configFile({ env }) : configFile; } } From 0e69461383292883156617d3d81ae7e03f75dd76 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:56:03 +0000 Subject: [PATCH 06/10] fix(admin): build pipeline & deps (#18658) --- .../admin/_internal/node/core/dependencies.ts | 4 +- .../core/admin/_internal/node/core/plugins.ts | 25 ----- .../core/admin/_internal/node/staticFiles.ts | 2 +- packages/core/admin/package.json | 8 +- .../core/content-type-builder/package.json | 4 +- .../src/commands/data-transfer.ts | 6 +- packages/core/email/package.json | 4 +- packages/core/helper-plugin/package.json | 4 +- packages/core/strapi/package.json | 24 +++++ packages/core/strapi/packup.config.ts | 17 +++- packages/core/strapi/src/admin.ts | 21 +++++ .../actions/plugin/build-command/action.ts | 4 + packages/core/upload/package.json | 4 +- .../src/templates/js/plugin-package.json.hbs | 4 +- .../src/templates/ts/plugin-package.json.hbs | 4 +- packages/plugins/cloud/package.json | 8 +- packages/plugins/color-picker/package.json | 4 +- packages/plugins/documentation/package.json | 4 +- packages/plugins/graphql/package.json | 4 +- packages/plugins/i18n/package.json | 4 +- packages/plugins/sentry/package.json | 4 +- .../plugins/users-permissions/package.json | 4 +- yarn.lock | 94 ++++++------------- 23 files changed, 138 insertions(+), 123 deletions(-) create mode 100644 packages/core/strapi/src/admin.ts diff --git a/packages/core/admin/_internal/node/core/dependencies.ts b/packages/core/admin/_internal/node/core/dependencies.ts index c4e3edd6cc..e167a8dc64 100644 --- a/packages/core/admin/_internal/node/core/dependencies.ts +++ b/packages/core/admin/_internal/node/core/dependencies.ts @@ -15,8 +15,8 @@ import { getPackageManager } from './managers'; const PEER_DEPS = { react: '^18.0.0', 'react-dom': '^18.0.0', - 'react-router-dom': '^5.0.0', - 'styled-components': '^5.0.0', + 'react-router-dom': '^5.2.0', + 'styled-components': '^5.2.1', }; interface CheckRequiredDependenciesResult { diff --git a/packages/core/admin/_internal/node/core/plugins.ts b/packages/core/admin/_internal/node/core/plugins.ts index fa2d9584a5..f3f5003b75 100644 --- a/packages/core/admin/_internal/node/core/plugins.ts +++ b/packages/core/admin/_internal/node/core/plugins.ts @@ -5,13 +5,6 @@ import { getModule, PackageJson } from './dependencies'; import { loadFile } from './files'; import { BuildContext, CreateBuildContextArgs } from '../createBuildContext'; -const CORE_PLUGINS = [ - '@strapi/plugin-content-manager', - '@strapi/plugin-content-type-builder', - '@strapi/plugin-email', - '@strapi/plugin-upload', -]; - interface PluginMeta { name: string; pathToPlugin: string; @@ -46,24 +39,6 @@ export const getEnabledPlugins = async ({ }: Pick) => { const plugins: Record = {}; - logger.debug('Core plugins', os.EOL, CORE_PLUGINS); - - for (const plugin of CORE_PLUGINS) { - const pkg = await getModule(plugin, cwd); - - if (pkg && validatePackageIsPlugin(pkg)) { - /** - * We know there's a name because these are our packages. - */ - const name = (pkg.strapi.name || pkg.name)!; - - plugins[name] = { - name, - pathToPlugin: plugin, - }; - } - } - /** * This is the list of dependencies that are installed in the user's project. * It will include libraries like "react", so we need to collect the ones that diff --git a/packages/core/admin/_internal/node/staticFiles.ts b/packages/core/admin/_internal/node/staticFiles.ts index 53f23ed82c..e76f87054f 100644 --- a/packages/core/admin/_internal/node/staticFiles.ts +++ b/packages/core/admin/_internal/node/staticFiles.ts @@ -26,7 +26,7 @@ const getEntryModule = ({ plugins }: EntryModuleArgs): string => { * Any modifications made will be discarded. */ ${pluginsImport} - import { renderAdmin } from "@strapi/admin/strapi-admin" + import { renderAdmin } from "@strapi/strapi/admin" renderAdmin( document.getElementById("strapi"), diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 5d7f97a639..8a7b3e7647 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -96,6 +96,7 @@ "css-loader": "^6.8.1", "date-fns": "2.30.0", "dotenv": "14.2.0", + "esbuild": "0.19.2", "esbuild-loader": "^2.21.0", "esbuild-register": "3.5.0", "execa": "5.1.1", @@ -185,7 +186,12 @@ "vite": "4.4.9" }, "peerDependencies": { - "@strapi/strapi": "^4.3.4" + "@strapi/data-transfer": "4.15.0", + "@strapi/strapi": "^4.3.4", + "react": "^17.0.0 || ^18.0.0", + "react-dom": "^17.0.0 || ^18.0.0", + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index c10caf2e0a..0c525ea7d0 100644 --- a/packages/core/content-type-builder/package.json +++ b/packages/core/content-type-builder/package.json @@ -58,8 +58,8 @@ "peerDependencies": { "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/core/data-transfer/src/commands/data-transfer.ts b/packages/core/data-transfer/src/commands/data-transfer.ts index 3639a81169..8a0d3569f7 100644 --- a/packages/core/data-transfer/src/commands/data-transfer.ts +++ b/packages/core/data-transfer/src/commands/data-transfer.ts @@ -5,7 +5,7 @@ import { configs, createLogger } from '@strapi/logger'; import strapiFactory from '@strapi/strapi'; import ora from 'ora'; import { merge } from 'lodash/fp'; -import type { LoadedStrapi } from '@strapi/types'; +import type { LoadedStrapi, Strapi } from '@strapi/types'; import { readableBytes, exitWith } from './helpers'; import { getParseListWithChoices, parseInteger, confirmMessage } from './commander'; @@ -148,7 +148,9 @@ const setSignalHandler = async ( }); }; -const createStrapiInstance = async (opts: { logLevel?: string } = {}) => { +const createStrapiInstance = async ( + opts: { logLevel?: string } = {} +): Promise> => { try { const appContext = await strapiFactory.compile(); const app = strapiFactory({ ...opts, ...appContext }); diff --git a/packages/core/email/package.json b/packages/core/email/package.json index b4bac7c6e0..4c915b55d0 100644 --- a/packages/core/email/package.json +++ b/packages/core/email/package.json @@ -81,8 +81,8 @@ "koa": "2.13.4", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index a2efc46f9c..a358f26ef9 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -100,8 +100,8 @@ "@strapi/icons": "1.13.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "^5.3.4", - "styled-components": "^5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index be42150880..af1b9c65a7 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -64,6 +64,30 @@ "url": "https://strapi.io" } ], + "exports": { + ".": { + "types": "./dist/index.d.ts", + "source": "./src/index.ts", + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "default": "./dist/index.js" + }, + "./dist/utils/ee": { + "types": "./dist/utils/ee.d.ts", + "source": "./src/utils/ee.ts", + "import": "./dist/utils/ee.mjs", + "require": "./dist/utils/ee.js", + "default": "./dist/utils/ee.js" + }, + "./admin": { + "types": "./dist/admin.d.ts", + "source": "./src/admin.ts", + "import": "./dist/admin.mjs", + "require": "./dist/admin.js", + "default": "./dist/admin.js" + }, + "./package.json": "./package.json" + }, "main": "./dist/index.js", "module": "./dist/index.mjs", "source": "./src/index.ts", diff --git a/packages/core/strapi/packup.config.ts b/packages/core/strapi/packup.config.ts index e9d04140f4..05d5f09b71 100644 --- a/packages/core/strapi/packup.config.ts +++ b/packages/core/strapi/packup.config.ts @@ -4,13 +4,28 @@ import { builtinModules } from 'node:module'; export default defineConfig({ bundles: [ + { + source: './src/index.ts', + import: './dist/index.js', + require: './dist/index.js', + types: './dist/index.d.ts', + runtime: 'node', + }, { source: './src/cli.ts', require: './dist/cli.js', runtime: 'node', }, + { + source: './src/admin.ts', + import: './dist/admin.js', + require: './dist/admin.js', + types: './dist/index.d.ts', + runtime: 'web', + }, ], + exports: {}, + dist: './dist', externals: [...builtinModules], preserveModules: true, - runtime: 'node', }); diff --git a/packages/core/strapi/src/admin.ts b/packages/core/strapi/src/admin.ts new file mode 100644 index 0000000000..0502ebd0b8 --- /dev/null +++ b/packages/core/strapi/src/admin.ts @@ -0,0 +1,21 @@ +import { RenderAdminArgs, renderAdmin } from '@strapi/admin/strapi-admin'; +// @ts-expect-error – No types, yet. +import contentTypeBuilder from '@strapi/plugin-content-type-builder/strapi-admin'; +import email from '@strapi/plugin-email/strapi-admin'; +// @ts-expect-error – No types, yet. +import upload from '@strapi/plugin-upload/strapi-admin'; + +const render = (mountNode: HTMLElement | null, { plugins }: RenderAdminArgs) => { + return renderAdmin(mountNode, { + plugins: { + 'content-type-builder': contentTypeBuilder, + // @ts-expect-error – TODO: fix this + email, + upload, + ...plugins, + }, + }); +}; + +export { render as renderAdmin }; +export type { RenderAdminArgs }; diff --git a/packages/core/strapi/src/commands/actions/plugin/build-command/action.ts b/packages/core/strapi/src/commands/actions/plugin/build-command/action.ts index 99bd24cde9..f9db9da023 100644 --- a/packages/core/strapi/src/commands/actions/plugin/build-command/action.ts +++ b/packages/core/strapi/src/commands/actions/plugin/build-command/action.ts @@ -12,6 +12,10 @@ interface ActionOptions extends BuildCLIOptions { export default async ({ force, ...opts }: ActionOptions) => { const logger = createLogger({ debug: opts.debug, silent: opts.silent, timestamp: false }); try { + /** + * ALWAYS set production for using plugin build CLI. + */ + process.env.NODE_ENV = 'production'; /** * Notify users this is an experimental command and get them to approve first * this can be opted out by setting the argument --yes diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json index 72303f1ee1..f412ec9704 100644 --- a/packages/core/upload/package.json +++ b/packages/core/upload/package.json @@ -65,8 +65,8 @@ "peerDependencies": { "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/generators/generators/src/templates/js/plugin-package.json.hbs b/packages/generators/generators/src/templates/js/plugin-package.json.hbs index 9815e69e51..2609f63277 100644 --- a/packages/generators/generators/src/templates/js/plugin-package.json.hbs +++ b/packages/generators/generators/src/templates/js/plugin-package.json.hbs @@ -23,8 +23,8 @@ "peerDependencies": { "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "^5.3.4", - "styled-components": "^5.3.6" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "author": { "name": "A Strapi developer" diff --git a/packages/generators/generators/src/templates/ts/plugin-package.json.hbs b/packages/generators/generators/src/templates/ts/plugin-package.json.hbs index 4bf831f38f..64c7db712a 100644 --- a/packages/generators/generators/src/templates/ts/plugin-package.json.hbs +++ b/packages/generators/generators/src/templates/ts/plugin-package.json.hbs @@ -28,8 +28,8 @@ "peerDependencies": { "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "^5.3.4", - "styled-components": "^5.3.6" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "author": { "name": "A Strapi developer" diff --git a/packages/plugins/cloud/package.json b/packages/plugins/cloud/package.json index 7bc755c0f0..6c5eccf8b5 100644 --- a/packages/plugins/cloud/package.json +++ b/packages/plugins/cloud/package.json @@ -53,8 +53,8 @@ "eslint-config-custom": "4.15.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-router-dom": "^5.3.4", - "styled-components": "^5.3.3", + "react-router-dom": "5.3.4", + "styled-components": "5.3.3", "tsconfig": "4.15.1", "typescript": "5.2.2" }, @@ -62,8 +62,8 @@ "@strapi/strapi": "^4.4.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "^5.3.4", - "styled-components": "^5.3.6" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/plugins/color-picker/package.json b/packages/plugins/color-picker/package.json index 62a0bbe93c..bb38ed153e 100644 --- a/packages/plugins/color-picker/package.json +++ b/packages/plugins/color-picker/package.json @@ -79,8 +79,8 @@ "@strapi/strapi": "^4.4.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json index 5755a661ff..2d41143ccb 100644 --- a/packages/plugins/documentation/package.json +++ b/packages/plugins/documentation/package.json @@ -61,8 +61,8 @@ "@strapi/strapi": "^4.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json index 1d851ad457..d3ce813a8e 100644 --- a/packages/plugins/graphql/package.json +++ b/packages/plugins/graphql/package.json @@ -54,8 +54,8 @@ "@strapi/strapi": "^4.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json index 2dfdf49c51..f726b0d513 100644 --- a/packages/plugins/i18n/package.json +++ b/packages/plugins/i18n/package.json @@ -56,8 +56,8 @@ "peerDependencies": { "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/plugins/sentry/package.json b/packages/plugins/sentry/package.json index e47c05220b..6e9e43b6ec 100644 --- a/packages/plugins/sentry/package.json +++ b/packages/plugins/sentry/package.json @@ -41,8 +41,8 @@ "@strapi/strapi": "^4.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/packages/plugins/users-permissions/package.json b/packages/plugins/users-permissions/package.json index 2783662bba..0d31661f90 100644 --- a/packages/plugins/users-permissions/package.json +++ b/packages/plugins/users-permissions/package.json @@ -63,8 +63,8 @@ "peerDependencies": { "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", - "react-router-dom": "5.3.4", - "styled-components": "5.3.3" + "react-router-dom": "^5.2.0", + "styled-components": "^5.2.1" }, "engines": { "node": ">=18.0.0 <=20.x.x", diff --git a/yarn.lock b/yarn.lock index 4eea839607..e165171cd7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2814,15 +2814,6 @@ __metadata: languageName: node linkType: hard -"@emotion/is-prop-valid@npm:^1.1.0": - version: 1.2.1 - resolution: "@emotion/is-prop-valid@npm:1.2.1" - dependencies: - "@emotion/memoize": "npm:^0.8.1" - checksum: fe231c472d38b3bbe519bcc9a5585cd41c45604147f3a065e333caf0f695d668aa21bc4229e657c1b6ea7398e096899e6ad54662548c73f11f6ba594aebd76a1 - languageName: node - linkType: hard - "@emotion/memoize@npm:0.7.4": version: 0.7.4 resolution: "@emotion/memoize@npm:0.7.4" @@ -2837,13 +2828,6 @@ __metadata: languageName: node linkType: hard -"@emotion/memoize@npm:^0.8.1": - version: 0.8.1 - resolution: "@emotion/memoize@npm:0.8.1" - checksum: a19cc01a29fcc97514948eaab4dc34d8272e934466ed87c07f157887406bc318000c69ae6f813a9001c6a225364df04249842a50e692ef7a9873335fbcc141b0 - languageName: node - linkType: hard - "@emotion/react@npm:^11.8.1": version: 11.10.5 resolution: "@emotion/react@npm:11.10.5" @@ -7467,6 +7451,7 @@ __metadata: css-loader: "npm:^6.8.1" date-fns: "npm:2.30.0" dotenv: "npm:14.2.0" + esbuild: "npm:0.19.2" esbuild-loader: "npm:^2.21.0" esbuild-register: "npm:3.5.0" execa: "npm:5.1.1" @@ -7543,7 +7528,12 @@ __metadata: webpack-hot-middleware: "npm:2.25.4" yup: "npm:0.32.9" peerDependencies: + "@strapi/data-transfer": 4.15.0 "@strapi/strapi": ^4.3.4 + react: ^17.0.0 || ^18.0.0 + react-dom: ^17.0.0 || ^18.0.0 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -7755,8 +7745,8 @@ __metadata: "@strapi/icons": 1.13.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: ^5.3.4 - styled-components: ^5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -7869,16 +7859,16 @@ __metadata: react: "npm:^18.2.0" react-dom: "npm:^18.2.0" react-intl: "npm:6.4.1" - react-router-dom: "npm:^5.3.4" - styled-components: "npm:^5.3.3" + react-router-dom: "npm:5.3.4" + styled-components: "npm:5.3.3" tsconfig: "npm:4.15.1" typescript: "npm:5.2.2" peerDependencies: "@strapi/strapi": ^4.4.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: ^5.3.4 - styled-components: ^5.3.6 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -7905,8 +7895,8 @@ __metadata: "@strapi/strapi": ^4.4.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -7951,8 +7941,8 @@ __metadata: peerDependencies: react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -7990,8 +7980,8 @@ __metadata: "@strapi/strapi": ^4.0.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -8024,8 +8014,8 @@ __metadata: koa: 2.13.4 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -8060,8 +8050,8 @@ __metadata: "@strapi/strapi": ^4.0.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -8092,8 +8082,8 @@ __metadata: peerDependencies: react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -8113,8 +8103,8 @@ __metadata: "@strapi/strapi": ^4.0.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -8159,8 +8149,8 @@ __metadata: peerDependencies: react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -8199,8 +8189,8 @@ __metadata: peerDependencies: react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 - react-router-dom: 5.3.4 - styled-components: 5.3.3 + react-router-dom: ^5.2.0 + styled-components: ^5.2.1 languageName: unknown linkType: soft @@ -26849,7 +26839,7 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:5.3.4, react-router-dom@npm:^5.3.4": +"react-router-dom@npm:5.3.4": version: 5.3.4 resolution: "react-router-dom@npm:5.3.4" dependencies: @@ -29526,28 +29516,6 @@ __metadata: languageName: node linkType: hard -"styled-components@npm:^5.3.3": - version: 5.3.11 - resolution: "styled-components@npm:5.3.11" - dependencies: - "@babel/helper-module-imports": "npm:^7.0.0" - "@babel/traverse": "npm:^7.4.5" - "@emotion/is-prop-valid": "npm:^1.1.0" - "@emotion/stylis": "npm:^0.8.4" - "@emotion/unitless": "npm:^0.7.4" - babel-plugin-styled-components: "npm:>= 1.12.0" - css-to-react-native: "npm:^3.0.0" - hoist-non-react-statics: "npm:^3.0.0" - shallowequal: "npm:^1.1.0" - supports-color: "npm:^5.5.0" - peerDependencies: - react: ">= 16.8.0" - react-dom: ">= 16.8.0" - react-is: ">= 16.8.0" - checksum: 7e1baee0f7b4479fe1a4064e4ae87e40f1ba583030d04827cef73fa7b36d3a91ed552dc76164d319216039f906af42a5229648c023482280fa4b5f71f00eef2d - languageName: node - linkType: hard - "stylis@npm:4.1.3": version: 4.1.3 resolution: "stylis@npm:4.1.3" From 805908ba2b5d46ea3554792b8a9c6ca579afd13e Mon Sep 17 00:00:00 2001 From: Alexandre BODIN Date: Fri, 3 Nov 2023 16:28:46 +0100 Subject: [PATCH 07/10] fix(admin): close webpack watch on reload (#18667) --- packages/core/admin/_internal/node/develop.ts | 3 ++- .../admin/_internal/node/webpack/watch.ts | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/core/admin/_internal/node/develop.ts b/packages/core/admin/_internal/node/develop.ts index 6934eab865..2387fcd690 100644 --- a/packages/core/admin/_internal/node/develop.ts +++ b/packages/core/admin/_internal/node/develop.ts @@ -85,7 +85,7 @@ const develop = async ({ cwd, polling, logger, tsconfig, ...options }: DevelopOp EE.init(cwd); await writeStaticClientFiles(ctx); - await watchWebpack(ctx); + const webpackWatcher = await watchWebpack(ctx); const adminDuration = timer.end('creatingAdmin'); adminSpinner.text = `Creating admin (${adminDuration}ms)`; @@ -165,6 +165,7 @@ const develop = async ({ cwd, polling, logger, tsconfig, ...options }: DevelopOp ); await watcher.close(); await strapiInstance.destroy(); + webpackWatcher.close(); process.send?.('killed'); break; } diff --git a/packages/core/admin/_internal/node/webpack/watch.ts b/packages/core/admin/_internal/node/webpack/watch.ts index 838ff4f2a2..cf87e67772 100644 --- a/packages/core/admin/_internal/node/webpack/watch.ts +++ b/packages/core/admin/_internal/node/webpack/watch.ts @@ -1,5 +1,6 @@ import os from 'node:os'; import path from 'node:path'; +import { promisify } from 'node:util'; import webpackDevMiddleware from 'webpack-dev-middleware'; import webpackHotMiddleware from 'webpack-hot-middleware'; import { webpack } from 'webpack'; @@ -7,13 +8,17 @@ import type { BuildContext } from '../createBuildContext'; import { mergeConfigWithUserConfig, resolveDevelopmentConfig } from './config'; import { Common } from '@strapi/types'; -const watch = async (ctx: BuildContext) => { +interface Closer { + close(): Promise; +} + +const watch = async (ctx: BuildContext): Promise => { const config = await resolveDevelopmentConfig(ctx); const finalConfig = await mergeConfigWithUserConfig(config, ctx); ctx.logger.debug('Final webpack config:', os.EOL, finalConfig); - return new Promise((res) => { + return new Promise((res) => { const compiler = webpack(finalConfig); const devMiddleware = webpackDevMiddleware(compiler); @@ -91,7 +96,15 @@ const watch = async (ctx: BuildContext) => { ]); devMiddleware.waitUntilValid(() => { - res(true); + res({ + async close() { + await Promise.all([ + promisify(devMiddleware.close.bind(devMiddleware))(), + hotMiddleware.close(), + promisify(compiler.close.bind(compiler))(), + ]); + }, + }); }); }); }; From e741a4a0c03191c45777bd1c92a0f1861299e521 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:06:51 +0000 Subject: [PATCH 08/10] fix: import Document directly & add `ignorePrompts` CLI flag (#18668) --- packages/core/admin/_internal/cli/index.ts | 2 ++ packages/core/admin/_internal/node/build.ts | 16 +++++++++---- .../admin/_internal/node/core/dependencies.ts | 8 +++++-- packages/core/admin/_internal/node/develop.ts | 23 +++++++++++++++---- .../core/admin/_internal/node/staticFiles.ts | 17 ++++---------- packages/core/admin/tsconfig.json | 7 +----- 6 files changed, 43 insertions(+), 30 deletions(-) diff --git a/packages/core/admin/_internal/cli/index.ts b/packages/core/admin/_internal/cli/index.ts index ae78fa8e93..6a7983b12a 100644 --- a/packages/core/admin/_internal/cli/index.ts +++ b/packages/core/admin/_internal/cli/index.ts @@ -9,6 +9,7 @@ const build: StrapiCommand = ({ command, ctx }) => { command .command('build') .option('-d, --debug', 'Enable debugging mode with verbose logs', false) + .option('--ignore-prompts', 'Ignore all prompts', false) .option('--minify', 'Minify the output', true) .option('--no-optimization', '[deprecated]: use minify instead') .option('--silent', "Don't log anything", false) @@ -31,6 +32,7 @@ const develop: StrapiCommand = ({ command, ctx }) => { .alias('dev') .option('-d, --debug', 'Enable debugging mode with verbose logs', false) .option('--silent', "Don't log anything", false) + .option('--ignore-prompts', 'Ignore all prompts', false) .option('--polling', 'Watch for file changes in network directories', false) .option( '--no-build', diff --git a/packages/core/admin/_internal/node/build.ts b/packages/core/admin/_internal/node/build.ts index 37008262ed..3396dbeb42 100644 --- a/packages/core/admin/_internal/node/build.ts +++ b/packages/core/admin/_internal/node/build.ts @@ -10,6 +10,10 @@ import { getTimer } from './core/timer'; import type { CLIContext } from '@strapi/strapi'; interface BuildOptions extends CLIContext { + /** + * @default false + */ + ignorePrompts?: boolean; /** * Minify the output * @@ -31,13 +35,15 @@ interface BuildOptions extends CLIContext { * * @description Builds the admin panel of the strapi application. */ -const build = async ({ logger, cwd, tsconfig, ...options }: BuildOptions) => { +const build = async ({ logger, cwd, tsconfig, ignorePrompts, ...options }: BuildOptions) => { const timer = getTimer(); - const { didInstall } = await checkRequiredDependencies({ cwd, logger }).catch((err) => { - logger.error(err.message); - process.exit(1); - }); + const { didInstall } = await checkRequiredDependencies({ cwd, logger, ignorePrompts }).catch( + (err) => { + logger.error(err.message); + process.exit(1); + } + ); if (didInstall) { return; diff --git a/packages/core/admin/_internal/node/core/dependencies.ts b/packages/core/admin/_internal/node/core/dependencies.ts index e167a8dc64..5813d27572 100644 --- a/packages/core/admin/_internal/node/core/dependencies.ts +++ b/packages/core/admin/_internal/node/core/dependencies.ts @@ -41,7 +41,11 @@ interface DepToInstall { const checkRequiredDependencies = async ({ cwd, logger, -}: Pick): Promise => { + ignorePrompts, +}: Pick< + BuildOptions, + 'cwd' | 'logger' | 'ignorePrompts' +>): Promise => { const pkg = await readPkgUp({ cwd }); if (!pkg) { @@ -102,7 +106,7 @@ const checkRequiredDependencies = async ({ /** * temporary until V5 when we _will_ be enforcing these dependencies as required. */ - if (process.env.NODE_ENV !== 'development') { + if (process.env.NODE_ENV !== 'development' || ignorePrompts) { return { didInstall: false }; } diff --git a/packages/core/admin/_internal/node/develop.ts b/packages/core/admin/_internal/node/develop.ts index 2387fcd690..55b08f5f1c 100644 --- a/packages/core/admin/_internal/node/develop.ts +++ b/packages/core/admin/_internal/node/develop.ts @@ -13,18 +13,31 @@ import EE from '@strapi/strapi/dist/utils/ee'; import { writeStaticClientFiles } from './staticFiles'; interface DevelopOptions extends CLIContext { + /** + * @default false + */ + ignorePrompts?: boolean; polling?: boolean; open?: boolean; } -const develop = async ({ cwd, polling, logger, tsconfig, ...options }: DevelopOptions) => { +const develop = async ({ + cwd, + polling, + logger, + tsconfig, + ignorePrompts, + ...options +}: DevelopOptions) => { const timer = getTimer(); if (cluster.isPrimary) { - const { didInstall } = await checkRequiredDependencies({ cwd, logger }).catch((err) => { - logger.error(err.message); - process.exit(1); - }); + const { didInstall } = await checkRequiredDependencies({ cwd, logger, ignorePrompts }).catch( + (err) => { + logger.error(err.message); + process.exit(1); + } + ); if (didInstall) { return; diff --git a/packages/core/admin/_internal/node/staticFiles.ts b/packages/core/admin/_internal/node/staticFiles.ts index e76f87054f..5ae9545c24 100644 --- a/packages/core/admin/_internal/node/staticFiles.ts +++ b/packages/core/admin/_internal/node/staticFiles.ts @@ -4,6 +4,7 @@ import outdent from 'outdent'; import { format } from 'prettier'; import { createElement } from 'react'; import { renderToStaticMarkup } from 'react-dom/server'; +import { DefaultDocument as Document } from '../../admin/src/components/DefaultDocument'; import type { BuildContext } from './createBuildContext'; @@ -38,21 +39,11 @@ const getEntryModule = ({ plugins }: EntryModuleArgs): string => { `; }; -const getDefaultDocumentComponent = () => { - // eslint-disable-next-line @typescript-eslint/no-var-requires, node/no-missing-require - const { DefaultDocument } = require('@strapi/admin/strapi-admin'); - - return DefaultDocument; -}; - /** * TODO: Here in the future we could add the ability * to load a user's Document component? */ -const getDocumentHTML = ({ logger }: Pick) => { - const Document = getDefaultDocumentComponent(); - logger.debug('Got the default document'); - +const getDocumentHTML = async ({ logger }: Pick) => { const result = renderToStaticMarkup(createElement(Document)); logger.debug('Rendered the HTML'); @@ -84,7 +75,9 @@ const writeStaticClientFiles = async (ctx: BuildContext) => { await fs.mkdir(ctx.runtimeDir, { recursive: true }); ctx.logger.debug('Created the runtime directory'); - const indexHtml = decorateHTMLWithAutoGeneratedWarning(getDocumentHTML({ logger: ctx.logger })); + const indexHtml = decorateHTMLWithAutoGeneratedWarning( + await getDocumentHTML({ logger: ctx.logger }) + ); await fs.writeFile( path.join(ctx.runtimeDir, 'index.html'), diff --git a/packages/core/admin/tsconfig.json b/packages/core/admin/tsconfig.json index d4bc062ea4..c63a63d751 100644 --- a/packages/core/admin/tsconfig.json +++ b/packages/core/admin/tsconfig.json @@ -1,10 +1,5 @@ { - "extends": "tsconfig/base.json", - "compilerOptions": { - "module": "ESNext", - "moduleResolution": "Bundler", - "noEmit": true - }, + "extends": "tsconfig/client.json", "include": ["_internal", "packup.config.ts"], "exclude": ["node_modules"] } From 03194ce5a38172d044a20569a606986987d6ad2e Mon Sep 17 00:00:00 2001 From: Alexandre BODIN Date: Mon, 6 Nov 2023 11:58:55 +0100 Subject: [PATCH 09/10] fix(admin): use appropriate loader between jsx and tsx (#18670) --- .../core/admin/_internal/node/webpack/config.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/core/admin/_internal/node/webpack/config.ts b/packages/core/admin/_internal/node/webpack/config.ts index 2a1f0be1a4..8cf2ad9ab2 100644 --- a/packages/core/admin/_internal/node/webpack/config.ts +++ b/packages/core/admin/_internal/node/webpack/config.ts @@ -33,12 +33,23 @@ const resolveBaseConfig = async (ctx: BuildContext) => { module: { rules: [ { - test: /\.(t|j)sx?$/, + test: /\.(ts|tsx)$/, loader: require.resolve('esbuild-loader'), options: { loader: 'tsx', - jsx: 'automatic', target, + jsx: 'automatic', + }, + }, + { + test: /\.(js|jsx|mjs)$/, + use: { + loader: require.resolve('esbuild-loader'), + options: { + loader: 'jsx', + target, + jsx: 'automatic', + }, }, }, { From ca1ec5aecf0f501a93df9d60bf5bc21108a6bc60 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Tue, 7 Nov 2023 10:35:40 +0000 Subject: [PATCH 10/10] refactor(admin): add watch-admin flag (#18688) --- packages/core/admin/_internal/cli/index.ts | 1 + .../_internal/node/createBuildContext.ts | 27 +++-- packages/core/admin/_internal/node/develop.ts | 102 ++++++++++++++---- .../admin/_internal/node/webpack/watch.ts | 9 +- 4 files changed, 103 insertions(+), 36 deletions(-) diff --git a/packages/core/admin/_internal/cli/index.ts b/packages/core/admin/_internal/cli/index.ts index 6a7983b12a..05e591b9b9 100644 --- a/packages/core/admin/_internal/cli/index.ts +++ b/packages/core/admin/_internal/cli/index.ts @@ -34,6 +34,7 @@ const develop: StrapiCommand = ({ command, ctx }) => { .option('--silent', "Don't log anything", false) .option('--ignore-prompts', 'Ignore all prompts', false) .option('--polling', 'Watch for file changes in network directories', false) + .option('--watch-admin', 'Watch the admin panel for hot changes', false) .option( '--no-build', '[deprecated]: there is middleware for the server, it is no longer a separate process' diff --git a/packages/core/admin/_internal/node/createBuildContext.ts b/packages/core/admin/_internal/node/createBuildContext.ts index d5393ab995..959caedb1c 100644 --- a/packages/core/admin/_internal/node/createBuildContext.ts +++ b/packages/core/admin/_internal/node/createBuildContext.ts @@ -5,7 +5,6 @@ import syncFs from 'node:fs'; import camelCase from 'lodash/camelCase'; import browserslist from 'browserslist'; import strapiFactory, { CLIContext } from '@strapi/strapi'; -import type { Strapi } from '@strapi/types'; import { getConfigUrls } from '@strapi/utils'; import { getStrapiAdminEnvVars, loadEnv } from './core/env'; @@ -14,6 +13,7 @@ import { isError } from './core/errors'; import type { BuildOptions } from './build'; import { DevelopOptions } from './develop'; import { getEnabledPlugins } from './core/plugins'; +import { Strapi } from '@strapi/types'; interface BuildContext { /** @@ -75,6 +75,7 @@ interface BuildContext { } interface CreateBuildContextArgs extends CLIContext { + strapi?: Strapi; options?: BuildContext['options']; } @@ -89,16 +90,24 @@ const createBuildContext = async ({ cwd, logger, tsconfig, + strapi, options = {}, }: CreateBuildContextArgs) => { - const strapiInstance = strapiFactory({ - // Directories - appDir: cwd, - distDir: tsconfig?.config.options.outDir ?? '', - // Options - autoReload: true, - serveAdminPanel: false, - }); + /** + * If you make a new strapi instance when one already exists, + * you will overwrite the global and the app will _most likely_ + * crash and die. + */ + const strapiInstance = + strapi ?? + strapiFactory({ + // Directories + appDir: cwd, + distDir: tsconfig?.config.options.outDir ?? '', + // Options + autoReload: true, + serveAdminPanel: false, + }); const { serverUrl, adminPath } = getConfigUrls(strapiInstance.config, true); diff --git a/packages/core/admin/_internal/node/develop.ts b/packages/core/admin/_internal/node/develop.ts index 55b08f5f1c..3d27479081 100644 --- a/packages/core/admin/_internal/node/develop.ts +++ b/packages/core/admin/_internal/node/develop.ts @@ -7,10 +7,12 @@ import cluster from 'node:cluster'; import { getTimer } from './core/timer'; import { checkRequiredDependencies } from './core/dependencies'; import { createBuildContext } from './createBuildContext'; -import { watch as watchWebpack } from './webpack/watch'; +import { WebpackWatcher, watch as watchWebpack } from './webpack/watch'; +import { build as buildWebpack } from './webpack/build'; import EE from '@strapi/strapi/dist/utils/ee'; import { writeStaticClientFiles } from './staticFiles'; +import strapiFactory from '@strapi/strapi'; interface DevelopOptions extends CLIContext { /** @@ -19,6 +21,7 @@ interface DevelopOptions extends CLIContext { ignorePrompts?: boolean; polling?: boolean; open?: boolean; + watchAdmin?: boolean; } const develop = async ({ @@ -27,6 +30,7 @@ const develop = async ({ logger, tsconfig, ignorePrompts, + watchAdmin, ...options }: DevelopOptions) => { const timer = getTimer(); @@ -43,6 +47,38 @@ const develop = async ({ return; } + /** + * IF we're not watching the admin we're going to build it, this makes + * sure that at least the admin is built for users & they can interact + * with the application. + */ + if (!watchAdmin) { + timer.start('createBuildContext'); + const contextSpinner = logger.spinner(`Building build context`).start(); + console.log(''); + + const ctx = await createBuildContext({ + cwd, + logger, + tsconfig, + options, + }); + const contextDuration = timer.end('createBuildContext'); + contextSpinner.text = `Building build context (${contextDuration}ms)`; + contextSpinner.succeed(); + + timer.start('creatingAdmin'); + const adminSpinner = logger.spinner(`Creating admin`).start(); + + EE.init(cwd); + await writeStaticClientFiles(ctx); + await buildWebpack(ctx); + + const adminDuration = timer.end('creatingAdmin'); + adminSpinner.text = `Creating admin (${adminDuration}ms)`; + adminSpinner.succeed(); + } + cluster.on('message', async (worker, message) => { switch (message) { case 'reload': { @@ -79,32 +115,48 @@ const develop = async ({ compilingTsSpinner.succeed(); } - timer.start('createBuildContext'); - const contextSpinner = logger.spinner(`Building build context`).start(); - console.log(''); - - const ctx = await createBuildContext({ - cwd, - logger, - tsconfig, - options, + const strapi = strapiFactory({ + appDir: cwd, + distDir: tsconfig?.config.options.outDir ?? '', + autoReload: true, + serveAdminPanel: !watchAdmin, }); - const contextDuration = timer.end('createBuildContext'); - contextSpinner.text = `Building build context (${contextDuration}ms)`; - contextSpinner.succeed(); - timer.start('creatingAdmin'); - const adminSpinner = logger.spinner(`Creating admin`).start(); + let webpackWatcher: WebpackWatcher | undefined; - EE.init(cwd); - await writeStaticClientFiles(ctx); - const webpackWatcher = await watchWebpack(ctx); + /** + * If we're watching the admin panel then we're going to attach the watcher + * as a strapi middleware. + */ + if (watchAdmin) { + timer.start('createBuildContext'); + const contextSpinner = logger.spinner(`Building build context`).start(); + console.log(''); - const adminDuration = timer.end('creatingAdmin'); - adminSpinner.text = `Creating admin (${adminDuration}ms)`; - adminSpinner.succeed(); + const ctx = await createBuildContext({ + cwd, + logger, + strapi, + tsconfig, + options, + }); + const contextDuration = timer.end('createBuildContext'); + contextSpinner.text = `Building build context (${contextDuration}ms)`; + contextSpinner.succeed(); - const strapiInstance = await ctx.strapi.load(); + timer.start('creatingAdmin'); + const adminSpinner = logger.spinner(`Creating admin`).start(); + + EE.init(cwd); + await writeStaticClientFiles(ctx); + webpackWatcher = await watchWebpack(ctx); + + const adminDuration = timer.end('creatingAdmin'); + adminSpinner.text = `Creating admin (${adminDuration}ms)`; + adminSpinner.succeed(); + } + + const strapiInstance = await strapi.load(); timer.start('generatingTS'); const generatingTsSpinner = logger.spinner(`Generating types`).start(); @@ -177,8 +229,12 @@ const develop = async ({ 'child process has the kill message, destroying the strapi instance and sending the killed process message' ); await watcher.close(); + await strapiInstance.destroy(); - webpackWatcher.close(); + + if (webpackWatcher) { + webpackWatcher.close(); + } process.send?.('killed'); break; } diff --git a/packages/core/admin/_internal/node/webpack/watch.ts b/packages/core/admin/_internal/node/webpack/watch.ts index cf87e67772..4c3528a7db 100644 --- a/packages/core/admin/_internal/node/webpack/watch.ts +++ b/packages/core/admin/_internal/node/webpack/watch.ts @@ -6,19 +6,19 @@ import webpackHotMiddleware from 'webpack-hot-middleware'; import { webpack } from 'webpack'; import type { BuildContext } from '../createBuildContext'; import { mergeConfigWithUserConfig, resolveDevelopmentConfig } from './config'; -import { Common } from '@strapi/types'; +import { Common, Strapi } from '@strapi/types'; -interface Closer { +interface WebpackWatcher { close(): Promise; } -const watch = async (ctx: BuildContext): Promise => { +const watch = async (ctx: BuildContext): Promise => { const config = await resolveDevelopmentConfig(ctx); const finalConfig = await mergeConfigWithUserConfig(config, ctx); ctx.logger.debug('Final webpack config:', os.EOL, finalConfig); - return new Promise((res) => { + return new Promise((res) => { const compiler = webpack(finalConfig); const devMiddleware = webpackDevMiddleware(compiler); @@ -110,3 +110,4 @@ const watch = async (ctx: BuildContext): Promise => { }; export { watch }; +export type { WebpackWatcher };