From d564aa6f64d6047b67e1d5440b0d31c9f101182b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 09:22:25 +0200 Subject: [PATCH 01/11] chore(deps-dev): bump postcss from 8.4.27 to 8.4.31 (#6929) Bumps [postcss](https://github.com/postcss/postcss) from 8.4.27 to 8.4.31. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.27...8.4.31) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 67d920665890..1e8465e12d8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15257,9 +15257,9 @@ postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0. source-map "^0.6.1" postcss@^8.4.19, postcss@^8.4.7: - version "8.4.27" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057" - integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ== + version "8.4.31" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== dependencies: nanoid "^3.3.6" picocolors "^1.0.0" From b7d76e3457c2c4418998d551c7ee1302f91a699d Mon Sep 17 00:00:00 2001 From: Anze Demsar Date: Tue, 10 Oct 2023 13:24:02 +0200 Subject: [PATCH 02/11] v0.0.0 --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 30b92af85520..50f1f9fcaf42 100644 --- a/package.json +++ b/package.json @@ -198,5 +198,6 @@ "resolutions": { "react-redux": "^7.2.0", "babel-plugin-lodash/@babel/types": "~7.20.0" - } + }, + "version": "0.0.0" } From ff95449c6971ecddc4d3e193c1e892c014602271 Mon Sep 17 00:00:00 2001 From: Anze Demsar Date: Tue, 10 Oct 2023 14:22:13 +0200 Subject: [PATCH 03/11] style: remove some console logs --- packages/decap-cms-widget-list/src/ListControl.js | 2 -- .../src/MarkdownControl/plugins/shortcodes/insertShortcode.js | 3 --- 2 files changed, 5 deletions(-) diff --git a/packages/decap-cms-widget-list/src/ListControl.js b/packages/decap-cms-widget-list/src/ListControl.js index d5d269d2866f..3011e77b5dd6 100644 --- a/packages/decap-cms-widget-list/src/ListControl.js +++ b/packages/decap-cms-widget-list/src/ListControl.js @@ -593,8 +593,6 @@ export default class ListControl extends React.Component { } } - console.log('kurwa', classNameWrapper); - return ( field.has('default')) .map(field => field.get('default')); - // console.log(defaultValues); - const nodeData = { type: 'shortcode', id: pluginConfig.id, @@ -28,7 +26,6 @@ function insertShortcode(editor, pluginConfig) { } Transforms.insertNodes(editor, nodeData); - console.log('handleInsertShortcode', pluginConfig); } export default insertShortcode; From 90c984477488ed08c55a42eb1d3b45accf46c832 Mon Sep 17 00:00:00 2001 From: Anze Demsar Date: Tue, 10 Oct 2023 16:31:56 +0200 Subject: [PATCH 04/11] fix: change file-control default value to string (#6934) --- packages/decap-cms-widget-file/src/withFileControl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decap-cms-widget-file/src/withFileControl.js b/packages/decap-cms-widget-file/src/withFileControl.js index 9bf87237bf8e..aabffaf8639c 100644 --- a/packages/decap-cms-widget-file/src/withFileControl.js +++ b/packages/decap-cms-widget-file/src/withFileControl.js @@ -202,7 +202,7 @@ function sizeOfValue(value) { } function valueListToArray(value) { - return List.isList(value) ? value.toArray() : value ?? []; + return List.isList(value) ? value.toArray() : value ?? ''; } function valueListToSortableArray(value) { From 34f0b63b4602efa261ef11aafae85460ca8f77cd Mon Sep 17 00:00:00 2001 From: Anze Demsar Date: Tue, 10 Oct 2023 16:34:30 +0200 Subject: [PATCH 05/11] chore(release): publish - decap-cms-app@3.0.8 - decap-cms-widget-file@3.0.3 - decap-cms-widget-list@3.0.3 - decap-cms-widget-markdown@3.0.2 - decap-cms@3.0.8 --- packages/decap-cms-app/CHANGELOG.md | 8 ++++++++ packages/decap-cms-app/package.json | 8 ++++---- packages/decap-cms-widget-file/CHANGELOG.md | 11 +++++++++++ packages/decap-cms-widget-file/package.json | 2 +- packages/decap-cms-widget-list/CHANGELOG.md | 8 ++++++++ packages/decap-cms-widget-list/package.json | 2 +- packages/decap-cms-widget-markdown/CHANGELOG.md | 8 ++++++++ packages/decap-cms-widget-markdown/package.json | 2 +- packages/decap-cms/CHANGELOG.md | 8 ++++++++ packages/decap-cms/package.json | 4 ++-- 10 files changed, 52 insertions(+), 9 deletions(-) diff --git a/packages/decap-cms-app/CHANGELOG.md b/packages/decap-cms-app/CHANGELOG.md index 4f1240f7d997..8fee523d4456 100644 --- a/packages/decap-cms-app/CHANGELOG.md +++ b/packages/decap-cms-app/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.8](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.0.7...decap-cms-app@3.0.8) (2023-10-10) + +**Note:** Version bump only for package decap-cms-app + + + + + ## [3.0.7](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.0.6...decap-cms-app@3.0.7) (2023-09-06) **Note:** Version bump only for package decap-cms-app diff --git a/packages/decap-cms-app/package.json b/packages/decap-cms-app/package.json index 1993465496c2..d9bfbadec62e 100644 --- a/packages/decap-cms-app/package.json +++ b/packages/decap-cms-app/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-app", "description": "An extensible, open source, Git-based, React CMS for static sites. Reusable congiuration with React as peer.", - "version": "3.0.7", + "version": "3.0.8", "homepage": "https://www.decapcms.org", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -47,11 +47,11 @@ "decap-cms-widget-code": "^3.0.1", "decap-cms-widget-colorstring": "^3.0.1", "decap-cms-widget-datetime": "^3.0.2", - "decap-cms-widget-file": "^3.0.2", + "decap-cms-widget-file": "^3.0.3", "decap-cms-widget-image": "^3.0.2", - "decap-cms-widget-list": "^3.0.2", + "decap-cms-widget-list": "^3.0.3", "decap-cms-widget-map": "^3.0.1", - "decap-cms-widget-markdown": "^3.0.1", + "decap-cms-widget-markdown": "^3.0.2", "decap-cms-widget-number": "^3.0.1", "decap-cms-widget-object": "^3.0.1", "decap-cms-widget-relation": "^3.0.2", diff --git a/packages/decap-cms-widget-file/CHANGELOG.md b/packages/decap-cms-widget-file/CHANGELOG.md index f09398ecf327..ed0beee733f3 100644 --- a/packages/decap-cms-widget-file/CHANGELOG.md +++ b/packages/decap-cms-widget-file/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.3](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-file@3.0.2...decap-cms-widget-file@3.0.3) (2023-10-10) + + +### Bug Fixes + +* change file-control default value to string ([#6934](https://github.com/decaporg/decap-cms/issues/6934)) ([90c9844](https://github.com/decaporg/decap-cms/commit/90c984477488ed08c55a42eb1d3b45accf46c832)) + + + + + ## [3.0.2](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-file@3.0.1...decap-cms-widget-file@3.0.2) (2023-09-06) **Note:** Version bump only for package decap-cms-widget-file diff --git a/packages/decap-cms-widget-file/package.json b/packages/decap-cms-widget-file/package.json index 5180bf896ebf..8493d0a5d163 100644 --- a/packages/decap-cms-widget-file/package.json +++ b/packages/decap-cms-widget-file/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-widget-file", "description": "Widget for uploading files in Decap CMS.", - "version": "3.0.2", + "version": "3.0.3", "homepage": "https://www.decapcms.org/docs/widgets/#file", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-widget-file", "bugs": "https://github.com/decaporg/decap-cms/issues", diff --git a/packages/decap-cms-widget-list/CHANGELOG.md b/packages/decap-cms-widget-list/CHANGELOG.md index 6139b7b7aa05..5da64f8a2ea3 100644 --- a/packages/decap-cms-widget-list/CHANGELOG.md +++ b/packages/decap-cms-widget-list/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.3](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-list@3.0.2...decap-cms-widget-list@3.0.3) (2023-10-10) + +**Note:** Version bump only for package decap-cms-widget-list + + + + + ## [3.0.2](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-list@3.0.1...decap-cms-widget-list@3.0.2) (2023-09-06) **Note:** Version bump only for package decap-cms-widget-list diff --git a/packages/decap-cms-widget-list/package.json b/packages/decap-cms-widget-list/package.json index 759ed5a69b89..0ff5e82a44bb 100644 --- a/packages/decap-cms-widget-list/package.json +++ b/packages/decap-cms-widget-list/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-widget-list", "description": "Widget for editing lists in Decap CMS.", - "version": "3.0.2", + "version": "3.0.3", "homepage": "https://www.decapcms.org/docs/widgets/#list", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-widget-list", "bugs": "https://github.com/decaporg/decap-cms/issues", diff --git a/packages/decap-cms-widget-markdown/CHANGELOG.md b/packages/decap-cms-widget-markdown/CHANGELOG.md index 3c364b23b4a6..1cc55df0246a 100644 --- a/packages/decap-cms-widget-markdown/CHANGELOG.md +++ b/packages/decap-cms-widget-markdown/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.2](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-markdown@3.0.1...decap-cms-widget-markdown@3.0.2) (2023-10-10) + +**Note:** Version bump only for package decap-cms-widget-markdown + + + + + ## [3.0.1](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-markdown@3.0.0...decap-cms-widget-markdown@3.0.1) (2023-08-25) diff --git a/packages/decap-cms-widget-markdown/package.json b/packages/decap-cms-widget-markdown/package.json index b1a8d6d38a51..910fddde5c02 100644 --- a/packages/decap-cms-widget-markdown/package.json +++ b/packages/decap-cms-widget-markdown/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-widget-markdown", "description": "Widget for editing markdown in Decap CMS.", - "version": "3.0.1", + "version": "3.0.2", "homepage": "https://www.decapcms.org/docs/widgets/#markdown", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-widget-markdown", "bugs": "https://github.com/decaporg/decap-cms/issues", diff --git a/packages/decap-cms/CHANGELOG.md b/packages/decap-cms/CHANGELOG.md index 27a4aef22cbd..551c1aa67c95 100644 --- a/packages/decap-cms/CHANGELOG.md +++ b/packages/decap-cms/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.8](https://github.com/decaporg/decap-cms/compare/decap-cms@3.0.7...decap-cms@3.0.8) (2023-10-10) + +**Note:** Version bump only for package decap-cms + + + + + ## [3.0.7](https://github.com/decaporg/decap-cms/compare/decap-cms@3.0.6...decap-cms@3.0.7) (2023-09-06) **Note:** Version bump only for package decap-cms diff --git a/packages/decap-cms/package.json b/packages/decap-cms/package.json index 9a6b2708494e..94f36417fde1 100644 --- a/packages/decap-cms/package.json +++ b/packages/decap-cms/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms", "description": "An extensible, open source, Git-based, React CMS for static sites.", - "version": "3.0.7", + "version": "3.0.8", "homepage": "https://www.decapcms.org", "repository": "https://github.com/decaporg/decap-cms", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -22,7 +22,7 @@ "dependencies": { "codemirror": "^5.46.0", "create-react-class": "^15.7.0", - "decap-cms-app": "^3.0.7", + "decap-cms-app": "^3.0.8", "decap-cms-media-library-cloudinary": "^3.0.1", "decap-cms-media-library-uploadcare": "^3.0.0", "file-loader": "^6.2.0", From 1aac51d864e15a6b1646eb13ca8d95ad8554b0d5 Mon Sep 17 00:00:00 2001 From: Anze Demsar Date: Wed, 11 Oct 2023 11:19:26 +0200 Subject: [PATCH 06/11] fix: consider i18n strucutre when determining regex ruleString for github backend (#6937) --- packages/decap-cms-core/src/backend.ts | 12 ++++++++++-- packages/decap-cms-core/src/lib/i18n.ts | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/decap-cms-core/src/backend.ts b/packages/decap-cms-core/src/backend.ts index d6faf795c67d..2150cd984fd5 100644 --- a/packages/decap-cms-core/src/backend.ts +++ b/packages/decap-cms-core/src/backend.ts @@ -47,8 +47,10 @@ import { getI18nBackup, formatI18nBackup, getI18nInfo, + I18N_STRUCTURE, } from './lib/i18n'; +import type { I18nInfo } from './lib/i18n'; import type AssetProxy from './valueObjects/AssetProxy'; import type { CmsConfig, @@ -308,6 +310,13 @@ function collectionDepth(collection: Collection) { return depth; } +function i18nRulestring(ruleString: string, { defaultLocale, structure }: I18nInfo): string { + if (structure === I18N_STRUCTURE.MULTIPLE_FOLDERS) { + return `${defaultLocale}\\/${ruleString}`; + } + return `${ruleString}\\.${defaultLocale}\\..*`; +} + function collectionRegex(collection: Collection): RegExp | undefined { let ruleString = ''; @@ -319,8 +328,7 @@ function collectionRegex(collection: Collection): RegExp | undefined { } if (hasI18n(collection)) { - const { defaultLocale } = getI18nInfo(collection) as { defaultLocale: string }; - ruleString += `\\.${defaultLocale}\\..*`; + ruleString = i18nRulestring(ruleString, getI18nInfo(collection) as I18nInfo); } return ruleString ? new RegExp(ruleString) : undefined; diff --git a/packages/decap-cms-core/src/lib/i18n.ts b/packages/decap-cms-core/src/lib/i18n.ts index 013aaf631096..75e5defaf729 100644 --- a/packages/decap-cms-core/src/lib/i18n.ts +++ b/packages/decap-cms-core/src/lib/i18n.ts @@ -24,7 +24,7 @@ export function hasI18n(collection: Collection) { return collection.has(I18N); } -type I18nInfo = { +export type I18nInfo = { locales: string[]; defaultLocale: string; structure: I18N_STRUCTURE; From 50b94e4f945b50f47d5e379fe83034f3a24db1c2 Mon Sep 17 00:00:00 2001 From: Anze Demsar Date: Wed, 11 Oct 2023 11:20:51 +0200 Subject: [PATCH 07/11] chore(release): publish - decap-cms-app@3.0.9 - decap-cms-core@3.2.5 - decap-cms@3.0.9 --- packages/decap-cms-app/CHANGELOG.md | 8 ++++++++ packages/decap-cms-app/package.json | 4 ++-- packages/decap-cms-core/CHANGELOG.md | 11 +++++++++++ packages/decap-cms-core/package.json | 2 +- packages/decap-cms/CHANGELOG.md | 8 ++++++++ packages/decap-cms/package.json | 4 ++-- 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/packages/decap-cms-app/CHANGELOG.md b/packages/decap-cms-app/CHANGELOG.md index 8fee523d4456..a10881fb5b2e 100644 --- a/packages/decap-cms-app/CHANGELOG.md +++ b/packages/decap-cms-app/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.9](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.0.8...decap-cms-app@3.0.9) (2023-10-11) + +**Note:** Version bump only for package decap-cms-app + + + + + ## [3.0.8](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.0.7...decap-cms-app@3.0.8) (2023-10-10) **Note:** Version bump only for package decap-cms-app diff --git a/packages/decap-cms-app/package.json b/packages/decap-cms-app/package.json index d9bfbadec62e..b87d78a3e3f8 100644 --- a/packages/decap-cms-app/package.json +++ b/packages/decap-cms-app/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-app", "description": "An extensible, open source, Git-based, React CMS for static sites. Reusable congiuration with React as peer.", - "version": "3.0.8", + "version": "3.0.9", "homepage": "https://www.decapcms.org", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -36,7 +36,7 @@ "decap-cms-backend-gitlab": "^3.0.1", "decap-cms-backend-proxy": "^3.0.1", "decap-cms-backend-test": "^3.0.1", - "decap-cms-core": "^3.2.4", + "decap-cms-core": "^3.2.5", "decap-cms-editor-component-image": "^3.0.0", "decap-cms-lib-auth": "^3.0.0", "decap-cms-lib-util": "^3.0.1", diff --git a/packages/decap-cms-core/CHANGELOG.md b/packages/decap-cms-core/CHANGELOG.md index 0d0708b43f98..b85e5c32be98 100644 --- a/packages/decap-cms-core/CHANGELOG.md +++ b/packages/decap-cms-core/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.2.5](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.2.4...decap-cms-core@3.2.5) (2023-10-11) + + +### Bug Fixes + +* consider i18n strucutre when determining regex ruleString for github backend ([#6937](https://github.com/decaporg/decap-cms/issues/6937)) ([1aac51d](https://github.com/decaporg/decap-cms/commit/1aac51d864e15a6b1646eb13ca8d95ad8554b0d5)) + + + + + ## [3.2.4](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.2.3...decap-cms-core@3.2.4) (2023-09-06) **Note:** Version bump only for package decap-cms-core diff --git a/packages/decap-cms-core/package.json b/packages/decap-cms-core/package.json index de14a52b9c8f..498fbc0415f6 100644 --- a/packages/decap-cms-core/package.json +++ b/packages/decap-cms-core/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-core", "description": "Decap CMS core application, see decap-cms package for the main distribution.", - "version": "3.2.4", + "version": "3.2.5", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-core", "bugs": "https://github.com/decaporg/decap-cms/issues", "module": "dist/esm/index.js", diff --git a/packages/decap-cms/CHANGELOG.md b/packages/decap-cms/CHANGELOG.md index 551c1aa67c95..b9a4d64221f8 100644 --- a/packages/decap-cms/CHANGELOG.md +++ b/packages/decap-cms/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.9](https://github.com/decaporg/decap-cms/compare/decap-cms@3.0.8...decap-cms@3.0.9) (2023-10-11) + +**Note:** Version bump only for package decap-cms + + + + + ## [3.0.8](https://github.com/decaporg/decap-cms/compare/decap-cms@3.0.7...decap-cms@3.0.8) (2023-10-10) **Note:** Version bump only for package decap-cms diff --git a/packages/decap-cms/package.json b/packages/decap-cms/package.json index 94f36417fde1..6163222da17c 100644 --- a/packages/decap-cms/package.json +++ b/packages/decap-cms/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms", "description": "An extensible, open source, Git-based, React CMS for static sites.", - "version": "3.0.8", + "version": "3.0.9", "homepage": "https://www.decapcms.org", "repository": "https://github.com/decaporg/decap-cms", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -22,7 +22,7 @@ "dependencies": { "codemirror": "^5.46.0", "create-react-class": "^15.7.0", - "decap-cms-app": "^3.0.8", + "decap-cms-app": "^3.0.9", "decap-cms-media-library-cloudinary": "^3.0.1", "decap-cms-media-library-uploadcare": "^3.0.0", "file-loader": "^6.2.0", From 885131fb67a2cf0dd41ccc21159963c68432ee20 Mon Sep 17 00:00:00 2001 From: Nuno Marques Date: Wed, 11 Oct 2023 13:30:33 +0200 Subject: [PATCH 08/11] =?UTF-8?q?Update=20Docs:=20Contributing=20=E2=80=9C?= =?UTF-8?q?examples=E2=80=9D=20(#6938)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/content/docs/examples.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/content/docs/examples.md b/website/content/docs/examples.md index 8a80ddd013e0..023791ce61e7 100644 --- a/website/content/docs/examples.md +++ b/website/content/docs/examples.md @@ -12,14 +12,14 @@ Example | Tools | Type | Source | More info | [This Developing Journey](https://briandouglas.me) | middleman | blog | [bdougie/blog](https://github.com/bdougie/blog) | [blog post](https://www.netlify.com/blog/2017/04/20/creating-a-blog-with-middleman-and-netlify-cms/) [Jamstack Recipes](https://jamstack-cms.netlify.com) | Hugo, Azure | demo | [hlaueriksson/jamstack-cms](https://github.com/hlaueriksson/jamstack-cms) | [blog post](http://conductofcode.io/post/managing-content-for-a-jamstack-site-with-netlify-cms/) [Bael](https://bael-theme.jake101.com/) | Vue, Nuxt | blog | [jake-101/bael-template](https://github.com/jake-101/bael-template) | [blog post](https://bael-theme.jake101.com/blog/2018-06-19-top-10-reasons-why) -[Forest Garden Wales](https://www.forestgarden.wales/) | Hugo | blog | [forestgardenwales/forestgarden.wales](https://github.com/forestgardenwales/forestgarden.wales) | [blog post](https://www.forestgarden.wales/blog/now-using-netlify-cms/) +[Forest Garden Wales](https://github.com/forestgardenwales/forestgarden.wales) | Hugo | blog | [forestgardenwales/forestgarden.wales](https://github.com/forestgardenwales/forestgarden.wales) | [blog post](https://www.forestgarden.wales/blog/now-using-netlify-cms/) [Jekyll Demo](https://jekyll-netlifycms.netlify.com/) | Jekyll, Gulp | demo | [NickStees/jekyll-cms](https://github.com/NickStees/jekyll-cms) | [read me](https://github.com/NickStees/jekyll-cms) [Jekyll feat Alembic Theme Demo](https://alembic-kit-demo.netlify.com/) | Jekyll | demo | [DavidDarnes/alembic-netlifycms-kit](https://github.com/daviddarnes/alembic-netlifycms-kit) | [read me](https://github.com/daviddarnes/alembic-netlifycms-kit#starter-kit-for-alembic-with-netlify-cms) [Eleventy Starter Project](https://eleventy-netlify-boilerplate.netlify.com/) | Eleventy | demo | [danurbanowicz/eleventy-netlify-boilerplate](https://github.com/danurbanowicz/eleventy-netlify-boilerplate) | [read me](https://github.com/danurbanowicz/eleventy-netlify-boilerplate) [YellowCake - Complete website with blog](https://yellowcake.netlify.com) | Gatsby, Netlify-CMS, Uploadcare | demo | [thriveweb/yellowcake](https://github.com/thriveweb/yellowcake/) | [blog post](https://thriveweb.com.au/the-lab/yellowcake-gatsby-react-js-starter-project/) [Vue.js - Nuxt.js Starter Project](https://github.com/renestalder/nuxt-netlify-cms-starter-template) | Vue, Nuxt | demo | [renestalder/nuxt-netlify-cms-starter-template](https://github.com/renestalder/nuxt-netlify-cms-starter-template) | [read me](https://github.com/renestalder/nuxt-netlify-cms-starter-template) -[Hexo Demo](https://hexocms.imst.xyz/) | Hexo | demo | [DemoMacro/Hexo-NetlifyCMS](https://github.com/DemoMacro/Hexo-NetlifyCMS) | [read me](https://github.com/DemoMacro/Hexo-NetlifyCMS) -[Gitbook Demo](https://gitbook.imst.xyz/) | Gitbook | demo | [DemoMacro/Gitbook-NetlifyCMS](https://github.com/DemoMacro/Gitbook-NetlifyCMS) | [read me](https://github.com/DemoMacro/Gitbook-NetlifyCMS) +[Hexo Demo](https://hexo-boilerplate.netlify.app/) | Hexo | demo | [DemoMacro/Hexo-NetlifyCMS](https://github.com/DemoMacro/Hexo-NetlifyCMS) | [read me](https://github.com/DemoMacro/Hexo-NetlifyCMS) +[Gitbook Demo](https://gitbook-boilerplate.netlify.app/) | Gitbook | demo | [DemoMacro/Gitbook-NetlifyCMS](https://github.com/DemoMacro/Gitbook-NetlifyCMS) | [read me](https://github.com/DemoMacro/Gitbook-NetlifyCMS) [VuePress Demo](https://vuedn.netlify.app/) | VuePress | demo | [NdagiStanley/VueDN](https://github.com/NdagiStanley/VueDN) | [read me](https://github.com/NdagiStanley/VueDN) [Jigsaw Blog Starter Template Demo](https://jigsaw-blog-netlify-netlifycms-template.netlify.com/) | Jigsaw | demo | [erickpatrick/jigsaw-blog-netlify-netlifycms-template](https://github.com/erickpatrick/jigsaw-blog-netlify-netlifycms-template) | [blog post](https://www.erickpatrick.net/blog/augmenting-tightenco-jigsaw-with-netlifycms/) [Nuxt & NetlifyCMS Boilerplate](https://nuxt-netlifycms-boilerplate.netlify.com/) | Vue, Nuxt | demo | [tylermercer/nuxt-netlifycms-boilerplate](https://github.com/tylermercer/nuxt-netlifycms-boilerplate) | [read me](https://github.com/tylermercer/nuxt-netlifycms-boilerplate) From c498a5a6acc12b3b239c45692a4edbfdfcdb0af5 Mon Sep 17 00:00:00 2001 From: Anze Demsar Date: Thu, 12 Oct 2023 14:32:02 +0200 Subject: [PATCH 09/11] chore: update emotion to v11 (#6940) --- babel.config.js | 2 +- jest.config.js | 2 +- package.json | 6 +- packages/decap-cms-app/package.json | 4 +- packages/decap-cms-backend-azure/package.json | 4 +- .../decap-cms-backend-bitbucket/package.json | 4 +- .../package.json | 4 +- .../src/__tests__/AuthenticationPage.spec.js | 35 +- .../AuthenticationPage.spec.js.snap | 206 +- .../decap-cms-backend-github/package.json | 4 +- .../decap-cms-backend-gitlab/package.json | 4 +- packages/decap-cms-backend-proxy/package.json | 4 +- packages/decap-cms-backend-test/package.json | 4 +- packages/decap-cms-core/package.json | 4 +- .../src/components/App/Header.js | 2 +- .../components/Collection/ControlButton.js | 2 +- .../components/Collection/NestedCollection.js | 2 +- .../src/components/Collection/Sidebar.js | 2 +- .../__snapshots__/Collection.spec.js.snap | 32 +- .../NestedCollection.spec.js.snap | 286 +- .../__snapshots__/Sidebar.spec.js.snap | 72 +- .../Editor/EditorControlPane/EditorControl.js | 2 +- .../EditorControlPane/EditorControlPane.js | 2 +- .../src/components/Editor/EditorInterface.js | 2 +- .../src/components/Editor/EditorToolbar.js | 2 +- .../__snapshots__/EditorToolbar.spec.js.snap | 2102 +++++++-------- .../MediaLibrary/MediaLibraryButtons.js | 2 +- .../MediaLibraryCard.spec.js.snap | 140 +- .../decap-cms-core/src/components/UI/Modal.js | 2 +- .../src/components/UI/SettingsDropdown.js | 2 +- .../src/components/Workflow/WorkflowCard.js | 2 +- .../src/components/Workflow/WorkflowList.js | 2 +- .../decap-cms-default-exports/package.json | 4 +- .../decap-cms-default-exports/src/index.js | 4 +- packages/decap-cms-ui-default/package.json | 4 +- packages/decap-cms-ui-default/src/Dropdown.js | 2 +- packages/decap-cms-ui-default/src/Loader.js | 2 +- .../src/ObjectWidgetTopBar.js | 2 +- packages/decap-cms-ui-default/src/Toggle.js | 2 +- packages/decap-cms-ui-default/src/styles.js | 2 +- .../decap-cms-widget-boolean/package.json | 2 +- .../src/BooleanControl.js | 2 +- packages/decap-cms-widget-code/package.json | 2 +- .../decap-cms-widget-code/src/CodeControl.js | 2 +- .../decap-cms-widget-colorstring/package.json | 4 +- .../decap-cms-widget-datetime/package.json | 2 +- .../src/DateTimeControl.js | 2 +- packages/decap-cms-widget-file/package.json | 4 +- .../src/withFileControl.js | 2 +- packages/decap-cms-widget-image/package.json | 4 +- packages/decap-cms-widget-list/package.json | 4 +- .../decap-cms-widget-list/src/ListControl.js | 2 +- .../__snapshots__/ListControl.spec.js.snap | 845 +++--- packages/decap-cms-widget-map/package.json | 2 +- .../src/withMapControl.js | 2 +- .../decap-cms-widget-markdown/package.json | 4 +- .../src/MarkdownControl/RawEditor.js | 2 +- .../src/MarkdownControl/Toolbar.js | 2 +- .../src/MarkdownControl/VisualEditor.js | 2 +- .../MarkdownControl/components/Shortcode.js | 2 +- .../MarkdownControl/components/VoidBlock.js | 2 +- .../src/MarkdownControl/renderers.js | 2 +- packages/decap-cms-widget-object/package.json | 4 +- .../src/ObjectControl.js | 2 +- .../decap-cms-widget-relation/package.json | 4 +- scripts/externals.js | 10 +- yarn.lock | 2313 +++++++++-------- 67 files changed, 3131 insertions(+), 3066 deletions(-) diff --git a/babel.config.js b/babel.config.js index 22544c8297e9..9b7b21006133 100644 --- a/babel.config.js +++ b/babel.config.js @@ -46,7 +46,7 @@ function presets() { [ '@emotion/babel-preset-css-prop', { - autoLabel: true, + autoLabel: 'always', }, ], '@babel/typescript', diff --git a/jest.config.js b/jest.config.js index 51325685f9d2..b1bc986b7a5b 100644 --- a/jest.config.js +++ b/jest.config.js @@ -10,7 +10,7 @@ module.exports = { '\\.(css|less)$': '/__mocks__/styleMock.js', }, testURL: 'http://localhost:8080', - snapshotSerializers: ['jest-emotion'], + snapshotSerializers: ['@emotion/jest/serializer'], transformIgnorePatterns: [ 'node_modules/(?!copy-text-to-clipboard|clean-stack|escape-string-regexp)', ], diff --git a/package.json b/package.json index 50f1f9fcaf42..53df4698d489 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "@commitlint/cli": "^16.0.0", "@commitlint/config-conventional": "^16.0.0", "@emotion/eslint-plugin": "^11.0.0", + "@emotion/jest": "^11.11.0", "@octokit/rest": "^16.28.7", "@soda/friendly-errors-webpack-plugin": "^1.8.1", "@storybook/addon-actions": "^5.3.6", @@ -141,7 +142,6 @@ "husky": "^7.0.0", "jest": "^27.0.0", "jest-cli": "^27.0.0", - "jest-emotion": "^10.0.32", "js-yaml": "^4.0.0", "mockserver-client": "^5.8.0", "mockserver-node": "^5.8.0", @@ -184,10 +184,10 @@ }, "private": true, "dependencies": { - "@emotion/babel-preset-css-prop": "^10.0.27", + "@emotion/babel-preset-css-prop": "^11.11.0", "browserify": "^17.0.0", "buffer": "^6.0.3", - "emotion": "^10.0.9", + "emotion": "^11.0.0", "eslint-config-prettier": "^8.0.0", "eslint-plugin-babel": "^5.3.0", "globby": "^12.0.0", diff --git a/packages/decap-cms-app/package.json b/packages/decap-cms-app/package.json index b87d78a3e3f8..96818363cad9 100644 --- a/packages/decap-cms-app/package.json +++ b/packages/decap-cms-app/package.json @@ -26,8 +26,8 @@ ], "license": "MIT", "dependencies": { - "@emotion/core": "^10.0.35", - "@emotion/styled": "^10.0.27", + "@emotion/react": "^11.11.1", + "@emotion/styled": "^11.11.0", "codemirror": "^5.46.0", "decap-cms-backend-azure": "^3.0.1", "decap-cms-backend-bitbucket": "^3.0.1", diff --git a/packages/decap-cms-backend-azure/package.json b/packages/decap-cms-backend-azure/package.json index 03f131b260f4..2fd57d9949f3 100644 --- a/packages/decap-cms-backend-azure/package.json +++ b/packages/decap-cms-backend-azure/package.json @@ -24,8 +24,8 @@ "semaphore": "^1.1.0" }, "peerDependencies": { - "@emotion/core": "^10.0.9", - "@emotion/styled": "^10.0.9", + "@emotion/react": "^11.11.1", + "@emotion/styled": "^11.11.0", "decap-cms-lib-auth": "^3.0.0", "decap-cms-lib-util": "^3.0.0", "decap-cms-ui-default": "^3.0.0", diff --git a/packages/decap-cms-backend-bitbucket/package.json b/packages/decap-cms-backend-bitbucket/package.json index c3f5db69d6ff..af6dde82bd8a 100644 --- a/packages/decap-cms-backend-bitbucket/package.json +++ b/packages/decap-cms-backend-bitbucket/package.json @@ -25,8 +25,8 @@ "what-the-diff": "^0.6.0" }, "peerDependencies": { - "@emotion/core": "^10.0.35", - "@emotion/styled": "^10.0.27", + "@emotion/react": "^11.11.1", + "@emotion/styled": "^11.11.0", "decap-cms-lib-auth": "^3.0.0", "decap-cms-lib-util": "^3.0.0", "decap-cms-ui-default": "^3.0.0", diff --git a/packages/decap-cms-backend-git-gateway/package.json b/packages/decap-cms-backend-git-gateway/package.json index e99c95d4d59e..06e7526ba5dc 100644 --- a/packages/decap-cms-backend-git-gateway/package.json +++ b/packages/decap-cms-backend-git-gateway/package.json @@ -26,8 +26,8 @@ "minimatch": "^3.0.4" }, "peerDependencies": { - "@emotion/core": "^10.0.35", - "@emotion/styled": "^10.0.27", + "@emotion/react": "^11.11.1", + "@emotion/styled": "^11.11.0", "decap-cms-backend-bitbucket": "^3.0.0", "decap-cms-backend-github": "^3.0.0", "decap-cms-backend-gitlab": "^3.0.0", diff --git a/packages/decap-cms-backend-git-gateway/src/__tests__/AuthenticationPage.spec.js b/packages/decap-cms-backend-git-gateway/src/__tests__/AuthenticationPage.spec.js index f392c816d02c..1a77164aa6d0 100644 --- a/packages/decap-cms-backend-git-gateway/src/__tests__/AuthenticationPage.spec.js +++ b/packages/decap-cms-backend-git-gateway/src/__tests__/AuthenticationPage.spec.js @@ -1,6 +1,8 @@ import React from 'react'; import { render } from '@testing-library/react'; +import GitGatewayAuthenticationPage from '../AuthenticationPage'; + window.netlifyIdentity = { currentUser: jest.fn(), on: jest.fn(), @@ -21,21 +23,32 @@ describe('GitGatewayAuthenticationPage', () => { }); it('should render with identity error', () => { - const { default: GitGatewayAuthenticationPage } = require('../AuthenticationPage'); - const { asFragment } = render(); + // obtain mock calls + require('../AuthenticationPage'); + + function TestComponent() { + const { asFragment } = render(); - const errorCallback = window.netlifyIdentity.on.mock.calls.find(call => call[0] === 'error')[1]; + const errorCallback = window.netlifyIdentity.on.mock.calls.find( + call => call[0] === 'error', + )[1]; - errorCallback( - new Error('Failed to load settings from https://site.netlify.com/.netlify/identity'), - ); + errorCallback( + new Error('Failed to load settings from https://site.netlify.com/.netlify/identity'), + ); - expect(asFragment()).toMatchSnapshot(); + expect(asFragment()).toMatchSnapshot(); + } + + TestComponent(); }); - it('should render with no identity error', () => { - const { default: GitGatewayAuthenticationPage } = require('../AuthenticationPage'); - const { asFragment } = render(); - expect(asFragment()).toMatchSnapshot(); + test('should render with no identity error', () => { + function TestComponent() { + const { asFragment } = render(); + expect(asFragment()).toMatchSnapshot(); + } + + TestComponent(); }); }); diff --git a/packages/decap-cms-backend-git-gateway/src/__tests__/__snapshots__/AuthenticationPage.spec.js.snap b/packages/decap-cms-backend-git-gateway/src/__tests__/__snapshots__/AuthenticationPage.spec.js.snap index 73c27397f940..d5b474d66b8c 100644 --- a/packages/decap-cms-backend-git-gateway/src/__tests__/__snapshots__/AuthenticationPage.spec.js.snap +++ b/packages/decap-cms-backend-git-gateway/src/__tests__/__snapshots__/AuthenticationPage.spec.js.snap @@ -2,11 +2,12 @@ exports[`GitGatewayAuthenticationPage should render with identity error 1`] = ` - .emotion-5 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; display: flex; + -webkit-box-flex-flow: column nowrap; -webkit-flex-flow: column nowrap; -ms-flex-flow: column nowrap; flex-flow: column nowrap; @@ -15,24 +16,63 @@ exports[`GitGatewayAuthenticationPage should render with identity error 1`] = ` -ms-flex-align: center; align-items: center; -webkit-box-pack: center; - -webkit-justify-content: center; -ms-flex-pack: center; + -webkit-justify-content: center; justify-content: center; gap: 50px; height: 100vh; } -.emotion-0 { +.emotion-2 { width: 300px; height: auto; } -.emotion-3 { +.emotion-4 { + border: 0; + border-radius: 5px; + cursor: pointer; + box-shadow: 0 4px 12px 0 rgba(68, 74, 87, 0.15),0 1px 3px 0 rgba(68, 74, 87, 0.25); + height: 36px; + line-height: 36px; + font-weight: 500; + padding: 0 15px; + background-color: #798291; + color: #fff; + background-color: #313d3e; + color: #fff; + padding: 0 12px; + margin-top: 0; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + position: relative; +} + +.emotion-4:focus, +.emotion-4:hover { + color: #fff; + background-color: #555a65; +} + +.emotion-4[disabled] { + background-color: #eff0f4; + color: #798291; + cursor: default; +} + +.emotion-7 { display: inline-block; line-height: 0; width: 100px; height: 100px; -webkit-transform: rotate(0deg); + -moz-transform: rotate(0deg); -ms-transform: rotate(0deg); transform: rotate(0deg); color: #c4c6d2; @@ -40,42 +80,40 @@ exports[`GitGatewayAuthenticationPage should render with identity error 1`] = ` bottom: 10px; } -.emotion-3 path:not(.no-fill), -.emotion-3 circle:not(.no-fill), -.emotion-3 polygon:not(.no-fill), -.emotion-3 rect:not(.no-fill) { +.emotion-7 path:not(.no-fill), +.emotion-7 circle:not(.no-fill), +.emotion-7 polygon:not(.no-fill), +.emotion-7 rect:not(.no-fill) { fill: currentColor; } -.emotion-3 path.clipped { +.emotion-7 path.clipped { fill: transparent; } -.emotion-3 svg { +.emotion-7 svg { width: 100%; height: 100%; }
Logo - - auth.errors.identitySettings - + auth.loginWithNetlifyIdentity + - .emotion-7 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; display: flex; + -webkit-box-flex-flow: column nowrap; -webkit-flex-flow: column nowrap; -ms-flex-flow: column nowrap; flex-flow: column nowrap; @@ -115,115 +154,23 @@ exports[`GitGatewayAuthenticationPage should render with no identity error 1`] = -ms-flex-align: center; align-items: center; -webkit-box-pack: center; - -webkit-justify-content: center; -ms-flex-pack: center; - justify-content: center; - gap: 50px; - height: 100vh; -} - -.emotion-0 { - width: 300px; - height: auto; -} - -.emotion-2 { - border: 0; - border-radius: 5px; - cursor: pointer; - box-shadow: 0 4px 12px 0 rgba(68,74,87,0.15),0 1px 3px 0 rgba(68,74,87,0.25); - height: 36px; - line-height: 36px; - font-weight: 500; - padding: 0 15px; - background-color: #798291; - color: #fff; - background-color: #313d3e; - color: #fff; - padding: 0 12px; - margin-top: 0; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - position: relative; -} - -.emotion-2:focus, -.emotion-2:hover { - color: #fff; - background-color: #555a65; -} - -.emotion-2[disabled] { - background-color: #eff0f4; - color: #798291; - cursor: default; -} - -.emotion-5 { - display: inline-block; - line-height: 0; - width: 100px; - height: 100px; - -webkit-transform: rotate(0deg); - -ms-transform: rotate(0deg); - transform: rotate(0deg); - color: #c4c6d2; - position: absolute; - bottom: 10px; -} - -.emotion-5 path:not(.no-fill), -.emotion-5 circle:not(.no-fill), -.emotion-5 polygon:not(.no-fill), -.emotion-5 rect:not(.no-fill) { - fill: currentColor; -} - -.emotion-5 path.clipped { - fill: transparent; -} - -.emotion-5 svg { - width: 100%; - height: 100%; -} - -.emotion-7 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-flex-flow: column nowrap; - -ms-flex-flow: column nowrap; - flex-flow: column nowrap; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; -webkit-justify-content: center; - -ms-flex-pack: center; justify-content: center; gap: 50px; height: 100vh; } -.emotion-0 { +.emotion-2 { width: 300px; height: auto; } -.emotion-2 { +.emotion-4 { border: 0; border-radius: 5px; cursor: pointer; - box-shadow: 0 4px 12px 0 rgba(68,74,87,0.15),0 1px 3px 0 rgba(68,74,87,0.25); + box-shadow: 0 4px 12px 0 rgba(68, 74, 87, 0.15),0 1px 3px 0 rgba(68, 74, 87, 0.25); height: 36px; line-height: 36px; font-weight: 500; @@ -245,24 +192,25 @@ exports[`GitGatewayAuthenticationPage should render with no identity error 1`] = position: relative; } -.emotion-2:focus, -.emotion-2:hover { +.emotion-4:focus, +.emotion-4:hover { color: #fff; background-color: #555a65; } -.emotion-2[disabled] { +.emotion-4[disabled] { background-color: #eff0f4; color: #798291; cursor: default; } -.emotion-5 { +.emotion-7 { display: inline-block; line-height: 0; width: 100px; height: 100px; -webkit-transform: rotate(0deg); + -moz-transform: rotate(0deg); -ms-transform: rotate(0deg); transform: rotate(0deg); color: #c4c6d2; @@ -270,27 +218,27 @@ exports[`GitGatewayAuthenticationPage should render with no identity error 1`] = bottom: 10px; } -.emotion-5 path:not(.no-fill), -.emotion-5 circle:not(.no-fill), -.emotion-5 polygon:not(.no-fill), -.emotion-5 rect:not(.no-fill) { +.emotion-7 path:not(.no-fill), +.emotion-7 circle:not(.no-fill), +.emotion-7 polygon:not(.no-fill), +.emotion-7 rect:not(.no-fill) { fill: currentColor; } -.emotion-5 path.clipped { +.emotion-7 path.clipped { fill: transparent; } -.emotion-5 svg { +.emotion-7 svg { width: 100%; height: 100%; }
Logo - .emotion-2 { + .emotion-0 { margin: 28px 18px; } -.emotion-0 { +.emotion-2 { padding-left: 280px; }
- .emotion-2 { + .emotion-0 { margin: 28px 18px; } -.emotion-0 { +.emotion-2 { padding-left: 280px; }
- .emotion-2 { + .emotion-0 { margin: 28px 18px; } -.emotion-0 { +.emotion-2 { padding-left: 280px; }
- .emotion-2 { + .emotion-0 { margin: 28px 18px; } -.emotion-0 { +.emotion-2 { padding-left: 280px; }
- .emotion-6 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -18,29 +18,29 @@ exports[`NestedCollection should render connected component 1`] = ` border-left: 2px solid #fff; } -.emotion-6 mocked-icon { +.emotion-0 mocked-icon { margin-right: 8px; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } -.emotion-6:hover, -.emotion-6:active, -.emotion-6.sidebar-active { +.emotion-0:hover, +.emotion-0:active, +.emotion-0.sidebar-active { color: #3a69c7; background-color: #e8f5fe; border-left-color: #4863c6; } -.emotion-4 { +.emotion-2 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; display: flex; -webkit-box-pack: center; - -webkit-justify-content: center; -ms-flex-pack: center; + -webkit-justify-content: center; justify-content: center; -webkit-align-items: center; -webkit-box-align: center; @@ -48,11 +48,11 @@ exports[`NestedCollection should render connected component 1`] = ` align-items: center; } -.emotion-0 { +.emotion-4 { margin-right: 4px; } -.emotion-2 { +.emotion-6 { position: relative; top: 2px; color: #fff; @@ -67,7 +67,7 @@ exports[`NestedCollection should render connected component 1`] = `
Pages
- .emotion-2 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; -} - -.emotion-0 { - margin-right: 4px; -} - -.emotion-4 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -123,23 +104,42 @@ exports[`NestedCollection should render connected component 1`] = ` border-left: 2px solid #fff; } -.emotion-4 mocked-icon { +.emotion-0 mocked-icon { margin-right: 8px; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } -.emotion-4:hover, -.emotion-4:active, -.emotion-4.sidebar-active { +.emotion-0:hover, +.emotion-0:active, +.emotion-0.sidebar-active { color: #3a69c7; background-color: #e8f5fe; border-left-color: #4863c6; } +.emotion-2 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} + +.emotion-4 { + margin-right: 4px; +} +
File 1
- .emotion-2 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; -} - -.emotion-0 { - margin-right: 4px; -} - -.emotion-4 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -192,23 +173,42 @@ exports[`NestedCollection should render connected component 1`] = ` border-left: 2px solid #fff; } -.emotion-4 mocked-icon { +.emotion-0 mocked-icon { margin-right: 8px; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } -.emotion-4:hover, -.emotion-4:active, -.emotion-4.sidebar-active { +.emotion-0:hover, +.emotion-0:active, +.emotion-0.sidebar-active { color: #3a69c7; background-color: #e8f5fe; border-left-color: #4863c6; } +.emotion-2 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} + +.emotion-4 { + margin-right: 4px; +} +
File 2
@@ -231,7 +231,7 @@ exports[`NestedCollection should render connected component 1`] = ` exports[`NestedCollection should render correctly with nested entries 1`] = ` - .emotion-6 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -247,29 +247,29 @@ exports[`NestedCollection should render correctly with nested entries 1`] = ` border-left: 2px solid #fff; } -.emotion-6 mocked-icon { +.emotion-0 mocked-icon { margin-right: 8px; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } -.emotion-6:hover, -.emotion-6:active, -.emotion-6.sidebar-active { +.emotion-0:hover, +.emotion-0:active, +.emotion-0.sidebar-active { color: #3a69c7; background-color: #e8f5fe; border-left-color: #4863c6; } -.emotion-4 { +.emotion-2 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; display: flex; -webkit-box-pack: center; - -webkit-justify-content: center; -ms-flex-pack: center; + -webkit-justify-content: center; justify-content: center; -webkit-align-items: center; -webkit-box-align: center; @@ -277,11 +277,11 @@ exports[`NestedCollection should render correctly with nested entries 1`] = ` align-items: center; } -.emotion-0 { +.emotion-4 { margin-right: 4px; } -.emotion-2 { +.emotion-6 { position: relative; top: 2px; color: #fff; @@ -296,7 +296,7 @@ exports[`NestedCollection should render correctly with nested entries 1`] = `
Pages
- .emotion-2 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; -} - -.emotion-0 { - margin-right: 4px; -} - -.emotion-4 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -352,23 +333,42 @@ exports[`NestedCollection should render correctly with nested entries 1`] = ` border-left: 2px solid #fff; } -.emotion-4 mocked-icon { +.emotion-0 mocked-icon { margin-right: 8px; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } -.emotion-4:hover, -.emotion-4:active, -.emotion-4.sidebar-active { +.emotion-0:hover, +.emotion-0:active, +.emotion-0.sidebar-active { color: #3a69c7; background-color: #e8f5fe; border-left-color: #4863c6; } +.emotion-2 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} + +.emotion-4 { + margin-right: 4px; +} +
File 1
- .emotion-2 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; -} - -.emotion-0 { - margin-right: 4px; -} - -.emotion-4 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -421,23 +402,42 @@ exports[`NestedCollection should render correctly with nested entries 1`] = ` border-left: 2px solid #fff; } -.emotion-4 mocked-icon { +.emotion-0 mocked-icon { margin-right: 8px; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } -.emotion-4:hover, -.emotion-4:active, -.emotion-4.sidebar-active { +.emotion-0:hover, +.emotion-0:active, +.emotion-0.sidebar-active { color: #3a69c7; background-color: #e8f5fe; border-left-color: #4863c6; } +.emotion-2 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} + +.emotion-4 { + margin-right: 4px; +} +
File 2
@@ -460,7 +460,7 @@ exports[`NestedCollection should render correctly with nested entries 1`] = ` exports[`NestedCollection should render correctly with no entries 1`] = ` - .emotion-6 { + .emotion-0 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -476,29 +476,29 @@ exports[`NestedCollection should render correctly with no entries 1`] = ` border-left: 2px solid #fff; } -.emotion-6 mocked-icon { +.emotion-0 mocked-icon { margin-right: 8px; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } -.emotion-6:hover, -.emotion-6:active, -.emotion-6.sidebar-active { +.emotion-0:hover, +.emotion-0:active, +.emotion-0.sidebar-active { color: #3a69c7; background-color: #e8f5fe; border-left-color: #4863c6; } -.emotion-4 { +.emotion-2 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; display: flex; -webkit-box-pack: center; - -webkit-justify-content: center; -ms-flex-pack: center; + -webkit-justify-content: center; justify-content: center; -webkit-align-items: center; -webkit-box-align: center; @@ -506,11 +506,11 @@ exports[`NestedCollection should render correctly with no entries 1`] = ` align-items: center; } -.emotion-0 { +.emotion-4 { margin-right: 4px; } -.emotion-2 { +.emotion-6 { position: relative; top: 2px; color: #fff; @@ -525,7 +525,7 @@ exports[`NestedCollection should render correctly with no entries 1`] = ` }
Pages
diff --git a/packages/decap-cms-core/src/components/Collection/__tests__/__snapshots__/Sidebar.spec.js.snap b/packages/decap-cms-core/src/components/Collection/__tests__/__snapshots__/Sidebar.spec.js.snap index 6d5f297883b0..6e7ecd2607f1 100644 --- a/packages/decap-cms-core/src/components/Collection/__tests__/__snapshots__/Sidebar.spec.js.snap +++ b/packages/decap-cms-core/src/components/Collection/__tests__/__snapshots__/Sidebar.spec.js.snap @@ -2,8 +2,8 @@ exports[`Sidebar should render nested collection with filterTerm 1`] = ` - .emotion-4 { - box-shadow: 0 2px 6px 0 rgba(68,74,87,0.05),0 1px 3px 0 rgba(68,74,87,0.1); + .emotion-0 { + box-shadow: 0 2px 6px 0 rgba(68, 74, 87, 0.05),0 1px 3px 0 rgba(68, 74, 87, 0.1); border-radius: 5px; background-color: #fff; width: 250px; @@ -19,7 +19,7 @@ exports[`Sidebar should render nested collection with filterTerm 1`] = ` flex-direction: column; } -.emotion-0 { +.emotion-2 { font-size: 23px; font-weight: 600; padding: 0; @@ -27,17 +27,17 @@ exports[`Sidebar should render nested collection with filterTerm 1`] = ` color: #313d3e; } -.emotion-2 { +.emotion-4 { margin: 16px 0 0; list-style: none; overflow: auto; }