Features/alias tidy up

dirAlias.js

@@ -9,48 +9,54 @@ module.exports = {
   webpackDirAlias: {
     '#app': resolvePath('src/app'),
     '#contexts': resolvePath('src/app/contexts'),
-    '#components': resolvePath('src/app/legacy/components'),
+    '#components': resolvePath('src/app/components'),
     '#containers': resolvePath('src/app/legacy/containers'),
     '#data': resolvePath('data/'),
     '#hooks': resolvePath('src/app/hooks'),
-    '#psammead': resolvePath('src/app/legacy/psammead'),
+    '#legacy': resolvePath('src/app/legacy'),
     '#lib': resolvePath('src/app/lib/'),
     '#models': resolvePath('src/app/models/'),
     '#pages': resolvePath('src/app/pages/'),
-    '#testHelpers': resolvePath('src/testHelpers/'),
+    '#psammead': resolvePath('src/app/legacy/psammead/'),
+    '#routes': resolvePath('src/app/routes/'),
     '#server': resolvePath('src/server/'),
     '#storybook': resolvePath('.storybook/'),
+    '#testHelpers': resolvePath('src/testHelpers/'),
   },
   jestDirAlias: {
     '^#app(.*)$': '<rootDir>/src/app$1',
     '^#contexts(.*)$': '<rootDir>/src/app/contexts$1',
-    '^#components(.*)$': '<rootDir>/src/app/legacy/components$1',
+    '^#components(.*)$': '<rootDir>/src/app/components$1',
     '^#containers(.*)$': '<rootDir>/src/app/legacy/containers$1',
     '^#data(.*)$': '<rootDir>/data$1',
     '^#hooks(.*)$': '<rootDir>/src/app/hooks$1',
-    '^#psammead(.*)$': '<rootDir>/src/app/legacy/psammead$1',
+    '^#legacy(.*)$': '<rootDir>/src/app/legacy$1',
     '^#lib(.*)$': '<rootDir>/src/app/lib$1',
     '^#models(.*)$': '<rootDir>/src/app/models$1',
     '^#pages(.*)$': '<rootDir>/src/app/pages$1',
-    '^#testHelpers(.*)$': '<rootDir>/src/testHelpers$1',
+    '^#psammead(.*)$': '<rootDir>/src/app/legacy/psammead$1',
+    '^#routes(.*)$': '<rootDir>/src/app/routes$1',
     '^#server(.*)$': '<rootDir>/src/server$1',
     '^#storybook(.*)$': '<rootDir>/.storybook$1',
+    '^#testHelpers(.*)$': '<rootDir>/src/testHelpers$1',
   },
   eslintDirAlias: {
     map: [
       ['#app', './src/app'],
       ['#contexts', './src/app/contexts'],
-      ['#components', './src/app/legacy/components'],
+      ['#components', './src/app/components'],
       ['#containers', './src/app/legacy/containers'],
       ['#data', './data'],
       ['#hooks', './src/app/hooks'],
+      ['#legacy', './src/app/legacy'],
       ['#lib', './src/app/lib'],
-      ['#psammead', './src/app/legacy/psammead'],
       ['#models', './src/app/models'],
       ['#pages', './src/app/pages'],
-      ['#testHelpers', './src/testHelpers'],
+      ['#psammead', './src/app/legacy/psammead'],
+      ['#routes', './src/app/routes'],
       ['#server', './src/server'],
       ['#storybook', './.storybook'],
+      ['#testHelpers', './src/testHelpers'],
     ],
     extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
   },

jsconfig.json

@@ -5,16 +5,18 @@
     "paths": {
       "#app/*": ["./src/app/*"],
       "#contexts/*": ["./src/app/contexts/*"],
-      "#components/*": ["./src/app/legacy/components/*"],
+      "#components/*": ["./src/app/components/*"],
       "#containers/*": ["./src/app/legacy/containers/*"],
       "#data/*": ["./data/*"],
       "#hooks/*": [".src/app/hooks/*"],
+      "#legacy/*": ["./src/app/legacy/*"],
       "#psammead/*": ["./src/app/legacy/psammead/*"],
       "#lib/*": ["./src/app/lib/*"],
       "#models/*": ["./src/app/models/*"],
       "#pages/*": ["./src/app/pages/*"],
-      "#testHelpers/*": ["./src/testHelpers/*"],
-      "#server/*": ["./src/server/*"]
+      "#routes/*": ["./src/app/routes/*"],
+      "#server/*": ["./src/server/*"],
+      "#testHelpers/*": ["./src/testHelpers/*"]
     }
   },
   "exclude": ["node_modules", "dist"]

