From 55c718315f3e60e0448af8c3ef5c19fa8d9384b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20R=C3=B6tsch?= Date: Thu, 5 May 2022 15:16:27 +0200 Subject: [PATCH] feat(contentful): add support for tables in Rich Text (#33870) * feat(contentful): add support for tables in Rich Text * fix(contentful): migrate to latest rich text helper packages * build: upgrade to latest rich-text dependencies * chore: update yarn.lock * test: update e2e test snapshots for rich text tables --- .../cypress/integration/rich-text.js | 3 +++ e2e-tests/contentful/snapshots.js | 3 +++ packages/gatsby-source-contentful/package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/e2e-tests/contentful/cypress/integration/rich-text.js b/e2e-tests/contentful/cypress/integration/rich-text.js index f548bd80fe301..30d7c7bce4513 100644 --- a/e2e-tests/contentful/cypress/integration/rich-text.js +++ b/e2e-tests/contentful/cypress/integration/rich-text.js @@ -76,4 +76,7 @@ describe(`rich-text`, () => { cy.get(`[data-cy-id="english-rich-text-localized"]`).snapshot() cy.get(`[data-cy-id="german-rich-text-localized"]`).snapshot() }) + it(`rich-text: Tables`, () => { + cy.get(`[data-cy-id="rich-text-tables"]`).snapshot() + }) }) diff --git a/e2e-tests/contentful/snapshots.js b/e2e-tests/contentful/snapshots.js index 85def40e4cab3..8544bcc3833d4 100644 --- a/e2e-tests/contentful/snapshots.js +++ b/e2e-tests/contentful/snapshots.js @@ -57,6 +57,9 @@ module.exports = { "rich-text: Localized": { "1": "
\n

Rich Text: Localized

\n

Rich Text in English

\n
\n
", "2": "
\n

Rich Text: Localized

\n

Reichhaltiger Text in deutscher\n Sprache

\n
\n
" + }, + "rich-text: Tables": { + "1": "
\n

Rich Text: Tables

\n

Table test

\n

\n \n \n \n \n \n \n \n \n \n \n \n \n \n
\n

Heading One

\n 		\n

Heading Two

\n 		\n

Heading Three

\n
\n

\n 		\n

This should be fat

\n 		\n

Baz

\n
\n

\n
\n
" } }, "text": { diff --git a/packages/gatsby-source-contentful/package.json b/packages/gatsby-source-contentful/package.json index e4710e4acea35..24be0370ed08a 100644 --- a/packages/gatsby-source-contentful/package.json +++ b/packages/gatsby-source-contentful/package.json @@ -8,8 +8,8 @@ }, "dependencies": { "@babel/runtime": "^7.15.4", - "@contentful/rich-text-react-renderer": "^14.1.3", - "@contentful/rich-text-types": "^14.1.2", + "@contentful/rich-text-react-renderer": "^15.12.1", + "@contentful/rich-text-types": "^15.12.1", "@hapi/joi": "^15.1.1", "@vercel/fetch-retry": "^5.0.3", "axios": "^0.21.1", diff --git a/yarn.lock b/yarn.lock index 59f0b00f4e636..a2009b19d7639 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1825,17 +1825,17 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@contentful/rich-text-react-renderer@^14.1.3": - version "14.1.3" - resolved "https://registry.npmjs.org/@contentful/rich-text-react-renderer/-/rich-text-react-renderer-14.1.3.tgz#501136677742d0ad3f4b50fa2c12b17fc1d68cc8" - integrity sha512-qieT2qEKlHarlYjDvDHpv6vwf2M9uI0Nf+WgyKBP6SFgakpzxuO5PR9j5CnxyusZ/NzsWcGBu9SDQMnKeM2iZw== +"@contentful/rich-text-react-renderer@^15.12.1": + version "15.12.1" + resolved "https://registry.yarnpkg.com/@contentful/rich-text-react-renderer/-/rich-text-react-renderer-15.12.1.tgz#978c335e7ad5284dc6790a6a8c0ec16878b957b0" + integrity sha512-bQ69cN51iGBTF3/nYi5MGUaDJ/lnrEXtCUBCxulIZ0fLS/AAEledZTJcEKs+PKeYYgDqiUVDsmx2xZP2QsJJ+Q== dependencies: - "@contentful/rich-text-types" "^14.1.2" + "@contentful/rich-text-types" "^15.12.1" -"@contentful/rich-text-types@^14.1.2": - version "14.1.2" - resolved "https://registry.yarnpkg.com/@contentful/rich-text-types/-/rich-text-types-14.1.2.tgz#33162fdbf427891122a96030f806ca9a9cf0e844" - integrity sha512-XbgZ7op5uyYYszipgQg/bYobF4b+llXyTwS8hISRniQY9xKESz544eP2OGmRc4J3MHx29M7Vmx7TVA/IK65giQ== +"@contentful/rich-text-types@^15.12.1": + version "15.12.1" + resolved "https://registry.yarnpkg.com/@contentful/rich-text-types/-/rich-text-types-15.12.1.tgz#3b131f03fc55b6001f6eb5f5615aefb22678b3d3" + integrity sha512-WQJic0fnAbTa8xzO3Z+aVqDmA5+JMNQlATQMVJ40GoOrnM8YoJZsKGf6xX/O6Y6Eq10T1LrpxIOslODFI9qFgg== "@discoveryjs/json-ext@^0.5.0": version "0.5.2"