From f086746a601b71b5a868104cd1ca20743fac3457 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 10:01:42 +0000 Subject: [PATCH 01/27] chore(deps): bump reselect from 4.1.6 to 4.1.7 Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/reduxjs/reselect/releases) - [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/reselect/compare/v4.1.6...v4.1.7) --- updated-dependencies: - dependency-name: reselect dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/core/admin/package.json | 2 +- packages/core/content-type-builder/package.json | 2 +- packages/plugins/documentation/package.json | 2 +- .../utils/babel-plugin-switch-ee-ce/package.json | 2 +- yarn.lock | 13 ++++--------- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 28484ec17a..040329a4e3 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -123,7 +123,7 @@ "react-router-dom": "5.3.4", "react-window": "1.8.7", "redux": "^4.2.1", - "reselect": "^4.0.0", + "reselect": "^4.1.7", "rimraf": "3.0.2", "sanitize-html": "2.7.3", "semver": "7.3.8", diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index cd18320b3c..07c1eef221 100644 --- a/packages/core/content-type-builder/package.json +++ b/packages/core/content-type-builder/package.json @@ -41,7 +41,7 @@ "react-router": "^5.2.0", "react-router-dom": "5.3.4", "redux": "^4.2.1", - "reselect": "^4.0.0", + "reselect": "^4.1.7", "yup": "^0.32.9" }, "devDependencies": { diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json index 8cac4c368a..0a4e594725 100644 --- a/packages/plugins/documentation/package.json +++ b/packages/plugins/documentation/package.json @@ -41,7 +41,7 @@ "react-router": "^5.2.0", "react-router-dom": "5.3.4", "redux": "^4.2.1", - "reselect": "^4.0.0", + "reselect": "^4.1.7", "swagger-ui-dist": "4.15.5", "yaml": "1.10.2" }, diff --git a/packages/utils/babel-plugin-switch-ee-ce/package.json b/packages/utils/babel-plugin-switch-ee-ce/package.json index 24ca1be2e4..217068a073 100644 --- a/packages/utils/babel-plugin-switch-ee-ce/package.json +++ b/packages/utils/babel-plugin-switch-ee-ce/package.json @@ -20,7 +20,7 @@ "main": "lib/index.js", "dependencies": { "@babel/template": "^7.20.7", - "reselect": "4.0.0", + "reselect": "4.1.7", "resolve": "1.20.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index a525d48d0d..47d190c783 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19572,15 +19572,10 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== -reselect@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7" - integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA== - -reselect@^4.0.0: - version "4.1.6" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.6.tgz#19ca2d3d0b35373a74dc1c98692cdaffb6602656" - integrity sha512-ZovIuXqto7elwnxyXbBtCPo9YFEr3uJqj2rRbcOOog1bmu2Ag85M4hixSwFWyaBMKXNgvPaJ9OSu9SkBPIeJHQ== +reselect@4.1.7, reselect@^4.1.7: + version "4.1.7" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.7.tgz#56480d9ff3d3188970ee2b76527bd94a95567a42" + integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A== resolve-alpn@^1.0.0: version "1.2.1" From ed010184b179d182a18e5974907e4a5e4488742c Mon Sep 17 00:00:00 2001 From: Christian Capeans Date: Thu, 23 Feb 2023 16:02:54 +0100 Subject: [PATCH 02/27] Add documentation to install with lerna --- docs/docs/use-lerna.md | 21 +++++++++++++++++++++ docs/sidebars.js | 9 +++++++++ 2 files changed, 30 insertions(+) create mode 100644 docs/docs/use-lerna.md diff --git a/docs/docs/use-lerna.md b/docs/docs/use-lerna.md new file mode 100644 index 0000000000..a1e00105cb --- /dev/null +++ b/docs/docs/use-lerna.md @@ -0,0 +1,21 @@ +--- +title: How to install packages +slug: /how-to-install-packages +tags: + - content-type-builder + - plugins +--- + +# Best practices for installing packages in the Strapi + +When working with the Strapi mono repo, it's important to follow best practices for installing packages to avoid potential issues and ensure consistent results. Instead of using the standard **`yarn add`** command, we recommend using **`yarn lerna add --scope @strapi/`** for installing packages. + +This approach uses Lerna, a tool for managing JavaScript projects with multiple packages, to ensure that the package is installed in the correct location and version across all modules. The **`--scope`** flag specifies the specific module that the package should be installed in, ensuring that it's only installed where it's needed. + +By using this method, Strapi developers can avoid issues with mismatched package versions or unnecessary dependencies in certain modules. This can help to keep the codebase clean and maintainable, and reduce the potential for conflicts or issues in the future. + +Overall, we recommend using **`yarn lerna add`** with the **`--scope`** flag for installing packages in the Strapi mono repo, to ensure consistent and reliable results. + +## Resources + +- [Lerna Docs](https://futurestud.io/tutorials/lerna-install-dependencies-for-a-specific-package) diff --git a/docs/sidebars.js b/docs/sidebars.js index bf6c6ecb96..fca0bd2554 100644 --- a/docs/sidebars.js +++ b/docs/sidebars.js @@ -167,6 +167,15 @@ const sidebars = { }, items: [], }, + { + type: 'category', + label: 'How to install packages', + link: { + type: 'doc', + id: 'how-to-install-packages', + }, + items: [], + }, ], api: [{ type: 'autogenerated', dirName: 'api' }], community: [{ type: 'autogenerated', dirName: 'community' }], From 9b289f3b31d749bd4fb07520be7af14240dc3cfe Mon Sep 17 00:00:00 2001 From: Christian Capeans Date: Fri, 24 Feb 2023 11:56:44 +0100 Subject: [PATCH 03/27] Fix small issues in the lerna docs --- docs/docs/{use-lerna.md => how-to-install-packages.md} | 6 +++--- docs/sidebars.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename docs/docs/{use-lerna.md => how-to-install-packages.md} (93%) diff --git a/docs/docs/use-lerna.md b/docs/docs/how-to-install-packages.md similarity index 93% rename from docs/docs/use-lerna.md rename to docs/docs/how-to-install-packages.md index a1e00105cb..9f49c25364 100644 --- a/docs/docs/use-lerna.md +++ b/docs/docs/how-to-install-packages.md @@ -2,11 +2,11 @@ title: How to install packages slug: /how-to-install-packages tags: - - content-type-builder - - plugins + - lerna + - packages --- -# Best practices for installing packages in the Strapi +# Best practices for installing packages in Strapi When working with the Strapi mono repo, it's important to follow best practices for installing packages to avoid potential issues and ensure consistent results. Instead of using the standard **`yarn add`** command, we recommend using **`yarn lerna add --scope @strapi/`** for installing packages. diff --git a/docs/sidebars.js b/docs/sidebars.js index fca0bd2554..b821ed612b 100644 --- a/docs/sidebars.js +++ b/docs/sidebars.js @@ -169,7 +169,7 @@ const sidebars = { }, { type: 'category', - label: 'How to install packages', + label: 'How to install', link: { type: 'doc', id: 'how-to-install-packages', From e841c3197080bb7d4e45ba5131ef6aac6eab08ff Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 24 Feb 2023 14:06:24 +0100 Subject: [PATCH 04/27] Update docs/docs/how-to-install-packages.md Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com> --- docs/docs/how-to-install-packages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/how-to-install-packages.md b/docs/docs/how-to-install-packages.md index 9f49c25364..5eef9cb156 100644 --- a/docs/docs/how-to-install-packages.md +++ b/docs/docs/how-to-install-packages.md @@ -8,7 +8,7 @@ tags: # Best practices for installing packages in Strapi -When working with the Strapi mono repo, it's important to follow best practices for installing packages to avoid potential issues and ensure consistent results. Instead of using the standard **`yarn add`** command, we recommend using **`yarn lerna add --scope @strapi/`** for installing packages. +When working with the Strapi monorepo, it's important to follow best practices for installing packages to avoid potential issues and ensure consistent results. Instead of using the standard **`yarn add`** command, we recommend using **`yarn lerna add --scope @strapi/`** for installing packages. This approach uses Lerna, a tool for managing JavaScript projects with multiple packages, to ensure that the package is installed in the correct location and version across all modules. The **`--scope`** flag specifies the specific module that the package should be installed in, ensuring that it's only installed where it's needed. From e4f2b38ce3ca3cf66a57eae75d479985e7b12de0 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 24 Feb 2023 14:06:35 +0100 Subject: [PATCH 05/27] Update docs/sidebars.js Co-authored-by: Ben Irvin --- docs/sidebars.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sidebars.js b/docs/sidebars.js index b821ed612b..058de83884 100644 --- a/docs/sidebars.js +++ b/docs/sidebars.js @@ -169,7 +169,7 @@ const sidebars = { }, { type: 'category', - label: 'How to install', + label: 'How to install packages in a module', link: { type: 'doc', id: 'how-to-install-packages', From 3548c7c818688ebaf1452c3d1becec0026c4cb38 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 24 Feb 2023 14:07:15 +0100 Subject: [PATCH 06/27] Update docs/docs/how-to-install-packages.md Co-authored-by: Ben Irvin --- docs/docs/how-to-install-packages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/how-to-install-packages.md b/docs/docs/how-to-install-packages.md index 5eef9cb156..d2fdff4fdf 100644 --- a/docs/docs/how-to-install-packages.md +++ b/docs/docs/how-to-install-packages.md @@ -10,7 +10,7 @@ tags: When working with the Strapi monorepo, it's important to follow best practices for installing packages to avoid potential issues and ensure consistent results. Instead of using the standard **`yarn add`** command, we recommend using **`yarn lerna add --scope @strapi/`** for installing packages. -This approach uses Lerna, a tool for managing JavaScript projects with multiple packages, to ensure that the package is installed in the correct location and version across all modules. The **`--scope`** flag specifies the specific module that the package should be installed in, ensuring that it's only installed where it's needed. +This approach uses Lerna, a tool for managing JavaScript projects with multiple packages, to ensure that the package is installed in the correct location(s) and version across all modules that include it. The **`--scope`** flag specifies the specific module(s) that the package should be installed in, ensuring that it's only installed where it's needed. By using this method, Strapi developers can avoid issues with mismatched package versions or unnecessary dependencies in certain modules. This can help to keep the codebase clean and maintainable, and reduce the potential for conflicts or issues in the future. From df846baf729c3dea07d96285f70fbb4765e739fa Mon Sep 17 00:00:00 2001 From: Christian Capeans Date: Fri, 24 Feb 2023 14:30:15 +0100 Subject: [PATCH 07/27] Add possible error using yarn --- docs/docs/how-to-install-packages.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/docs/how-to-install-packages.md b/docs/docs/how-to-install-packages.md index d2fdff4fdf..a8881d996a 100644 --- a/docs/docs/how-to-install-packages.md +++ b/docs/docs/how-to-install-packages.md @@ -8,7 +8,9 @@ tags: # Best practices for installing packages in Strapi -When working with the Strapi monorepo, it's important to follow best practices for installing packages to avoid potential issues and ensure consistent results. Instead of using the standard **`yarn add`** command, we recommend using **`yarn lerna add --scope @strapi/`** for installing packages. +When working with the Strapi monorepo, it's important to follow best practices for installing packages to avoid potential issues and ensure consistent results. Instead of using the standard **`yarn add`** command, we recommend using **`yarn lerna add --scope @strapi/`** for installing packages. Actually, you may encounter the following error using `yarn add`: + +`An unexpected error occurred: "expected workspace package to exist for \"@typescript-eslint/typescript-estree\'` This approach uses Lerna, a tool for managing JavaScript projects with multiple packages, to ensure that the package is installed in the correct location(s) and version across all modules that include it. The **`--scope`** flag specifies the specific module(s) that the package should be installed in, ensuring that it's only installed where it's needed. From 0aa5e6140a37ba6aebc8b25f071b5fd210ac13bd Mon Sep 17 00:00:00 2001 From: fuwanhong Date: Sat, 25 Feb 2023 13:01:47 +0800 Subject: [PATCH 08/27] chore: update zh-Hans translation --- .../admin/admin/src/translations/zh-Hans.json | 32 ++++++++++++++++++- .../admin/src/translations/zh-Hans.json | 8 +++++ .../admin/src/translations/zh-Hans.json | 2 ++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/packages/core/admin/admin/src/translations/zh-Hans.json b/packages/core/admin/admin/src/translations/zh-Hans.json index 5da7e75ae9..4264b4eb16 100644 --- a/packages/core/admin/admin/src/translations/zh-Hans.json +++ b/packages/core/admin/admin/src/translations/zh-Hans.json @@ -139,6 +139,34 @@ "Settings.profile.form.section.experience.mode.label": "界面风格", "Settings.profile.form.section.experience.mode.hint": "将会用所选择的风格显示你的界面", "Settings.profile.form.section.experience.mode.option-label": "{name}界面", + "Settings.application.customization": "自定义", + "Settings.application.customization.size-details": "最大尺寸：{dimension}×{dimension}，最大文件大小：{size}KB", + "Settings.application.customization.carousel.menu-logo.title": "菜单 Logo", + "Settings.application.customization.carousel.auth-logo.title": "认证 Logo", + "Settings.application.customization.carousel.change-action": "更换 Logo", + "Settings.application.customization.carousel.reset-action": "重置 Logo", + "Settings.application.customization.carousel-slide.label": "Logo 幻灯片", + "Settings.application.customization.menu-logo.carousel-hint": "更换主导航栏中的 Logo", + "Settings.application.customization.auth-logo.carousel-hint": "更换身份验证页面中的 Logo", + "Settings.application.customization.modal.cancel": "取消", + "Settings.application.customization.modal.upload": "上传 Logo", + "Settings.application.customization.modal.tab.label": "您想如何上传您的资产？", + "Settings.application.customization.modal.upload.from-computer": "从本地上传", + "Settings.application.customization.modal.upload.file-validation": "最大尺寸：{dimension}×{dimension}，最大文件大小：{size}KB", + "Settings.application.customization.modal.upload.error-format": "上传格式不正确（仅支持格式：jpeg、jpg、png、svg）。", + "Settings.application.customization.modal.upload.error-size": "上传的文件过大（最大尺寸：{dimension}×{dimension}，最大文件大小：{size}KB）", + "Settings.application.customization.modal.upload.error-network": "网络错误", + "Settings.application.customization.modal.upload.cta.browse": "浏览文件", + "Settings.application.customization.modal.upload.drag-drop": "拖放到此处或", + "Settings.application.customization.modal.upload.from-url": "从 URL 上传", + "Settings.application.customization.modal.upload.from-url.input-label": "URL", + "Settings.application.customization.modal.upload.next": "下一步", + "Settings.application.customization.modal.pending": "待定 Logo", + "Settings.application.customization.modal.pending.choose-another": "选择另一个", + "Settings.application.customization.modal.pending.title": "准备上传的 Logo", + "Settings.application.customization.modal.pending.subtitle": "在上传前管理选择的 Logo", + "Settings.application.customization.modal.pending.upload": "上传", + "Settings.application.customization.modal.pending.card-badge": "图像", "light": "浅色", "dark": "深色", "Settings.profile.form.section.experience.title": "体验", @@ -602,7 +630,7 @@ "content-manager.popUpwarning.warning.has-draft-relations.message": "{count, plural, =0 { 个关联的内容} one { 个关联的内容} other { 个关联的内容}} 尚未发布。

它可能会在你的项目上产生关联失效和错误。", "content-type-builder.button.component.create": "创建一个新的组件", "content-type-builder.button.model.create": "创建一个新的集合类型", - "content-type-builder.button.single-types.create": "创新一个新的单一类型", + "content-type-builder.button.single-types.create": "创建一个新的单一类型", "content-type-builder.form.button.add.field.to.collectionType": "为这个集合类型添加另一个字段", "content-type-builder.form.button.add.field.to.singleType": "为这个单一类型添加另一个字段", "content-type-builder.listView.headerLayout.description": "定义内容的数据结构", @@ -611,9 +639,11 @@ "content-type-builder.menu.section.single-types.name": "单一类型", "content-type-builder.plugin.name": "模型构建器", "form.button.done": "完成", + "form.button.continue": "继续", "global.search": "搜索", "global.back": "返回", "global.cancel": "取消", + "global.continue": "继续", "global.change-password": "修改密码", "global.content-manager": "内容管理", "global.delete": "删除", diff --git a/packages/core/content-type-builder/admin/src/translations/zh-Hans.json b/packages/core/content-type-builder/admin/src/translations/zh-Hans.json index 68577b0666..0bd83e7f20 100644 --- a/packages/core/content-type-builder/admin/src/translations/zh-Hans.json +++ b/packages/core/content-type-builder/admin/src/translations/zh-Hans.json @@ -43,6 +43,13 @@ "contentType.collectionName.description": "当 Content Type 的名称和表名称不同时会很有用", "contentType.collectionName.label": "集合名称", "contentType.displayName.label": "显示名称", + "contentType.apiId-plural.description": "API ID（复数形式）", + "contentType.apiId-plural.label": "API ID（复数形式）", + "contentType.apiId-singular.description": "UID 用于生成 API 路由和数据库表/集合。", + "contentType.apiId-singular.label": "API ID（单数形式）", + "contentType.draftAndPublish.description": "允许编写条目的草稿版本，在发布之前进行修改", + "contentType.draftAndPublish.label": "草稿 & 发布", + "contentType.kind.change.warning": "您刚刚更改了内容类型的种类：API 将被重置（路由、控制器和服务将被覆盖）。", "error.contentTypeName.reserved-name": "此名称不能在项目中使用，因为它可能会破坏其他功能", "error.validation.minSupMax": "不能更高", "form.attribute.component.option.add": "添加一个组件", @@ -109,6 +116,7 @@ "modalForm.sub-header.attribute.edit": "编辑 {name}", "modalForm.sub-header.chooseAttribute.collectionType": "为您的 Content Type 选择一个字段", "modalForm.sub-header.chooseAttribute.component": "为您的组件选择一个字段", + "modalForm.collectionType.header-create": "创建一个集合类型", "modelPage.attribute.relationWith": "关联", "notification.info.autoreaload-disable": "要使用此插件，需要自动重载功能。请使用 `strapi develop` 启动服务", "notification.info.creating.notSaved": "在创建新的内容类型或组件之前，请保存您的工作", diff --git a/packages/core/upload/admin/src/translations/zh-Hans.json b/packages/core/upload/admin/src/translations/zh-Hans.json index 2a47ba30e8..7d36f90d41 100644 --- a/packages/core/upload/admin/src/translations/zh-Hans.json +++ b/packages/core/upload/admin/src/translations/zh-Hans.json @@ -62,11 +62,13 @@ "plugin.description.short": "媒体文件管理", "plugin.name": "媒体库", "search.placeholder": "搜索素材...", + "settings.blockTitle": "资源管理", "settings.form.autoOrientation.description": "根据EXIF orientation标签自动旋转图像", "settings.form.autoOrientation.label": "开始自动旋转功能", "settings.form.responsiveDimensions.description": "上传素材将会自动生成大，中，小三种尺寸", "settings.form.responsiveDimensions.label": "启动响应式图片上传", "settings.form.sizeOptimization.label": "开启图片大小优化(无损)", + "settings.form.sizeOptimization.description": "启用此选项将缩小图像大小并略微降低其质量。", "settings.form.videoPreview.description": "自动生成6秒钟的视频预览（GIF）", "settings.form.videoPreview.label": "预览", "settings.header.label": "媒体库 - 设置", From 73b225f3c7fe5d2a984affc854e29177edd892fd Mon Sep 17 00:00:00 2001 From: fuwanhong Date: Sat, 25 Feb 2023 17:07:29 +0800 Subject: [PATCH 09/27] chore: update zh-Hans translation --- .../admin/src/pages/App/MediaLibrary/index.js | 4 +- .../admin/src/translations/zh-Hans.json | 63 ++++++++++++++++++- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js index 9664ebb756..2abdefac16 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js @@ -278,11 +278,11 @@ export const MediaLibrary = () => { label={ isGridView ? formatMessage({ - id: 'view-switch.list', + id: getTrad('view-switch.list'), defaultMessage: 'List View', }) : formatMessage({ - id: 'view-switch.grid', + id: getTrad('view-switch.grid'), defaultMessage: 'Grid View', }) } diff --git a/packages/core/upload/admin/src/translations/zh-Hans.json b/packages/core/upload/admin/src/translations/zh-Hans.json index 7d36f90d41..27b831f5a9 100644 --- a/packages/core/upload/admin/src/translations/zh-Hans.json +++ b/packages/core/upload/admin/src/translations/zh-Hans.json @@ -1,5 +1,6 @@ { "header.actions.add-assets": "添加新素材", + "header.actions.add-folder": "添加新文件夹", "button.next": "下一步", "checkControl.crop-duplicate": "复制裁剪素材", "checkControl.crop-original": "裁剪原始素材", @@ -17,6 +18,10 @@ "form.input.label.file-alt": "备用文本", "form.input.label.file-caption": "标题", "form.input.label.file-name": "文件名", + "form.input.label.file-location": "位置", + "form.input.label.folder-name": "文件夹名称", + "form.input.label.folder-location": "位置", + "form.input.label.folder-location-default-label": "媒体库", "form.upload-url.error.url.invalid": "有一个链接格式不合法", "form.upload-url.error.url.invalids": "{number}个链接格式不合法", "header.actions.upload-assets": "上传素材", @@ -37,6 +42,27 @@ "list.assets.preview-asset": "预览视频（路径：{path}）", "list.assets.selected": "{number, plural, one {# 个素材} other {# 个素材}}准备上传", "list.assets.type-not-allowed": "文件类型不合法", + "list.table.header.actions": "操作", + "list.table.header.preview": "预览", + "list.table.header.name": "名称", + "list.table.header.ext": "扩展名", + "list.table.header.size": "大小", + "list.table.header.createdAt": "创建时间", + "list.table.header.updatedAt": "最后更新时间", + "list.table.header.sort": "按{label}排序", + "list.table.content.empty-label": "此字段为空", + "list.assets.title": "资源({count})", + "list.asset.at.finished": "资源已经加载完毕", + "list.assets-empty.search": "未找到结果", + "list.assets.empty-upload": "上传你的第一个资源...", + "list.assets.empty.no-permissions": "没有查看权限", + "list-assets-select": "选择{name}资源", + "list.assets.to-upload": "有{number, plural, =0 {没有资源} one {1个资源} other {#个资产}}可以上传", + "list.folder.edit": "编辑文件夹", + "list.folder.select": "选择{name}文件夹", + "list.folder.subtitle": "{folderCount, plural, =0 {#个文件夹} one {#个文件夹} other {#个文件夹}}, {filesCount, plural, =0 {#个资源} one {#个资源} other {#个资源}}", + "list.folders.title": "文件夹（{count}）", + "list.folders.link-label": "访问文件夹", "mediaLibraryInput.actions.nextSlide": "下一张幻灯片", "mediaLibraryInput.actions.previousSlide": "上一张幻灯片", "mediaLibraryInput.placeholder": "点击添加素材，或拖放一个素材到当前区域", @@ -45,6 +71,16 @@ "modal.file-details.dimensions": "尺寸", "modal.file-details.extension": "扩展名", "modal.file-details.size": "大小", + "modal.file-details.id": "资源ID", + "modal.folder.elements.count": "{folderCount}个文件夹，{assetCount}个资源", + "modal.folder.move.title": "将元素移动到", + "modal.remove.success-label": "元素已成功删除", + "modal.move.success-label": "元素已成功移动", + "modal.upload.cancelled": "手动上传已中止", + "modal.folder.create.title": "新增文件夹", + "modal.folder.create.submit": "新增", + "modal.folder.cancel": "取消", + "modal.header.go-back": "返回", "modal.header.browse": "上传素材", "modal.header.file-detail": "详情", "modal.header.pending-assets": "素材上传中", @@ -61,7 +97,10 @@ "plugin.description.long": "媒体文件管理", "plugin.description.short": "媒体文件管理", "plugin.name": "媒体库", + "settings.section.doc.label": "文档", "search.placeholder": "搜索素材...", + "search.clear.label": "清除搜索", + "search.label": "搜索资源", "settings.blockTitle": "资源管理", "settings.form.autoOrientation.description": "根据EXIF orientation标签自动旋转图像", "settings.form.autoOrientation.label": "开始自动旋转功能", @@ -83,5 +122,27 @@ "sort.updated_at_asc": "最早更新", "sort.updated_at_desc": "最近更新", "window.confirm.close-modal.file": "你确定吗？你的更改将会丢失", - "window.confirm.close-modal.files": "你确定吗？你还有一些文件还没有被上传" + "window.confirm.close-modal.files": "你确定吗？你还有一些文件还没有被上传", + "apiError.FileTooBig": "上传的文件超过允许的最大资源大小", + "upload.generic-error": "上传文件时发生错误", + "bulk.select.label": "选择所有资源", + "content.isLoading": "内容正在加载中", + "control-card.stop-crop": "停止裁剪", + "header.actions.add-assets.folder": "文件夹", + "header.actions.upload-new-asset": "上传新资源", + "header.content.assets-empty": "无资源", + "input.label": "拖拽到此处或", + "input.notification.not-supported": "您无法上传此类型的文件，仅接受以下类型 - {fileTypes}", + "permissions.not-allowed.update": "您无权编辑此文件", + "tabs.title": "您希望如何上传您的资源？", + "config.title": "配置视图 - 媒体库", + "config.back": "返回", + "config.subtitle": "定义媒体库的视图设置", + "config.entries.title": "每页条目数", + "config.sort.title": "默认排序顺序", + "config.entries.note": "媒体库中默认显示的资源数量", + "config.note": "注意：您可以在媒体库中覆盖此值", + "config.popUpWarning.warning.updateAllSettings": "这将修改您的所有设置", + "view-switch.list": "列表视图", + "view-switch.grid": "网格视图" } From 999c16f24e53c8c91f69ddf805914256891544fc Mon Sep 17 00:00:00 2001 From: DMehaffy Date: Mon, 27 Feb 2023 20:07:01 -0700 Subject: [PATCH 10/27] Fix db generated config - pg port PG port was wrong when generating the database.js config it was using 3306 instead of 5432 as the default --- .../resources/templates/database-templates/js/database.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/generators/app/lib/resources/templates/database-templates/js/database.template b/packages/generators/app/lib/resources/templates/database-templates/js/database.template index b6de3768a8..9a97b6cd15 100644 --- a/packages/generators/app/lib/resources/templates/database-templates/js/database.template +++ b/packages/generators/app/lib/resources/templates/database-templates/js/database.template @@ -30,7 +30,7 @@ module.exports = ({ env }) => { connection: { connectionString: env('DATABASE_URL'), host: env('DATABASE_HOST', 'localhost'), - port: env.int('DATABASE_PORT', 3306), + port: env.int('DATABASE_PORT', 5432), database: env('DATABASE_NAME', 'strapi'), user: env('DATABASE_USERNAME', 'strapi'), password: env('DATABASE_PASSWORD', 'strapi'), From 571ed836283a14ea81b50d8a7e1f510951f8576e Mon Sep 17 00:00:00 2001 From: Marc-Roig Date: Tue, 28 Feb 2023 16:38:33 +0100 Subject: [PATCH 11/27] use optional chaining on isPrivateAttribute --- packages/core/utils/lib/content-types.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/utils/lib/content-types.js b/packages/core/utils/lib/content-types.js index 0303b8d2a5..a6a299b8d0 100644 --- a/packages/core/utils/lib/content-types.js +++ b/packages/core/utils/lib/content-types.js @@ -99,8 +99,8 @@ const getPrivateAttributes = (model = {}) => { ); }; -const isPrivateAttribute = (model = {}, attributeName) => { - return model && model.privateAttributes && model.privateAttributes.includes(attributeName); +const isPrivateAttribute = (model, attributeName) => { + return model?.privateAttributes?.includes(attributeName) || false; }; const isScalarAttribute = (attribute) => { From 5925ace19a7043d0dd24e704a236b3e346da013c Mon Sep 17 00:00:00 2001 From: Jamie Howard Date: Wed, 1 Mar 2023 12:08:52 +0000 Subject: [PATCH 12/27] fix(content-manager): typo when returning a component category --- .../services/__tests__/components.test.js | 28 +++++++++++++++++++ .../server/services/components.js | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 packages/core/content-manager/server/services/__tests__/components.test.js diff --git a/packages/core/content-manager/server/services/__tests__/components.test.js b/packages/core/content-manager/server/services/__tests__/components.test.js new file mode 100644 index 0000000000..77726a77d1 --- /dev/null +++ b/packages/core/content-manager/server/services/__tests__/components.test.js @@ -0,0 +1,28 @@ +'use strict'; + +const componentsService = require('../components'); + +const configuration = { + test: 'value', + some: 'config', +}; + +jest.mock('../configuration', () => + jest.fn(() => ({ + getConfiguration: jest.fn(() => configuration), + })) +); + +describe('componentService', () => { + test('findComponent', async () => { + const { findConfiguration } = componentsService({}); + + const component = { + uid: 'blog.test-compo', + category: 'blog', + }; + const result = await findConfiguration(component); + + expect(result).toEqual({ ...component, ...configuration }); + }); +}); diff --git a/packages/core/content-manager/server/services/components.js b/packages/core/content-manager/server/services/components.js index 0ab2b8bbed..1808ec1144 100644 --- a/packages/core/content-manager/server/services/components.js +++ b/packages/core/content-manager/server/services/components.js @@ -41,7 +41,7 @@ module.exports = ({ strapi }) => ({ return { uid: component.uid, - category: component.categoru, + category: component.category, ...configuration, }; }, From 24901be60be05a14ef589d8fcc8727e78cdae5e7 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Wed, 1 Mar 2023 20:13:22 +0100 Subject: [PATCH 13/27] Fix license seat undefined block user creation --- packages/core/admin/ee/server/controllers/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/admin/ee/server/controllers/admin.js b/packages/core/admin/ee/server/controllers/admin.js index 684b3f74cb..5fa15a8799 100644 --- a/packages/core/admin/ee/server/controllers/admin.js +++ b/packages/core/admin/ee/server/controllers/admin.js @@ -38,7 +38,7 @@ module.exports = { currentActiveUserCount, permittedSeats, shouldNotify, - shouldStopCreate: currentActiveUserCount >= permittedSeats, + shouldStopCreate: permittedSeats && currentActiveUserCount >= permittedSeats, licenseLimitStatus, isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud', }; From 5896480c223f74030367aadd29ceb10e45020e08 Mon Sep 17 00:00:00 2001 From: Fernando Chavez Date: Thu, 2 Mar 2023 09:06:48 +0100 Subject: [PATCH 14/27] Add new page to helper-plugin's storybook about useCustomFields --- .../useCustomFields.stories.mdx | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx diff --git a/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx b/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx new file mode 100644 index 0000000000..3ae7ef83ce --- /dev/null +++ b/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx @@ -0,0 +1,74 @@ + + +import { Meta, Canvas, Story } from '@storybook/addon-docs'; + + + +# useCustomFields + +This hook provides you with a `get` function to retrieve information about a specific custom field registered in the app, as well as an `getAll` function to obtain information about all custom fields registered in the app. + +## Get information about a specific plugin if I know its uid + +With the `get` function from the `useCustomFields` hook you can have all the information of a custom field. + +### Example + +```js +import { useCustomFields } from '@strapi/helper-plugin'; + +const CustomIcon = ({ customFieldUuid }) => { + const customFieldsRegistry = useCustomFields(); + const customField = customFieldsRegistry.get(customFieldUuid); + + /* + { + components: {}, + icon: {}, + intlDescription: {}, + intlLabel: {}, + name: "Custom field name", + options: {}, + pluginId: "custom-field-id", + type: "string|number|etc" + } + */ + + if (customField?.icon) { + return customFieldIcon; + } + + return ; +}; +``` + +## Get all the custom fields + +With the getAll function of the useCustomFields hook, you will receive a dictionary containing all the custom fields with their respective information. + +```js +import { useCustomFields } from '@strapi/helper-plugin'; +import { Typography } from '@strapi/design-system'; + +const CustomFieldsList = () => { + const customFieldsRegistry = useCustomFields(); + const customFields = customFieldsRegistry.getAll(); + /* + { + plugin::my-plugin.my-custom-field: { + ... All the custom field information + }, + plugin::other-plugin.other-custom-field: { ... } + } + */ + const registeredCustomFields = Object.entries(customFields.getAll()); + + return ( + <> + {registeredCustomFields.map(([uid, customField]) => ( + {`${customField.name} uid: ${uid}`} + ))} + + ); +}; +``` From 8ac67d6b8bfb77c089754cc8da52179e33f6f83b Mon Sep 17 00:00:00 2001 From: Marc Date: Thu, 2 Mar 2023 09:17:44 +0100 Subject: [PATCH 15/27] Update packages/core/utils/lib/content-types.js Co-authored-by: Alexandre BODIN --- packages/core/utils/lib/content-types.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/utils/lib/content-types.js b/packages/core/utils/lib/content-types.js index a6a299b8d0..de642c17e5 100644 --- a/packages/core/utils/lib/content-types.js +++ b/packages/core/utils/lib/content-types.js @@ -100,7 +100,7 @@ const getPrivateAttributes = (model = {}) => { }; const isPrivateAttribute = (model, attributeName) => { - return model?.privateAttributes?.includes(attributeName) || false; + return model?.privateAttributes?.includes(attributeName) ?? false; }; const isScalarAttribute = (attribute) => { From e56b0061c7fa96704b1f331a3afdbe253b855f1f Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Thu, 2 Mar 2023 09:19:25 +0100 Subject: [PATCH 16/27] Make checks stricter --- .../ee/admin/hooks/useLicenseLimitNotification/index.js | 3 ++- .../pages/Users/ListPage/CreateAction/index.js | 3 ++- packages/core/admin/ee/server/controllers/admin.js | 7 ++++--- packages/core/admin/ee/server/controllers/user.js | 4 ++-- packages/core/admin/ee/server/services/seat-enforcement.js | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js b/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js index 0c8faf1c02..85a3c41d5c 100644 --- a/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js +++ b/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js @@ -7,6 +7,7 @@ import { useEffect } from 'react'; import { useIntl } from 'react-intl'; import { useLocation } from 'react-router'; import { useNotification } from '@strapi/helper-plugin'; +import isNil from 'lodash/isNil'; import useLicenseLimits from '../useLicenseLimits'; const STORAGE_KEY_PREFIX = 'strapi-notification-seat-limit'; @@ -29,7 +30,7 @@ const useLicenseLimitNotification = () => { license?.data ?? {}; const shouldDisplayNotification = - permittedSeats && + !isNil(permittedSeats) && !window.sessionStorage.getItem(`${STORAGE_KEY_PREFIX}-${pathname}`) && (licenseLimitStatus === 'AT_LIMIT' || licenseLimitStatus === 'OVER_LIMIT'); diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js index 0bbd94dccc..e48829c1b6 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js @@ -3,6 +3,7 @@ import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; import { Stack, Button, Tooltip, Icon } from '@strapi/design-system'; import { Envelop, ExclamationMarkCircle } from '@strapi/icons'; +import isNil from 'lodash/isNil'; import { useLicenseLimits } from '../../../../../../hooks'; const CreateAction = ({ onClick }) => { @@ -12,7 +13,7 @@ const CreateAction = ({ onClick }) => { return ( - {permittedSeats && shouldStopCreate && ( + {!isNil(permittedSeats) && shouldStopCreate && ( permittedSeats) { + if (!isNil(permittedSeats) && enforcementUserCount > permittedSeats) { shouldNotify = true; licenseLimitStatus = 'OVER_LIMIT'; } - if (enforcementUserCount === permittedSeats) { + if (!isNil(permittedSeats) && enforcementUserCount === permittedSeats) { shouldNotify = true; licenseLimitStatus = 'AT_LIMIT'; } @@ -38,7 +39,7 @@ module.exports = { currentActiveUserCount, permittedSeats, shouldNotify, - shouldStopCreate: permittedSeats && currentActiveUserCount >= permittedSeats, + shouldStopCreate: isNil(permittedSeats) ? false : currentActiveUserCount >= permittedSeats, licenseLimitStatus, isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud', }; diff --git a/packages/core/admin/ee/server/controllers/user.js b/packages/core/admin/ee/server/controllers/user.js index 1544e8d242..902ff4cb42 100644 --- a/packages/core/admin/ee/server/controllers/user.js +++ b/packages/core/admin/ee/server/controllers/user.js @@ -3,7 +3,7 @@ // eslint-disable-next-line node/no-extraneous-require const ee = require('@strapi/strapi/lib/utils/ee'); const _ = require('lodash'); -const { pick } = require('lodash/fp'); +const { pick, isNil } = require('lodash/fp'); const { ApplicationError, ForbiddenError } = require('@strapi/utils').errors; const { validateUserCreationInput } = require('../validation/user'); const { @@ -20,7 +20,7 @@ const hasAdminSeatsAvaialble = async () => { } const permittedSeats = ee.seats; - if (!permittedSeats) { + if (isNil(permittedSeats)) { return true; } diff --git a/packages/core/admin/ee/server/services/seat-enforcement.js b/packages/core/admin/ee/server/services/seat-enforcement.js index 90b297f442..076f711573 100644 --- a/packages/core/admin/ee/server/services/seat-enforcement.js +++ b/packages/core/admin/ee/server/services/seat-enforcement.js @@ -2,7 +2,7 @@ // eslint-disable-next-line node/no-extraneous-require const ee = require('@strapi/strapi/lib/utils/ee'); -const { take, drop, map, prop, pick, reverse } = require('lodash/fp'); +const { take, drop, map, prop, pick, reverse, isNil } = require('lodash/fp'); const { getService } = require('../../../server/utils'); const { SUPER_ADMIN_CODE } = require('../../../server/services/constants'); @@ -90,7 +90,7 @@ const syncDisabledUserRecords = async () => { const seatEnforcementWorkflow = async () => { const adminSeats = ee.seats; - if (!adminSeats) { + if (isNil(adminSeats)) { return; } From 0307fb4bf7b006c4cd902412967d3987d7810ed8 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Thu, 2 Mar 2023 10:24:10 +0100 Subject: [PATCH 17/27] v4.7.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 | 2 +- packages/cli/create-strapi-app/package.json | 4 +-- .../cli/create-strapi-starter/package.json | 4 +-- packages/core/admin/package.json | 16 +++++------ packages/core/content-manager/package.json | 4 +-- .../core/content-type-builder/package.json | 8 +++--- packages/core/data-transfer/package.json | 6 ++-- packages/core/database/package.json | 2 +- packages/core/email/package.json | 8 +++--- packages/core/helper-plugin/package.json | 2 +- packages/core/permissions/package.json | 4 +-- packages/core/strapi/package.json | 28 +++++++++---------- packages/core/upload/package.json | 8 +++--- packages/core/utils/package.json | 2 +- packages/generators/app/package.json | 2 +- packages/generators/generators/package.json | 6 ++-- packages/plugins/color-picker/package.json | 2 +- packages/plugins/documentation/package.json | 6 ++-- packages/plugins/graphql/package.json | 4 +-- packages/plugins/i18n/package.json | 4 +-- packages/plugins/sentry/package.json | 2 +- .../plugins/users-permissions/package.json | 6 ++-- .../providers/audit-logs-local/package.json | 2 +- .../providers/email-amazon-ses/package.json | 4 +-- packages/providers/email-mailgun/package.json | 4 +-- .../providers/email-nodemailer/package.json | 2 +- .../providers/email-sendgrid/package.json | 4 +-- .../providers/email-sendmail/package.json | 4 +-- packages/providers/upload-aws-s3/package.json | 2 +- .../providers/upload-cloudinary/package.json | 4 +-- packages/providers/upload-local/package.json | 4 +-- .../babel-plugin-switch-ee-ce/package.json | 2 +- packages/utils/logger/package.json | 2 +- packages/utils/typescript/package.json | 2 +- 39 files changed, 105 insertions(+), 105 deletions(-) diff --git a/.github/actions/check-pr-status/package.json b/.github/actions/check-pr-status/package.json index ea1917de4a..c42554da64 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.7.0", + "version": "4.7.1", "main": "dist/index.js", "license": "MIT", "private": true, diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index d0241f6ba2..459014ce26 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -1,7 +1,7 @@ { "name": "getstarted", "private": true, - "version": "4.7.0", + "version": "4.7.1", "description": "A Strapi application.", "scripts": { "develop": "strapi develop", @@ -12,16 +12,16 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/plugin-color-picker": "4.7.0", - "@strapi/plugin-documentation": "4.7.0", - "@strapi/plugin-graphql": "4.7.0", - "@strapi/plugin-i18n": "4.7.0", - "@strapi/plugin-sentry": "4.7.0", - "@strapi/plugin-users-permissions": "4.7.0", - "@strapi/provider-email-mailgun": "4.7.0", - "@strapi/provider-upload-aws-s3": "4.7.0", - "@strapi/provider-upload-cloudinary": "4.7.0", - "@strapi/strapi": "4.7.0", + "@strapi/plugin-color-picker": "4.7.1", + "@strapi/plugin-documentation": "4.7.1", + "@strapi/plugin-graphql": "4.7.1", + "@strapi/plugin-i18n": "4.7.1", + "@strapi/plugin-sentry": "4.7.1", + "@strapi/plugin-users-permissions": "4.7.1", + "@strapi/provider-email-mailgun": "4.7.1", + "@strapi/provider-upload-aws-s3": "4.7.1", + "@strapi/provider-upload-cloudinary": "4.7.1", + "@strapi/strapi": "4.7.1", "@vscode/sqlite3": "5.0.8", "better-sqlite3": "8.0.1", "lodash": "4.17.21", diff --git a/examples/kitchensink-ts/package.json b/examples/kitchensink-ts/package.json index 19117c2e89..7adf7ba7de 100644 --- a/examples/kitchensink-ts/package.json +++ b/examples/kitchensink-ts/package.json @@ -1,7 +1,7 @@ { "name": "kitchensink-ts", "private": true, - "version": "4.7.0", + "version": "4.7.1", "description": "A Strapi application", "scripts": { "develop": "strapi develop", @@ -10,9 +10,9 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/plugin-i18n": "4.7.0", - "@strapi/plugin-users-permissions": "4.7.0", - "@strapi/strapi": "4.7.0", + "@strapi/plugin-i18n": "4.7.1", + "@strapi/plugin-users-permissions": "4.7.1", + "@strapi/strapi": "4.7.1", "better-sqlite3": "8.0.1" }, "author": { diff --git a/examples/kitchensink/package.json b/examples/kitchensink/package.json index 35cf524046..b65d8e84ce 100644 --- a/examples/kitchensink/package.json +++ b/examples/kitchensink/package.json @@ -1,7 +1,7 @@ { "name": "kitchensink", "private": true, - "version": "4.7.0", + "version": "4.7.1", "description": "A Strapi application.", "scripts": { "develop": "strapi develop", @@ -12,10 +12,10 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/provider-email-mailgun": "4.7.0", - "@strapi/provider-upload-aws-s3": "4.7.0", - "@strapi/provider-upload-cloudinary": "4.7.0", - "@strapi/strapi": "4.7.0", + "@strapi/provider-email-mailgun": "4.7.1", + "@strapi/provider-upload-aws-s3": "4.7.1", + "@strapi/provider-upload-cloudinary": "4.7.1", + "@strapi/strapi": "4.7.1", "lodash": "4.17.21", "mysql": "2.18.1", "passport-google-oauth2": "0.2.0", diff --git a/lerna.json b/lerna.json index 967e6909e0..a05f0d2a27 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.7.0", + "version": "4.7.1", "packages": [ "packages/*", "examples/*" diff --git a/packages/admin-test-utils/package.json b/packages/admin-test-utils/package.json index 07664140fd..3991064a2e 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.7.0", + "version": "4.7.1", "private": true, "description": "Test utilities for the Strapi administration panel", "license": "MIT", diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json index 0409245324..ff7f439218 100644 --- a/packages/cli/create-strapi-app/package.json +++ b/packages/cli/create-strapi-app/package.json @@ -1,9 +1,9 @@ { "name": "create-strapi-app", - "version": "4.7.0", + "version": "4.7.1", "description": "Generate a new Strapi application.", "dependencies": { - "@strapi/generate-new": "4.7.0", + "@strapi/generate-new": "4.7.1", "commander": "8.3.0", "inquirer": "8.2.5" }, diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json index 977426700b..9a4ced1063 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.7.0", + "version": "4.7.1", "description": "Generate a new Strapi application.", "keywords": [ "create-strapi-starter", @@ -38,7 +38,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/generate-new": "4.7.0", + "@strapi/generate-new": "4.7.1", "chalk": "4.1.1", "ci-info": "3.5.0", "commander": "8.3.0", diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 0840e22387..1eb25375e0 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/admin", - "version": "4.7.0", + "version": "4.7.1", "description": "Strapi Admin", "repository": { "type": "git", @@ -46,15 +46,15 @@ "@casl/ability": "^5.4.3", "@fingerprintjs/fingerprintjs": "3.3.6", "@pmmmwh/react-refresh-webpack-plugin": "0.5.10", - "@strapi/babel-plugin-switch-ee-ce": "4.7.0", - "@strapi/data-transfer": "4.7.0", + "@strapi/babel-plugin-switch-ee-ce": "4.7.1", + "@strapi/data-transfer": "4.7.1", "@strapi/design-system": "1.6.3", - "@strapi/helper-plugin": "4.7.0", + "@strapi/helper-plugin": "4.7.1", "@strapi/icons": "1.6.3", - "@strapi/permissions": "4.7.0", - "@strapi/provider-audit-logs-local": "4.7.0", - "@strapi/typescript-utils": "4.7.0", - "@strapi/utils": "4.7.0", + "@strapi/permissions": "4.7.1", + "@strapi/provider-audit-logs-local": "4.7.1", + "@strapi/typescript-utils": "4.7.1", + "@strapi/utils": "4.7.1", "axios": "1.2.2", "babel-loader": "^9.1.2", "babel-plugin-styled-components": "2.0.2", diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json index ac64eceba3..77f4c0e031 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.7.0", + "version": "4.7.1", "description": "A powerful UI to easily manage your data.", "repository": { "type": "git", @@ -24,7 +24,7 @@ }, "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "lodash": "4.17.21" }, "engines": { diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index e6abcf0def..1c3cbc612f 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.7.0", + "version": "4.7.1", "description": "Strapi plugin to create content type", "repository": { "type": "git", @@ -28,9 +28,9 @@ }, "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/generators": "4.7.0", - "@strapi/helper-plugin": "4.7.0", - "@strapi/utils": "4.7.0", + "@strapi/generators": "4.7.1", + "@strapi/helper-plugin": "4.7.1", + "@strapi/utils": "4.7.1", "fs-extra": "10.0.0", "lodash": "4.17.21", "pluralize": "^8.0.0", diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json index 9e36ebe9b0..e66f903fc4 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.7.0", + "version": "4.7.1", "description": "Data transfer capabilities for Strapi", "keywords": [ "strapi", @@ -39,8 +39,8 @@ "lib": "./lib" }, "dependencies": { - "@strapi/logger": "4.7.0", - "@strapi/strapi": "4.7.0", + "@strapi/logger": "4.7.1", + "@strapi/strapi": "4.7.1", "chalk": "4.1.2", "fs-extra": "10.0.0", "lodash": "4.17.21", diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 0d9ea7ed4c..f75fc6481a 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/database", - "version": "4.7.0", + "version": "4.7.1", "description": "Strapi's database layer", "homepage": "https://strapi.io", "bugs": { diff --git a/packages/core/email/package.json b/packages/core/email/package.json index 46d1ff8304..ac4afd7097 100644 --- a/packages/core/email/package.json +++ b/packages/core/email/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-email", - "version": "4.7.0", + "version": "4.7.1", "description": "Easily configure your Strapi application to send emails.", "repository": { "type": "git", @@ -26,12 +26,12 @@ "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll" }, "dependencies": { - "@strapi/provider-email-sendmail": "4.7.0", - "@strapi/utils": "4.7.0", + "@strapi/provider-email-sendmail": "4.7.1", + "@strapi/utils": "4.7.1", "lodash": "4.17.21" }, "devDependencies": { - "@strapi/helper-plugin": "4.7.0", + "@strapi/helper-plugin": "4.7.1", "@testing-library/react": "12.1.4" }, "engines": { diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index 9fab9b0a0f..127bcef668 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.7.0", + "version": "4.7.1", "description": "Helper for Strapi plugins development", "repository": { "type": "git", diff --git a/packages/core/permissions/package.json b/packages/core/permissions/package.json index c5f3c33f63..15ddf59fcb 100644 --- a/packages/core/permissions/package.json +++ b/packages/core/permissions/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/permissions", - "version": "4.7.0", + "version": "4.7.1", "description": "Strapi's permission layer.", "repository": { "type": "git", @@ -25,7 +25,7 @@ }, "dependencies": { "@casl/ability": "5.4.4", - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "lodash": "4.17.21", "sift": "16.0.0" }, diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index c2d1cff66b..745b2d7592 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/strapi", - "version": "4.7.0", + "version": "4.7.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", @@ -81,19 +81,19 @@ "dependencies": { "@koa/cors": "3.4.3", "@koa/router": "10.1.1", - "@strapi/admin": "4.7.0", - "@strapi/data-transfer": "4.7.0", - "@strapi/database": "4.7.0", - "@strapi/generate-new": "4.7.0", - "@strapi/generators": "4.7.0", - "@strapi/logger": "4.7.0", - "@strapi/permissions": "4.7.0", - "@strapi/plugin-content-manager": "4.7.0", - "@strapi/plugin-content-type-builder": "4.7.0", - "@strapi/plugin-email": "4.7.0", - "@strapi/plugin-upload": "4.7.0", - "@strapi/typescript-utils": "4.7.0", - "@strapi/utils": "4.7.0", + "@strapi/admin": "4.7.1", + "@strapi/data-transfer": "4.7.1", + "@strapi/database": "4.7.1", + "@strapi/generate-new": "4.7.1", + "@strapi/generators": "4.7.1", + "@strapi/logger": "4.7.1", + "@strapi/permissions": "4.7.1", + "@strapi/plugin-content-manager": "4.7.1", + "@strapi/plugin-content-type-builder": "4.7.1", + "@strapi/plugin-email": "4.7.1", + "@strapi/plugin-upload": "4.7.1", + "@strapi/typescript-utils": "4.7.1", + "@strapi/utils": "4.7.1", "bcryptjs": "2.4.3", "boxen": "5.1.2", "chalk": "4.1.2", diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json index 3ba172b656..a3a8e21d10 100644 --- a/packages/core/upload/package.json +++ b/packages/core/upload/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-upload", - "version": "4.7.0", + "version": "4.7.1", "description": "Makes it easy to upload images and files to your Strapi Application.", "license": "SEE LICENSE IN LICENSE", "author": { @@ -23,9 +23,9 @@ "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll" }, "dependencies": { - "@strapi/helper-plugin": "4.7.0", - "@strapi/provider-upload-local": "4.7.0", - "@strapi/utils": "4.7.0", + "@strapi/helper-plugin": "4.7.1", + "@strapi/provider-upload-local": "4.7.1", + "@strapi/utils": "4.7.1", "byte-size": "7.0.1", "cropperjs": "1.5.12", "date-fns": "2.29.3", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 65eea700a9..f9cbf6f463 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/utils", - "version": "4.7.0", + "version": "4.7.1", "description": "Shared utilities for the Strapi packages", "keywords": [ "strapi", diff --git a/packages/generators/app/package.json b/packages/generators/app/package.json index 49c5327f59..85e21086e5 100644 --- a/packages/generators/app/package.json +++ b/packages/generators/app/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/generate-new", - "version": "4.7.0", + "version": "4.7.1", "description": "Generate a new Strapi application.", "keywords": [ "generate", diff --git a/packages/generators/generators/package.json b/packages/generators/generators/package.json index 31f4364bfd..b2a416a626 100644 --- a/packages/generators/generators/package.json +++ b/packages/generators/generators/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/generators", - "version": "4.7.0", + "version": "4.7.1", "description": "Interactive API generator.", "keywords": [ "strapi", @@ -30,8 +30,8 @@ "main": "lib/index.js", "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/typescript-utils": "4.7.0", - "@strapi/utils": "4.7.0", + "@strapi/typescript-utils": "4.7.1", + "@strapi/utils": "4.7.1", "chalk": "4.1.2", "fs-extra": "10.0.0", "node-plop": "0.26.3", diff --git a/packages/plugins/color-picker/package.json b/packages/plugins/color-picker/package.json index 877e1418a5..7003e13bf2 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.7.0", + "version": "4.7.1", "description": "Strapi maintained Custom Fields", "strapi": { "name": "color-picker", diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json index 9e71507afb..f4721a6c67 100644 --- a/packages/plugins/documentation/package.json +++ b/packages/plugins/documentation/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-documentation", - "version": "4.7.0", + "version": "4.7.1", "description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.", "repository": { "type": "git", @@ -24,8 +24,8 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/helper-plugin": "4.7.0", - "@strapi/utils": "4.7.0", + "@strapi/helper-plugin": "4.7.1", + "@strapi/utils": "4.7.1", "bcryptjs": "2.4.3", "cheerio": "^1.0.0-rc.12", "fs-extra": "10.0.0", diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json index e90d04e616..85d4bbdc11 100644 --- a/packages/plugins/graphql/package.json +++ b/packages/plugins/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-graphql", - "version": "4.7.0", + "version": "4.7.1", "description": "Adds GraphQL endpoint with default API methods.", "repository": { "type": "git", @@ -29,7 +29,7 @@ "dependencies": { "@graphql-tools/schema": "8.5.1", "@graphql-tools/utils": "^8.12.0", - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "apollo-server-core": "3.11.1", "apollo-server-koa": "3.10.0", "glob": "^7.1.7", diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json index 615375d46b..4821f237d6 100644 --- a/packages/plugins/i18n/package.json +++ b/packages/plugins/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-i18n", - "version": "4.7.0", + "version": "4.7.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", @@ -24,7 +24,7 @@ "test:unit": "jest --verbose" }, "dependencies": { - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "lodash": "4.17.21" }, "devDependencies": { diff --git a/packages/plugins/sentry/package.json b/packages/plugins/sentry/package.json index b84642e20d..a135deea7d 100644 --- a/packages/plugins/sentry/package.json +++ b/packages/plugins/sentry/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-sentry", - "version": "4.7.0", + "version": "4.7.1", "description": "Send Strapi error events to Sentry", "repository": { "type": "git", diff --git a/packages/plugins/users-permissions/package.json b/packages/plugins/users-permissions/package.json index 88ea34880c..2d8db6d313 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.7.0", + "version": "4.7.1", "description": "Protect your API with a full-authentication process based on JWT", "repository": { "type": "git", @@ -27,8 +27,8 @@ "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll" }, "dependencies": { - "@strapi/helper-plugin": "4.7.0", - "@strapi/utils": "4.7.0", + "@strapi/helper-plugin": "4.7.1", + "@strapi/utils": "4.7.1", "bcryptjs": "2.4.3", "grant-koa": "5.4.8", "jsonwebtoken": "9.0.0", diff --git a/packages/providers/audit-logs-local/package.json b/packages/providers/audit-logs-local/package.json index 4a85a70560..192d4312b3 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.7.0", + "version": "4.7.1", "description": "Local provider for strapi audit logs", "keywords": [ "audit-logs", diff --git a/packages/providers/email-amazon-ses/package.json b/packages/providers/email-amazon-ses/package.json index ae463b36b5..8414b187d0 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.7.0", + "version": "4.7.1", "description": "Amazon SES provider for strapi email", "keywords": [ "email", @@ -36,7 +36,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "node-ses": "^3.0.3" }, "engines": { diff --git a/packages/providers/email-mailgun/package.json b/packages/providers/email-mailgun/package.json index c54604628e..0a124ba243 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.7.0", + "version": "4.7.1", "description": "Mailgun provider for strapi email plugin", "keywords": [ "email", @@ -36,7 +36,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "form-data": "^4.0.0", "mailgun.js": "5.2.2" }, diff --git a/packages/providers/email-nodemailer/package.json b/packages/providers/email-nodemailer/package.json index 64f299de2f..47c2119ca6 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.7.0", + "version": "4.7.1", "description": "Nodemailer provider for Strapi 3", "keywords": [ "strapi", diff --git a/packages/providers/email-sendgrid/package.json b/packages/providers/email-sendgrid/package.json index 63772da533..6c3528d556 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.7.0", + "version": "4.7.1", "description": "Sendgrid provider for strapi email", "keywords": [ "email", @@ -37,7 +37,7 @@ }, "dependencies": { "@sendgrid/mail": "7.7.0", - "@strapi/utils": "4.7.0" + "@strapi/utils": "4.7.1" }, "engines": { "node": ">=14.19.1 <=18.x.x", diff --git a/packages/providers/email-sendmail/package.json b/packages/providers/email-sendmail/package.json index fd97a393dd..3af5cf642b 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.7.0", + "version": "4.7.1", "description": "Sendmail provider for strapi email", "keywords": [ "email", @@ -35,7 +35,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "sendmail": "^1.6.1" }, "engines": { diff --git a/packages/providers/upload-aws-s3/package.json b/packages/providers/upload-aws-s3/package.json index e35b3f2659..c166e0404c 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.7.0", + "version": "4.7.1", "description": "AWS S3 provider for strapi upload", "keywords": [ "upload", diff --git a/packages/providers/upload-cloudinary/package.json b/packages/providers/upload-cloudinary/package.json index 6570a63ce9..b33d8d9b66 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.7.0", + "version": "4.7.1", "description": "Cloudinary provider for strapi upload", "keywords": [ "upload", @@ -36,7 +36,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "cloudinary": "^1.33.0", "into-stream": "^5.1.0" }, diff --git a/packages/providers/upload-local/package.json b/packages/providers/upload-local/package.json index d92b770907..91bc4d78b1 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.7.0", + "version": "4.7.1", "description": "Local provider for strapi upload", "keywords": [ "upload", @@ -35,7 +35,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.7.0", + "@strapi/utils": "4.7.1", "fs-extra": "10.0.0" }, "engines": { diff --git a/packages/utils/babel-plugin-switch-ee-ce/package.json b/packages/utils/babel-plugin-switch-ee-ce/package.json index 1cb9b387bf..64464b42bb 100644 --- a/packages/utils/babel-plugin-switch-ee-ce/package.json +++ b/packages/utils/babel-plugin-switch-ee-ce/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/babel-plugin-switch-ee-ce", - "version": "4.7.0", + "version": "4.7.1", "private": false, "description": "Babel plugin to switch from CE to EE at runtime", "repository": "git://github.com/strapi/strapi.git", diff --git a/packages/utils/logger/package.json b/packages/utils/logger/package.json index 87cb4c3976..91565539ef 100644 --- a/packages/utils/logger/package.json +++ b/packages/utils/logger/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/logger", - "version": "4.7.0", + "version": "4.7.1", "description": "Strapi's logger", "homepage": "https://strapi.io", "bugs": { diff --git a/packages/utils/typescript/package.json b/packages/utils/typescript/package.json index b7e2650a53..33e442b6b1 100644 --- a/packages/utils/typescript/package.json +++ b/packages/utils/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/typescript-utils", - "version": "4.7.0", + "version": "4.7.1", "description": "Typescript support for Strapi", "keywords": [ "strapi", From a2a40506b05dbcb89a5ec7e99480b3327faf64b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 09:27:31 +0000 Subject: [PATCH 18/27] chore(deps): bump ci-info from 3.5.0 to 3.8.0 Bumps [ci-info](https://github.com/watson/ci-info) from 3.5.0 to 3.8.0. - [Release notes](https://github.com/watson/ci-info/releases) - [Changelog](https://github.com/watson/ci-info/blob/master/CHANGELOG.md) - [Commits](https://github.com/watson/ci-info/compare/v3.5.0...v3.8.0) --- updated-dependencies: - dependency-name: ci-info dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/cli/create-strapi-starter/package.json | 2 +- packages/core/strapi/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json index 9a4ced1063..f8f97ac130 100644 --- a/packages/cli/create-strapi-starter/package.json +++ b/packages/cli/create-strapi-starter/package.json @@ -40,7 +40,7 @@ "dependencies": { "@strapi/generate-new": "4.7.1", "chalk": "4.1.1", - "ci-info": "3.5.0", + "ci-info": "3.8.0", "commander": "8.3.0", "execa": "5.1.1", "fs-extra": "10.0.0", diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index 745b2d7592..1286354e0a 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -98,7 +98,7 @@ "boxen": "5.1.2", "chalk": "4.1.2", "chokidar": "3.5.2", - "ci-info": "3.5.0", + "ci-info": "3.8.0", "cli-table3": "0.6.2", "commander": "8.3.0", "configstore": "5.0.1", diff --git a/yarn.lock b/yarn.lock index 85a4d79db4..a1ef971b1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9017,10 +9017,10 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -ci-info@3.5.0, ci-info@^3.2.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" - integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== +ci-info@3.8.0, ci-info@^3.2.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== ci-info@^2.0.0: version "2.0.0" From 47e0709cd21282117b02377fe4289c27170e3e40 Mon Sep 17 00:00:00 2001 From: Fernando Chavez Date: Thu, 2 Mar 2023 10:58:06 +0100 Subject: [PATCH 19/27] add methods and typescript declaration to the docs --- .../useCustomFields.stories.mdx | 65 +++++++++++-------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx b/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx index 3ae7ef83ce..93403c12d6 100644 --- a/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx +++ b/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx @@ -8,11 +8,9 @@ import { Meta, Canvas, Story } from '@storybook/addon-docs'; This hook provides you with a `get` function to retrieve information about a specific custom field registered in the app, as well as an `getAll` function to obtain information about all custom fields registered in the app. -## Get information about a specific plugin if I know its uid +## Usage -With the `get` function from the `useCustomFields` hook you can have all the information of a custom field. - -### Example +### Get information about a specific plugin if I know its uid ```js import { useCustomFields } from '@strapi/helper-plugin'; @@ -21,19 +19,6 @@ const CustomIcon = ({ customFieldUuid }) => { const customFieldsRegistry = useCustomFields(); const customField = customFieldsRegistry.get(customFieldUuid); - /* - { - components: {}, - icon: {}, - intlDescription: {}, - intlLabel: {}, - name: "Custom field name", - options: {}, - pluginId: "custom-field-id", - type: "string|number|etc" - } - */ - if (customField?.icon) { return customFieldIcon; } @@ -42,9 +27,7 @@ const CustomIcon = ({ customFieldUuid }) => { }; ``` -## Get all the custom fields - -With the getAll function of the useCustomFields hook, you will receive a dictionary containing all the custom fields with their respective information. +### Get all the custom fields ```js import { useCustomFields } from '@strapi/helper-plugin'; @@ -53,14 +36,6 @@ import { Typography } from '@strapi/design-system'; const CustomFieldsList = () => { const customFieldsRegistry = useCustomFields(); const customFields = customFieldsRegistry.getAll(); - /* - { - plugin::my-plugin.my-custom-field: { - ... All the custom field information - }, - plugin::other-plugin.other-custom-field: { ... } - } - */ const registeredCustomFields = Object.entries(customFields.getAll()); return ( @@ -72,3 +47,37 @@ const CustomFieldsList = () => { ); }; ``` + +## Methods + +### `get(customFieldUid: Uid): Object` + +With the method from `useCustomFields` hook you can have all the information of a custom field. + +### `getAll(): Object` + +With this method from `useCustomFields` hook, you will receive a dictionary containing all the custom fields with their respective information. + +## Typescript + +```ts +interface CustomField { + components: Object; + icon: React.ComponentType; + intlDescription: IntlObject; + intlLabel: IntlObject; + name: string; + options: Object; + pluginId: string; + type: string; +} + +type CustomFields = { + [uid: string]: CustomField; +}; + +type UseCustomFields = () => { + get: (uid: string) => CustomField | undefined; + getAll: () => CustomFields; +}; +``` From b2e5f90da7a01d6103ef7316f293d6b1bb66983a Mon Sep 17 00:00:00 2001 From: Fernando Chavez Date: Thu, 2 Mar 2023 11:00:20 +0100 Subject: [PATCH 20/27] remove unnecessary storybook imports --- .../lib/src/hooks/useCustomFields/useCustomFields.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx b/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx index 93403c12d6..629ad3f5a7 100644 --- a/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx +++ b/packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx @@ -1,6 +1,6 @@ -import { Meta, Canvas, Story } from '@storybook/addon-docs'; +import { Meta } from '@storybook/addon-docs'; From 09ff54bc6ebb0d41ca631d3436a2f2dab0ca08f1 Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Thu, 16 Feb 2023 17:24:28 +0100 Subject: [PATCH 21/27] chore: convert Stack components to Flex chore: update snapshots chore: convert rest of files to use Flex chore: fix duplicate import chore: update snapshots chore: add eslint rule for stack refactor: catch other Stack component uses chore: remove horizontal prop --- .eslintrc.front.js | 8 + .../Blocker.js | 8 +- .../Overlay.js | 4 +- .../components/GuidedTour/Homepage/index.js | 6 +- .../GuidedTour/Homepage/tests/index.test.js | 200 ++- .../GuidedTour/Modal/components/Content.js | 58 +- .../GuidedTour/Modal/components/Modal.js | 10 +- .../GuidedTour/Modal/tests/index.test.js | 200 ++- .../admin/src/components/LeftMenu/index.js | 6 +- .../src/components/Notifications/index.js | 10 +- .../Notifications/tests/index.test.js | 12 +- .../src/components/UpgradePlanModal/index.js | 13 +- .../components/ComponentInitializer/index.js | 6 +- .../DragLayer/RelationDragPreview.js | 6 +- .../DynamicTable/ConfirmDialogDelete/index.js | 14 +- .../ConfirmDialogDeleteAll/index.js | 14 +- .../DynamicZone/components/ComponentCard.js | 8 +- .../components/DynamicComponent.js | 7 +- .../components/DynamicZone/index.js | 6 +- .../components/FieldComponent/index.js | 6 +- .../NonRepeatableComponent/index.js | 6 +- .../RelationInput/components/Relation.js | 12 +- .../RelationInput/components/RelationItem.js | 8 +- .../__snapshots__/RelationItem.test.js.snap | 24 +- .../__snapshots__/RelationList.test.js.snap | 28 +- .../__snapshots__/RelationInput.test.js.snap | 286 ++-- .../components/Component.js | 18 +- .../components/Wysiwyg/index.js | 10 +- .../tests/__snapshots__/index.test.js.snap | 98 +- .../components/DisplayedFields.js | 10 +- .../components/DynamicZoneList.js | 6 +- .../pages/EditSettingsView/index.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 152 +- .../pages/EditView/Header/index.js | 13 +- .../pages/EditView/Header/tests/index.test.js | 22 +- .../pages/EditView/Information/index.js | 18 +- .../content-manager/pages/EditView/index.js | 18 +- .../components/CardPreview.js | 6 +- .../components/DraggableCard.js | 6 +- .../ListSettingsView/components/Settings.js | 10 +- .../components/SortDisplayedFields.js | 14 +- .../tests/__snapshots__/index.test.js.snap | 234 +-- .../admin/src/pages/Admin/Onboarding/index.js | 16 +- .../components/ForgotPassword/index.js | 6 +- .../AuthPage/components/Login/BaseLogin.js | 15 +- .../components/Login/tests/BaseLogin.test.js | 32 +- .../AuthPage/components/Register/index.js | 5 +- .../components/Register/tests/index.test.js | 258 ++- .../components/ResetPassword/index.js | 6 +- .../ResetPassword/tests/index.test.js | 30 +- .../admin/src/pages/HomePage/ContentBlocks.js | 6 +- .../admin/src/pages/HomePage/HomeHeader.js | 10 +- .../admin/src/pages/HomePage/SocialLinks.js | 10 +- .../components/NpmPackageCard/PackageStats.js | 6 +- .../components/NpmPackageCard/index.js | 6 +- .../NpmPackagesFilters/FiltersPopover.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 157 +- .../tests/__snapshots__/plugins.test.js.snap | 157 +- .../__snapshots__/providers.test.js.snap | 199 ++- .../admin/src/pages/ProfilePage/index.js | 22 +- .../tests/__snapshots__/index.test.js.snap | 197 ++- .../components/Tokens/FormHead/index.js | 6 +- .../components/ActionBoundRoutes/index.js | 10 +- .../EditView/components/BoundRoute/index.js | 10 +- .../components/FormApiTokenContainer/index.js | 6 +- .../EditView/components/Permissions/index.js | 6 +- .../pages/ApiTokens/EditView/index.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 641 ++++---- .../tests/__snapshots__/index.test.js.snap | 26 +- .../LogoModalStepper/FromComputerForm.js | 5 +- .../__snapshots__/AddLogoDialog.test.js.snap | 174 +- .../pages/ApplicationInfosPage/index.js | 13 +- .../components/GlobalActions/index.js | 10 +- .../EditPage/components/RoleForm/index.js | 5 +- .../pages/Roles/EditPage/index.js | 10 +- .../tests/__snapshots__/index.test.js.snap | 150 +- .../FormTransferTokenContainer/index.js | 6 +- .../pages/TransferTokens/EditView/index.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 377 +++-- .../pages/Users/EditPage/index.js | 14 +- .../pages/Users/ListPage/ModalForm/index.js | 10 +- .../EditView/components/EventInput/index.js | 6 +- .../EditView/components/HeadersInput/index.js | 5 +- .../components/TriggerContainer/index.js | 18 +- .../EditView/components/WebhookForm/index.js | 14 +- .../pages/Webhooks/ListView/index.js | 325 ++-- .../Webhooks/ListView/tests/index.test.js | 24 +- .../admin/src/pages/UseCasePage/index.js | 5 +- .../src/pages/UseCasePage/tests/index.test.js | 28 +- .../__snapshots__/StrapiApp.test.js.snap | 12 +- .../pages/AuthPage/components/Login/index.js | 6 +- .../AuthPage/components/Providers/index.js | 6 +- .../components/AdminSeatInfo/index.js | 6 +- .../pages/Roles/CreatePage/index.js | 13 +- .../tests/__snapshots__/index.test.js.snap | 110 +- .../SettingsPage/pages/SingleSignOn/index.js | 14 +- .../tests/__snapshots__/index.test.js.snap | 52 +- .../Users/ListPage/CreateAction/index.js | 6 +- .../AttributeOptions/AttributeList/index.js | 6 +- .../CustomFieldsList/index.js | 6 +- .../tests/__snapshots__/index.test.js.snap | 330 ++-- .../CheckboxWithNumberField/index.js | 6 +- .../components/CustomRadioGroup/components.js | 4 +- .../src/components/CustomRadioGroup/index.js | 12 +- .../src/components/DynamicZoneList/index.js | 10 +- .../admin/src/components/FormModal/index.js | 9 +- .../src/components/FormModalHeader/index.js | 14 +- .../components/FormModalSubHeader/index.js | 6 +- .../admin/src/components/ListRow/index.js | 10 +- .../Relation/RelationNaturePicker/index.js | 6 +- .../admin/src/pages/ListView/index.js | 14 +- .../tests/__snapshots__/index.test.js.snap | 1424 +++++++++-------- .../Settings/components/Configuration.js | 18 +- .../email/admin/src/pages/Settings/index.js | 10 +- .../src/pages/Settings/tests/index.test.js | 281 ++-- .../lib/src/components/ConfirmDialog/index.js | 14 +- .../ContentBox/ContentBox.stories.mdx | 7 +- .../lib/src/components/ContentBox/index.js | 6 +- .../components/ContentBox/tests/index.test.js | 22 +- .../DynamicTable/DynamicTable.stories.mdx | 25 +- .../FilterListURLQuery.stories.mdx | 10 +- .../FilterPopoverURLQuery.stories.mdx | 8 +- .../components/FilterPopoverURLQuery/index.js | 6 +- .../GenericInput/GenericInput.stories.mdx | 6 +- .../SearchURLQuery/SearchURLQuery.stories.mdx | 6 +- .../AssetCard/UploadingAssetCard.js | 5 +- .../tests/__snapshots__/index.test.js.snap | 201 +-- .../AssetDialog/SelectedStep/index.js | 10 +- .../admin/src/components/AssetDialog/index.js | 5 +- .../BulkMoveDialog/BulkMoveDialog.js | 5 +- .../__snapshots__/BulkMoveDialog.test.js.snap | 200 ++- .../src/components/ContextInfo/ContextInfo.js | 6 +- .../__snapshots__/ContextInfo.test.js.snap | 36 +- .../PreviewBox/CroppingActions.js | 6 +- .../EditAssetDialog/PreviewBox/index.js | 6 +- .../src/components/EditAssetDialog/index.js | 9 +- .../EditAssetDialog.test.js.snap | 407 ++--- .../RemoveAssetDialog.test.js.snap | 126 +- .../tests/__snapshots__/index.test.js.snap | 407 ++--- .../EditFolderDialog/EditFolderDialog.js | 9 +- .../EditFolderDialog.test.js.snap | 125 +- .../admin/src/components/EmptyAssets/index.js | 15 +- .../src/components/FilterPopover/index.js | 6 +- .../FolderCard/FolderCard/FolderCard.js | 9 +- .../__snapshots__/FolderCard.test.js.snap | 150 +- .../PendingAssetStep/PendingAssetStep.js | 9 +- .../PendingAssetStep.test.js.snap | 337 ++-- .../src/components/UploadProgress/index.js | 10 +- .../UploadProgress/tests/index.test.js | 56 +- .../MediaLibrary/components/BulkActions.js | 6 +- .../App/MediaLibrary/components/Header.js | 6 +- .../__snapshots__/BulkActions.test.js.snap | 122 +- .../tests/__snapshots__/Header.test.js.snap | 22 +- .../src/pages/App/components/BulkActions.js | 6 +- .../admin/src/pages/App/components/Header.js | 6 +- .../admin/src/pages/SettingsPage/index.js | 9 +- .../pages/SettingsPage/tests/index.test.js | 86 +- .../ColorPicker/ColorPickerInput/index.js | 5 +- .../color-picker-input.test.js.snap | 58 +- .../admin/src/pages/SettingsPage/index.js | 6 +- .../CMEditViewCopyLocale/index.js | 5 +- .../CMEditViewLocalePicker/index.js | 6 +- .../components/CheckboxConfirmation/index.js | 5 +- .../src/components/LocaleList/LocaleTable.js | 11 +- .../admin/src/components/BoundRoute/index.js | 10 +- .../admin/src/components/FormModal/index.js | 6 +- .../admin/src/components/Permissions/index.js | 6 +- .../admin/src/components/Policies/index.js | 10 +- .../src/components/UsersPermissions/index.js | 10 +- .../admin/src/pages/AdvancedSettings/index.js | 6 +- .../AdvancedSettings/tests/index.test.js | 54 +- .../admin/src/pages/Roles/CreatePage/index.js | 10 +- .../Roles/CreatePage/tests/index.test.js | 245 +-- .../admin/src/pages/Roles/EditPage/index.js | 10 +- .../pages/Roles/EditPage/tests/index.test.js | 245 +-- 175 files changed, 5344 insertions(+), 4950 deletions(-) diff --git a/.eslintrc.front.js b/.eslintrc.front.js index 90daf4c7c8..12ef7809f2 100644 --- a/.eslintrc.front.js +++ b/.eslintrc.front.js @@ -41,6 +41,14 @@ module.exports = { 'no-restricted-imports': [ 'error', { + paths: [ + { + name: '@strapi/design-system', + importNames: ['Stack'], + message: + "'Stack' has been deprecated. Please import 'Flex' from '@strapi/design-system' instead.", + }, + ], patterns: [ { group: [ diff --git a/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js b/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js index 9565a1496f..3ebcdefa0e 100644 --- a/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js +++ b/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js @@ -6,7 +6,7 @@ import styled, { keyframes } from 'styled-components'; import { pxToRem } from '@strapi/helper-plugin'; import { Clock, Refresh } from '@strapi/icons'; import { Link } from '@strapi/design-system/v2'; -import { Box, Stack, Flex, Typography } from '@strapi/design-system'; +import { Box, Flex, Typography } from '@strapi/design-system'; import { Content, IconBox, Overlay } from './Overlay'; const overlayContainer = document.createElement('div'); @@ -40,8 +40,8 @@ const Blocker = ({ displayedIcon, description, title, isOpen }) => { if (isOpen) { return ReactDOM.createPortal( - - + + {formatMessage(title)} @@ -52,7 +52,7 @@ const Blocker = ({ displayedIcon, description, title, isOpen }) => { {formatMessage(description)} - + {displayedIcon === 'reload' && ( diff --git a/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Overlay.js b/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Overlay.js index b91d5a5f57..36454a9fc8 100644 --- a/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Overlay.js +++ b/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Overlay.js @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { Box, Stack } from '@strapi/design-system'; +import { Box, Flex } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; const Overlay = styled(Box)` @@ -21,7 +21,7 @@ const Overlay = styled(Box)` } `; -const Content = styled(Stack)` +const Content = styled(Flex)` position: fixed; top: 0; right: 0; diff --git a/packages/core/admin/admin/src/components/GuidedTour/Homepage/index.js b/packages/core/admin/admin/src/components/GuidedTour/Homepage/index.js index 0836f320a3..ed38c93d6c 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Homepage/index.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Homepage/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { useGuidedTour, useTracking, LinkButton } from '@strapi/helper-plugin'; import { useIntl } from 'react-intl'; -import { Stack, Flex, Box, Typography, Button } from '@strapi/design-system'; +import { Flex, Box, Typography, Button } from '@strapi/design-system'; import { ArrowRight } from '@strapi/icons'; import StepperHomepage from './components/Stepper'; import layout from '../layout'; @@ -47,7 +47,7 @@ const GuidedTourHomepage = () => { paddingBottom={4} background="neutral0" > - + {formatMessage({ id: 'app.components.GuidedTour.title', @@ -55,7 +55,7 @@ const GuidedTourHomepage = () => { })} - + )} - + diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js index f6df83070c..8320a5eeea 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js @@ -48,7 +48,7 @@ describe('', () => { expect(screen.getByText('🧠 Create a first Collection type')).toBeInTheDocument(); expect(document.body).toMatchInlineSnapshot(` - .c16 { + .c15 { font-weight: 600; font-size: 0.6875rem; line-height: 1.45; @@ -56,14 +56,14 @@ describe('', () => { color: #4945ff; } - .c20 { + .c19 { font-size: 0.875rem; line-height: 1.43; font-weight: 500; color: #ffffff; } - .c21 { + .c20 { font-weight: 600; font-size: 2rem; line-height: 1.25; @@ -71,13 +71,13 @@ describe('', () => { color: #32324d; } - .c25 { + .c24 { font-size: 0.875rem; line-height: 1.43; color: #32324d; } - .c27 { + .c26 { font-size: 0.75rem; line-height: 1.33; font-weight: 600; @@ -96,17 +96,17 @@ describe('', () => { width: 41.25rem; } - .c11 { + .c10 { padding-right: 32px; padding-left: 32px; } - .c13 { + .c12 { margin-right: 40px; min-width: 1.875rem; } - .c14 { + .c13 { background: #7b79ff; border-radius: 4px; width: 0.125rem; @@ -114,12 +114,12 @@ describe('', () => { min-height: 1.5rem; } - .c18 { + .c17 { padding-top: 12px; padding-bottom: 12px; } - .c19 { + .c18 { background: #4945ff; padding: 8px; border-radius: 50%; @@ -127,11 +127,11 @@ describe('', () => { height: 1.875rem; } - .c23 { + .c22 { padding-bottom: 24px; } - .c28 { + .c27 { padding-left: 8px; } @@ -165,9 +165,10 @@ describe('', () => { -webkit-flex-direction: column; -ms-flex-direction: column; flex-direction: column; + gap: 40px; } - .c8 { + .c7 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -185,7 +186,7 @@ describe('', () => { justify-content: flex-end; } - .c12 { + .c11 { -webkit-align-items: stretch; -webkit-box-align: stretch; -ms-flex-align: stretch; @@ -199,7 +200,7 @@ describe('', () => { flex-direction: row; } - .c17 { + .c16 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -213,7 +214,7 @@ describe('', () => { flex-direction: row; } - .c22 { + .c21 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -231,25 +232,22 @@ describe('', () => { justify-content: center; } - .c7 > * { - margin-top: 0; - margin-bottom: 0; + .c23 { + -webkit-align-items: stretch; + -webkit-box-align: stretch; + -ms-flex-align: stretch; + align-items: stretch; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; + gap: 16px; } - .c7 > * + * { - margin-top: 40px; - } - - .c24 > * { - margin-top: 0; - margin-bottom: 0; - } - - .c24 > * + * { - margin-top: 16px; - } - - .c9 { + .c8 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -263,21 +261,21 @@ describe('', () => { outline: none; } - .c9 svg { + .c8 svg { height: 12px; width: 12px; } - .c9 svg > g, - .c9 svg path { + .c8 svg > g, + .c8 svg path { fill: #ffffff; } - .c9[aria-disabled='true'] { + .c8[aria-disabled='true'] { pointer-events: none; } - .c9:after { + .c8:after { -webkit-transition-property: all; transition-property: all; -webkit-transition-duration: 0.2s; @@ -292,11 +290,11 @@ describe('', () => { border: 2px solid transparent; } - .c9:focus-visible { + .c8:focus-visible { outline: none; } - .c9:focus-visible:after { + .c8:focus-visible:after { border-radius: 8px; content: ''; position: absolute; @@ -319,7 +317,7 @@ describe('', () => { width: 1px; } - .c26 { + .c25 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -331,7 +329,7 @@ describe('', () => { padding-right: 16px; } - .c26 .c1 { + .c25 .c1 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -342,52 +340,52 @@ describe('', () => { align-items: center; } - .c26 .c15 { + .c25 .c14 { color: #ffffff; } - .c26[aria-disabled='true'] { + .c25[aria-disabled='true'] { border: 1px solid #dcdce4; background: #eaeaef; } - .c26[aria-disabled='true'] .c15 { + .c25[aria-disabled='true'] .c14 { color: #666687; } - .c26[aria-disabled='true'] svg > g,.c26[aria-disabled='true'] svg path { + .c25[aria-disabled='true'] svg > g,.c25[aria-disabled='true'] svg path { fill: #666687; } - .c26[aria-disabled='true']:active { + .c25[aria-disabled='true']:active { border: 1px solid #dcdce4; background: #eaeaef; } - .c26[aria-disabled='true']:active .c15 { + .c25[aria-disabled='true']:active .c14 { color: #666687; } - .c26[aria-disabled='true']:active svg > g,.c26[aria-disabled='true']:active svg path { + .c25[aria-disabled='true']:active svg > g,.c25[aria-disabled='true']:active svg path { fill: #666687; } - .c26:hover { + .c25:hover { border: 1px solid #7b79ff; background: #7b79ff; } - .c26:active { + .c25:active { border: 1px solid #4945ff; background: #4945ff; } - .c26 svg > g, - .c26 svg path { + .c25 svg > g, + .c25 svg path { fill: #ffffff; } - .c29 { + .c28 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -401,7 +399,7 @@ describe('', () => { background: #ffffff; } - .c29 .c1 { + .c28 .c1 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -412,54 +410,54 @@ describe('', () => { align-items: center; } - .c29 .c15 { + .c28 .c14 { color: #ffffff; } - .c29[aria-disabled='true'] { + .c28[aria-disabled='true'] { border: 1px solid #dcdce4; background: #eaeaef; } - .c29[aria-disabled='true'] .c15 { + .c28[aria-disabled='true'] .c14 { color: #666687; } - .c29[aria-disabled='true'] svg > g,.c29[aria-disabled='true'] svg path { + .c28[aria-disabled='true'] svg > g,.c28[aria-disabled='true'] svg path { fill: #666687; } - .c29[aria-disabled='true']:active { + .c28[aria-disabled='true']:active { border: 1px solid #dcdce4; background: #eaeaef; } - .c29[aria-disabled='true']:active .c15 { + .c28[aria-disabled='true']:active .c14 { color: #666687; } - .c29[aria-disabled='true']:active svg > g,.c29[aria-disabled='true']:active svg path { + .c28[aria-disabled='true']:active svg > g,.c28[aria-disabled='true']:active svg path { fill: #666687; } - .c29:hover { + .c28:hover { background-color: #f6f6f9; } - .c29:active { + .c28:active { background-color: #eaeaef; } - .c29 .c15 { + .c28 .c14 { color: #32324d; } - .c29 svg > g, - .c29 svg path { + .c28 svg > g, + .c28 svg path { fill: #32324d; } - .c10 { + .c9 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -476,26 +474,26 @@ describe('', () => { width: 2rem; } - .c10 svg > g, - .c10 svg path { + .c9 svg > g, + .c9 svg path { fill: #8e8ea9; } - .c10:hover svg > g, - .c10:hover svg path { + .c9:hover svg > g, + .c9:hover svg path { fill: #666687; } - .c10:active svg > g, - .c10:active svg path { + .c9:active svg > g, + .c9:active svg path { fill: #a5a5ba; } - .c10[aria-disabled='true'] { + .c9[aria-disabled='true'] { background-color: #eaeaef; } - .c10[aria-disabled='true'] svg path { + .c9[aria-disabled='true'] svg path { fill: #666687; } @@ -540,15 +538,15 @@ describe('', () => {