src/app/components/ATIAnalytics/amp/index.test.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '../../react-testing-library-with-providers';
+import { render } from '#components/react-testing-library-with-providers';
 import AmpATIAnalytics from '.';
 
 describe('Amp ATI Analytics', () => {

src/app/components/ATIAnalytics/atiUrl/index.test.ts

@@ -1,5 +1,5 @@
 import { resetWindowValue } from '#psammead/psammead-test-helpers/src';
-import * as genericLabelHelpers from '../../../lib/analyticsUtils';
+import * as genericLabelHelpers from '#lib/analyticsUtils';
 import { buildATIPageTrackPath, buildATIEventTrackUrl } from '.';
 
 // @ts-expect-error required for testing purposes

src/app/components/ATIAnalytics/atiUrl/index.ts

@@ -17,7 +17,7 @@ import {
   getCampaignType,
   getATIMarketingString,
   getRSSMarketingString,
-} from '../../../lib/analyticsUtils';
+} from '#lib/analyticsUtils';
 import { ATIEventTrackingProps, ATIPageTrackingProps } from '../types';
 
 /*

src/app/components/ATIAnalytics/beacon/index.test.ts

@@ -1,5 +1,5 @@
-import * as sendBeacon from '../../../lib/analyticsUtils/sendBeacon';
-import * as analyticsUtils from '../../../lib/analyticsUtils';
+import * as sendBeacon from '#lib/analyticsUtils/sendBeacon';
+import * as analyticsUtils from '#lib/analyticsUtils';
 import { sendEventBeacon } from '.';
 
 const sendBeaconSpy = jest.spyOn(sendBeacon, 'default');

src/app/components/ATIAnalytics/beacon/index.ts

@@ -1,4 +1,4 @@
-import sendBeacon from '../../../lib/analyticsUtils/sendBeacon';
+import sendBeacon from '#lib/analyticsUtils/sendBeacon';
 import { buildATIEventTrackUrl } from '../atiUrl';
 import { ATIEventTrackingProps } from '../types';
 

src/app/components/ATIAnalytics/canonical/index.test.tsx

@@ -1,10 +1,7 @@
 import React from 'react';
-import {
-  render,
-  act,
-} from '#app/components/react-testing-library-with-providers';
+import { render, act } from '#components/react-testing-library-with-providers';
 import * as isOperaProxy from '#app/lib/utilities/isOperaProxy';
-import * as beacon from '../../../lib/analyticsUtils/sendBeacon';
+import * as beacon from '#lib/analyticsUtils/sendBeacon';
 import CanonicalATIAnalytics from '.';
 
 describe('Canonical ATI Analytics', () => {

src/app/components/ATIAnalytics/canonical/index.tsx

@@ -3,7 +3,7 @@ import { getEnvConfig } from '#app/lib/utilities/getEnvConfig';
 import { RequestContext } from '#app/contexts/RequestContext';
 import isOperaProxy from '#app/lib/utilities/isOperaProxy';
 import { Helmet } from 'react-helmet';
-import sendBeacon from '../../../lib/analyticsUtils/sendBeacon';
+import sendBeacon from '#lib/analyticsUtils/sendBeacon';
 import { ATIAnalyticsProps } from '../types';
 import sendBeaconOperaMiniScript from './sendBeaconOperaMiniScript';
 

src/app/components/ATIAnalytics/index.test.tsx

@@ -12,7 +12,7 @@ import {
   setWindowValue,
   resetWindowValue,
 } from '#psammead/psammead-test-helpers/src';
-import { render } from '../react-testing-library-with-providers';
+import { render } from '#components/react-testing-library-with-providers';
 import {
   ARTICLE_PAGE,
   FRONT_PAGE,
@@ -22,7 +22,7 @@ import {
   STORY_PAGE,
   CORRESPONDENT_STORY_PAGE,
   MEDIA_ARTICLE_PAGE,
-} from '../../routes/utils/pageTypes';
+} from '#routes/utils/pageTypes';
 import ATIAnalytics from '.';
 import * as amp from './amp';
 import * as canonical from './canonical';

src/app/components/ATIAnalytics/index.tsx

@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import { RequestContext } from '#contexts/RequestContext';
-import { ServiceContext } from '../../contexts/ServiceContext';
+import { ServiceContext } from '#contexts/ServiceContext';
 import CanonicalATIAnalytics from './canonical';
 import AmpATIAnalytics from './amp';
 import { ATIProps } from './types';

src/app/components/ATIAnalytics/params/genericPage/buildParams.test.ts

@@ -1,7 +1,7 @@
-import { TOPIC_PAGE } from '#app/routes/utils/pageTypes';
+import { TOPIC_PAGE } from '#routes/utils/pageTypes';
 import * as analyticsUtils from '#lib/analyticsUtils';
-import { RequestContextProps } from '../../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../../models/types/serviceConfig';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 import { buildPageATIParams, buildPageATIUrl } from './buildParams';
 
 (analyticsUtils.getAtUserId as jest.Mock) = jest.fn();

src/app/components/ATIAnalytics/params/genericPage/buildParams.ts

@@ -1,4 +1,4 @@
-import { LIBRARY_VERSION } from '../../../../lib/analyticsUtils';
+import { LIBRARY_VERSION } from '#lib/analyticsUtils';
 import { buildATIPageTrackPath } from '../../atiUrl';
 import { ATIDataWithContexts } from '../../types';
 

src/app/components/ATIAnalytics/params/index.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import * as analyticsUtils from '../../../lib/analyticsUtils';
+import * as analyticsUtils from '#lib/analyticsUtils';
 import {
   ARTICLE_PAGE,
   FRONT_PAGE,
@@ -10,11 +10,11 @@ import {
   HOME_PAGE,
   ERROR_PAGE,
   LIVE_PAGE,
-} from '../../../routes/utils/pageTypes';
+} from '#routes/utils/pageTypes';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 import { buildATIUrl, buildATIEventTrackingParams } from '.';
 import * as buildPageATIFunctionImports from './genericPage/buildParams';
-import { RequestContextProps } from '../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../models/types/serviceConfig';
 import { ATIData, PageData } from '../types';
 
 (analyticsUtils.getAtUserId as jest.Mock) = jest.fn();

src/app/components/ATIAnalytics/params/index.ts

@@ -18,7 +18,10 @@ import {
   UGC_PAGE,
   AV_EMBEDS,
   DOWNLOADS_PAGE,
-} from '../../../routes/utils/pageTypes';
+} from '#routes/utils/pageTypes';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
+import { PageTypes } from '#models/types/global';
 import {
   buildTvRadioATIParams,
   buildTvRadioATIUrl,
@@ -28,14 +31,11 @@ import {
   buildIndexPageATIParams,
   buildIndexPageATIUrl,
 } from './indexPage/buildParams';
-import { RequestContextProps } from '../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../models/types/serviceConfig';
 import {
   PageData,
   ATIPageTrackingProps,
   ATIConfigurationDetailsProviders,
 } from '../types';
-import { PageTypes } from '../../../models/types/global';
 
 const MIGRATED_PAGE_TYPES: PageTypes[] = [
   HOME_PAGE,

src/app/components/ATIAnalytics/params/indexPage/buildParams.test.ts

@@ -1,8 +1,8 @@
 import * as analyticsUtils from '#lib/analyticsUtils';
-import { FRONT_PAGE, FEATURE_INDEX_PAGE } from '#app/routes/utils/pageTypes';
+import { FRONT_PAGE, FEATURE_INDEX_PAGE } from '#routes/utils/pageTypes';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 import { buildIndexPageATIParams, buildIndexPageATIUrl } from './buildParams';
-import { RequestContextProps } from '../../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../../models/types/serviceConfig';
 
 (analyticsUtils.getAtUserId as jest.Mock) = jest.fn();
 (analyticsUtils.getCurrentTime as jest.Mock) = jest

src/app/components/ATIAnalytics/params/indexPage/buildParams.ts

@@ -1,16 +1,13 @@
-import {
-  LIBRARY_VERSION,
-  getPublishedDatetime,
-} from '../../../../lib/analyticsUtils';
+import { LIBRARY_VERSION, getPublishedDatetime } from '#lib/analyticsUtils';
 import {
   getContentId,
   getContentType,
   getLanguage,
   getPageIdentifier,
   getPageTitle,
-} from '../../../../lib/analyticsUtils/indexPage';
-import { RequestContextProps } from '../../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../../models/types/serviceConfig';
+} from '#lib/analyticsUtils/indexPage';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 import { buildATIPageTrackPath } from '../../atiUrl';
 import { PageData } from '../../types';
 

src/app/components/ATIAnalytics/params/topicPage/buildParams.test.ts

@@ -1,6 +1,6 @@
 import * as analyticsUtils from '#lib/analyticsUtils';
-import { RequestContextProps } from '../../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../../models/types/serviceConfig';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 import { buildTopicPageATIParams, buildTopicPageATIUrl } from './buildParams';
 
 (analyticsUtils.getAtUserId as jest.Mock) = jest.fn();

src/app/components/ATIAnalytics/params/topicPage/buildParams.ts

@@ -1,6 +1,6 @@
-import { LIBRARY_VERSION } from '../../../../lib/analyticsUtils';
-import { RequestContextProps } from '../../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../../models/types/serviceConfig';
+import { LIBRARY_VERSION } from '#lib/analyticsUtils';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 import { buildATIPageTrackPath } from '../../atiUrl';
 import { PageData } from '../../types';
 

src/app/components/ATIAnalytics/params/tvRadioPage/buildParams.test.ts

@@ -1,6 +1,6 @@
 import * as analyticsUtils from '#lib/analyticsUtils';
-import { RequestContextProps } from '../../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../../models/types/serviceConfig';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 import { buildTvRadioATIParams, buildTvRadioATIUrl } from './buildParams';
 
 (analyticsUtils.getAtUserId as jest.Mock) = jest.fn();

src/app/components/ATIAnalytics/params/tvRadioPage/buildParams.ts

@@ -1,6 +1,6 @@
-import { LIBRARY_VERSION } from '../../../../lib/analyticsUtils';
-import { RequestContextProps } from '../../../../contexts/RequestContext';
-import { ServiceConfig } from '../../../../models/types/serviceConfig';
+import { LIBRARY_VERSION } from '#lib/analyticsUtils';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 import { buildATIPageTrackPath } from '../../atiUrl';
 import { PageData } from '../../types';
 

src/app/components/ATIAnalytics/types.ts

@@ -1,6 +1,6 @@
-import { PageTypes, Platforms, Services } from '../../models/types/global';
-import { RequestContextProps } from '../../contexts/RequestContext';
-import { ServiceConfig } from '../../models/types/serviceConfig';
+import { PageTypes, Platforms, Services } from '#models/types/global';
+import { RequestContextProps } from '#contexts/RequestContext';
+import { ServiceConfig } from '#models/types/serviceConfig';
 
 export interface AMPAnalyticsData {
   transport: {

src/app/components/Ad/Amp/AdSlot/index.test.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '../../../react-testing-library-with-providers';
+import { render } from '#components/react-testing-library-with-providers';
 import AdSlot, { getDataSlot, getAssetType } from '.';
 
 describe('getAssetType', () => {

src/app/components/Ad/Amp/AdSlot/index.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 import isLive from '#lib/utilities/isLive';
-import { STORY_PAGE } from '../../../../routes/utils/pageTypes';
-import { PageTypes, Services } from '../../../../models/types/global';
-import { SlotType } from '../../types';
+import { STORY_PAGE } from '#routes/utils/pageTypes';
+import { PageTypes, Services } from '#models/types/global';
 import {
   GROUP_3_MAX_WIDTH_BP,
   GROUP_4_MIN_WIDTH_BP,
-} from '../../../ThemeProvider/mediaQueries';
+} from '#components/ThemeProvider/mediaQueries';
+import { SlotType } from '../../types';
 
 const publicServiceList = ['news', 'sport', 'ws'];
 

src/app/components/Ad/Amp/index.test.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import { RequestContextProvider } from '#contexts/RequestContext';
-import { FRONT_PAGE } from '#app/routes/utils/pageTypes';
+import { FRONT_PAGE } from '#routes/utils/pageTypes';
+import { render } from '#components/react-testing-library-with-providers';
+import { ServiceContext } from '#contexts/ServiceContext';
+import latinDiacritics from '#components/ThemeProvider/fontScripts/latinWithDiacritics';
 import AmpAd, { AMP_ACCESS_FETCH } from './index';
-import { render } from '../../react-testing-library-with-providers';
-import { ServiceContext } from '../../../contexts/ServiceContext';
-import latinDiacritics from '../../ThemeProvider/fontScripts/latinWithDiacritics';
 import { SlotType } from '../types';
 
 const adJsonAttributes = (slotType: SlotType) => ({

src/app/components/Ad/Amp/index.tsx

@@ -10,10 +10,10 @@ import {
   AMP_ADS_JS,
 } from '#psammead/psammead-assets/src/amp-boilerplate';
 import { getEnvConfig } from '#app/lib/utilities/getEnvConfig';
-import { ServiceContext } from '../../../contexts/ServiceContext';
+import { ServiceContext } from '#contexts/ServiceContext';
+import { Direction, PageTypes, Services } from '#models/types/global';
 import getAdsAriaLabel from '../utilities/getAdsAriaLabel';
 import AdSlot from './AdSlot';
-import { Direction, PageTypes, Services } from '../../../models/types/global';
 import styles from './index.styles';
 import adStyles from '../utilities/adSlot.styles';
 import { AdProps, SLOT_TYPES, SlotType } from '../types';

src/app/components/Ad/Canonical/AdBootstrapJs/index.test.tsx

@@ -4,7 +4,7 @@ import {
   render,
   act,
   waitFor,
-} from '../../../react-testing-library-with-providers';
+} from '#components/react-testing-library-with-providers';
 import AdBootstrapJs from '.';
 
 describe('AdBootstrapJs', () => {

src/app/components/Ad/Canonical/index.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
 import { RequestContext, RequestContextProps } from '#contexts/RequestContext';
 import isLive from '#lib/utilities/isLive';
-import { render } from '../../react-testing-library-with-providers';
+import { render } from '#components/react-testing-library-with-providers';
 import CanonicalAd, { getBootstrapSrc } from '.';
 import { SlotType } from '../types';
 
@@ -56,7 +56,7 @@ describe('CanonicalAds Ads', () => {
   });
 });
 
-jest.mock('../../../lib/utilities/isLive', () =>
+jest.mock('#lib/utilities/isLive', () =>
   jest.fn().mockImplementation(() => false),
 );