Skip to content

Commit 45b2fdc

Browse files
committed
feat: use organisation scoped HCRC-lib
HCRC-191. The 'react-helsinki-headless-cms' (HCRC-lib) has been published under city-of-helsinki organisation scope (https://www.npmjs.com/package/@city-of-helsinki/react-helsinki-headless-cms). This commit installs the new organisation scoped package and migrates all the related imports.
1 parent 59e482c commit 45b2fdc

115 files changed

Lines changed: 847 additions & 636 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/events-helsinki/config/vitest/TestProviders.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ import type {
77
import { useApolloClient } from '@apollo/client/react/index.js';
88
import type { MockedResponse } from '@apollo/client/testing/index.js';
99
import { MockedProvider } from '@apollo/client/testing/index.js';
10+
import type { Config as RHHCConfig } from '@city-of-helsinki/react-helsinki-headless-cms';
11+
import {
12+
ModuleItemTypeEnum,
13+
ConfigProvider as RHHCConfigProvider,
14+
getUri,
15+
defaultConfig as rhhcDefaultConfig,
16+
} from '@city-of-helsinki/react-helsinki-headless-cms';
1017
import {
1118
AppRoutingProvider,
1219
CmsHelperProvider,
@@ -20,13 +27,6 @@ import Link from 'next/link';
2027
import type { NextRouter } from 'next/router';
2128
import React from 'react';
2229
import { ErrorBoundary } from 'react-error-boundary';
23-
import type { Config as RHHCConfig } from 'react-helsinki-headless-cms';
24-
import {
25-
ModuleItemTypeEnum,
26-
ConfigProvider as RHHCConfigProvider,
27-
getUri,
28-
defaultConfig as rhhcDefaultConfig,
29-
} from 'react-helsinki-headless-cms';
3030
import { I18nextProvider } from 'react-i18next';
3131
import { ROUTES } from '../../src/constants';
3232
import cmsHelper from '../../src/domain/app/headlessCmsHelper';

apps/events-helsinki/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
],
4848
"dependencies": {
4949
"@apollo/client": "^3.11.10",
50+
"@city-of-helsinki/react-helsinki-headless-cms": "3.0.0",
5051
"@events-helsinki/common-i18n": "workspace:^",
5152
"@events-helsinki/components": "workspace:^",
5253
"@sentry/browser": "9.38.0",
@@ -78,7 +79,6 @@
7879
"react-datepicker": "^8.4.0",
7980
"react-dom": "18.3.1",
8081
"react-error-boundary": "4.0.10",
81-
"react-helsinki-headless-cms": "2.0.2",
8282
"react-i18next": "15.6.0",
8383
"react-scroll": "^1.9.3",
8484
"react-toastify": "^11.0.5",

apps/events-helsinki/src/domain/app/EventsApolloProvider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { ApolloProvider as BaseApolloProvider } from '@apollo/client/react/index.js';
2+
import { ConfigProvider as RHHCConfigProvider } from '@city-of-helsinki/react-helsinki-headless-cms';
23
import {
34
ApolloErrorNotification,
45
useApolloErrorHandler,
56
} from '@events-helsinki/components';
67
import React from 'react';
7-
import { ConfigProvider as RHHCConfigProvider } from 'react-helsinki-headless-cms';
88
import useEventsRHHCConfig from '../../hooks/useEventsRHHCConfig';
99
import { useEventsApolloClient } from '../clients/eventsApolloClient';
1010

apps/events-helsinki/src/domain/app/getEventsStaticProps.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type {
22
ApolloClient,
33
NormalizedCacheObject,
44
} from '@apollo/client/core/index.js';
5+
import { MenuDocument } from '@city-of-helsinki/react-helsinki-headless-cms/apollo';
56
import type { Menu, Language } from '@events-helsinki/components';
67
import {
78
DEFAULT_FOOTER_MENU_NAME,
@@ -11,7 +12,6 @@ import {
1112
DEFAULT_HEADER_UNIVERSAL_BAR_MENU_NAME,
1213
} from '@events-helsinki/components';
1314
import type { GetStaticPropsContext, GetStaticPropsResult } from 'next';
14-
import { MenuDocument } from 'react-helsinki-headless-cms/apollo';
1515
import { staticGenerationLogger } from '../../logger';
1616
import initializeEventsApolloClient from '../clients/eventsApolloClient';
1717
import AppConfig from './AppConfig';

apps/events-helsinki/src/domain/article/articleDetails/ArticleDetails.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { TagComponent as Tag } from '@city-of-helsinki/react-helsinki-headless-cms';
12
import React from 'react';
2-
import { TagComponent as Tag } from 'react-helsinki-headless-cms';
33

44
import styles from './articleDetails.module.scss';
55

apps/events-helsinki/src/domain/event/EventPageContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { Link } from '@city-of-helsinki/react-helsinki-headless-cms';
12
import {
23
LoadingSpinner,
34
useLocale,
@@ -17,7 +18,6 @@ import dynamic from 'next/dynamic';
1718
import { useRouter } from 'next/router';
1819
import { useTranslation } from 'next-i18next';
1920
import React, { useState } from 'react';
20-
import { Link } from 'react-helsinki-headless-cms';
2121

2222
import { ROUTES } from '../../constants';
2323
import AppConfig from '../../domain/app/AppConfig';

apps/events-helsinki/src/domain/search/eventSearch/SearchPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { useConfig } from '@city-of-helsinki/react-helsinki-headless-cms';
12
import type { QueryEventListArgs } from '@events-helsinki/components';
23
import {
34
LoadingSpinner,
@@ -22,7 +23,6 @@ import { ButtonVariant } from 'hds-react';
2223
import { useRouter } from 'next/router';
2324
import queryString from 'query-string';
2425
import React from 'react';
25-
import { useConfig } from 'react-helsinki-headless-cms';
2626
import { scroller } from 'react-scroll';
2727
import { toast } from 'react-toastify';
2828

apps/events-helsinki/src/domain/search/eventSearch/advancedSearch/AdvancedSearch.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import React from 'react';
21
import {
32
PageSection,
43
ContentContainer,
54
getTextFromHtml,
65
usePageContext,
7-
} from 'react-helsinki-headless-cms';
6+
} from '@city-of-helsinki/react-helsinki-headless-cms';
7+
import React from 'react';
88
import AdvancedSearchContext from './AdvancedSearchContext';
99
import AdvancedSearchForm from './AdvancedSearchForm';
1010
import styles from './search.module.scss';

apps/events-helsinki/src/domain/search/eventSearch/searchResultList/SearchResultsContainer.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
import {
2+
ContentContainer,
3+
PageSection,
4+
} from '@city-of-helsinki/react-helsinki-headless-cms';
15
import { useSearchTranslation } from '@events-helsinki/components';
26
import React from 'react';
3-
import { ContentContainer, PageSection } from 'react-helsinki-headless-cms';
47

58
import ResultsInfoContainer from './ResultsInfo';
69
import styles from './searchResultList.module.scss';

apps/events-helsinki/src/domain/search/landingPage/LandingPage.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
import React from 'react';
21
import type {
32
PageContentLayoutProps,
43
PageType,
5-
} from 'react-helsinki-headless-cms';
6-
import { PageSection, ContentContainer } from 'react-helsinki-headless-cms';
4+
} from '@city-of-helsinki/react-helsinki-headless-cms';
5+
import {
6+
PageSection,
7+
ContentContainer,
8+
} from '@city-of-helsinki/react-helsinki-headless-cms';
9+
import React from 'react';
710

811
import LandingPageSearch from '../landingPageSearch/LandingPageSearch';
912
import styles from './landingPage.module.scss';

0 commit comments

Comments
 (0)