@prezly/theme-kit-nextjs 1.1.4 → 1.2.1

package/build/newsroom-context/hooks/{useSelectedStory.js → useCurrentStory.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSelectedStory = void 0;
+exports.useCurrentStory = void 0;
 var useNewsroomContext_1 = require("./useNewsroomContext");
-var useSelectedStory = function () {
+var useCurrentStory = function () {
     var context = (0, useNewsroomContext_1.useNewsroomContext)();
-    return context.selectedStory;
+    return context.currentStory;
 };
-exports.useSelectedStory = useSelectedStory;
-//# sourceMappingURL=useSelectedStory.js.map
+exports.useCurrentStory = useCurrentStory;
+//# sourceMappingURL=useCurrentStory.js.map

package/build/newsroom-context/hooks/useCurrentStory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useCurrentStory.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useCurrentStory.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAEnD,IAAM,eAAe,GAAG;IAC3B,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,YAAY,CAAC;AAChC,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}

package/build/newsroom-context/hooks/useGetTranslationUrl.js

@@ -4,13 +4,13 @@ exports.useGetTranslationUrl = void 0;
 var router_1 = require("next/router");
 var react_1 = require("react");
 var data_fetching_1 = require("../../data-fetching");
-var useSelectedCategory_1 = require("./useSelectedCategory");
-var useSelectedStory_1 = require("./useSelectedStory");
+var useCurrentCategory_1 = require("./useCurrentCategory");
+var useCurrentStory_1 = require("./useCurrentStory");
 // Determine correct URL for translated stories/categories with a fallback to homepage
-function getTranslationUrl(locale, path, selectedCategory, selectedStory, noFallback) {
-    if (selectedCategory) {
-        if ((0, data_fetching_1.getCategoryHasTranslation)(selectedCategory, locale)) {
-            return (0, data_fetching_1.getCategoryUrl)(selectedCategory, locale);
+function getTranslationUrl(locale, path, currentCategory, currentStory, noFallback) {
+    if (currentCategory) {
+        if ((0, data_fetching_1.getCategoryHasTranslation)(currentCategory, locale)) {
+            return (0, data_fetching_1.getCategoryUrl)(currentCategory, locale);
         }
         if (noFallback) {
             return '';
@@ -18,8 +18,8 @@ function getTranslationUrl(locale, path, selectedCategory, selectedStory, noFall
         return '/';
     }
     var localeCode = locale.toUnderscoreCode();
-    if (selectedStory && selectedStory.culture.locale !== localeCode) {
-        var translatedStory = selectedStory.translations.find(function (_a) {
+    if (currentStory && currentStory.culture.locale !== localeCode) {
+        var translatedStory = currentStory.translations.find(function (_a) {
             var culture = _a.culture;
             return culture.locale === localeCode;
         });
@@ -35,11 +35,11 @@ function getTranslationUrl(locale, path, selectedCategory, selectedStory, noFall
 }
 function useGetTranslationUrl() {
     var asPath = (0, router_1.useRouter)().asPath;
-    var selectedCategory = (0, useSelectedCategory_1.useSelectedCategory)();
-    var selectedStory = (0, useSelectedStory_1.useSelectedStory)();
+    var currentCategory = (0, useCurrentCategory_1.useCurrentCategory)();
+    var currentStory = (0, useCurrentStory_1.useCurrentStory)();
     return (0, react_1.useCallback)(function (locale, noFallback) {
-        return getTranslationUrl(locale, asPath, selectedCategory, selectedStory, noFallback);
-    }, [asPath, selectedCategory, selectedStory]);
+        return getTranslationUrl(locale, asPath, currentCategory, currentStory, noFallback);
+    }, [asPath, currentCategory, currentStory]);
 }
 exports.useGetTranslationUrl = useGetTranslationUrl;
 //# sourceMappingURL=useGetTranslationUrl.js.map

package/build/newsroom-context/hooks/useGetTranslationUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetTranslationUrl.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useGetTranslationUrl.ts"],"names":[],"mappings":";;;AACA,sCAAwC;AACxC,+BAAoC;AAEpC,qDAAgF;AAGhF,6DAA4D;AAC5D,uDAAsD;AAEtD,sFAAsF;AACtF,SAAS,iBAAiB,CACtB,MAAoB,EACpB,IAAY,EACZ,gBAA2B,EAC3B,aAA6B,EAC7B,UAAoB;IAEpB,IAAI,gBAAgB,EAAE;QAClB,IAAI,IAAA,yCAAyB,EAAC,gBAAgB,EAAE,MAAM,CAAC,EAAE;YACrD,OAAO,IAAA,8BAAc,EAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;SACnD;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,CAAC;SACb;QAED,OAAO,GAAG,CAAC;KACd;IAED,IAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAE7C,IAAI,aAAa,IAAI,aAAa,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE;QAC9D,IAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CACnD,UAAC,EAAW;gBAAT,OAAO,aAAA;YAAO,OAAA,OAAO,CAAC,MAAM,KAAK,UAAU;QAA7B,CAA6B,CACjD,CAAC;QACF,IAAI,eAAe,EAAE;YACjB,OAAO,WAAI,eAAe,CAAC,IAAI,CAAE,CAAC;SACrC;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,CAAC;SACb;QAED,OAAO,GAAG,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,oBAAoB;IACxB,IAAA,MAAM,GAAK,IAAA,kBAAS,GAAE,OAAhB,CAAiB;IAC/B,IAAM,gBAAgB,GAAG,IAAA,yCAAmB,GAAE,CAAC;IAC/C,IAAM,aAAa,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAEzC,OAAO,IAAA,mBAAW,EACd,UAAC,MAAoB,EAAE,UAAoB;QACvC,OAAA,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,UAAU,CAAC;IAA9E,CAA8E,EAClF,CAAC,MAAM,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAC5C,CAAC;AACN,CAAC;AAVD,oDAUC"}
+{"version":3,"file":"useGetTranslationUrl.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useGetTranslationUrl.ts"],"names":[],"mappings":";;;AACA,sCAAwC;AACxC,+BAAoC;AAEpC,qDAAgF;AAGhF,2DAA0D;AAC1D,qDAAoD;AAEpD,sFAAsF;AACtF,SAAS,iBAAiB,CACtB,MAAoB,EACpB,IAAY,EACZ,eAA0B,EAC1B,YAA4B,EAC5B,UAAoB;IAEpB,IAAI,eAAe,EAAE;QACjB,IAAI,IAAA,yCAAyB,EAAC,eAAe,EAAE,MAAM,CAAC,EAAE;YACpD,OAAO,IAAA,8BAAc,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;SAClD;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,CAAC;SACb;QAED,OAAO,GAAG,CAAC;KACd;IAED,IAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAE7C,IAAI,YAAY,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE;QAC5D,IAAM,eAAe,GAAG,YAAY,CAAC,YAAY,CAAC,IAAI,CAClD,UAAC,EAAW;gBAAT,OAAO,aAAA;YAAO,OAAA,OAAO,CAAC,MAAM,KAAK,UAAU;QAA7B,CAA6B,CACjD,CAAC;QACF,IAAI,eAAe,EAAE;YACjB,OAAO,WAAI,eAAe,CAAC,IAAI,CAAE,CAAC;SACrC;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,CAAC;SACb;QAED,OAAO,GAAG,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,oBAAoB;IACxB,IAAA,MAAM,GAAK,IAAA,kBAAS,GAAE,OAAhB,CAAiB;IAC/B,IAAM,eAAe,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAC7C,IAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAC;IAEvC,OAAO,IAAA,mBAAW,EACd,UAAC,MAAoB,EAAE,UAAoB;QACvC,OAAA,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,UAAU,CAAC;IAA5E,CAA4E,EAChF,CAAC,MAAM,EAAE,eAAe,EAAE,YAAY,CAAC,CAC1C,CAAC;AACN,CAAC;AAVD,oDAUC"}

package/build/newsroom-context/hooks/useNewsroomContext.d.ts

@@ -1,2 +1,2 @@
-import { INewsroomContext } from '../context';
-export declare const useNewsroomContext: () => INewsroomContext;
+import { NewsroomContextType } from '../context';
+export declare const useNewsroomContext: () => NewsroomContextType;

package/build/newsroom-context/hooks/useNewsroomContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"useNewsroomContext.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useNewsroomContext.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AAEnC,sCAA+D;AAExD,IAAM,kBAAkB,GAAG;IAC9B,mGAAmG;IACnG,iFAAiF;IACjF,IAAM,eAAe,GAAiC,IAAA,kBAAU,EAAC,yBAAe,CAAC,CAAC;IAClF,IAAI,CAAC,eAAe,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;KAC3F;IAED,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B"}
+{"version":3,"file":"useNewsroomContext.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useNewsroomContext.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AAEnC,sCAAkE;AAE3D,IAAM,kBAAkB,GAAG;IAC9B,mGAAmG;IACnG,iFAAiF;IACjF,IAAM,eAAe,GAAoC,IAAA,kBAAU,EAAC,yBAAe,CAAC,CAAC;IACrF,IAAI,CAAC,eAAe,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;KAC3F;IAED,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B"}

package/build/newsroom-context/index.d.ts

@@ -1,2 +1,2 @@
-export { NewsroomContext, NewsroomContextProvider } from './context';
+export { NewsroomContext, NewsroomContextProvider, NewsroomContextProps } from './context';
 export * from './hooks';

package/build/newsroom-context/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/newsroom-context/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAAqE;AAA5D,0GAAA,eAAe,OAAA;AAAE,kHAAA,uBAAuB,OAAA;AACjD,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/newsroom-context/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAA2F;AAAlF,0GAAA,eAAe,OAAA;AAAE,kHAAA,uBAAuB,OAAA;AACjD,0CAAwB"}

package/build/types.d.ts

@@ -1,23 +1,10 @@
-import type { AlgoliaSettings } from './data-fetching';
-import type { Category, CultureRef, ExtendedStory, ExtraStoryFields, Newsroom, NewsroomCompanyInformation, NewsroomContact, NewsroomLanguageSettings, NewsroomThemePreset, Story } from '@prezly/sdk';
-export interface BasePageProps {
-    newsroom: Newsroom;
-    companyInformation: NewsroomCompanyInformation;
-    categories: Category[];
-    languages: NewsroomLanguageSettings[];
-    localeCode: string;
-    /**
-     * `false` means it's the default locale
-     */
-    shortestLocaleCode: string | false;
+import type { CultureRef, ExtraStoryFields, Story } from '@prezly/sdk';
+import { NewsroomContextProps } from './newsroom-context';
+export interface ServerSidePageProps {
     localeResolved: boolean;
-    themePreset: NewsroomThemePreset;
-    algoliaSettings: AlgoliaSettings;
-    translations?: Translations;
-    contacts?: NewsroomContact[];
-    isTrackingEnabled?: boolean;
-    selectedCategory?: Category;
-    selectedStory?: ExtendedStory;
+}
+export interface PageProps {
+    newsroomContextProps: NewsroomContextProps;
 }
 export interface AlgoliaCategoryRef {
     id: number;
@@ -31,4 +18,3 @@ export declare type AlgoliaStory = Pick<Story, 'uuid' | 'slug' | 'title' | 'subt
     culture: Pick<CultureRef, 'code' | 'name' | 'native_name' | 'language_code'>;
     categories: AlgoliaCategoryRef[];
 };
-export declare type Translations = Record<string, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prezly/theme-kit-nextjs",
-  "version": "1.1.4",
+  "version": "1.2.1",
   "description": "Data layer and utility library for developing Prezly themes with NextJS",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -29,12 +29,18 @@
   "homepage": "https://github.com/prezly/theme-kit-nextjs#readme",
   "scripts": {
     "clean": "rimraf build/ node_modules/",
-    "typecheck": "tsc --noEmit --incremental --project .",
     "prebuild": "npm run clean && npm install",
     "build": "tsc --project .",
     "test": "echo \"Tests? maybe next time ;)\" && exit 0",
-    "prerelease": "npm run typecheck && npm run build",
-    "release": "np"
+    "typecheck": "tsc --noEmit --incremental --project .",
+    "lint": "eslint src",
+    "lint:fix": "npm run lint -- --fix",
+    "prettier": "prettier --check './**/*.(js|ts|tsx|css)'",
+    "prettier:fix": "npm run prettier -- --write --no-list-different",
+    "check": "npm run lint && npm run typecheck",
+    "prerelease": "npm run check && npm run build",
+    "release": "np",
+    "release:preview": "npm run prerelease && np prerelease --any-branch --no-release-draft --tag=preview"
   },
   "peerDependencies": {
     "next": "^12.x",
@@ -50,7 +56,18 @@
     "@types/parse-data-url": "^3.0.0",
     "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",
+    "eslint": "^8.8.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^16.1.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "eslint-plugin-sort-export-all": "^1.2.1",
     "np": "^7.6.0",
+    "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },

package/src/adapter-nextjs/{getBasePageProps.ts → getNewsroomServerSideProps.ts}

@@ -2,22 +2,22 @@ import type { GetServerSidePropsContext } from 'next';
 
 import { getPrezlyApi } from '../data-fetching';
 
-interface BasePagePropsOptions {
+interface Options {
     loadHomepageContacts?: boolean;
 }
 
-export async function getBasePageProps(
+export async function getNewsroomServerSideProps(
     context: GetServerSidePropsContext,
-    options: BasePagePropsOptions = {},
+    options: Options = {},
 ) {
     const { req: request, locale } = context;
 
     const api = getPrezlyApi(request);
-    const basePageProps = await api.getBasePageProps(request, locale);
+    const serverSideProps = await api.getNewsroomServerSideProps(request, locale);
 
     if (options.loadHomepageContacts) {
-        basePageProps.contacts = await api.getNewsroomContacts();
+        serverSideProps.newsroomContextProps.contacts = await api.getNewsroomContacts();
     }
 
-    return { api, basePageProps };
+    return { api, serverSideProps };
 }

package/src/adapter-nextjs/index.ts

@@ -1,2 +1,2 @@
-export * from './getBasePageProps';
+export * from './getNewsroomServerSideProps';
 export * from './processRequest';

package/src/adapter-nextjs/processRequest.ts

@@ -1,31 +1,39 @@
 import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';
 
-import { getRedirectToCanonicalLocale } from '../intl';
-import { BasePageProps } from '../types';
+import { getShortestLocaleCode } from '../data-fetching';
+import { getRedirectToCanonicalLocale, LocaleObject } from '../intl';
+import { PageProps, ServerSidePageProps } from '../types';
 
-export function processRequest<Props extends BasePageProps>(
+export function processRequest<Props>(
     context: GetServerSidePropsContext,
-    basePageProps: BasePageProps,
+    props: Props & PageProps & ServerSidePageProps,
     canonicalUrl?: string,
-    customProps?: Omit<Props, keyof BasePageProps>,
 ): GetServerSidePropsResult<Props> {
-    const { locale, query } = context;
+    const { locale: nextLocale, query } = context;
 
-    if (!basePageProps.localeResolved) {
+    const { localeResolved, ...pageProps } = props;
+
+    if (!localeResolved) {
         return { notFound: true };
     }
 
     if (canonicalUrl) {
-        const redirect = getRedirectToCanonicalLocale(basePageProps, locale, canonicalUrl, query);
+        const { languages, localeCode } = pageProps.newsroomContextProps;
+        const currentLocale = LocaleObject.fromAnyCode(localeCode);
+        const shortestLocaleCode = getShortestLocaleCode(languages, currentLocale);
+
+        const redirect = getRedirectToCanonicalLocale(
+            shortestLocaleCode,
+            nextLocale,
+            canonicalUrl,
+            query,
+        );
         if (redirect) {
             return { redirect };
         }
     }
 
     return {
-        props: {
-            ...basePageProps,
-            ...customProps,
-        } as Props,
+        props: pageProps as Props & PageProps,
     };
 }

package/src/data-fetching/api/PrezlyApi.ts

@@ -8,7 +8,7 @@ import PrezlySDK, {
 import type { IncomingMessage } from 'http';
 
 import { LocaleObject } from '../../intl';
-import { BasePageProps } from '../../types';
+import { PageProps, ServerSidePageProps } from '../../types';
 import { DEFAULT_PAGE_SIZE } from '../constants';
 import { getAlgoliaSettings } from '../lib/getAlgoliaSettings';
 
@@ -17,7 +17,6 @@ import {
     getDefaultLanguage,
     getLanguageFromNextLocaleIsoCode,
     getLanguageFromStory,
-    getShortestLocaleCode,
 } from './languages';
 import {
     getContactsQuery,
@@ -199,11 +198,11 @@ export class PrezlyApi {
         return this.sdk.newsroomThemes.getActive(this.newsroomUuid);
     }
 
-    async getBasePageProps(
+    async getNewsroomServerSideProps(
         request: IncomingMessage | undefined,
         nextLocaleIsoCode?: string,
         story?: Story,
-    ): Promise<BasePageProps> {
+    ): Promise<PageProps & ServerSidePageProps> {
         const [newsroom, languages, categories, themePreset] = await Promise.all([
             this.getNewsroom(),
             this.getNewsroomLanguages(),
@@ -218,7 +217,6 @@ export class PrezlyApi {
 
         const { code: localeCode } = currentLanguage || defaultLanguage;
         const locale = LocaleObject.fromAnyCode(localeCode);
-        const shortestLocaleCode = getShortestLocaleCode(languages, locale);
 
         // TODO: if no information given for current language, show boilerplate from default language
         const companyInformation = getCompanyInformation(languages, locale);
@@ -226,15 +224,16 @@ export class PrezlyApi {
         const algoliaSettings = getAlgoliaSettings(request);
 
         return {
-            newsroom,
-            companyInformation,
-            categories,
-            languages,
-            localeCode,
-            shortestLocaleCode,
+            newsroomContextProps: {
+                newsroom,
+                companyInformation,
+                categories,
+                languages,
+                localeCode,
+                themePreset,
+                algoliaSettings,
+            },
             localeResolved: Boolean(currentLanguage),
-            themePreset,
-            algoliaSettings,
         };
     }
 }

package/src/data-fetching/getNewsroomLogoUrl.ts

@@ -4,7 +4,7 @@ import { getAssetsUrl } from './getAssetsUrl';
 
 export function getNewsroomLogoUrl(newsroom: Newsroom): string {
     if (newsroom.newsroom_logo) {
-        getAssetsUrl(newsroom.newsroom_logo.uuid);
+        return getAssetsUrl(newsroom.newsroom_logo.uuid);
     }
 
     return '';

package/src/intl/locale.ts

@@ -1,8 +1,6 @@
 import type { Redirect } from 'next';
 import { ParsedUrlQuery, stringify } from 'querystring';
 
-import { BasePageProps } from '../types';
-
 import { LocaleObject } from './localeObject';
 
 export const DEFAULT_LOCALE = 'en';
@@ -76,12 +74,11 @@ export function getSupportedLocaleIsoCode(locale: LocaleObject): string {
 }
 
 export function getRedirectToCanonicalLocale(
-    basePageProps: BasePageProps,
+    shortestLocaleCode: string | false,
     nextLocaleIsoCode: string | undefined,
     redirectPath: string,
     query?: ParsedUrlQuery,
 ): Redirect | undefined {
-    const { shortestLocaleCode } = basePageProps;
     const shortestLocaleSlug = shortestLocaleCode
         ? LocaleObject.fromAnyCode(shortestLocaleCode).toUrlSlug()
         : shortestLocaleCode;

package/src/newsroom-context/context.tsx

@@ -7,41 +7,39 @@ import type {
     NewsroomLanguageSettings,
     NewsroomThemePreset,
 } from '@prezly/sdk';
-import React, { createContext, FunctionComponent, useMemo } from 'react';
+import { createContext, FunctionComponent, useMemo } from 'react';
 
 import type { AlgoliaSettings } from '../data-fetching';
 import { DEFAULT_LOCALE, LocaleObject } from '../intl';
 
-export interface INewsroomContext {
+export interface NewsroomContextType {
     newsroom: Newsroom;
     companyInformation: NewsroomCompanyInformation;
     categories: Category[];
     contacts?: NewsroomContact[];
-    selectedCategory?: Category;
-    selectedStory?: ExtendedStory;
+    currentCategory?: Category;
+    currentStory?: ExtendedStory;
     languages: NewsroomLanguageSettings[];
     locale: LocaleObject;
-    hasError?: boolean;
     themePreset: NewsroomThemePreset;
     algoliaSettings: AlgoliaSettings;
 }
 
-interface Props extends Omit<INewsroomContext, 'locale'> {
+export interface NewsroomContextProps extends Omit<NewsroomContextType, 'locale'> {
     localeCode: string;
 }
 
-export const NewsroomContext = createContext<INewsroomContext | undefined>(undefined);
+export const NewsroomContext = createContext<NewsroomContextType | undefined>(undefined);
 
-export const NewsroomContextProvider: FunctionComponent<Props> = ({
+export const NewsroomContextProvider: FunctionComponent<NewsroomContextProps> = ({
     categories,
     contacts,
     newsroom,
-    selectedCategory,
-    selectedStory,
+    currentCategory,
+    currentStory,
     companyInformation,
     languages,
     localeCode,
-    hasError,
     themePreset,
     algoliaSettings,
     children,
@@ -57,12 +55,11 @@ export const NewsroomContextProvider: FunctionComponent<Props> = ({
                 categories,
                 contacts,
                 newsroom,
-                selectedCategory,
-                selectedStory,
+                currentCategory,
+                currentStory,
                 companyInformation,
                 languages,
                 locale,
-                hasError,
                 themePreset,
                 algoliaSettings,
             }}

package/src/newsroom-context/hooks/index.ts

@@ -1,11 +1,11 @@
 export * from './useAlgoliaSettings';
 export * from './useCategories';
 export * from './useCompanyInformation';
+export * from './useCurrentCategory';
 export * from './useCurrentLocale';
+export * from './useCurrentStory';
 export * from './useGetLinkLocaleSlug';
 export * from './useGetTranslationUrl';
 export * from './useLanguages';
 export * from './useNewsroom';
 export * from './useNewsroomContext';
-export * from './useSelectedCategory';
-export * from './useSelectedStory';

package/src/newsroom-context/hooks/{useSelectedCategory.ts → useCurrentCategory.ts}

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useSelectedCategory = () => {
+export const useCurrentCategory = () => {
     const context = useNewsroomContext();
 
-    return context.selectedCategory;
+    return context.currentCategory;
 };

package/src/newsroom-context/hooks/{useSelectedStory.ts → useCurrentStory.ts}

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useSelectedStory = () => {
+export const useCurrentStory = () => {
     const context = useNewsroomContext();
 
-    return context.selectedStory;
+    return context.currentStory;
 };

package/src/newsroom-context/hooks/useGetTranslationUrl.ts

@@ -5,20 +5,20 @@ import { useCallback } from 'react';
 import { getCategoryHasTranslation, getCategoryUrl } from '../../data-fetching';
 import { LocaleObject } from '../../intl';
 
-import { useSelectedCategory } from './useSelectedCategory';
-import { useSelectedStory } from './useSelectedStory';
+import { useCurrentCategory } from './useCurrentCategory';
+import { useCurrentStory } from './useCurrentStory';
 
 // Determine correct URL for translated stories/categories with a fallback to homepage
 function getTranslationUrl(
     locale: LocaleObject,
     path: string,
-    selectedCategory?: Category,
-    selectedStory?: ExtendedStory,
+    currentCategory?: Category,
+    currentStory?: ExtendedStory,
     noFallback?: boolean,
 ) {
-    if (selectedCategory) {
-        if (getCategoryHasTranslation(selectedCategory, locale)) {
-            return getCategoryUrl(selectedCategory, locale);
+    if (currentCategory) {
+        if (getCategoryHasTranslation(currentCategory, locale)) {
+            return getCategoryUrl(currentCategory, locale);
         }
 
         if (noFallback) {
@@ -30,8 +30,8 @@ function getTranslationUrl(
 
     const localeCode = locale.toUnderscoreCode();
 
-    if (selectedStory && selectedStory.culture.locale !== localeCode) {
-        const translatedStory = selectedStory.translations.find(
+    if (currentStory && currentStory.culture.locale !== localeCode) {
+        const translatedStory = currentStory.translations.find(
             ({ culture }) => culture.locale === localeCode,
         );
         if (translatedStory) {
@@ -50,12 +50,12 @@ function getTranslationUrl(
 
 export function useGetTranslationUrl() {
     const { asPath } = useRouter();
-    const selectedCategory = useSelectedCategory();
-    const selectedStory = useSelectedStory();
+    const currentCategory = useCurrentCategory();
+    const currentStory = useCurrentStory();
 
     return useCallback(
         (locale: LocaleObject, noFallback?: boolean) =>
-            getTranslationUrl(locale, asPath, selectedCategory, selectedStory, noFallback),
-        [asPath, selectedCategory, selectedStory],
+            getTranslationUrl(locale, asPath, currentCategory, currentStory, noFallback),
+        [asPath, currentCategory, currentStory],
     );
 }

package/src/newsroom-context/hooks/useNewsroomContext.ts

@@ -1,11 +1,11 @@
 import { useContext } from 'react';
 
-import { INewsroomContext, NewsroomContext } from '../context';
+import { NewsroomContext, NewsroomContextType } from '../context';
 
 export const useNewsroomContext = () => {
     // TS Compiler is having a hard time figuring this type implicitly, so we have to set it explicitly
     // See https://github.com/microsoft/TypeScript/issues/5711#issuecomment-340283439
-    const newsroomContext: INewsroomContext | undefined = useContext(NewsroomContext);
+    const newsroomContext: NewsroomContextType | undefined = useContext(NewsroomContext);
     if (!newsroomContext) {
         throw new Error('No `NewsroomContextProvider` found when calling `useNewsroomContext`');
     }

package/src/newsroom-context/index.ts

@@ -1,2 +1,2 @@
-export { NewsroomContext, NewsroomContextProvider } from './context';
+export { NewsroomContext, NewsroomContextProvider, NewsroomContextProps } from './context';
 export * from './hooks';

package/src/types.ts

@@ -1,37 +1,16 @@
 // TODO: Re-arrange the types to make them isolated to respective libs where possible
-import type { AlgoliaSettings } from './data-fetching';
-import type {
-    Category,
-    CultureRef,
-    ExtendedStory,
-    ExtraStoryFields,
-    Newsroom,
-    NewsroomCompanyInformation,
-    NewsroomContact,
-    NewsroomLanguageSettings,
-    NewsroomThemePreset,
-    Story,
-} from '@prezly/sdk';
+import type { CultureRef, ExtraStoryFields, Story } from '@prezly/sdk';
 
-export interface BasePageProps {
-    newsroom: Newsroom;
-    companyInformation: NewsroomCompanyInformation;
-    categories: Category[];
-    languages: NewsroomLanguageSettings[];
-    localeCode: string;
-    /**
-     * `false` means it's the default locale
-     */
-    shortestLocaleCode: string | false;
+import { NewsroomContextProps } from './newsroom-context';
+
+export interface ServerSidePageProps {
     localeResolved: boolean;
-    themePreset: NewsroomThemePreset;
-    algoliaSettings: AlgoliaSettings;
-    translations?: Translations;
-    contacts?: NewsroomContact[];
-    isTrackingEnabled?: boolean;
-    selectedCategory?: Category;
-    selectedStory?: ExtendedStory;
 }
+
+export interface PageProps {
+    newsroomContextProps: NewsroomContextProps;
+}
+
 export interface AlgoliaCategoryRef {
     id: number;
     name: string;
@@ -46,5 +25,3 @@ export type AlgoliaStory = Pick<Story, 'uuid' | 'slug' | 'title' | 'subtitle'> &
         culture: Pick<CultureRef, 'code' | 'name' | 'native_name' | 'language_code'>;
         categories: AlgoliaCategoryRef[];
     };
-
-export type Translations = Record<string, string>;

package/build/adapter-nextjs/getBasePageProps.d.ts

@@ -1,9 +0,0 @@
-import type { GetServerSidePropsContext } from 'next';
-interface BasePagePropsOptions {
-    loadHomepageContacts?: boolean;
-}
-export declare function getBasePageProps(context: GetServerSidePropsContext, options?: BasePagePropsOptions): Promise<{
-    api: import("../data-fetching/api/PrezlyApi").PrezlyApi;
-    basePageProps: import("..").BasePageProps;
-}>;
-export {};

package/build/adapter-nextjs/getBasePageProps.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBasePageProps.js","sourceRoot":"","sources":["../../src/adapter-nextjs/getBasePageProps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kDAAgD;AAMhD,SAAsB,gBAAgB,CAClC,OAAkC,EAClC,OAAkC;IAAlC,wBAAA,EAAA,YAAkC;;;;;;oBAErB,OAAO,GAAa,OAAO,IAApB,EAAE,MAAM,GAAK,OAAO,OAAZ,CAAa;oBAEnC,GAAG,GAAG,IAAA,4BAAY,EAAC,OAAO,CAAC,CAAC;oBACZ,qBAAM,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAA;;oBAA3D,aAAa,GAAG,SAA2C;yBAE7D,OAAO,CAAC,oBAAoB,EAA5B,wBAA4B;oBAC5B,KAAA,aAAa,CAAA;oBAAY,qBAAM,GAAG,CAAC,mBAAmB,EAAE,EAAA;;oBAAxD,GAAc,QAAQ,GAAG,SAA+B,CAAC;;wBAG7D,sBAAO,EAAE,GAAG,KAAA,EAAE,aAAa,eAAA,EAAE,EAAC;;;;CACjC;AAdD,4CAcC"}

package/build/newsroom-context/hooks/useSelectedCategory.d.ts

@@ -1 +0,0 @@
-export declare const useSelectedCategory: () => import("@prezly/sdk").Category | undefined;

package/build/newsroom-context/hooks/useSelectedCategory.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSelectedCategory = void 0;
-var useNewsroomContext_1 = require("./useNewsroomContext");
-var useSelectedCategory = function () {
-    var context = (0, useNewsroomContext_1.useNewsroomContext)();
-    return context.selectedCategory;
-};
-exports.useSelectedCategory = useSelectedCategory;
-//# sourceMappingURL=useSelectedCategory.js.map

package/build/newsroom-context/hooks/useSelectedCategory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useSelectedCategory.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useSelectedCategory.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAEnD,IAAM,mBAAmB,GAAG;IAC/B,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,gBAAgB,CAAC;AACpC,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B"}

package/build/newsroom-context/hooks/useSelectedStory.d.ts

@@ -1 +0,0 @@
-export declare const useSelectedStory: () => import("@prezly/sdk").ExtendedStory | undefined;