feat: use organisation scoped HCRC-lib

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

@@ -7,6 +7,13 @@ import type {
 import { useApolloClient } from '@apollo/client/react/index.js';
 import type { MockedResponse } from '@apollo/client/testing/index.js';
 import { MockedProvider } from '@apollo/client/testing/index.js';
+import type { Config as RHHCConfig } from '@city-of-helsinki/react-helsinki-headless-cms';
+import {
+  ModuleItemTypeEnum,
+  ConfigProvider as RHHCConfigProvider,
+  getUri,
+  defaultConfig as rhhcDefaultConfig,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
 import {
   AppRoutingProvider,
   CmsHelperProvider,
@@ -20,13 +27,6 @@ import Link from 'next/link';
 import type { NextRouter } from 'next/router';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import type { Config as RHHCConfig } from 'react-helsinki-headless-cms';
-import {
-  ModuleItemTypeEnum,
-  ConfigProvider as RHHCConfigProvider,
-  getUri,
-  defaultConfig as rhhcDefaultConfig,
-} from 'react-helsinki-headless-cms';
 import { I18nextProvider } from 'react-i18next';
 import { ROUTES } from '../../src/constants';
 import cmsHelper from '../../src/domain/app/headlessCmsHelper';

apps/events-helsinki/package.json

@@ -47,6 +47,7 @@
   ],
   "dependencies": {
     "@apollo/client": "^3.11.10",
+    "@city-of-helsinki/react-helsinki-headless-cms": "3.0.0",
     "@events-helsinki/common-i18n": "workspace:^",
     "@events-helsinki/components": "workspace:^",
     "@sentry/browser": "9.38.0",
@@ -78,7 +79,6 @@
     "react-datepicker": "^8.4.0",
     "react-dom": "18.3.1",
     "react-error-boundary": "4.0.10",
-    "react-helsinki-headless-cms": "2.0.2",
     "react-i18next": "15.6.0",
     "react-scroll": "^1.9.3",
     "react-toastify": "^11.0.5",

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

@@ -1,10 +1,10 @@
 import { ApolloProvider as BaseApolloProvider } from '@apollo/client/react/index.js';
+import { ConfigProvider as RHHCConfigProvider } from '@city-of-helsinki/react-helsinki-headless-cms';
 import {
   ApolloErrorNotification,
   useApolloErrorHandler,
 } from '@events-helsinki/components';
 import React from 'react';
-import { ConfigProvider as RHHCConfigProvider } from 'react-helsinki-headless-cms';
 import useEventsRHHCConfig from '../../hooks/useEventsRHHCConfig';
 import { useEventsApolloClient } from '../clients/eventsApolloClient';
 

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

@@ -2,6 +2,7 @@ import type {
   ApolloClient,
   NormalizedCacheObject,
 } from '@apollo/client/core/index.js';
+import { MenuDocument } from '@city-of-helsinki/react-helsinki-headless-cms/apollo';
 import type { Menu, Language } from '@events-helsinki/components';
 import {
   DEFAULT_FOOTER_MENU_NAME,
@@ -11,7 +12,6 @@ import {
   DEFAULT_HEADER_UNIVERSAL_BAR_MENU_NAME,
 } from '@events-helsinki/components';
 import type { GetStaticPropsContext, GetStaticPropsResult } from 'next';
-import { MenuDocument } from 'react-helsinki-headless-cms/apollo';
 import { staticGenerationLogger } from '../../logger';
 import initializeEventsApolloClient from '../clients/eventsApolloClient';
 import AppConfig from './AppConfig';

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

@@ -1,5 +1,5 @@
+import { TagComponent as Tag } from '@city-of-helsinki/react-helsinki-headless-cms';
 import React from 'react';
-import { TagComponent as Tag } from 'react-helsinki-headless-cms';
 
 import styles from './articleDetails.module.scss';
 

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

@@ -1,3 +1,4 @@
+import { Link } from '@city-of-helsinki/react-helsinki-headless-cms';
 import {
   LoadingSpinner,
   useLocale,
@@ -17,7 +18,6 @@ import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
 import { useTranslation } from 'next-i18next';
 import React, { useState } from 'react';
-import { Link } from 'react-helsinki-headless-cms';
 
 import { ROUTES } from '../../constants';
 import AppConfig from '../../domain/app/AppConfig';

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

@@ -1,3 +1,4 @@
+import { useConfig } from '@city-of-helsinki/react-helsinki-headless-cms';
 import type { QueryEventListArgs } from '@events-helsinki/components';
 import {
   LoadingSpinner,
@@ -22,7 +23,6 @@ import { ButtonVariant } from 'hds-react';
 import { useRouter } from 'next/router';
 import queryString from 'query-string';
 import React from 'react';
-import { useConfig } from 'react-helsinki-headless-cms';
 import { scroller } from 'react-scroll';
 import { toast } from 'react-toastify';
 

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

@@ -1,10 +1,10 @@
-import React from 'react';
 import {
   PageSection,
   ContentContainer,
   getTextFromHtml,
   usePageContext,
-} from 'react-helsinki-headless-cms';
+} from '@city-of-helsinki/react-helsinki-headless-cms';
+import React from 'react';
 import AdvancedSearchContext from './AdvancedSearchContext';
 import AdvancedSearchForm from './AdvancedSearchForm';
 import styles from './search.module.scss';

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

@@ -1,6 +1,9 @@
+import {
+  ContentContainer,
+  PageSection,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
 import { useSearchTranslation } from '@events-helsinki/components';
 import React from 'react';
-import { ContentContainer, PageSection } from 'react-helsinki-headless-cms';
 
 import ResultsInfoContainer from './ResultsInfo';
 import styles from './searchResultList.module.scss';

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

@@ -1,9 +1,12 @@
-import React from 'react';
 import type {
   PageContentLayoutProps,
   PageType,
-} from 'react-helsinki-headless-cms';
-import { PageSection, ContentContainer } from 'react-helsinki-headless-cms';
+} from '@city-of-helsinki/react-helsinki-headless-cms';
+import {
+  PageSection,
+  ContentContainer,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
+import React from 'react';
 
 import LandingPageSearch from '../landingPageSearch/LandingPageSearch';
 import styles from './landingPage.module.scss';

apps/events-helsinki/src/domain/search/landingPageSearch/LandingPageSearchForm.tsx

@@ -1,3 +1,8 @@
+import {
+  isPageType,
+  SecondaryLink,
+  usePageContext,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
 import {
   DateSelector,
   MobileDateSelector,
@@ -8,11 +13,6 @@ import {
 } from '@events-helsinki/components';
 import classnames from 'classnames';
 import { Button, ButtonVariant, IconSearch } from 'hds-react';
-import {
-  isPageType,
-  SecondaryLink,
-  usePageContext,
-} from 'react-helsinki-headless-cms';
 import { ROUTES } from '../../../constants';
 import routerHelper from '../../../domain/app/routerHelper';
 import styles from './landingPageSearchForm.module.scss';

apps/events-helsinki/src/domain/venue/venueDetails/VenueDetails.tsx

@@ -1,9 +1,8 @@
+import { TagComponent as Tag } from '@city-of-helsinki/react-helsinki-headless-cms';
 import type { Venue } from '@events-helsinki/components';
 import { IconLocation } from 'hds-react';
 import React from 'react';
 
-import { TagComponent as Tag } from 'react-helsinki-headless-cms';
-
 import styles from './venueDetails.module.scss';
 
 export type VenueDetailsProps = {

apps/events-helsinki/src/hooks/useEventsRHHCConfig.tsx

@@ -2,6 +2,14 @@ import type {
   ApolloClient,
   NormalizedCacheObject,
 } from '@apollo/client/core/index.js';
+import type {
+  CardProps,
+  Config,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
+import {
+  defaultConfig as rhhcDefaultConfig,
+  ModuleItemTypeEnum,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
 import type { EventFieldsFragment } from '@events-helsinki/components';
 import {
   useResilientTranslation,
@@ -16,11 +24,6 @@ import { ButtonVariant } from 'hds-react';
 import Head from 'next/head';
 import Link from 'next/link';
 import React from 'react';
-import type { CardProps, Config } from 'react-helsinki-headless-cms';
-import {
-  defaultConfig as rhhcDefaultConfig,
-  ModuleItemTypeEnum,
-} from 'react-helsinki-headless-cms';
 import { ROUTES } from '../constants';
 import AppConfig from '../domain/app/AppConfig';
 import routerHelper from '../domain/app/routerHelper';

apps/events-helsinki/src/pages/articles/[...slug].tsx

@@ -1,4 +1,22 @@
 import type { NormalizedCacheObject } from '@apollo/client/core/index.js';
+import type {
+  CollectionType,
+  ArticleType,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
+import {
+  getCollections,
+  Page as RHHCPage,
+  useConfig,
+  getBreadcrumbsFromPage,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
+import type {
+  ArticleQuery,
+  ArticleQueryVariables,
+} from '@city-of-helsinki/react-helsinki-headless-cms/apollo';
+import {
+  ArticleDocument,
+  useCategoriesQuery,
+} from '@city-of-helsinki/react-helsinki-headless-cms/apollo';
 import {
   NavigationContext,
   ShareLinks,
@@ -35,21 +53,6 @@ import type {
 import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
 import { useContext } from 'react';
-import type { CollectionType, ArticleType } from 'react-helsinki-headless-cms';
-import {
-  getCollections,
-  Page as RHHCPage,
-  useConfig,
-  getBreadcrumbsFromPage,
-} from 'react-helsinki-headless-cms';
-import type {
-  ArticleQuery,
-  ArticleQueryVariables,
-} from 'react-helsinki-headless-cms/apollo';
-import {
-  ArticleDocument,
-  useCategoriesQuery,
-} from 'react-helsinki-headless-cms/apollo';
 import { ROUTES } from '../../constants';
 import AppConfig from '../../domain/app/AppConfig';
 import getEventsStaticProps from '../../domain/app/getEventsStaticProps';
@@ -60,7 +63,10 @@ import serverSideTranslationsWithCommon from '../../domain/i18n/serverSideTransl
 const CATEGORIES_AMOUNT = 20;
 
 const RHHCPageContentNoSSR = dynamic(
-  () => import('react-helsinki-headless-cms').then((mod) => mod.PageContent),
+  () =>
+    import('@city-of-helsinki/react-helsinki-headless-cms').then(
+      (mod) => mod.PageContent
+    ),
   {
     ssr: false,
   }

apps/events-helsinki/src/pages/articles/index.tsx

@@ -1,5 +1,27 @@
 import type { ParsedUrlQueryInput } from 'querystring';
 import { NetworkStatus } from '@apollo/client/core/index.js';
+import {
+  Page as RHHCPage,
+  Card,
+  LargeCard,
+  useConfig,
+  TemplateEnum,
+  getBreadcrumbsFromPage,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
+import type {
+  ArticleType,
+  CollectionItemType,
+  PageType,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
+import {
+  useCategoriesQuery,
+  PageByTemplateDocument,
+  usePostsQuery,
+} from '@city-of-helsinki/react-helsinki-headless-cms/apollo';
+import type {
+  PageByTemplateQuery,
+  PageByTemplateQueryVariables,
+} from '@city-of-helsinki/react-helsinki-headless-cms/apollo';
 import type { PreviewDataObject } from '@events-helsinki/components';
 import {
   getQlLanguage,
@@ -21,28 +43,6 @@ import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
 import queryString from 'query-string';
 import React, { useContext } from 'react';
-import {
-  Page as RHHCPage,
-  Card,
-  LargeCard,
-  useConfig,
-  TemplateEnum,
-  getBreadcrumbsFromPage,
-} from 'react-helsinki-headless-cms';
-import type {
-  ArticleType,
-  CollectionItemType,
-  PageType,
-} from 'react-helsinki-headless-cms';
-import {
-  useCategoriesQuery,
-  PageByTemplateDocument,
-  usePostsQuery,
-} from 'react-helsinki-headless-cms/apollo';
-import type {
-  PageByTemplateQuery,
-  PageByTemplateQueryVariables,
-} from 'react-helsinki-headless-cms/apollo';
 import AppConfig from '../../domain/app/AppConfig';
 import type { EventsGlobalPageProps } from '../../domain/app/getEventsStaticProps';
 import getEventsStaticProps from '../../domain/app/getEventsStaticProps';
@@ -54,7 +54,9 @@ const CATEGORIES_AMOUNT = 20;
 
 const SearchPageContentNoSSR = dynamic(
   () =>
-    import('react-helsinki-headless-cms').then((mod) => mod.SearchPageContent),
+    import('@city-of-helsinki/react-helsinki-headless-cms').then(
+      (mod) => mod.SearchPageContent
+    ),
   {
     ssr: false,
   }

apps/events-helsinki/src/pages/cookie-consent/index.tsx

@@ -1,3 +1,9 @@
+import type { PageType } from '@city-of-helsinki/react-helsinki-headless-cms';
+import {
+  Page as RHHCPage,
+  TemplateEnum,
+  getBreadcrumbsFromPage,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
 import commonTranslationsEn from '@events-helsinki/common-i18n/locales/en/common.json';
 import commonTranslationsFi from '@events-helsinki/common-i18n/locales/fi/common.json';
 import commonTranslationsSv from '@events-helsinki/common-i18n/locales/sv/common.json';
@@ -23,12 +29,6 @@ import { type BreadcrumbListItem } from 'hds-react';
 import type { GetStaticPropsContext } from 'next';
 import dynamic from 'next/dynamic';
 import React, { useContext } from 'react';
-import type { PageType } from 'react-helsinki-headless-cms';
-import {
-  Page as RHHCPage,
-  TemplateEnum,
-  getBreadcrumbsFromPage,
-} from 'react-helsinki-headless-cms';
 import AppConfig from '../../domain/app/AppConfig';
 import getEventsStaticProps from '../../domain/app/getEventsStaticProps';
 import ConsentPageContent from '../../domain/cookieConsent/ConsentPageContent';

apps/events-helsinki/src/pages/events/[eventId]/index.tsx

@@ -1,3 +1,8 @@
+import type { PageType } from '@city-of-helsinki/react-helsinki-headless-cms';
+import {
+  Page as RHHCPage,
+  getBreadcrumbsFromPage,
+} from '@city-of-helsinki/react-helsinki-headless-cms';
 import {
   EventDetailsDocument,
   NavigationContext,
@@ -21,11 +26,6 @@ import type {
 import type { BreadcrumbListItem } from 'hds-react';
 import type { GetStaticPropsContext, NextPage } from 'next';
 import React, { useContext } from 'react';
-import type { PageType } from 'react-helsinki-headless-cms';
-import {
-  Page as RHHCPage,
-  getBreadcrumbsFromPage,
-} from 'react-helsinki-headless-cms';
 import { ROUTES } from '../../../constants';
 import AppConfig from '../../../domain/app/AppConfig';
 import getEventsStaticProps from '../../../domain/app/getEventsStaticProps';