Lite Site: Remove data-react-helmet="true" attributes from all tags within the html <head> tag
#12350
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`Lite Site Home Page Lite Site Cta should match snapshot 1`] = ` | ||
| <section | ||
| aria-labelledby="LiteSiteCta" | ||
| class="bbc-1x0h7k" | ||
| data-e2e="lite-cta" | ||
| role="region" | ||
| > | ||
| <strong | ||
| class="bbc-ory9gk" | ||
| hidden="" | ||
| id="LiteSiteCta" | ||
| > | ||
| Ahagusaba uburyo (ama mega) buke | ||
| </strong> | ||
| <div | ||
| class="bbc-zudp5j" | ||
| > | ||
| <p | ||
| class="bbc-11k1lfi" | ||
| > | ||
| Uriko ubona ku rubuga aherekana amakuru mu nyandiko gusa, hakoresha uburyo buke. Ja ku rubuga nyamukuru ubone amakuru mu nyandiko iherekejwe n'amasanamu. | ||
| </p> | ||
| <p | ||
| class="bbc-vit5au" | ||
| data-e2e="to-main-site" | ||
| > | ||
| <a | ||
| class="bbc-16f79jf" | ||
| data-ignore-lite="true" | ||
| href="http://localhost:7080/gahuza" | ||
| > | ||
| <span | ||
| class="bbc-x7bqmd" | ||
| > | ||
| Njana ku rubuga nyamukuru canke aho gusoma gusa | ||
| </span> | ||
| <svg | ||
| aria-hidden="true" | ||
| class="bbc-2wok52" | ||
| focusable="false" | ||
| height="12" | ||
| viewBox="0 0 32 32" | ||
| width="12" | ||
| > | ||
| <path | ||
| d="M21.6 14.3L5.5 31h6.4l14.6-15L11.9 1H5.5l16.1 16.7v-3.4z" | ||
| /> | ||
| </svg> | ||
| </a> | ||
| </p> | ||
| <p | ||
| class="bbc-vit5au" | ||
| data-e2e="information-page" | ||
| > | ||
| <a | ||
| class="bbc-gcewl8" | ||
| href="https://www.bbc.com/gahuza/articles/cn7y7pvem0vo.lite" | ||
| > | ||
| <span | ||
| class="bbc-1qfjcgd" | ||
| > | ||
| Ibindi vyerekeye ingene urwo rubuga rugutwara uburyo (ama mega) buke | ||
| </span> | ||
| </a> | ||
| </p> | ||
| </div> | ||
| </section> | ||
| `; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /** | ||
| * @service gahuza | ||
| * @pathname /gahuza | ||
| */ | ||
|
|
||
| import { runLiteSiteTests } from '../../../common'; | ||
|
|
||
| describe('Lite Site', () => { | ||
| describe(pageType, () => { | ||
| runLiteSiteTests(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import React from 'react'; | ||
| import serialiseForScript from '#app/lib/utilities/serialiseForScript'; | ||
| import removeDataReactHelmetAttribute from '.'; | ||
|
|
||
| describe('removeDataReactHelmetAttribute', () => { | ||
| it('removes data-react-helmet from meta tags', () => { | ||
| const metaTags = [ | ||
| <meta data-react-helmet="true" name="name1" content="content1" />, | ||
| <meta data-react-helmet="true" name="name2" content="content2" />, | ||
| ]; | ||
|
|
||
| expect(removeDataReactHelmetAttribute(metaTags)).toStrictEqual([ | ||
| <meta name="name1" content="content1" />, | ||
| <meta name="name2" content="content2" />, | ||
| ]); | ||
| }); | ||
|
|
||
| it('removes data-react-helmet from link tags', () => { | ||
| const linkTags = [ | ||
| <link | ||
| data-react-helmet="true" | ||
| rel="canonical" | ||
| href="https://www.bbc.com/pidgin" | ||
| />, | ||
| <link | ||
| data-react-helmet="true" | ||
| rel="icon" | ||
| href="https://www.bbc.com/pidgin" | ||
| />, | ||
| ]; | ||
|
|
||
| expect(removeDataReactHelmetAttribute(linkTags)).toStrictEqual([ | ||
| <link rel="canonical" href="https://www.bbc.com/pidgin" />, | ||
| <link rel="icon" href="https://www.bbc.com/pidgin" />, | ||
| ]); | ||
| }); | ||
|
|
||
| it('removes data-react-helmet from script tags', () => { | ||
| const scriptTags = [ | ||
| <script data-react-helmet="true" type="text/javascript"> | ||
| console.log(`Hello World`); | ||
| </script>, | ||
| <script data-react-helmet="true" type="application/ld+json"> | ||
| {serialiseForScript({ key: 'value' })} | ||
| </script>, | ||
| ]; | ||
|
|
||
| expect(removeDataReactHelmetAttribute(scriptTags)).toStrictEqual([ | ||
| <script type="text/javascript">console.log(`Hello World`);</script>, | ||
| <script type="application/ld+json"> | ||
| {serialiseForScript({ key: 'value' })} | ||
| </script>, | ||
| ]); | ||
| }); | ||
|
|
||
| it('removes data-react-helmet from title tag', () => { | ||
| const title = <title data-react-helmet="true">Title</title>; | ||
|
|
||
| expect(removeDataReactHelmetAttribute(title)).toStrictEqual( | ||
| <title>Title</title>, | ||
| ); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { ReactElement } from 'react'; | ||
|
|
||
| const getPropsExcludingDataReactHelmet = (props: object) => { | ||
| return Object.fromEntries( | ||
| Object.entries(props).filter(([key]) => key !== 'data-react-helmet'), | ||
| ); | ||
| }; | ||
|
|
||
| export default (tags: ReactElement | ReactElement[]) => { | ||
| if (Array.isArray(tags)) { | ||
| return tags.map(tag => { | ||
| return { | ||
| ...tag, | ||
| props: getPropsExcludingDataReactHelmet(tag.props), | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| return { | ||
| ...tags, | ||
| props: getPropsExcludingDataReactHelmet(tags.props), | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /** | ||
| * @service gahuza | ||
| * @pathname /gahuza/live/c2dl5y6dgrzt | ||
| */ | ||
|
|
||
| import { runLiteSiteTests } from '../../../../../src/integration/common'; | ||
|
|
||
| describe('Lite Site', () => { | ||
| describe(pageType, () => { | ||
| runLiteSiteTests(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this perhaps be renamed to
removePlatforminstead?