Remove Express + unused dependencies

.github/dependabot.yml

@@ -19,8 +19,6 @@ updates:
       # https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2164: Migrate all page types to Next.js + Lambda to remove Express + EC2 infrastructure
       - dependency-name: 'react-router-config'
       - dependency-name: 'react-router-dom'
-      - dependency-name: 'express'
-        update-types: ['version-update:semver-major']
     labels:
       - 'dependencies'
     groups:
@@ -45,9 +43,6 @@ updates:
           - 'next'
           - 'next-*'
           - '@img-sharp-*'
-      loadable-minor-patch:
-        patterns:
-          - '@loadable/*'
       react:
         patterns:
           - 'react'

.github/workflows/simorgh-misc-checks.yml

@@ -96,7 +96,7 @@ jobs:
 
       - name: Linting
         if: github.ref != 'refs/heads/latest'
-        run: yarn build && yarn test:lint
+        run: yarn test:lint
 
       - name: NPM Audit
         if: github.ref != 'refs/heads/latest'

.storybook/main.ts

@@ -11,8 +11,8 @@ import type { StorybookConfig } from '@storybook/react-webpack5';
 import alias from '../dirAlias';
 
 import { fontInfo } from '../src/app/components/ThemeProvider/fontFaces';
-
 const require = createRequire(import.meta.url);
+const MomentTimezoneInclude = require('../src/app/legacy/psammead/moment-timezone-include/src');
 const DOT_ENV_CONFIG = dotenv.config({ quiet: true });
 
 const storybookConfig: StorybookConfig = {
@@ -116,6 +116,7 @@ const storybookConfig: StorybookConfig = {
       new webpack.ProvidePlugin({
         process: 'process/browser',
       }),
+      new MomentTimezoneInclude({ startYear: 2010, endYear: 2026 }),
     );
 
     config.resolve!.fallback = {

.storybook/preview.tsx

@@ -13,7 +13,7 @@ import { EventTrackingContextProvider } from '../src/app/contexts/EventTrackingC
 import withServicesDecorator from './withServicesDecorator';
 import pageDataFixture from '../data/news/articles/c0g992jmmkko.json';
 import { RequestContextProvider } from '../src/app/contexts/RequestContext';
-import serviceConfigs from '../src/server/utilities/serviceConfigs';
+import serviceConfigs from '#utilities/serviceConfigs';
 import {
   NOTO_SANS_ETHIOPIC_BOLD,
   NOTO_SANS_ETHIOPIC_REGULAR,

.vscode/launch.json

@@ -4,25 +4,11 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
-    {
-      "type": "node",
-      "runtimeVersion": "22",
-      "request": "launch",
-      "name": "Debug Express App",
-      "program": "${workspaceFolder}/node_modules/webpack/bin/webpack.js",
-      "args": [
-        "--watch", "--progress", "--env" , "config='server'"
-      ],
-      "env" : { "NODE_ENV" : "development" },
-      "skipFiles": [
-        "${workspaceFolder}/node_modules/**/*",
-      ]
-    },
     {
       "name": "Debug Next.js: server-side",
       "type": "node-terminal",
       "request": "launch",
       "command": "cd ws-nextjs-app && nvm use && yarn dev"
-    },
+    }
   ]
-}
+}

.vscode/readme.md

@@ -1,7 +1,3 @@
 # Debugging in VS Code
 
