Better encapulate the head shared component #3229

src/http/detect-client-classification.ts

@@ -1,5 +1,5 @@
 import { ParameterizedContext } from 'koa';
-import { ClientClassification } from '../shared-components/head';
+import { ClientClassification } from '../read-side/html-pages/shared-components/head';
 
 export const detectClientClassification = (context: ParameterizedContext): ClientClassification => ({
   userAgent: context.req.headers['user-agent'],

src/read-side/html-pages/construct-html-response.ts

@@ -5,9 +5,9 @@ import { CompleteHtmlDocument } from './complete-html-document';
 import { HtmlPage, toHtmlPage } from './html-page';
 import { PageLayout } from './page-layout';
 import { renderOopsMessage } from './render-oops-message';
+import { ClientClassification } from './shared-components/head';
 import { standardPageLayout } from './shared-components/standard-page-layout';
 import { wrapInHtmlDocument } from './wrap-in-html-document';
-import { ClientClassification } from '../../shared-components/head';
 import * as DE from '../../types/data-error';
 import { ErrorPageBodyViewModel } from '../../types/error-page-body-view-model';
 import { UserDetails } from '../../types/user-details';

src/shared-components/head.ts → src/read-side/html-pages/shared-components/head/head.ts

@@ -1,10 +1,10 @@
 import { htmlEscape } from 'escape-goat';
 import * as O from 'fp-ts/Option';
 import { pipe } from 'fp-ts/function';
-import { fathom, googleTagManager } from './analytics';
-import { HtmlPageHead } from '../read-side/html-pages/html-page';
-import { HtmlFragment, toHtmlFragment } from '../types/html-fragment';
-import { UserId } from '../types/user-id';
+import { fathom, googleTagManager } from '../../../../shared-components/analytics';
+import { HtmlFragment, toHtmlFragment } from '../../../../types/html-fragment';
+import { UserId } from '../../../../types/user-id';
+import { HtmlPageHead } from '../../html-page';
 
 export type ClientClassification = {
   userAgent: string | undefined,

src/read-side/html-pages/shared-components/head/index.ts

@@ -0,0 +1 @@
+export { ClientClassification, DynamicHeadViewModel, head } from './head';

src/read-side/html-pages/to-default-error-html-document.ts

@@ -3,8 +3,8 @@ import * as O from 'fp-ts/Option';
 import { pipe } from 'fp-ts/function';
 import { CompleteHtmlDocument } from './complete-html-document';
 import { constructHtmlResponse } from './construct-html-response';
+import { ClientClassification } from './shared-components/head';
 import { standardPageLayout } from './shared-components/standard-page-layout';
-import { ClientClassification } from '../../shared-components/head';
 import * as DE from '../../types/data-error';
 import { toErrorPageBodyViewModel } from '../../types/error-page-body-view-model';
 import { toHtmlFragment } from '../../types/html-fragment';

src/read-side/html-pages/wrap-in-html-document.ts

@@ -2,8 +2,8 @@ import * as O from 'fp-ts/Option';
 import { pipe } from 'fp-ts/function';
 import { CompleteHtmlDocument, toCompleteHtmlDocument } from './complete-html-document';
 import { ContentWrappedInLayout } from './content-wrapped-in-layout';
+import { DynamicHeadViewModel, head } from './shared-components/head';
 import { googleTagManagerNoScript } from '../../shared-components/analytics';
-import { DynamicHeadViewModel, head } from '../../shared-components/head';
 import { UserDetails } from '../../types/user-details';
 
 const serverStartupTimestamp = new Date();