Flytter decorator-utils tilbake...

Author: anders-nom

server/src/server-setup/server-setup.ts

@@ -14,7 +14,7 @@ import {
     addDecoratorUpdateListener,
     getDecoratorVersionId,
 } from '@navikt/nav-dekoratoren-moduler/ssr';
-import { decoratorEnvProps } from 'srcCommon/decorator/decorator-utils-serverside';
+import { decoratorEnvProps } from 'srcCommon/decorator-utils-serverside';
 
 // Set the no-cache header on json files from the incremental cache to ensure
 // data requested during client side navigation is always validated if cached

src/components/PageWrapper.tsx

@@ -4,7 +4,7 @@ import { onBreadcrumbClick, onLanguageSelect, setParams } from '@navikt/nav-deko
 import { ContentProps } from 'types/content-props/_content-common';
 import { hookAndInterceptInternalLink, prefetchOnMouseover } from 'utils/links';
 import { hasWhiteHeader, hasWhitePage } from 'utils/appearance';
-import { getDecoratorParams } from 'srcCommon/decorator/decorator-utils';
+import { getDecoratorParams } from 'utils/decorator-utils';
 import { getInternalRelativePath } from 'utils/urls';
 import { store } from 'store/store';
 import { fetchAndSetInnloggingsstatus } from 'utils/fetch/fetch-innloggingsstatus';

src/components/_common/metatags/DocumentParameterMetatags.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Head from 'next/head';
 import { ContentProps } from 'types/content-props/_content-common';
-import { getDecoratorParams } from 'srcCommon/decorator/decorator-utils';
+import { getDecoratorParams } from 'utils/decorator-utils';
 import { isLegacyContentType } from 'utils/content-types';
 
 type Props = {

src/pages/_document.tsx

@@ -4,7 +4,7 @@ import { DocumentInitialProps } from 'next/dist/pages/_document';
 import { DecoratorComponents } from '@navikt/nav-dekoratoren-moduler/ssr';
 import { Language } from 'translations';
 import { DocumentParameter } from 'components/_common/metatags/DocumentParameterMetatags';
-import { getDecoratorComponents } from 'srcCommon/decorator/decorator-utils-serverside';
+import { getDecoratorComponents } from 'srcCommon/decorator-utils-serverside';
 
 type DocumentProps = {
     language: Language;

srcCommon/decorator/decorator-utils.ts src/utils/decorator-utils.ts

@@ -1,11 +1,11 @@
 import { DecoratorParams } from '@navikt/nav-dekoratoren-moduler';
 import { Language } from 'translations';
-import { getContentLanguages } from 'utils/languages';
 import { ContentProps, ContentType } from 'types/content-props/_content-common';
 import { LanguageProps } from 'types/language';
-import { stripXpPathPrefix } from 'utils/urls';
 import { Audience, getAudience } from 'types/component-props/_mixins';
-import { hasWhiteHeader } from 'utils/appearance';
+import { stripXpPathPrefix } from './urls';
+import { getContentLanguages } from './languages';
+import { hasWhiteHeader } from './appearance';
 
 const defaultLanguage: DecoratorParams['language'] = 'nb';