-The setup here mirrors the [`webpack:dev:server`](https://github.com/bbc/simorgh/blob/2944b327aac6fa22a8b5474d24e48fb631728431/package.json#L65) `package.json` script. You run it in the debug tab choosing 'Debug Express App'.
-
-![A picture of the button to start debugging in VS Code](vscode-debug.png)
-
 You can debug the NextJS app by choosing 'Debug Next.js: server-side'; this command has been adapted from the docs [here](https://nextjs.org/docs/pages/building-your-application/configuring/debugging#debugging-with-vs-code)

babel.config.main.js

@@ -1,20 +1,8 @@
-const plugins = [
-  '@emotion/babel-plugin',
-  '@babel/plugin-proposal-object-rest-spread', // allows ...spread notation
-  '@babel/plugin-syntax-dynamic-import', // allows `await import()` syntax
-  '@babel/plugin-proposal-export-default-from',
-  '@babel/plugin-transform-runtime',
-  '@loadable/babel-plugin',
-  [
-    'transform-rename-import',
-    { original: 'next/dynamic', replacement: '@loadable/component' },
-  ],
-];
+const plugins = ['@emotion/babel-plugin'];
 
 // allows dynamic `import()` in Node tests.
 if (process.env.NODE_ENV === 'test') {
   plugins.push('dynamic-import-node');
-  plugins.push('@babel/plugin-proposal-throw-expressions'); // allows `throw new Error();`
 }
 
 const overrides = [
@@ -54,9 +42,6 @@ module.exports = api => {
               }),
           node: 'current',
         },
-        // analyses code & polyfills only the features that are used, only for the targeted browsers
-        useBuiltIns: 'usage',
-        corejs: '3',
       },
     ],
     [

dirAlias.js

@@ -10,6 +10,7 @@ module.exports = {
     '#app': resolvePath('src/app'),
     '#src': resolvePath('src'),
     '#nextjs': resolvePath('ws-nextjs-app/'),
+    '#utilities': resolvePath('ws-nextjs-app/utilities/'),
     '#contexts': resolvePath('src/app/contexts'),
     '#components': resolvePath('src/app/legacy/components'),
     '#containers': resolvePath('src/app/legacy/containers'),
@@ -20,14 +21,15 @@ module.exports = {
     '#models': resolvePath('src/app/models/'),
     '#pages': resolvePath('src/app/pages/'),
     '#testHelpers': resolvePath('src/testHelpers/'),
-    '#server': resolvePath('src/server/'),
+    '#server': resolvePath('ws-nextjs-app/server/'),
     '#storybook': resolvePath('.storybook/'),
     '#cypress': resolvePath('cypress/'),
   },
   jestDirAlias: {
     '^#app(.*)$': '<rootDir>/src/app$1',
     '^#src(.*)$': '<rootDir>/src$1',
     '^#nextjs(.*)$': '<rootDir>/ws-nextjs-app$1',
+    '^#utilities(.*)$': '<rootDir>/ws-nextjs-app/utilities$1',
     '^#contexts(.*)$': '<rootDir>/src/app/contexts$1',
     '^#components(.*)$': '<rootDir>/src/app/legacy/components$1',
     '^#containers(.*)$': '<rootDir>/src/app/legacy/containers$1',
@@ -38,7 +40,7 @@ module.exports = {
     '^#models(.*)$': '<rootDir>/src/app/models$1',
     '^#pages(.*)$': '<rootDir>/src/app/pages$1',
     '^#testHelpers(.*)$': '<rootDir>/src/testHelpers$1',
-    '^#server(.*)$': '<rootDir>/src/server$1',
+    '^#server(.*)$': '<rootDir>/ws-nextjs-app/server$1',
     '^#storybook(.*)$': '<rootDir>/.storybook$1',
     '^#cypress(.*)$': '<rootDir>/cypress$1',
   },
@@ -47,6 +49,7 @@ module.exports = {
       ['#app', './src/app'],
       ['#src', './src'],
       ['#nextjs', './ws-nextjs-app'],
+      ['#utilities', './ws-nextjs-app/utilities'],
       ['#contexts', './src/app/contexts'],
       ['#components', './src/app/legacy/components'],
       ['#containers', './src/app/legacy/containers'],
@@ -57,7 +60,7 @@ module.exports = {
       ['#models', './src/app/models'],
       ['#pages', './src/app/pages'],
       ['#testHelpers', './src/testHelpers'],
-      ['#server', './src/server'],
+      ['#server', './ws-nextjs-app/server'],
       ['#storybook', './.storybook'],
       ['#cypress', './cypress'],
     ],

docs/Rendering-Ads.mdx

@@ -21,7 +21,7 @@ Afrique, Arabic, Azeri, Bengali, Gahuza, Hausa, Hindi, Indonesia, Japanese, Kyrg
 
 Given you are using Chrome browser.
 
-1. Download [ModHeader Chrome extension](https://www.google.com/search?q=modheader+chrome+pass+boolean\&rlz=1C5CHFA_enGB762GB762\&oq=modheader\&aqs=chrome.0.69i59l2j69i57j69i60j69i61j69i60j69i65l2.1039j0j7\&sourceid=chrome\&ie=UTF-8)
+1. Download [ModHeader Chrome extension](https://www.google.com/search?q=modheader+chrome+pass+boolean&rlz=1C5CHFA_enGB762GB762&oq=modheader&aqs=chrome.0.69i59l2j69i57j69i60j69i61j69i60j69i65l2.1039j0j7&sourceid=chrome&ie=UTF-8)
 
 2. With the ModHeader extension, add a header of `BBC-Adverts` with the value `true`.
 
@@ -55,7 +55,7 @@ If you are unable to set a proxy on one of the Windows a11y laptops, you won't b
 
    e.g. `SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=http://192.168.0.50:7080`
 
-3. Disable the `upgrade-insecure-requests` directive from the [cspHeader](https://github.com/bbc/simorgh/blob/latest/src/server/utilities/cspHeader/index.js#L419)
+3. Disable the `upgrade-insecure-requests` directive from the [cspHeader](https://github.com/bbc/simorgh/blob/latest/src/ws-nextjs-app/utilities/cspHeader/index.ts#L419)
 
 4. If you can't set the `BBC-Adverts` header in the Windows laptop, you will need to remove [this](https://github.com/bbc/simorgh/blob/latest/src/app/containers/Ad/Canonical/index.jsx#L63) condition from the codebase to be able to render the ad
 

jest.config.js

@@ -51,69 +51,6 @@ const clientUnitTests = {
   ],
 };
 
-const ampIntegrationTests = {
-  displayName: 'Integration Tests - AMP',
-  setupFiles: ['./src/testHelpers/jest-setup.js'],
-  testEnvironment: './src/integration/integrationTestEnvironment.js',
-  testEnvironmentOptions: {
-    platform: 'amp',
-  },
-  moduleNameMapper: jestDirAlias,
-  setupFilesAfterEnv: ['./src/testHelpers/setupTests.js'],
-  testMatch: ['**/src/integration/!(utils)/**/*.test.js'],
-  testPathIgnorePatterns: [
-    '.*lite\\.test\\.js$',
-    '.*canonical\\.test\\.js$',
-    '<rootDir>/src/integration/pages/articles/',
-    '<rootDir>/src/integration/pages/mediaArticlePage/',
-    '<rootDir>/src/integration/pages/mediaAssetPage/',
-    '<rootDir>/src/integration/pages/photoGalleryPage/',
-    '<rootDir>/src/integration/pages/storyPage/',
-  ],
-};
-
-const canonicalIntegrationTests = {
-  displayName: 'Integration Tests - Canonical',
-  setupFiles: ['./src/testHelpers/jest-setup.js'],
-  testEnvironment: './src/integration/integrationTestEnvironment.js',
-  testEnvironmentOptions: {
-    platform: 'canonical',
-  },
-  moduleNameMapper: jestDirAlias,
-  setupFilesAfterEnv: ['./src/testHelpers/setupTests.js'],
-  testMatch: ['**/src/integration/!(utils)/**/*.test.js'],
-  testPathIgnorePatterns: [
-    '.*lite\\.test\\.js$',
-    '.*amp\\.test\\.js$',
-    '<rootDir>/src/integration/pages/articles/',
-    '<rootDir>/src/integration/pages/mediaArticlePage/',
-    '<rootDir>/src/integration/pages/mediaAssetPage/',
-    '<rootDir>/src/integration/pages/photoGalleryPage/',
-    '<rootDir>/src/integration/pages/storyPage/',
-  ],
-};
-
-const liteIntegrationTests = {
-  displayName: 'Integration Tests - Lite',
-  setupFiles: ['./src/testHelpers/jest-setup.js'],
-  testEnvironment: './src/integration/integrationTestEnvironment.js',
-  testEnvironmentOptions: {
-    platform: 'lite',
-  },
-  moduleNameMapper: jestDirAlias,
-  setupFilesAfterEnv: ['./src/testHelpers/setupTests.js'],
-  testMatch: ['**/src/integration/!(utils)/**/*.test.js'],
-  testPathIgnorePatterns: [
-    '.*canonical\\.test\\.js$',
-    '.*amp\\.test\\.js$',
-    '<rootDir>/src/integration/pages/articles/',
-    '<rootDir>/src/integration/pages/mediaArticlePage/',
-    '<rootDir>/src/integration/pages/mediaAssetPage/',
-    '<rootDir>/src/integration/pages/photoGalleryPage/',
-    '<rootDir>/src/integration/pages/storyPage/',
-  ],
-};
-
 const puppeteerTests = {
   preset: 'ts-jest',
   setupFiles: ['./puppeteer/jest-setup.js'],
@@ -126,14 +63,7 @@ const puppeteerTests = {
 };
 
 module.exports = {
-  projects: [
-    unitTests,
-    clientUnitTests,
-    ampIntegrationTests,
-    canonicalIntegrationTests,
-    liteIntegrationTests,
-    puppeteerTests,
-  ],
+  projects: [unitTests, clientUnitTests, puppeteerTests],
   reporters: [
     'default',
     [