Skip to content

Commit

Permalink
Merge branch 'latest' into lite-chartbeat-initial-impl
Browse files Browse the repository at this point in the history
  • Loading branch information
amoore108 committed Jan 22, 2025
2 parents 0de8e29 + 81f36a7 commit 7351a30
Show file tree
Hide file tree
Showing 2,538 changed files with 172,879 additions and 220,454 deletions.
14 changes: 14 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ module.exports = {
'linebreak-style': process.platform === 'win32' ? 'off' : ['error', 'unix'],
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'warn',
'import/no-import-module-exports': [
'error',
{
exceptions: ['**/*/startServer.js'],
},
],
'import/no-extraneous-dependencies': [
'off',
{
Expand Down Expand Up @@ -97,6 +103,14 @@ module.exports = {
// adds support for type, interface and enum declarations https://typescript-eslint.io/rules/no-use-before-define/#how-to-use
'no-use-before-define': 'off',
'@typescript-eslint/no-use-before-define': ['error'],
'@typescript-eslint/no-unused-vars': [
'warn',
{
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
caughtErrorsIgnorePattern: '^_',
},
],
'react/require-default-props': 'off',
'react/no-unused-prop-types': 'off',
},
Expand Down
7 changes: 3 additions & 4 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ Please familiarise yourself with our:
- [Code of conduct](https://github.com/bbc/simorgh/blob/latest/.github/CODE_OF_CONDUCT.md) (you are here)
- [Coding Standards](https://github.com/bbc/simorgh/blob/latest/docs/Coding-Standards/README.md)
- [Contributing guidelines](https://github.com/bbc/simorgh/blob/latest/CONTRIBUTING.md)
- [Guide to Code Reviews](https://github.com/bbc/simorgh/blob/latest/docs/Code-Reviews.stories.mdx)
- [Github Project Board Guide](https://github.com/bbc/simorgh/blob/latest/docs/Project-Board-Guide.stories.mdx)
- [Guide to Code Reviews](https://github.com/bbc/simorgh/blob/latest/docs/Code-Reviews.mdx)
- [Primary README](https://github.com/bbc/simorgh/blob/latest/README.md)
- [Recommended Tools](https://github.com/bbc/simorgh/blob/latest/docs/Recommended-Tools.stories.mdx)
- [Troubleshooting](https://github.com/bbc/simorgh/blob/latest/docs/Troubleshooting.stories.mdx)
- [Recommended Tools](https://github.com/bbc/simorgh/blob/latest/docs/Recommended-Tools.mdx)
- [Troubleshooting](https://github.com/bbc/simorgh/blob/latest/docs/Troubleshooting.mdx)

NB there is further documentation colocated with relevant code. The above list is an index of the top-level documentation of our repo.

Expand Down
72 changes: 72 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'weekly'
ignore:
- dependency-name: '@loadable/*'
update-types: ['version-update:semver-major']
- dependency-name: 'webpack'
update-types: ['version-update:semver-major']
- dependency-name: 'winston'
# https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2185: Latest version of eslint has breaking changes
- dependency-name: eslint
update-types: ['version-update:semver-major']
- dependency-name: '@typescript-eslint/eslint-plugin'
update-types: ['version-update:semver-major']
# https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2186: Latest version of Emotion contains a memory leak that needs resolved: https://github.com/emotion-js/emotion/issues/3221
- dependency-name: '@emotion/*'
# Opera Mini unsupported packages
- dependency-name: 'uuid' # https://github.com/bbc/simorgh/pull/11840
- dependency-name: '@types/uuid' # https://github.com/bbc/simorgh/pull/11840
# https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-1478 react-router & react-router-dom
- dependency-name: 'react-router-dom'
- dependency-name: 'react-router'
# https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2099: Delete path-to-regexp dependency
- dependency-name: 'path-to-regexp'
# https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2187: Latest major version of react has breaking changes
- dependency-name: 'react'
update-types: ['version-update:semver-major']
- dependency-name: 'react-dom'
update-types: ['version-update:semver-major']
- dependency-name: '@types/react'
update-types: ['version-update:semver-major']
- dependency-name: '@types/react-dom'
update-types: ['version-update:semver-major']
labels:
- 'dependencies'
groups:
babel:
patterns:
- '@babel/*'
- 'babel-*'
bbc:
patterns:
- '@bbc/*'
emotion:
patterns:
- '@emotion/*'
next:
patterns:
- '@next/*'
- 'next'
- 'next-*'
loadable-minor-patch:
patterns:
- '@loadable/*'
react:
patterns:
- 'react'
- 'react-dom'
- '@types/react'
- '@types/react-dom'
storybook:
patterns:
- '@storybook/*'
- 'storybook'
- '@esbuild/*'
webpack-minor-patch:
patterns:
- 'webpack'
- 'webpack-*'
3 changes: 0 additions & 3 deletions .github/workflows/cancel-previous-runs.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Auto Cancel Previous CI Runs
on:
create:
branches:
- '**'
pull_request:
branches:
- '**'
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/simorgh-e2e-tests.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
name: Simorgh CI - Cypress E2E Tests
on:
create:
branches:
- '**'
pull_request:
branches:
- '**'
push:
branches:
- latest
permissions:
contents: read

Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/simorgh-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
name: Simorgh CI - Integration Tests
on:
create:
branches:
- '**'
pull_request:
branches:
- '**'
push:
branches:
- latest
permissions:
contents: read

Expand All @@ -21,8 +15,6 @@ jobs:
env:
CI: true
LOG_LEVEL: 'error'
BFF_PATH: 'https://web-cdn.test.api.bbci.co.uk/fd/simorgh-bff'
INTEGRATION_TEST_BUILD: true

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/simorgh-local-server-tests.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
name: Simorgh CI - AMP Validation, Lighthouse & Puppeteer Tests
on:
create:
branches:
- '**'
pull_request:
branches:
- '**'
push:
branches:
- latest
permissions:
contents: read

Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/simorgh-misc-checks.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
name: Simorgh CI - Licences, Dependencies, Lint, Chromatic UI, NPM Audit
on:
create:
branches:
- '**'
pull_request:
branches:
- '**'
push:
branches:
- latest

permissions:
statuses: write
Expand Down Expand Up @@ -96,7 +90,7 @@ jobs:
run: yarn test:dependencies

- name: Linting
run: yarn test:lint
run: yarn build && yarn test:lint

- name: NPM Audit
run: npx audit-ci --config audit-ci.json
run: yarn npm audit --all --severity low --no-deprecations
6 changes: 0 additions & 6 deletions .github/workflows/simorgh-unit-tests.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
name: Simorgh CI - Unit Tests & Code Coverage
on:
create:
branches:
- '**'
pull_request:
branches:
- '**'
push:
branches:
- latest
permissions:
contents: read

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.17.1
v18.20.5
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const styles = {
margin: `-${spacings.FULL}rem`,
marginBottom: `${spacings.FULL}rem`,
background: colorCode,
[mq.HIGH_CONTRAST]: {
[mq.FORCED_COLOURS]: {
background: colorCode,
forcedColorAdjust: 'none',
},
Expand Down
1 change: 1 addition & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const storybookConfig: StorybookConfig = {
stories: [
'../src/app/legacy/components/**/*.stories.@(t|j)sx',
'../src/app/legacy/containers/**/*.stories.@(t|j)sx',
'../src/app/legacy/psammead/psammead-locales/**/*.stories.@(t|j)sx',
'../src/app/components/**/*.stories.@(t|j)sx',
'../src/app/pages/**/*.stories.@(t|j)sx',
'./DocsDecorator/**/*.stories.@(t|j)sx',
Expand Down
Loading

0 comments on commit 7351a30

Please sign in to comment.