Merge latest

Author: HarveyPeachey

.codeclimate.yml

@@ -4,7 +4,7 @@ plugins:
     enabled: true
     config:
       languages:
-      - javascript
+        - javascript
     exclude_patterns:
       - 'cypress/{integration,support}/**/*.js'
       # The line below should work but doesn't it removes all js and jsx quality checking
@@ -17,3 +17,5 @@ exclude_patterns:
   - 'scripts/lighthouseBudget.test.js'
   - 'scripts/lighthouseBudget.js'
   - 'scripts/dependencyCheck.js'
+  - 'scripts/simorghPages.js'
+  - 'scripts/simorghLaunchDates.js'

.eslintrc.js

@@ -39,7 +39,7 @@ module.exports = {
         ],
       },
     ],
-    "import/extensions": [1, { "json": "ignorePackages" }]
+    'import/extensions': [1, { json: 'ignorePackages' }],
   },
   settings: {
     'import/resolver': {

.github/CODE_OF_CONDUCT.md

@@ -1,5 +1,7 @@
 ### Documentation index
+
 Please familiarise yourself with our:
+
 - [Code of conduct](https://github.com/bbc/simorgh/blob/latest/.github/CODE_OF_CONDUCT.md) (you are here)
 - [Code Standards](https://github.com/bbc/simorgh/blob/latest/docs/Code-Standards.md)
 - [Contributing guidelines](https://github.com/bbc/simorgh/blob/latest/CONTRIBUTING.md)
@@ -18,19 +20,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
 
 Examples of behavior that contributes to creating a positive environment include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,10 @@
 Resolves #NUMBER
 
-**Overall change:** 
+**Overall change:**
 _A very high-level summary of easily-reproducible changes that can be understood by non-devs._
 
 **Code changes:**
+
 - _A bullet point list of key code changes that have been made._
 - _When describing code changes, try to communicate **how** and **why** you implemented something a specific way, not just **what** has changed._
 
@@ -14,6 +15,7 @@ _A very high-level summary of easily-reproducible changes that can be understood
 - [ ] I have assigned this PR to the Simorgh project
 
 **Testing:**
+
 - [ ] Automated (jest and/or cypress) tests added (for new features) or updated (for existing features)
-- [ ] If necessary, I have run the local E2E non-smoke tests relevant to my changes (`CYPRESS_APP_ENV=local CYPRESS_SMOKE=false npm run test:e2e:interactive`) 
+- [ ] If necessary, I have run the local E2E non-smoke tests relevant to my changes (`CYPRESS_APP_ENV=local CYPRESS_SMOKE=false npm run test:e2e:interactive`)
 - [ ] This PR requires manual testing

.github/workflows/simorgh_ci.yml

@@ -4,23 +4,22 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         node-version: [12.x]
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: npm install, build, and test
-      run: |
-        npm ci
-        npx apache2-license-checker
-        npm test
-      env:
-        CI: true
+      - uses: actions/checkout@v1
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: npm install, build, and test
+        run: |
+          npm ci
+          npx apache2-license-checker
+          npm test
+        env:
+          CI: true

.prettierrc

@@ -1,4 +1,4 @@
- {
+{
   "singleQuote": true,
   "trailingComma": "all"
- }
+}

.storybook/.eslintrc

@@ -1,6 +1,6 @@
 {
-  "globals":  {
+  "globals": {
     "cy": true,
     "Cypress": true
-    },
+  }
 }

.storybook/config.js

@@ -7,7 +7,7 @@ import GlobalStyles from '@bbc/psammead-styles/global-styles';
 const req = require.context('../src/app', true, /\.stories\.jsx$/);
 
 function loadStories() {
-  req.keys().forEach(filename => req(filename));
+  req.keys().forEach((filename) => req(filename));
 }
 
 const fontPathMap = [
@@ -24,13 +24,13 @@ const fontPathMap = [
   { prefix: 'F_SHONAR_BANGLA', path: 'fonts/ShonarBangla/' },
 ];
 
-addDecorator(story => (
+addDecorator((story) => (
   /* eslint-disable react/jsx-filename-extension */
   <>
     <GlobalStyles
-      fonts={Object.values(fontFaces).map(fontFace => {
+      fonts={Object.values(fontFaces).map((fontFace) => {
         const fontMap =
-          fontPathMap.find(map => fontFace.name.includes(map.prefix)) ||
+          fontPathMap.find((map) => fontFace.name.includes(map.prefix)) ||
           fontPathMap[0];
         return fontFace(fontMap.path);
       })}

.storybook/helpers/ampDecorator/index.jsx

@@ -13,7 +13,7 @@ import {
   Contains AMP required markup https://www.ampproject.org/docs/fundamentals/spec#required-markup
 */
 
-const AmpDecorator = storyFn => (
+const AmpDecorator = (storyFn) => (
   <div>
     <Helmet htmlAttributes={{ amp: '' }}>
       <link rel="canonical" href="http://foobar.com" />